fix(ui): keep submit disabled for empty custom answer

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Neural Nomads
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package.json

@@ -1,9 +1,8 @@
 {
   "name": "codenomad-workspace",
-  "version": "0.10.2",
+  "version": "0.9.2",
   "private": true,
   "description": "CodeNomad monorepo workspace",
-  "license": "MIT",
   "workspaces": {
     "packages": [
       "packages/server",

packages/cloudflare/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@codenomad/ui-host-worker",
   "private": true,
-  "license": "MIT",
   "type": "module",
   "scripts": {
     "build:manifest": "node ./scripts/build-manifest.mjs",

packages/cloudflare/release-config.json

@@ -1,4 +1,4 @@
 {
-  "minServerVersion": "0.10.2",
+  "minServerVersion": "0.9.2",
   "latestServerUrl": "https://github.com/NeuralNomadsAI/CodeNomad/releases/latest"
 }

packages/electron-app/electron/main/ipc.ts

@@ -1,8 +1,6 @@
-import { BrowserWindow, Notification, dialog, ipcMain, powerSaveBlocker, type OpenDialogOptions } from "electron"
+import { BrowserWindow, dialog, ipcMain, type OpenDialogOptions } from "electron"
 import type { CliProcessManager, CliStatus } from "./process-manager"
 
-let wakeLockId: number | null = null
-
 interface DialogOpenRequest {
   mode: "directory" | "file"
   title?: string
@@ -64,50 +62,4 @@ export function setupCliIPC(mainWindow: BrowserWindow, cliManager: CliProcessMan
 
     return { canceled: result.canceled, paths: result.filePaths }
   })
-
-  ipcMain.handle("power:setWakeLock", async (_event, enabled: boolean): Promise<{ enabled: boolean }> => {
-    const next = Boolean(enabled)
-    if (next) {
-      if (wakeLockId !== null && powerSaveBlocker.isStarted(wakeLockId)) {
-        return { enabled: true }
-      }
-      try {
-        wakeLockId = powerSaveBlocker.start("prevent-display-sleep")
-      } catch {
-        wakeLockId = null
-        return { enabled: false }
-      }
-      return { enabled: true }
-    }
-
-    if (wakeLockId !== null) {
-      try {
-        if (powerSaveBlocker.isStarted(wakeLockId)) {
-          powerSaveBlocker.stop(wakeLockId)
-        }
-      } finally {
-        wakeLockId = null
-      }
-    }
-    return { enabled: false }
-  })
-
-  ipcMain.handle(
-    "notifications:show",
-    async (_event, payload: { title?: unknown; body?: unknown }): Promise<{ ok: boolean; reason?: string }> => {
-      if (!Notification.isSupported()) {
-        return { ok: false, reason: "unsupported" }
-      }
-
-      const title = typeof payload?.title === "string" ? payload.title : "CodeNomad"
-      const body = typeof payload?.body === "string" ? payload.body : ""
-      try {
-        const notification = new Notification({ title, body })
-        notification.show()
-        return { ok: true }
-      } catch (error) {
-        return { ok: false, reason: error instanceof Error ? error.message : String(error) }
-      }
-    },
-  )
 }

packages/electron-app/electron/main/main.ts

@@ -473,14 +473,6 @@ if (isMac) {
 }
 
 app.whenReady().then(() => {
-  // Required for Windows notifications / taskbar grouping.
-  // Keep in sync with desktop app identifier.
-  try {
-    app.setAppUserModelId("ai.neuralnomads.codenomad.client")
-  } catch {
-    // ignore
-  }
-
   startCli()
 
   if (isMac) {
@@ -513,6 +505,7 @@ app.on("before-quit", async (event) => {
 })
 
 app.on("window-all-closed", () => {
-  // CodeNomad supports a single window; closing it should quit the app on all platforms.
-  app.quit()
+  if (process.platform !== "darwin") {
+    app.quit()
+  }
 })

packages/electron-app/electron/main/process-manager.ts

@@ -1,4 +1,4 @@
-import { spawn, spawnSync, type ChildProcess } from "child_process"
+import { spawn, type ChildProcess } from "child_process"
 import { app } from "electron"
 import { createRequire } from "module"
 import { EventEmitter } from "events"
@@ -82,7 +82,6 @@ export class CliProcessManager extends EventEmitter {
   private stdoutBuffer = ""
   private stderrBuffer = ""
   private bootstrapToken: string | null = null
-  private requestedStop = false
 
   async start(options: StartOptions): Promise<CliStatus> {
     if (this.child) {
@@ -92,7 +91,6 @@ export class CliProcessManager extends EventEmitter {
     this.stdoutBuffer = ""
     this.stderrBuffer = ""
     this.bootstrapToken = null
-    this.requestedStop = false
     this.updateStatus({ state: "starting", port: undefined, pid: undefined, url: undefined, error: undefined })
 
     const cliEntry = this.resolveCliEntry(options)
@@ -111,13 +109,11 @@ export class CliProcessManager extends EventEmitter {
       ? buildUserShellCommand(`ELECTRON_RUN_AS_NODE=1 exec ${this.buildCommand(cliEntry, args)}`)
       : this.buildDirectSpawn(cliEntry, args)
 
-    const detached = process.platform !== "win32"
     const child = spawn(spawnDetails.command, spawnDetails.args, {
       cwd: process.cwd(),
       stdio: ["ignore", "pipe", "pipe"],
       env,
       shell: false,
-      detached,
     })
 
     console.info(`[cli] spawn command: ${spawnDetails.command} ${spawnDetails.args.join(" ")}`)
@@ -179,89 +175,12 @@ export class CliProcessManager extends EventEmitter {
       return
     }
 
-    this.requestedStop = true
-
-    const pid = child.pid
-    if (!pid) {
-      this.child = undefined
-      this.updateStatus({ state: "stopped" })
-      return
-    }
-
-    const isAlreadyExited = () => child.exitCode !== null || child.signalCode !== null
-
-    const tryKillPosixGroup = (signal: NodeJS.Signals) => {
-      try {
-        // Negative PID targets the process group (POSIX).
-        process.kill(-pid, signal)
-        return true
-      } catch (error) {
-        const err = error as NodeJS.ErrnoException
-        if (err?.code === "ESRCH") {
-          return true
-        }
-        return false
-      }
-    }
-
-    const tryKillSinglePid = (signal: NodeJS.Signals) => {
-      try {
-        process.kill(pid, signal)
-        return true
-      } catch (error) {
-        const err = error as NodeJS.ErrnoException
-        if (err?.code === "ESRCH") {
-          return true
-        }
-        return false
-      }
-    }
-
-    const tryTaskkill = (force: boolean) => {
-      const args = ["/PID", String(pid), "/T"]
-      if (force) {
-        args.push("/F")
-      }
-
-      try {
-        const result = spawnSync("taskkill", args, { encoding: "utf8" })
-        const exitCode = result.status
-        if (exitCode === 0) {
-          return true
-        }
-
-        // If the PID is already gone, treat it as success.
-        const stderr = (result.stderr ?? "").toString().toLowerCase()
-        const stdout = (result.stdout ?? "").toString().toLowerCase()
-        const combined = `${stdout}\n${stderr}`
-        if (combined.includes("not found") || combined.includes("no running instance")) {
-          return true
-        }
-        return false
-      } catch {
-        return false
-      }
-    }
-
-    const sendStopSignal = (signal: NodeJS.Signals) => {
-      if (process.platform === "win32") {
-        tryTaskkill(signal === "SIGKILL")
-        return
-      }
-
-      // Prefer process-group signaling so wrapper launchers (shell/tsx) don't outlive Electron.
-      const groupOk = tryKillPosixGroup(signal)
-      if (!groupOk) {
-        tryKillSinglePid(signal)
-      }
-    }
-
     return new Promise((resolve) => {
       const killTimeout = setTimeout(() => {
         console.warn(
           `[cli] stop timed out after 30000ms; sending SIGKILL (pid=${child.pid ?? "unknown"})`,
         )
-        sendStopSignal("SIGKILL")
+        child.kill("SIGKILL")
       }, 30000)
 
       child.on("exit", () => {
@@ -272,15 +191,7 @@ export class CliProcessManager extends EventEmitter {
         resolve()
       })
 
-      if (isAlreadyExited()) {
-        clearTimeout(killTimeout)
-        this.child = undefined
-        this.updateStatus({ state: "stopped" })
-        resolve()
-        return
-      }
-
-      sendStopSignal("SIGTERM")
+      child.kill("SIGTERM")
     })
   }
 
@@ -294,16 +205,7 @@ export class CliProcessManager extends EventEmitter {
 
   private handleTimeout() {
     if (this.child) {
-      const pid = this.child.pid
-      if (pid && process.platform !== "win32") {
-        try {
-          process.kill(-pid, "SIGKILL")
-        } catch {
-          this.child.kill("SIGKILL")
-        }
-      } else {
-        this.child.kill("SIGKILL")
-      }
+      this.child.kill("SIGKILL")
       this.child = undefined
     }
     this.updateStatus({ state: "error", error: "CLI did not start in time" })
@@ -347,27 +249,38 @@ export class CliProcessManager extends EventEmitter {
       console.info(`[cli][${stream}] ${trimmed}`)
       this.emit("log", { stream, message: trimmed })
 
-      const localUrl = this.extractLocalUrl(trimmed)
-      if (localUrl && this.status.state === "starting") {
-        let port: number | undefined
-        try {
-          port = Number(new URL(localUrl).port) || undefined
-        } catch {
-          port = undefined
-        }
-        console.info(`[cli] ready on ${localUrl}`)
-        this.updateStatus({ state: "ready", port, url: localUrl })
+      const port = this.extractPort(trimmed)
+      if (port && this.status.state === "starting") {
+        const url = `http://127.0.0.1:${port}`
+        console.info(`[cli] ready on ${url}`)
+        this.updateStatus({ state: "ready", port, url })
         this.emit("ready", this.status)
       }
     }
   }
 
-  private extractLocalUrl(line: string): string | null {
-    const match = line.match(/^Local\s+Connection\s+URL\s*:\s*(https?:\/\/\S+)\s*$/i)
-    if (!match) {
-      return null
+  private extractPort(line: string): number | null {
+    const readyMatch = line.match(/CodeNomad Server is ready at http:\/\/[^:]+:(\d+)/i)
+    if (readyMatch) {
+      return parseInt(readyMatch[1], 10)
     }
-    return match[1] ?? null
+
+    if (line.toLowerCase().includes("http server listening")) {
+      const httpMatch = line.match(/:(\d{2,5})(?!.*:\d)/)
+      if (httpMatch) {
+        return parseInt(httpMatch[1], 10)
+      }
+      try {
+        const parsed = JSON.parse(line)
+        if (typeof parsed.port === "number") {
+          return parsed.port
+        }
+      } catch {
+        // not JSON, ignore
+      }
+    }
+
+    return null
   }
 
   private updateStatus(patch: Partial<CliStatus>) {
@@ -376,18 +289,7 @@ export class CliProcessManager extends EventEmitter {
   }
 
   private buildCliArgs(options: StartOptions, host: string): string[] {
-    const args = ["serve", "--host", host, "--generate-token"]
-
-    if (options.dev) {
-      // Dev: run plain HTTP + Vite dev server proxy.
-      args.push("--https", "false", "--http", "true")
-      // Avoid collisions with an already-running server (and dual-stack ::/0.0.0.0 quirks)
-      // by forcing an ephemeral port in dev.
-      args.push("--http-port", "0")
-    } else {
-      // Prod desktop: always keep loopback HTTP enabled.
-      args.push("--https", "true", "--http", "true")
-    }
+    const args = ["serve", "--host", host, "--port", "0", "--generate-token"]
 
     if (options.dev) {
       args.push("--ui-dev-server", "http://localhost:3000", "--log-level", "debug")

packages/electron-app/electron/preload/index.cjs

@@ -12,8 +12,6 @@ const electronAPI = {
   getCliStatus: () => ipcRenderer.invoke("cli:getStatus"),
   restartCli: () => ipcRenderer.invoke("cli:restart"),
   openDialog: (options) => ipcRenderer.invoke("dialog:open", options),
-  setWakeLock: (enabled) => ipcRenderer.invoke("power:setWakeLock", Boolean(enabled)),
-  showNotification: (payload) => ipcRenderer.invoke("notifications:show", payload),
 }
 
 contextBridge.exposeInMainWorld("electronAPI", electronAPI)

packages/electron-app/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@neuralnomads/codenomad-electron-app",
-  "version": "0.10.2",
+  "version": "0.9.2",
   "description": "CodeNomad - AI coding assistant",
-  "license": "MIT",
   "author": {
     "name": "Neural Nomads",
     "email": "codenomad@neuralnomads.ai"

packages/opencode-config/package.json

@@ -2,8 +2,7 @@
   "name": "@codenomad/opencode-config",
   "version": "0.5.0",
   "private": true,
-  "license": "MIT",
   "dependencies": {
-    "@opencode-ai/plugin": "1.1.53"
+    "@opencode-ai/plugin": "1.1.36"
   }
-}
+}

packages/opencode-config/plugin/lib/request.ts

@@ -1,7 +1,3 @@
-import http from "http"
-import https from "https"
-import { Readable } from "stream"
-
 export type PluginEvent = {
   type: string
   properties?: Record<string, unknown>
@@ -20,8 +16,7 @@ export function getCodeNomadConfig(): CodeNomadConfig {
 }
 
 export function createCodeNomadRequester(config: CodeNomadConfig) {
-  const rawBaseUrl = (config.baseUrl ?? "").trim()
-  const baseUrl = rawBaseUrl.replace(/\/+$/, "")
+  const baseUrl = config.baseUrl.replace(/\/+$/, "")
   const pluginBase = `${baseUrl}/workspaces/${encodeURIComponent(config.instanceId)}/plugin`
   const authorization = buildInstanceAuthorizationHeader()
 
@@ -47,10 +42,10 @@ export function createCodeNomadRequester(config: CodeNomadConfig) {
     const hasBody = init?.body !== undefined
     const headers = buildHeaders(init?.headers, hasBody)
 
-    // The CodeNomad plugin only talks to the local CodeNomad server.
-    // Use a single request implementation that tolerates custom/self-signed certs
-    // without disabling TLS verification for the whole Node process.
-    return nodeFetch(url, { ...init, headers }, { rejectUnauthorized: false })
+    return fetch(url, {
+      ...init,
+      headers,
+    })
   }
 
   const requestJson = async <T>(path: string, init?: RequestInit): Promise<T> => {
@@ -92,91 +87,6 @@ export function createCodeNomadRequester(config: CodeNomadConfig) {
   }
 }
 
-async function nodeFetch(
-  url: string,
-  init: RequestInit & { headers?: Record<string, string> },
-  tls: { rejectUnauthorized: boolean },
-): Promise<Response> {
-  const parsed = new URL(url)
-  const isHttps = parsed.protocol === "https:"
-  const requestFn = isHttps ? https.request : http.request
-
-  const method = (init.method ?? "GET").toUpperCase()
-  const headers = init.headers ?? {}
-  const body = init.body
-
-  return await new Promise<Response>((resolve, reject) => {
-    const req = requestFn(
-      {
-        protocol: parsed.protocol,
-        hostname: parsed.hostname,
-        port: parsed.port ? Number(parsed.port) : undefined,
-        path: `${parsed.pathname}${parsed.search}`,
-        method,
-        headers,
-        ...(isHttps ? { rejectUnauthorized: tls.rejectUnauthorized } : {}),
-      },
-      (res) => {
-        const responseHeaders = new Headers()
-        for (const [key, value] of Object.entries(res.headers)) {
-          if (value === undefined) continue
-          if (Array.isArray(value)) {
-            responseHeaders.set(key, value.join(", "))
-          } else {
-            responseHeaders.set(key, String(value))
-          }
-        }
-
-        // Convert Node stream -> Web ReadableStream for Response.
-        const webBody = Readable.toWeb(res) as unknown as ReadableStream<Uint8Array>
-        resolve(new Response(webBody, { status: res.statusCode ?? 0, headers: responseHeaders }))
-      },
-    )
-
-    const signal = init.signal
-    const abort = () => {
-      const err = new Error("Request aborted")
-      ;(err as any).name = "AbortError"
-      req.destroy(err)
-      reject(err)
-    }
-
-    if (signal) {
-      if (signal.aborted) {
-        abort()
-        return
-      }
-      signal.addEventListener("abort", abort, { once: true })
-      req.once("close", () => signal.removeEventListener("abort", abort))
-    }
-
-    req.once("error", reject)
-
-    if (body === undefined || body === null) {
-      req.end()
-      return
-    }
-
-    if (typeof body === "string") {
-      req.end(body)
-      return
-    }
-
-    if (body instanceof Uint8Array) {
-      req.end(Buffer.from(body))
-      return
-    }
-
-    if (body instanceof ArrayBuffer) {
-      req.end(Buffer.from(new Uint8Array(body)))
-      return
-    }
-
-    // Fallback for less common BodyInit types.
-    req.end(String(body))
-  })
-}
-
 function requireEnv(key: string): string {
   const value = process.env[key]
   if (!value || !value.trim()) {

packages/server/README.md

@@ -31,11 +31,6 @@ You can run CodeNomad directly without installing it:
 npx @neuralnomads/codenomad --launch
 ```
 
-On startup, CodeNomad prints two URLs:
-
-- `Local Connection URL : ...` (used by desktop shells)
-- `Remote Connection URL : ...` (used by browsers/other machines when remote access is enabled)
-
 ### Install Globally
 Or install it globally to use the `codenomad` command:
 
@@ -49,78 +44,15 @@ You can configure the server using flags or environment variables:
 
 | Flag | Env Variable | Description |
 |------|--------------|-------------|
-| `--https <enabled>` | `CLI_HTTPS` | Enable HTTPS listener (default `true`) |
-| `--http <enabled>` | `CLI_HTTP` | Enable HTTP listener (default `false`) |
-| `--https-port <number>` | `CLI_HTTPS_PORT` | HTTPS port (default `9898`, use `0` for auto) |
-| `--http-port <number>` | `CLI_HTTP_PORT` | HTTP port (default `9899`, use `0` for auto) |
-| `--tls-key <path>` | `CLI_TLS_KEY` | TLS private key (PEM). Requires `--tls-cert`. |
-| `--tls-cert <path>` | `CLI_TLS_CERT` | TLS certificate (PEM). Requires `--tls-key`. |
-| `--tls-ca <path>` | `CLI_TLS_CA` | Optional CA chain/bundle (PEM) |
-| `--tlsSANs <list>` | `CLI_TLS_SANS` | Additional TLS SANs (comma-separated) |
+| `--port <number>` | `CLI_PORT` | HTTP port (default 9898) |
 | `--host <addr>` | `CLI_HOST` | Interface to bind (default 127.0.0.1) |
 | `--workspace-root <path>` | `CLI_WORKSPACE_ROOT` | Default root for new workspaces |
 | `--unrestricted-root` | `CLI_UNRESTRICTED_ROOT` | Allow full-filesystem browsing |
 | `--config <path>` | `CLI_CONFIG` | Config file location |
 | `--launch` | `CLI_LAUNCH` | Open the UI in a Chromium-based browser |
 | `--log-level <level>` | `CLI_LOG_LEVEL` | Logging level (trace, debug, info, warn, error) |
-| `--username <username>` | `CODENOMAD_SERVER_USERNAME` | Username for CodeNomad's internal auth (default `codenomad`) |
-| `--password <password>` | `CODENOMAD_SERVER_PASSWORD` | Password for CodeNomad's internal auth |
-| `--generate-token` | `CODENOMAD_GENERATE_TOKEN` | Emit a one-time local bootstrap token for desktop flows |
-| `--dangerously-skip-auth` | `CODENOMAD_SKIP_AUTH` | Disable CodeNomad's internal auth (use only behind a trusted perimeter) |
-
-### HTTP vs HTTPS
-
-- Default: `--https=true --http=false` (HTTPS only).
-- To run plain HTTP only (useful for development):
-
-```sh
-codenomad --https=false --http=true
-```
-
-- To run both HTTPS (for remote) and HTTP loopback (for desktop):
-
-```sh
-codenomad --https=true --http=true
-```
-
-### Remote Access Binding Rules
-
-- When remote access is enabled (bind host is non-loopback, e.g. `--host 0.0.0.0`):
-  - HTTP listens on `127.0.0.1` only.
-  - HTTPS listens on `--host` (LAN/all interfaces).
-- When remote access is disabled (bind host is loopback, e.g. `--host 127.0.0.1`):
-  - Both HTTP and HTTPS listen on `127.0.0.1`.
-
-### Self-Signed Certificates
-
-If `--https=true` and you do not provide `--tls-key/--tls-cert`, CodeNomad generates a local certificate automatically under your config directory:
-
-- `~/.config/codenomad/tls/ca-cert.pem`
-- `~/.config/codenomad/tls/server-cert.pem`
-
-Certificates are valid for about 30 days and rotate automatically on startup when needed. You can add extra SANs via:
-
-```sh
-codenomad --tlsSANs "localhost,127.0.0.1,my-hostname,192.168.1.10"
-```
-
-### Authentication
-- Default behavior: CodeNomad requires a login (username/password) and stores a session cookie in the browser.
-- `--dangerously-skip-auth` / `CODENOMAD_SKIP_AUTH=true` disables the login prompt and treats all requests as authenticated.
-  Use this only when access is already protected by another layer (SSO proxy, VPN, Coder workspace auth, etc.).
-  If you bind to `0.0.0.0` while skipping auth, anyone who can reach the port can access the API.
-
-### Progressive Web App (PWA)
-When running as a server CodeNomad can also be installed as a PWA from any supported browser, giving you a native app experience just like the Electron installation but executing on the remote server instead.
-
-1. Open the CodeNomad UI in a Chromium-based browser (Chrome, Edge, Brave, etc.).
-2. Click the install icon in the address bar, or use the browser menu → "Install CodeNomad".
-3. The app will open in a standalone window and appear in your OS app list.
-
-> **TLS requirement**
-> Browsers require a secure (`https://`) connection for PWA installation.
-> If you host CodeNomad on a remote machine, use HTTPS. Self-signed certificates generally won't work unless they are explicitly trusted by the device/browser (e.g., via a custom CA).
 
 ### Data Storage
 - **Config**: `~/.config/codenomad/config.json`
 - **Instance Data**: `~/.config/codenomad/instances` (chat history, etc.)
+

packages/server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@neuralnomads/codenomad",
-  "version": "0.10.2",
+  "version": "0.9.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@neuralnomads/codenomad",
-      "version": "0.10.2",
+      "version": "0.9.2",
       "dependencies": {
         "@fastify/cors": "^8.5.0",
         "@fastify/reply-from": "^9.8.0",

packages/server/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@neuralnomads/codenomad",
-  "version": "0.10.2",
+  "version": "0.9.2",
   "description": "CodeNomad Server",
-  "license": "MIT",
   "author": {
     "name": "Neural Nomads",
     "email": "codenomad@neuralnomads.ai"
@@ -21,7 +20,7 @@
     "build:ui": "npm run build --prefix ../ui",
     "prepare-ui": "node ./scripts/copy-ui-dist.mjs",
     "prepare-config": "node ./scripts/copy-opencode-config.mjs",
-    "dev": "cross-env CODENOMAD_DEV=1 CODENOMAD_SERVER_PASSWORD=codenomad-dev CLI_UI_DEV_SERVER=http://localhost:3000 CLI_HTTPS=false CLI_HTTP=true tsx src/index.ts",
+    "dev": "cross-env CODENOMAD_DEV=1 CODENOMAD_SERVER_PASSWORD=codenomad-dev CLI_UI_DEV_SERVER=http://localhost:3000 tsx src/index.ts",
     "typecheck": "tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
@@ -31,14 +30,12 @@
     "commander": "^12.1.0",
     "fastify": "^4.28.1",
     "fuzzysort": "^2.0.4",
-    "node-forge": "^1.3.3",
     "pino": "^9.4.0",
     "undici": "^6.19.8",
     "yauzl": "^2.10.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@types/node-forge": "^1.3.14",
     "@types/yauzl": "^2.10.0",
     "cross-env": "^7.0.3",
     "ts-node": "^10.9.2",

packages/server/src/api-types.ts

@@ -50,38 +50,6 @@ export interface WorkspaceDeleteResponse {
   status: WorkspaceStatus
 }
 
-export type WorktreeKind = "root" | "worktree"
-
-export interface WorktreeDescriptor {
-  /** Stable identifier used by CodeNomad + clients ("root" for repo root). */
-  slug: string
-  /** Absolute directory path on the server host. */
-  directory: string
-  kind: WorktreeKind
-  /** Optional VCS branch name when available. */
-  branch?: string
-}
-
-export interface WorktreeListResponse {
-  worktrees: WorktreeDescriptor[]
-  /** True when the workspace folder resolves to a Git repository. */
-  isGitRepo?: boolean
-}
-
-export interface WorktreeCreateRequest {
-  slug: string
-  /** Optional branch name (defaults to slug). */
-  branch?: string
-}
-
-export interface WorktreeMap {
-  version: 1
-  /** Default worktree to use for new sessions and as fallback. */
-  defaultWorktreeSlug: string
-  /** Mapping of *parent* session IDs to a worktree slug. */
-  parentSessionWorktreeSlug: Record<string, string>
-}
-
 export type LogLevel = "debug" | "info" | "warn" | "error"
 
 export interface WorkspaceLogEntry {
@@ -236,8 +204,7 @@ export interface NetworkAddress {
   ip: string
   family: "ipv4" | "ipv6"
   scope: "external" | "internal" | "loopback"
-  /** Remote URL using the server's remote protocol/port for this IP. */
-  remoteUrl: string
+  url: string
 }
 
 export interface LatestReleaseInfo {
@@ -263,20 +230,16 @@ export interface SupportMeta {
 }
 
 export interface ServerMeta {
-  /** URL desktop apps should use to connect (prefers loopback HTTP when enabled). */
-  localUrl: string
-  /** URL remote clients should use (prefers HTTPS when enabled). */
-  remoteUrl?: string
+  /** Base URL clients should target for REST calls (useful for Electron embedding). */
+  httpBaseUrl: string
   /** SSE endpoint advertised to clients (`/api/events` by default). */
   eventsUrl: string
   /** Host the server is bound to (e.g., 127.0.0.1 or 0.0.0.0). */
   host: string
   /** Listening mode derived from host binding. */
   listeningMode: "local" | "all"
-  /** Actual local port in use after binding. */
-  localPort: number
-  /** Actual remote port in use after binding (when remoteUrl is set). */
-  remotePort?: number
+  /** Actual port in use after binding. */
+  port: number
   /** Display label for the host (e.g., hostname or friendly name). */
   hostLabel: string
   /** Absolute path of the filesystem root exposed to clients. */

packages/server/src/auth/manager.ts

@@ -15,25 +15,15 @@ export interface AuthManagerInit {
   username: string
   password?: string
   generateToken: boolean
-  dangerouslySkipAuth?: boolean
 }
 
 export class AuthManager {
-  private readonly authStore: AuthStore | null
+  private readonly authStore: AuthStore
   private readonly tokenManager: TokenManager | null
   private readonly sessionManager = new SessionManager()
   private readonly cookieName = DEFAULT_AUTH_COOKIE_NAME
-  private readonly authEnabled: boolean
 
   constructor(private readonly init: AuthManagerInit, private readonly logger: Logger) {
-    this.authEnabled = !Boolean(init.dangerouslySkipAuth)
-
-    if (!this.authEnabled) {
-      this.authStore = null
-      this.tokenManager = null
-      return
-    }
-
     const authFilePath = resolveAuthFilePath(init.configPath)
     this.authStore = new AuthStore(authFilePath, logger.child({ component: "auth" }))
 
@@ -47,10 +37,6 @@ export class AuthManager {
     this.tokenManager = init.generateToken ? new TokenManager(60_000) : null
   }
 
-  isAuthEnabled(): boolean {
-    return this.authEnabled
-  }
-
   getCookieName(): string {
     return this.cookieName
   }
@@ -70,31 +56,19 @@ export class AuthManager {
   }
 
   validateLogin(username: string, password: string): boolean {
-    if (!this.authEnabled) {
-      return true
-    }
-    return this.requireAuthStore().validateCredentials(username, password)
+    return this.authStore.validateCredentials(username, password)
   }
 
   createSession(username: string) {
-    if (!this.authEnabled) {
-      return { id: "auth-disabled", createdAt: Date.now(), username: this.init.username }
-    }
     return this.sessionManager.createSession(username)
   }
 
   getStatus() {
-    if (!this.authEnabled) {
-      return { username: this.init.username, passwordUserProvided: false }
-    }
-    return this.requireAuthStore().getStatus()
+    return this.authStore.getStatus()
   }
 
   setPassword(password: string) {
-    if (!this.authEnabled) {
-      throw new Error("Internal authentication is disabled")
-    }
-    return this.requireAuthStore().setPassword({ password, markUserProvided: true })
+    return this.authStore.setPassword({ password, markUserProvided: true })
   }
 
   isLoopbackRequest(request: FastifyRequest): boolean {
@@ -102,12 +76,6 @@ export class AuthManager {
   }
 
   getSessionFromRequest(request: FastifyRequest): { username: string; sessionId: string } | null {
-    if (!this.authEnabled) {
-      // When auth is disabled, treat all requests as authenticated.
-      // We still return a stable username so callers can display it.
-      return { username: this.init.username, sessionId: "auth-disabled" }
-    }
-
     const cookies = parseCookies(request.headers.cookie)
     const sessionId = cookies[this.cookieName]
     const session = this.sessionManager.getSession(sessionId)
@@ -119,24 +87,9 @@ export class AuthManager {
     reply.header("Set-Cookie", buildSessionCookie(this.cookieName, sessionId))
   }
 
-  setSessionCookieWithOptions(reply: FastifyReply, sessionId: string, options?: { secure?: boolean }) {
-    reply.header("Set-Cookie", buildSessionCookie(this.cookieName, sessionId, options))
-  }
-
   clearSessionCookie(reply: FastifyReply) {
     reply.header("Set-Cookie", buildSessionCookie(this.cookieName, "", { maxAgeSeconds: 0 }))
   }
-
-  clearSessionCookieWithOptions(reply: FastifyReply, options?: { secure?: boolean }) {
-    reply.header("Set-Cookie", buildSessionCookie(this.cookieName, "", { maxAgeSeconds: 0, ...options }))
-  }
-
-  private requireAuthStore(): AuthStore {
-    if (!this.authStore) {
-      throw new Error("Auth store is unavailable")
-    }
-    return this.authStore
-  }
 }
 
 function resolveAuthFilePath(configPath: string) {
@@ -151,11 +104,8 @@ function resolvePath(filePath: string) {
   return path.resolve(filePath)
 }
 
-function buildSessionCookie(name: string, value: string, options?: { maxAgeSeconds?: number; secure?: boolean }) {
+function buildSessionCookie(name: string, value: string, options?: { maxAgeSeconds?: number }) {
   const parts = [`${name}=${encodeURIComponent(value)}`, "HttpOnly", "Path=/", "SameSite=Lax"]
-  if (options?.secure) {
-    parts.push("Secure")
-  }
   if (options?.maxAgeSeconds !== undefined) {
     parts.push(`Max-Age=${Math.max(0, Math.floor(options.maxAgeSeconds))}`)
   }

packages/server/src/config/schema.ts

@@ -12,7 +12,6 @@ const PreferencesSchema = z.object({
   showThinkingBlocks: z.boolean().default(false),
   thinkingBlocksExpansion: z.enum(["expanded", "collapsed"]).default("expanded"),
   showTimelineTools: z.boolean().default(true),
-  promptSubmitOnEnter: z.boolean().default(false),
   lastUsedBinary: z.string().optional(),
   locale: z.string().optional(),
   environmentVariables: z.record(z.string()).default({}),
@@ -25,12 +24,6 @@ const PreferencesSchema = z.object({
   showUsageMetrics: z.boolean().default(true),
   autoCleanupBlankSessions: z.boolean().default(true),
   listeningMode: z.enum(["local", "all"]).default("local"),
-
-  // OS notifications
-  osNotificationsEnabled: z.boolean().default(false),
-  osNotificationsAllowWhenVisible: z.boolean().default(false),
-  notifyOnNeedsInput: z.boolean().default(true),
-  notifyOnIdle: z.boolean().default(true),
 })
 
 const RecentFolderSchema = z.object({

packages/server/src/filesystem/browser.ts

@@ -222,18 +222,20 @@ export class FileSystemBrowser {
     const results: FileSystemEntry[] = []
 
     for (const entry of dirents) {
+      if (!options.includeFiles && !entry.isDirectory()) {
+        continue
+      }
+
       const absoluteEntryPath = path.join(directory, entry.name)
       let stats: fs.Stats
       try {
-        // Use fs.statSync (not Dirent.isDirectory) so symlinks to directories
-        // are treated as directories in directory-only listings.
         stats = fs.statSync(absoluteEntryPath)
       } catch {
         // Skip entries we cannot stat (insufficient permissions, etc.)
         continue
       }
 
-      const isDirectory = stats.isDirectory()
+      const isDirectory = entry.isDirectory()
       if (!options.includeFiles && !isDirectory) {
         continue
       }

packages/server/src/index.ts

@@ -19,8 +19,6 @@ import { createLogger } from "./logger"
 import { launchInBrowser } from "./launcher"
 import { resolveUi } from "./ui/remote-ui"
 import { AuthManager, BOOTSTRAP_TOKEN_STDOUT_PREFIX, DEFAULT_AUTH_USERNAME } from "./auth/manager"
-import { resolveHttpsOptions } from "./server/tls"
-import { resolveNetworkAddresses } from "./server/network-addresses"
 
 const require = createRequire(import.meta.url)
 
@@ -30,15 +28,8 @@ const __dirname = path.dirname(__filename)
 const DEFAULT_UI_STATIC_DIR = path.resolve(__dirname, "../public")
 
 interface CliOptions {
+  port: number
   host: string
-  https: boolean
-  http: boolean
-  httpsPort: number
-  httpPort: number
-  tlsKeyPath?: string
-  tlsCertPath?: string
-  tlsCaPath?: string
-  tlsSANs?: string
   rootDir: string
   configPath: string
   unrestrictedRoot: boolean
@@ -53,13 +44,11 @@ interface CliOptions {
   authUsername: string
   authPassword?: string
   generateToken: boolean
-  dangerouslySkipAuth: boolean
 }
 
+const DEFAULT_PORT = 9898
 const DEFAULT_HOST = "127.0.0.1"
 const DEFAULT_CONFIG_PATH = "~/.config/codenomad/config.json"
-const DEFAULT_HTTPS_PORT = 9898
-const DEFAULT_HTTP_PORT = 9899
 
 function parseCliOptions(argv: string[]): CliOptions {
   const program = new Command()
@@ -67,14 +56,7 @@ function parseCliOptions(argv: string[]): CliOptions {
     .description("CodeNomad CLI server")
     .version(packageJson.version, "-v, --version", "Show the CLI version")
     .addOption(new Option("--host <host>", "Host interface to bind").env("CLI_HOST").default(DEFAULT_HOST))
-    .addOption(new Option("--https <enabled>", "Enable HTTPS listener (true|false)").env("CLI_HTTPS").default("true"))
-    .addOption(new Option("--http <enabled>", "Enable HTTP listener (true|false)").env("CLI_HTTP").default("false"))
-    .addOption(new Option("--https-port <number>", "HTTPS port (0 for auto)").env("CLI_HTTPS_PORT").default(DEFAULT_HTTPS_PORT).argParser(parsePort))
-    .addOption(new Option("--http-port <number>", "HTTP port (0 for auto)").env("CLI_HTTP_PORT").default(DEFAULT_HTTP_PORT).argParser(parsePort))
-    .addOption(new Option("--tls-key <path>", "TLS private key (PEM)").env("CLI_TLS_KEY"))
-    .addOption(new Option("--tls-cert <path>", "TLS certificate (PEM)").env("CLI_TLS_CERT"))
-    .addOption(new Option("--tls-ca <path>", "TLS CA chain (PEM)").env("CLI_TLS_CA"))
-    .addOption(new Option("--tlsSANs <list>", "Additional TLS SANs (comma-separated)").env("CLI_TLS_SANS"))
+    .addOption(new Option("--port <number>", "Port for the HTTP server").env("CLI_PORT").default(DEFAULT_PORT).argParser(parsePort))
     .addOption(
       new Option("--workspace-root <path>", "Workspace root directory").env("CLI_WORKSPACE_ROOT").default(process.cwd()),
     )
@@ -102,26 +84,11 @@ function parseCliOptions(argv: string[]): CliOptions {
         .env("CODENOMAD_GENERATE_TOKEN")
         .default(false),
     )
-    .addOption(
-      new Option(
-        "--dangerously-skip-auth",
-        "Disable CodeNomad's internal auth. Use only behind a trusted perimeter (SSO/VPN/etc).",
-      )
-        .env("CODENOMAD_SKIP_AUTH")
-        .default(false),
-    )
 
   program.parse(argv, { from: "user" })
   const parsed = program.opts<{
     host: string
-    https?: string
-    http?: string
-    httpsPort: number
-    httpPort: number
-    tlsKey?: string
-    tlsCert?: string
-    tlsCa?: string
-    tlsSANs?: string
+    port: number
     workspaceRoot?: string
     root?: string
     unrestrictedRoot?: boolean
@@ -137,14 +104,8 @@ function parseCliOptions(argv: string[]): CliOptions {
     username: string
     password?: string
     generateToken?: boolean
-    dangerouslySkipAuth?: boolean
   }>()
 
-  const parseBooleanEnv = (value: string | undefined): boolean => {
-    const normalized = (value ?? "").trim().toLowerCase()
-    return normalized === "1" || normalized === "true" || normalized === "yes" || normalized === "y" || normalized === "on"
-  }
-
   const resolvedRoot = parsed.workspaceRoot ?? parsed.root ?? process.cwd()
 
   const normalizedHost = resolveHost(parsed.host)
@@ -152,23 +113,9 @@ function parseCliOptions(argv: string[]): CliOptions {
   const autoUpdateString = (parsed.uiAutoUpdate ?? "true").trim().toLowerCase()
   const uiAutoUpdate = autoUpdateString === "1" || autoUpdateString === "true" || autoUpdateString === "yes"
 
-  const httpsEnabled = parseBooleanEnv(parsed.https)
-  const httpEnabled = parseBooleanEnv(parsed.http)
-
-  if (!httpsEnabled && !httpEnabled) {
-    throw new InvalidArgumentError("At least one listener must be enabled (--https or --http)")
-  }
-
   return {
+    port: parsed.port,
     host: normalizedHost,
-    https: httpsEnabled,
-    http: httpEnabled,
-    httpsPort: parsed.httpsPort,
-    httpPort: parsed.httpPort,
-    tlsKeyPath: parsed.tlsKey,
-    tlsCertPath: parsed.tlsCert,
-    tlsCaPath: parsed.tlsCa,
-    tlsSANs: parsed.tlsSANs,
     rootDir: resolvedRoot,
     configPath: parsed.config,
     unrestrictedRoot: Boolean(parsed.unrestrictedRoot),
@@ -183,7 +130,6 @@ function parseCliOptions(argv: string[]): CliOptions {
     authUsername: parsed.username,
     authPassword: parsed.password,
     generateToken: Boolean(parsed.generateToken),
-    dangerouslySkipAuth: Boolean(parsed.dangerouslySkipAuth),
   }
 }
 
@@ -210,13 +156,6 @@ function resolveHost(input: string | undefined): string {
   return trimmed
 }
 
-function resolvePath(filePath: string) {
-  if (filePath.startsWith("~/")) {
-    return path.join(process.env.HOME ?? "", filePath.slice(2))
-  }
-  return path.resolve(filePath)
-}
-
 function programHasArg(argv: string[], flag: string): boolean {
   return argv.includes(flag)
 }
@@ -235,30 +174,16 @@ async function main() {
 
   logger.info({ options: logOptions }, "Starting CodeNomad CLI server")
 
-  if (options.dangerouslySkipAuth) {
-    logger.warn(
-      "DANGEROUS: internal authentication is disabled (--dangerously-skip-auth / CODENOMAD_SKIP_AUTH).",
-    )
-  }
-
   const eventBus = new EventBus(eventLogger)
 
   const isLoopbackHost = (host: string) => host === "127.0.0.1" || host === "::1" || host.startsWith("127.")
 
-  const configDir = path.dirname(resolvePath(options.configPath))
-
-  if ((options.tlsKeyPath && !options.tlsCertPath) || (!options.tlsKeyPath && options.tlsCertPath)) {
-    throw new InvalidArgumentError("--tls-key and --tls-cert must be provided together")
-  }
-
   const serverMeta: ServerMeta = {
-    localUrl: "http://localhost:0",
-    remoteUrl: undefined,
+    httpBaseUrl: `http://${options.host}:${options.port}`,
     eventsUrl: `/api/events`,
     host: options.host,
     listeningMode: isLoopbackHost(options.host) ? "local" : "all",
-    localPort: 0,
-    remotePort: undefined,
+    port: options.port,
     hostLabel: options.host,
     workspaceRoot: options.rootDir,
     addresses: [],
@@ -270,31 +195,17 @@ async function main() {
       username: options.authUsername,
       password: options.authPassword,
       generateToken: options.generateToken,
-      dangerouslySkipAuth: options.dangerouslySkipAuth,
     },
     logger.child({ component: "auth" }),
   )
 
-  if (options.generateToken && !options.dangerouslySkipAuth) {
+  if (options.generateToken) {
     const token = authManager.issueBootstrapToken()
     if (token) {
       console.log(`${BOOTSTRAP_TOKEN_STDOUT_PREFIX}${token}`)
     }
   }
 
-  const tlsResolution = resolveHttpsOptions({
-    enabled: options.https,
-    configDir,
-    host: options.host,
-    tlsKeyPath: options.tlsKeyPath,
-    tlsCertPath: options.tlsCertPath,
-    tlsCaPath: options.tlsCaPath,
-    tlsSANs: options.tlsSANs,
-    logger: logger.child({ component: "tls" }),
-  })
-
-  const nodeExtraCaCertsPath = !options.http ? tlsResolution?.caCertPath : undefined
-
   const configStore = new ConfigStore(options.configPath, eventBus, configLogger)
   const binaryRegistry = new BinaryRegistry(configStore, eventBus, configLogger)
   const workspaceManager = new WorkspaceManager({
@@ -303,8 +214,7 @@ async function main() {
     binaryRegistry,
     eventBus,
     logger: workspaceLogger,
-    getServerBaseUrl: () => serverMeta.localUrl,
-    nodeExtraCaCertsPath,
+    getServerBaseUrl: () => serverMeta.httpBaseUrl,
   })
   const fileSystemBrowser = new FileSystemBrowser({ rootDir: options.rootDir, unrestricted: options.unrestrictedRoot })
   const instanceStore = new InstanceStore()
@@ -344,125 +254,28 @@ async function main() {
     minServerVersion: uiResolution.minServerVersion,
   }
 
-  if (uiResolution.uiDevServerUrl && options.https) {
-    throw new InvalidArgumentError("UI dev proxy is only supported with --https=false --http=true")
-  }
+  const server = createHttpServer({
+    host: options.host,
+    port: options.port,
+    workspaceManager,
+    configStore,
+    binaryRegistry,
+    fileSystemBrowser,
+    eventBus,
+    serverMeta,
+    instanceStore,
+    authManager,
+    uiStaticDir: uiResolution.uiStaticDir ?? DEFAULT_UI_STATIC_DIR,
+    uiDevServerUrl: uiResolution.uiDevServerUrl,
+    logger,
+  })
 
-  const remoteAccessEnabled = options.host === "0.0.0.0" || !isLoopbackHost(options.host)
-
-  const httpsPortExplicit = programHasArg(process.argv.slice(2), "--https-port") || Boolean(process.env.CLI_HTTPS_PORT)
-  const httpPortExplicit = programHasArg(process.argv.slice(2), "--http-port") || Boolean(process.env.CLI_HTTP_PORT)
-
-  const httpsBindPort = httpsPortExplicit ? options.httpsPort : 0
-  const httpBindPort = httpPortExplicit ? options.httpPort : 0
-
-  // Listener binding rules:
-  // - Remote access enabled: HTTP listens on loopback, HTTPS on all IPs (host=0.0.0.0 / LAN IP).
-  // - Remote access disabled: both listen on loopback.
-  // - HTTP-only mode: respect --host (used for dev/testing).
-  const httpsBindHost = remoteAccessEnabled ? options.host : "127.0.0.1"
-  const httpBindHost = options.http ? (options.https ? "127.0.0.1" : options.host) : "127.0.0.1"
-
-  const servers: Array<ReturnType<typeof createHttpServer>> = []
-
-  const httpServer = options.http
-    ? createHttpServer({
-        bindHost: httpBindHost,
-        bindPort: httpBindPort,
-        defaultPort: options.httpPort,
-        protocol: "http",
-        workspaceManager,
-        configStore,
-        binaryRegistry,
-        fileSystemBrowser,
-        eventBus,
-        serverMeta,
-        instanceStore,
-        authManager,
-        uiStaticDir: uiResolution.uiStaticDir ?? DEFAULT_UI_STATIC_DIR,
-        uiDevServerUrl: uiResolution.uiDevServerUrl,
-        logger,
-      })
-    : null
-
-  const httpsServer = options.https
-    ? createHttpServer({
-        bindHost: httpsBindHost,
-        bindPort: httpsBindPort,
-        defaultPort: options.httpsPort,
-        protocol: "https",
-        httpsOptions: tlsResolution?.httpsOptions,
-        workspaceManager,
-        configStore,
-        binaryRegistry,
-        fileSystemBrowser,
-        eventBus,
-        serverMeta,
-        instanceStore,
-        authManager,
-        uiStaticDir: uiResolution.uiStaticDir ?? DEFAULT_UI_STATIC_DIR,
-        uiDevServerUrl: undefined,
-        logger,
-      })
-    : null
-
-  if (httpServer) servers.push(httpServer)
-  if (httpsServer) servers.push(httpsServer)
-
-  const [httpStart, httpsStart] = await Promise.all([
-    httpServer ? httpServer.start() : Promise.resolve(null),
-    httpsServer ? httpsServer.start() : Promise.resolve(null),
-  ])
-
-  const localStart = httpStart ?? httpsStart
-  if (!localStart) {
-    throw new Error("No listeners started")
-  }
-
-  const remoteStart = httpsStart ?? httpStart
-  const localProtocol: "http" | "https" = httpStart ? "http" : "https"
-  const remoteProtocol: "http" | "https" = httpsStart ? "https" : "http"
-
-  // Use an explicit IPv4 loopback address for the "local" URL.
-  // On macOS, `localhost` often resolves to ::1 first, and it is possible to have
-  // another instance bound on IPv6 while this instance binds IPv4 (or vice versa),
-  // which can lead clients to talk to the wrong process.
-  const localUrl = `${localProtocol}://127.0.0.1:${localStart.port}`
-  let remoteUrl: string | undefined
-  if (remoteStart) {
-    const wantsAll = options.host === "0.0.0.0" || !isLoopbackHost(options.host)
-    let remoteHost = options.host
-    if (wantsAll) {
-      if (options.host === "0.0.0.0") {
-        const candidates = resolveNetworkAddresses({ host: options.host, protocol: remoteProtocol, port: remoteStart.port })
-        remoteHost = candidates.find((addr) => addr.scope === "external")?.ip ?? "localhost"
-      }
-    } else {
-      remoteHost = "localhost"
-    }
-    remoteUrl = `${remoteProtocol}://${remoteHost}:${remoteStart.port}`
-  }
-
-  serverMeta.localUrl = localUrl
-  serverMeta.localPort = localStart.port
-  serverMeta.remoteUrl = remoteUrl
-  serverMeta.remotePort = remoteStart?.port
-  serverMeta.host = options.host
-  serverMeta.listeningMode = options.host === "0.0.0.0" || !isLoopbackHost(options.host) ? "all" : "local"
-
-  if (serverMeta.remotePort && remoteUrl) {
-    serverMeta.addresses = resolveNetworkAddresses({ host: options.host, protocol: remoteProtocol, port: serverMeta.remotePort })
-  } else {
-    serverMeta.addresses = []
-  }
-
-  console.log(`Local Connection URL : ${serverMeta.localUrl}`)
-  if (serverMeta.remoteUrl) {
-    console.log(`Remote Connection URL : ${serverMeta.remoteUrl}`)
-  }
+  const startInfo = await server.start()
+  logger.info({ port: startInfo.port, host: options.host }, "HTTP server listening")
+  console.log(`CodeNomad Server is ready at ${startInfo.url}`)
 
   if (options.launch) {
-    await launchInBrowser(serverMeta.localUrl, logger.child({ component: "launcher" }))
+    await launchInBrowser(startInfo.url, logger.child({ component: "launcher" }))
   }
 
   let shuttingDown = false
@@ -492,8 +305,8 @@ async function main() {
 
     const shutdownHttp = (async () => {
       try {
-        await Promise.allSettled(servers.map((srv) => srv.stop()))
-        logger.info("HTTP server(s) stopped")
+        await server.stop()
+        logger.info("HTTP server stopped")
       } catch (error) {
         logger.error({ err: error }, "Failed to stop HTTP server")
       }

packages/server/src/server/http-server.ts

@@ -7,7 +7,6 @@ import path from "path"
 import { fetch } from "undici"
 import type { Logger } from "../logger"
 import { WorkspaceManager } from "../workspaces/manager"
-import { isValidWorktreeSlug, listWorktrees, resolveRepoRoot } from "../workspaces/git-worktrees"
 
 import { ConfigStore } from "../config/store"
 import { BinaryRegistry } from "../config/binaries"
@@ -21,7 +20,6 @@ import { registerEventRoutes } from "./routes/events"
 import { registerStorageRoutes } from "./routes/storage"
 import { registerPluginRoutes } from "./routes/plugin"
 import { registerBackgroundProcessRoutes } from "./routes/background-processes"
-import { registerWorktreeRoutes } from "./routes/worktrees"
 import { ServerMeta } from "../api-types"
 import { InstanceStore } from "../storage/instance-store"
 import { BackgroundProcessManager } from "../background-processes/manager"
@@ -30,12 +28,8 @@ import { registerAuthRoutes } from "./routes/auth"
 import { sendUnauthorized, wantsHtml } from "../auth/http-auth"
 
 interface HttpServerDeps {
-  bindHost: string
-  bindPort: number
-  /** When bindPort is 0, try this first. */
-  defaultPort: number
-  protocol: "http" | "https"
-  httpsOptions?: { key: string | Buffer; cert: string | Buffer; ca?: string | Buffer }
+  host: string
+  port: number
   workspaceManager: WorkspaceManager
   configStore: ConfigStore
   binaryRegistry: BinaryRegistry
@@ -55,15 +49,10 @@ interface HttpServerStartResult {
   displayHost: string
 }
 
+const DEFAULT_HTTP_PORT = 9898
+
 export function createHttpServer(deps: HttpServerDeps) {
-  // Fastify's type-level RawServer inference gets noisy when toggling HTTP vs HTTPS.
-  // We keep the runtime behavior correct and cast the instance to a generic FastifyInstance.
-  const app = Fastify(
-    ({
-      logger: false,
-      ...(deps.protocol === "https" && deps.httpsOptions ? { https: deps.httpsOptions } : {}),
-    } as unknown) as any,
-  ) as unknown as FastifyInstance
+  const app = Fastify({ logger: false })
   const proxyLogger = deps.logger.child({ component: "proxy" })
   const apiLogger = deps.logger.child({ component: "http" })
   const sseLogger = deps.logger.child({ component: "sse" })
@@ -106,27 +95,6 @@ export function createHttpServer(deps: HttpServerDeps) {
   const allowedDevOrigins = new Set(["http://localhost:3000", "http://127.0.0.1:3000"])
   const isLoopbackHost = (host: string) => host === "127.0.0.1" || host === "::1" || host.startsWith("127.")
 
-  const getSelfOrigins = (): Set<string> => {
-    const origins = new Set<string>()
-    const candidates: Array<string | undefined> = [deps.serverMeta.localUrl, deps.serverMeta.remoteUrl]
-    for (const candidate of candidates) {
-      if (!candidate) continue
-      try {
-        origins.add(new URL(candidate).origin)
-      } catch {
-        // ignore
-      }
-    }
-    for (const addr of deps.serverMeta.addresses ?? []) {
-      try {
-        origins.add(new URL(addr.remoteUrl).origin)
-      } catch {
-        // ignore
-      }
-    }
-    return origins
-  }
-
   app.register(cors, {
     origin: (origin, cb) => {
       if (!origin) {
@@ -134,8 +102,14 @@ export function createHttpServer(deps: HttpServerDeps) {
         return
       }
 
-      const selfOrigins = getSelfOrigins()
-      if (selfOrigins.has(origin)) {
+      let selfOrigin: string | null = null
+      try {
+        selfOrigin = new URL(deps.serverMeta.httpBaseUrl).origin
+      } catch {
+        selfOrigin = null
+      }
+
+      if (selfOrigin && origin === selfOrigin) {
         cb(null, true)
         return
       }
@@ -146,7 +120,7 @@ export function createHttpServer(deps: HttpServerDeps) {
        }
 
        // When we bind to a non-loopback host (e.g., 0.0.0.0 or LAN IP), allow cross-origin UI access.
-       if (deps.bindHost === "0.0.0.0" || !isLoopbackHost(deps.bindHost)) {
+       if (deps.host === "0.0.0.0" || !isLoopbackHost(deps.host)) {
          cb(null, true)
          return
        }
@@ -248,7 +222,6 @@ export function createHttpServer(deps: HttpServerDeps) {
   registerFilesystemRoutes(app, { fileSystemBrowser: deps.fileSystemBrowser })
   registerMetaRoutes(app, { serverMeta: deps.serverMeta })
   registerEventRoutes(app, { eventBus: deps.eventBus, registerClient: registerSseClient, logger: sseLogger })
-  registerWorktreeRoutes(app, { workspaceManager: deps.workspaceManager })
   registerStorageRoutes(app, {
     instanceStore: deps.instanceStore,
     eventBus: deps.eventBus,
@@ -269,12 +242,12 @@ export function createHttpServer(deps: HttpServerDeps) {
     instance: app,
     start: async (): Promise<HttpServerStartResult> => {
       const attemptListen = async (requestedPort: number) => {
-        const addressInfo = await app.listen({ port: requestedPort, host: deps.bindHost })
+        const addressInfo = await app.listen({ port: requestedPort, host: deps.host })
         return { addressInfo, requestedPort }
       }
 
-      const autoPortRequested = deps.bindPort === 0
-      const primaryPort = autoPortRequested ? deps.defaultPort : deps.bindPort
+      const autoPortRequested = deps.port === 0
+      const primaryPort = autoPortRequested ? DEFAULT_HTTP_PORT : deps.port
 
       const shouldRetryWithEphemeral = (error: unknown) => {
         if (!autoPortRequested) return false
@@ -310,10 +283,15 @@ export function createHttpServer(deps: HttpServerDeps) {
         }
       }
 
-      const displayHost = deps.bindHost === "127.0.0.1" ? "localhost" : deps.bindHost
-      const serverUrl = `${deps.protocol}://${displayHost}:${actualPort}`
+      const displayHost = deps.host === "127.0.0.1" ? "localhost" : deps.host
+      const serverUrl = `http://${displayHost}:${actualPort}`
 
-      deps.logger.info({ port: actualPort, host: deps.bindHost, protocol: deps.protocol }, "HTTP server listening")
+      deps.serverMeta.httpBaseUrl = serverUrl
+      deps.serverMeta.host = deps.host
+      deps.serverMeta.port = actualPort
+      deps.serverMeta.listeningMode = deps.host === "0.0.0.0" || !isLoopbackHost(deps.host) ? "all" : "local"
+      deps.logger.info({ port: actualPort, host: deps.host }, "HTTP server listening")
+      console.log(`CodeNomad Server is ready at ${serverUrl}`)
 
       return { port: actualPort, url: serverUrl, displayHost }
     },
@@ -334,36 +312,31 @@ function registerInstanceProxyRoutes(app: FastifyInstance, deps: InstanceProxyDe
     instance.removeAllContentTypeParsers()
     instance.addContentTypeParser("*", (req, body, done) => done(null, body))
 
-    const proxyBaseHandler = async (
-      request: FastifyRequest<{ Params: { id: string; slug: string } }>,
-      reply: FastifyReply,
-    ) => {
+    const proxyBaseHandler = async (request: FastifyRequest<{ Params: { id: string } }>, reply: FastifyReply) => {
       await proxyWorkspaceRequest({
         request,
         reply,
         workspaceManager: deps.workspaceManager,
-        worktreeSlug: request.params.slug,
         pathSuffix: "",
         logger: deps.logger,
       })
     }
 
     const proxyWildcardHandler = async (
-      request: FastifyRequest<{ Params: { id: string; slug: string; "*": string } }>,
+      request: FastifyRequest<{ Params: { id: string; "*": string } }>,
       reply: FastifyReply,
     ) => {
       await proxyWorkspaceRequest({
         request,
         reply,
         workspaceManager: deps.workspaceManager,
-        worktreeSlug: request.params.slug,
         pathSuffix: request.params["*"] ?? "",
         logger: deps.logger,
       })
     }
 
-    instance.all("/workspaces/:id/worktrees/:slug/instance", proxyBaseHandler)
-    instance.all("/workspaces/:id/worktrees/:slug/instance/*", proxyWildcardHandler)
+    instance.all("/workspaces/:id/instance", proxyBaseHandler)
+    instance.all("/workspaces/:id/instance/*", proxyWildcardHandler)
   })
 }
 
@@ -374,75 +347,12 @@ async function proxyWorkspaceRequest(args: {
   reply: FastifyReply
   workspaceManager: WorkspaceManager
   logger: Logger
-  worktreeSlug: string
   pathSuffix?: string
 }) {
-  const { request, reply, workspaceManager, logger, worktreeSlug } = args
+  const { request, reply, workspaceManager, logger } = args
   const workspaceId = (request.params as { id: string }).id
   const workspace = workspaceManager.get(workspaceId)
 
-  const bodyToJson = (body: unknown): unknown => {
-    if (body == null) return null
-
-    const anyBody = body as any
-    if (anyBody && typeof anyBody.pipe === "function") {
-      // Don't consume streams (would break proxying).
-      // Best-effort: if the stream already has buffered chunks, parse those.
-      try {
-        const buffered = anyBody?._readableState?.buffer
-        if (Array.isArray(buffered) && buffered.length > 0) {
-          const chunks: Buffer[] = []
-          for (const entry of buffered) {
-            if (!entry) continue
-            if (Buffer.isBuffer(entry)) {
-              chunks.push(entry)
-              continue
-            }
-            const data = (entry as any).data
-            if (Buffer.isBuffer(data)) {
-              chunks.push(data)
-            }
-          }
-
-          if (chunks.length > 0) {
-            const text = Buffer.concat(chunks).toString("utf-8")
-            try {
-              return JSON.parse(text)
-            } catch {
-              return { __raw: text }
-            }
-          }
-        }
-      } catch {
-        // fall through
-      }
-
-      return { __stream: true }
-    }
-
-    const maybeParse = (input: string): unknown => {
-      try {
-        return JSON.parse(input)
-      } catch {
-        return { __raw: input }
-      }
-    }
-
-    if (Buffer.isBuffer(body)) {
-      return maybeParse(body.toString("utf-8"))
-    }
-
-    if (typeof body === "string") {
-      return maybeParse(body)
-    }
-
-    if (typeof body === "object") {
-      return body
-    }
-
-    return body
-  }
-
   if (!workspace) {
     reply.code(404).send({ error: "Workspace not found" })
     return
@@ -454,23 +364,6 @@ async function proxyWorkspaceRequest(args: {
     return
   }
 
-  if (!isValidWorktreeSlug(worktreeSlug)) {
-    reply.code(400).send({ error: "Invalid worktree slug" })
-    return
-  }
-
-  const directory = await resolveWorktreeDirectory({
-    workspaceId,
-    workspacePath: workspace.path,
-    worktreeSlug,
-    logger,
-  })
-
-  if (!directory) {
-    reply.code(404).send({ error: "Worktree not found" })
-    return
-  }
-
   const normalizedSuffix = normalizeInstanceSuffix(args.pathSuffix)
   const queryIndex = (request.raw.url ?? "").indexOf("?")
   const search = queryIndex >= 0 ? (request.raw.url ?? "").slice(queryIndex) : ""
@@ -487,43 +380,6 @@ async function proxyWorkspaceRequest(args: {
       if (instanceAuthHeader) {
         headers.authorization = instanceAuthHeader
       }
-
-      // OpenCode expects the *full* path; we send it via header to avoid query tampering.
-      const isNonASCII = /[^\x00-\x7F]/.test(directory)
-      const encodedDirectory = isNonASCII ? encodeURIComponent(directory) : directory
-
-      // Overwrite any client-provided value (case-insensitive headers are normalized by Node).
-      ;(headers as Record<string, unknown>)["x-opencode-directory"] = encodedDirectory
-
-      if (logger.isLevelEnabled("trace")) {
-        const outgoing: Record<string, unknown> = {}
-        for (const [key, value] of Object.entries(headers as Record<string, unknown>)) {
-          outgoing[key] = value
-        }
-
-        // Redact sensitive headers.
-        for (const key of Object.keys(outgoing)) {
-          const lower = key.toLowerCase()
-          if (lower === "authorization" || lower === "cookie" || lower === "set-cookie") {
-            outgoing[key] = "<redacted>"
-          }
-        }
-
-        logger.trace(
-          {
-            workspaceId,
-            method: request.method,
-            targetUrl,
-            worktreeSlug,
-            directory,
-            contentType: request.headers["content-type"],
-            body: bodyToJson(request.body),
-            headers: outgoing,
-          },
-          "Proxy -> OpenCode request",
-        )
-      }
-
       return headers
     },
     onError: (proxyReply, { error }) => {
@@ -543,52 +399,6 @@ function normalizeInstanceSuffix(pathSuffix: string | undefined) {
   return trimmed.length === 0 ? "/" : `/${trimmed}`
 }
 
-type WorktreeCacheEntry = {
-  expiresAt: number
-  repoRoot: string
-  worktrees: Array<{ slug: string; directory: string }>
-}
-
-const WORKTREE_CACHE_TTL_MS = 2000
-const worktreeCache = new Map<string, WorktreeCacheEntry>()
-
-async function getCachedWorktrees(params: { workspaceId: string; workspacePath: string; logger: Logger }) {
-  const cached = worktreeCache.get(params.workspaceId)
-  const now = Date.now()
-  if (cached && cached.expiresAt > now) {
-    return cached
-  }
-
-  const { repoRoot } = await resolveRepoRoot(params.workspacePath, params.logger)
-  const worktrees = await listWorktrees({ repoRoot, workspaceFolder: params.workspacePath, logger: params.logger })
-  const entry: WorktreeCacheEntry = {
-    expiresAt: now + WORKTREE_CACHE_TTL_MS,
-    repoRoot,
-    worktrees: worktrees.map((wt) => ({ slug: wt.slug, directory: wt.directory })),
-  }
-  worktreeCache.set(params.workspaceId, entry)
-  return entry
-}
-
-async function resolveWorktreeDirectory(params: {
-  workspaceId: string
-  workspacePath: string
-  worktreeSlug: string
-  logger: Logger
-}): Promise<string | null> {
-  const { worktreeSlug } = params
-  const cached = await getCachedWorktrees({ workspaceId: params.workspaceId, workspacePath: params.workspacePath, logger: params.logger })
-  const match = cached.worktrees.find((wt) => wt.slug === worktreeSlug)
-  if (match) {
-    return match.directory
-  }
-
-  // If the slug is new (e.g., created moments ago), refresh once.
-  worktreeCache.delete(params.workspaceId)
-  const refreshed = await getCachedWorktrees({ workspaceId: params.workspaceId, workspacePath: params.workspacePath, logger: params.logger })
-  return refreshed.worktrees.find((wt) => wt.slug === worktreeSlug)?.directory ?? null
-}
-
 function setupStaticUi(app: FastifyInstance, uiDir: string, authManager: AuthManager) {
   if (!uiDir) {
     app.log.warn("UI static directory not provided; API endpoints only")

packages/server/src/server/network-addresses.ts

@@ -1,75 +0,0 @@
-import os from "os"
-import type { NetworkAddress } from "../api-types"
-
-export function resolveNetworkAddresses(args: {
-  host: string
-  protocol: "http" | "https"
-  port: number
-}): NetworkAddress[] {
-  const { host, protocol, port } = args
-  const interfaces = os.networkInterfaces()
-  const seen = new Set<string>()
-  const results: NetworkAddress[] = []
-
-  const addAddress = (ip: string, scope: NetworkAddress["scope"]) => {
-    if (!ip || ip === "0.0.0.0") return
-    const key = `ipv4-${ip}`
-    if (seen.has(key)) return
-    seen.add(key)
-    results.push({ ip, family: "ipv4", scope, remoteUrl: `${protocol}://${ip}:${port}` })
-  }
-
-  const normalizeFamily = (value: string | number) => {
-    if (typeof value === "string") {
-      const lowered = value.toLowerCase()
-      if (lowered === "ipv4") {
-        return "ipv4" as const
-      }
-    }
-    if (value === 4) return "ipv4" as const
-    return null
-  }
-
-  if (host === "0.0.0.0") {
-    // Enumerate system interfaces (IPv4 only)
-    for (const entries of Object.values(interfaces)) {
-      if (!entries) continue
-      for (const entry of entries) {
-        const family = normalizeFamily(entry.family)
-        if (!family) continue
-        if (!entry.address || entry.address === "0.0.0.0") continue
-        const scope: NetworkAddress["scope"] = entry.internal ? "loopback" : "external"
-        addAddress(entry.address, scope)
-      }
-    }
-  }
-
-  // Always include loopback address
-  addAddress("127.0.0.1", "loopback")
-
-  // Include explicitly configured host if it was IPv4
-  if (isIPv4Address(host) && host !== "0.0.0.0") {
-    const isLoopback = host.startsWith("127.")
-    addAddress(host, isLoopback ? "loopback" : "external")
-  }
-
-  const scopeWeight: Record<NetworkAddress["scope"], number> = { external: 0, internal: 1, loopback: 2 }
-
-  return results.sort((a, b) => {
-    const scopeDelta = scopeWeight[a.scope] - scopeWeight[b.scope]
-    if (scopeDelta !== 0) return scopeDelta
-    return a.ip.localeCompare(b.ip)
-  })
-}
-
-function isIPv4Address(value: string | undefined): value is string {
-  if (!value) return false
-  const parts = value.split(".")
-  if (parts.length !== 4) return false
-  return parts.every((part) => {
-    if (part.length === 0 || part.length > 3) return false
-    if (!/^[0-9]+$/.test(part)) return false
-    const num = Number(part)
-    return Number.isInteger(num) && num >= 0 && num <= 255
-  })
-}

packages/server/src/server/routes/auth.ts

@@ -88,7 +88,7 @@ export function registerAuthRoutes(app: FastifyInstance, deps: RouteDeps) {
     }
 
     const session = deps.authManager.createSession(body.username)
-    deps.authManager.setSessionCookieWithOptions(reply, session.id, { secure: isSecureRequest(request) })
+    deps.authManager.setSessionCookie(reply, session.id)
     reply.send({ ok: true })
   })
 
@@ -112,12 +112,12 @@ export function registerAuthRoutes(app: FastifyInstance, deps: RouteDeps) {
 
     const username = deps.authManager.getStatus().username
     const session = deps.authManager.createSession(username)
-    deps.authManager.setSessionCookieWithOptions(reply, session.id, { secure: isSecureRequest(request) })
+    deps.authManager.setSessionCookie(reply, session.id)
     reply.send({ ok: true })
   })
 
-  app.post("/api/auth/logout", async (request, reply) => {
-    deps.authManager.clearSessionCookieWithOptions(reply, { secure: isSecureRequest(request) })
+  app.post("/api/auth/logout", async (_request, reply) => {
+    deps.authManager.clearSessionCookie(reply)
     reply.send({ ok: true })
   })
 
@@ -139,13 +139,6 @@ export function registerAuthRoutes(app: FastifyInstance, deps: RouteDeps) {
   })
 }
 
-function isSecureRequest(request: any) {
-  if (request.protocol === "https") {
-    return true
-  }
-  return Boolean(request.raw?.socket && request.raw.socket.encrypted)
-}
-
 function escapeHtml(value: string) {
   return value.replace(/[&<>"]/g, (char) => {
     switch (char) {

packages/server/src/server/routes/meta.ts

@@ -1,6 +1,6 @@
 import { FastifyInstance } from "fastify"
-import { ServerMeta } from "../../api-types"
-import { resolveNetworkAddresses } from "../network-addresses"
+import os from "os"
+import { NetworkAddress, ServerMeta } from "../../api-types"
 
 interface RouteDeps {
   serverMeta: ServerMeta
@@ -11,25 +11,23 @@ export function registerMetaRoutes(app: FastifyInstance, deps: RouteDeps) {
 }
 
 function buildMetaResponse(meta: ServerMeta): ServerMeta {
-  const localPort = resolveLocalPort(meta)
-  const remote = resolveRemote(meta)
-  const addresses = remote && remote.port > 0 ? resolveNetworkAddresses({ host: meta.host, protocol: remote.protocol, port: remote.port }) : []
+  const port = resolvePort(meta)
+  const addresses = port > 0 ? resolveAddresses(port, meta.host) : []
 
   return {
     ...meta,
-    localPort,
-    remotePort: remote?.port,
+    port,
     listeningMode: meta.host === "0.0.0.0" || !isLoopbackHost(meta.host) ? "all" : "local",
     addresses,
   }
 }
 
-function resolveLocalPort(meta: ServerMeta): number {
-  if (Number.isInteger(meta.localPort) && meta.localPort > 0) {
-    return meta.localPort
+function resolvePort(meta: ServerMeta): number {
+  if (Number.isInteger(meta.port) && meta.port > 0) {
+    return meta.port
   }
   try {
-    const parsed = new URL(meta.localUrl)
+    const parsed = new URL(meta.httpBaseUrl)
     const port = Number(parsed.port)
     return Number.isInteger(port) && port > 0 ? port : 0
   } catch {
@@ -37,22 +35,74 @@ function resolveLocalPort(meta: ServerMeta): number {
   }
 }
 
-function resolveRemote(meta: ServerMeta): { protocol: "http" | "https"; port: number } | null {
-  if (!meta.remoteUrl) {
-    return null
-  }
-  try {
-    const parsed = new URL(meta.remoteUrl)
-    const protocol = parsed.protocol === "https:" ? "https" : "http"
-    const port = Number(parsed.port)
-    return { protocol, port: Number.isInteger(port) && port > 0 ? port : 0 }
-  } catch {
-    return null
-  }
-}
-
 function isLoopbackHost(host: string): boolean {
   return host === "127.0.0.1" || host === "::1" || host.startsWith("127.")
 }
 
-// NetworkAddress shape is resolved in ../network-addresses
+function resolveAddresses(port: number, host: string): NetworkAddress[] {
+  const interfaces = os.networkInterfaces()
+  const seen = new Set<string>()
+  const results: NetworkAddress[] = []
+
+  const addAddress = (ip: string, scope: NetworkAddress["scope"]) => {
+    if (!ip || ip === "0.0.0.0") return
+    const key = `ipv4-${ip}`
+    if (seen.has(key)) return
+    seen.add(key)
+    results.push({ ip, family: "ipv4", scope, url: `http://${ip}:${port}` })
+  }
+
+  const normalizeFamily = (value: string | number) => {
+    if (typeof value === "string") {
+      const lowered = value.toLowerCase()
+      if (lowered === "ipv4") {
+        return "ipv4" as const
+      }
+    }
+    if (value === 4) return "ipv4" as const
+    return null
+  }
+
+  if (host === "0.0.0.0") {
+    // Enumerate system interfaces (IPv4 only)
+    for (const entries of Object.values(interfaces)) {
+      if (!entries) continue
+      for (const entry of entries) {
+        const family = normalizeFamily(entry.family)
+        if (!family) continue
+        if (!entry.address || entry.address === "0.0.0.0") continue
+        const scope: NetworkAddress["scope"] = entry.internal ? "loopback" : "external"
+        addAddress(entry.address, scope)
+      }
+    }
+  }
+
+  // Always include loopback address
+  addAddress("127.0.0.1", "loopback")
+
+  // Include explicitly configured host if it was IPv4
+  if (isIPv4Address(host) && host !== "0.0.0.0") {
+    const isLoopback = host.startsWith("127.")
+    addAddress(host, isLoopback ? "loopback" : "external")
+  }
+
+  const scopeWeight: Record<NetworkAddress["scope"], number> = { external: 0, internal: 1, loopback: 2 }
+
+  return results.sort((a, b) => {
+    const scopeDelta = scopeWeight[a.scope] - scopeWeight[b.scope]
+    if (scopeDelta !== 0) return scopeDelta
+    return a.ip.localeCompare(b.ip)
+  })
+}
+
+function isIPv4Address(value: string | undefined): value is string {
+  if (!value) return false
+  const parts = value.split(".")
+  if (parts.length !== 4) return false
+  return parts.every((part) => {
+    if (part.length === 0 || part.length > 3) return false
+    if (!/^[0-9]+$/.test(part)) return false
+    const num = Number(part)
+    return Number.isInteger(num) && num >= 0 && num <= 255
+  })
+}

packages/server/src/server/routes/worktrees.ts

@@ -1,195 +0,0 @@
-import type { FastifyInstance, FastifyReply } from "fastify"
-import { z } from "zod"
-import { WorkspaceManager } from "../../workspaces/manager"
-import {
-  resolveRepoRoot,
-  listWorktrees,
-  isValidWorktreeSlug,
-  createManagedWorktree,
-  removeWorktree,
-} from "../../workspaces/git-worktrees"
-import type { WorktreeListResponse, WorktreeMap } from "../../api-types"
-import { ensureCodenomadGitExclude, readWorktreeMap, writeWorktreeMap } from "../../workspaces/worktree-map"
-
-interface RouteDeps {
-  workspaceManager: WorkspaceManager
-}
-
-const WorktreeMapSchema = z.object({
-  version: z.literal(1),
-  defaultWorktreeSlug: z.string().min(1).default("root"),
-  parentSessionWorktreeSlug: z.record(z.string(), z.string()).default({}),
-})
-
-const WorktreeCreateSchema = z.object({
-  slug: z.string().trim().min(1),
-  branch: z.string().trim().min(1).optional(),
-})
-
-export function registerWorktreeRoutes(app: FastifyInstance, deps: RouteDeps) {
-  app.get<{ Params: { id: string } }>("/api/workspaces/:id/worktrees", async (request, reply) => {
-    const workspace = deps.workspaceManager.get(request.params.id)
-    if (!workspace) {
-      reply.code(404)
-      return { error: "Workspace not found" }
-    }
-
-    const { repoRoot, isGitRepo } = await resolveRepoRoot(workspace.path, request.log)
-    const worktrees = await listWorktrees({ repoRoot, workspaceFolder: workspace.path, logger: request.log })
-    const response: WorktreeListResponse = { worktrees, isGitRepo }
-    return response
-  })
-
-  app.post<{ Params: { id: string } }>("/api/workspaces/:id/worktrees", async (request, reply) => {
-    const workspace = deps.workspaceManager.get(request.params.id)
-    if (!workspace) {
-      reply.code(404)
-      return { error: "Workspace not found" }
-    }
-
-    try {
-      const body = WorktreeCreateSchema.parse(request.body ?? {})
-      const slug = body.slug
-      if (!isValidWorktreeSlug(slug) || slug === "root") {
-        reply.code(400)
-        return { error: "Invalid worktree slug" }
-      }
-      if (body.branch) {
-        if (!isValidWorktreeSlug(body.branch) || body.branch === "root") {
-          reply.code(400)
-          return { error: "Invalid worktree branch" }
-        }
-        if (body.branch !== slug) {
-          reply.code(400)
-          return { error: "Branch must match slug" }
-        }
-      }
-
-      const { repoRoot, isGitRepo } = await resolveRepoRoot(workspace.path, request.log)
-      if (!isGitRepo) {
-        reply.code(400)
-        return { error: "Workspace is not a Git repository" }
-      }
-
-      await ensureCodenomadGitExclude(workspace.path, request.log).catch(() => undefined)
-
-      const created = await createManagedWorktree({
-        repoRoot,
-        workspaceFolder: workspace.path,
-        slug,
-        logger: request.log,
-      })
-
-      reply.code(201)
-      return created
-    } catch (error) {
-      return handleError(error, reply)
-    }
-  })
-
-  app.delete<{ Params: { id: string; slug: string }; Querystring: { force?: string } }>(
-    "/api/workspaces/:id/worktrees/:slug",
-    async (request, reply) => {
-    const workspace = deps.workspaceManager.get(request.params.id)
-    if (!workspace) {
-      reply.code(404)
-      return { error: "Workspace not found" }
-    }
-
-    const slug = (request.params.slug ?? "").trim()
-    if (!isValidWorktreeSlug(slug) || slug === "root") {
-      reply.code(400)
-      return { error: "Invalid worktree slug" }
-    }
-
-    const { repoRoot, isGitRepo } = await resolveRepoRoot(workspace.path, request.log)
-    if (!isGitRepo) {
-      reply.code(400)
-      return { error: "Workspace is not a Git repository" }
-    }
-
-    const force = (request.query?.force ?? "").toString().toLowerCase() === "true"
-
-    try {
-      const worktrees = await listWorktrees({ repoRoot, workspaceFolder: workspace.path, logger: request.log })
-      const match = worktrees.find((wt) => wt.slug === slug)
-      if (!match || match.kind === "root") {
-        reply.code(404)
-        return { error: "Worktree not found" }
-      }
-
-      await removeWorktree({ workspaceFolder: workspace.path, directory: match.directory, force, logger: request.log })
-
-      // Best-effort: prune any mappings that point at the deleted worktree.
-      const current = await readWorktreeMap(workspace.path, request.log)
-      let changed = false
-      const nextMapping: Record<string, string> = { ...(current.parentSessionWorktreeSlug ?? {}) }
-      for (const [sessionId, mapped] of Object.entries(nextMapping)) {
-        if (mapped === slug) {
-          delete nextMapping[sessionId]
-          changed = true
-        }
-      }
-      const nextDefault = current.defaultWorktreeSlug === slug ? "root" : current.defaultWorktreeSlug
-      if (nextDefault !== current.defaultWorktreeSlug) {
-        changed = true
-      }
-      if (changed) {
-        await writeWorktreeMap(
-          workspace.path,
-          {
-            version: 1,
-            defaultWorktreeSlug: nextDefault,
-            parentSessionWorktreeSlug: nextMapping,
-          },
-          request.log,
-        )
-      }
-
-      reply.code(204)
-    } catch (error) {
-      return handleError(error, reply)
-    }
-  },
-  )
-
-  app.get<{ Params: { id: string } }>("/api/workspaces/:id/worktrees/map", async (request, reply) => {
-    const workspace = deps.workspaceManager.get(request.params.id)
-    if (!workspace) {
-      reply.code(404)
-      return { error: "Workspace not found" }
-    }
-    return await readWorktreeMap(workspace.path, request.log)
-  })
-
-  app.put<{ Params: { id: string } }>("/api/workspaces/:id/worktrees/map", async (request, reply) => {
-    const workspace = deps.workspaceManager.get(request.params.id)
-    if (!workspace) {
-      reply.code(404)
-      return { error: "Workspace not found" }
-    }
-
-    try {
-      const parsed = WorktreeMapSchema.parse(request.body ?? {}) as WorktreeMap
-      if (!isValidWorktreeSlug(parsed.defaultWorktreeSlug)) {
-        reply.code(400)
-        return { error: "Invalid defaultWorktreeSlug" }
-      }
-      for (const slug of Object.values(parsed.parentSessionWorktreeSlug ?? {})) {
-        if (!isValidWorktreeSlug(slug)) {
-          reply.code(400)
-          return { error: "Invalid worktree slug in mapping" }
-        }
-      }
-      await writeWorktreeMap(workspace.path, parsed, request.log)
-      reply.code(204)
-    } catch (error) {
-      return handleError(error, reply)
-    }
-  })
-}
-
-function handleError(error: unknown, reply: FastifyReply) {
-  reply.code(400)
-  return { error: error instanceof Error ? error.message : "Unable to fulfill request" }
-}

packages/server/src/server/tls.ts

@@ -1,283 +0,0 @@
-import crypto from "crypto"
-import fs from "fs"
-import path from "path"
-import { createRequire } from "module"
-import type { Logger } from "../logger"
-
-const require = createRequire(import.meta.url)
-
-type Forge = typeof import("node-forge")
-
-function loadForge(): Forge {
-  // node-forge is CJS in many installs; require keeps this compatible with our ESM output.
-  return require("node-forge") as Forge
-}
-
-export interface ResolvedHttpsOptions {
-  httpsOptions: { key: string | Buffer; cert: string | Buffer; ca?: string | Buffer }
-  /** Path to CA certificate suitable for NODE_EXTRA_CA_CERTS. */
-  caCertPath?: string
-  mode: "provided" | "generated"
-}
-
-export interface ResolveHttpsOptionsArgs {
-  enabled: boolean
-  configDir: string
-  host: string
-  tlsKeyPath?: string
-  tlsCertPath?: string
-  tlsCaPath?: string
-  tlsSANs?: string
-  logger: Logger
-}
-
-const LEAF_VALIDITY_DAYS = 30
-const ROTATE_IF_EXPIRES_WITHIN_DAYS = 3
-
-const CA_VALIDITY_DAYS = 365
-
-export function resolveHttpsOptions(args: ResolveHttpsOptionsArgs): ResolvedHttpsOptions | null {
-  if (!args.enabled) {
-    return null
-  }
-
-  const hasProvided = Boolean(args.tlsKeyPath && args.tlsCertPath)
-  if (hasProvided) {
-    const key = fs.readFileSync(args.tlsKeyPath!, "utf-8")
-    const cert = fs.readFileSync(args.tlsCertPath!, "utf-8")
-    const ca = args.tlsCaPath ? fs.readFileSync(args.tlsCaPath, "utf-8") : undefined
-    return {
-      httpsOptions: { key, cert, ca },
-      caCertPath: args.tlsCaPath,
-      mode: "provided",
-    }
-  }
-
-  return ensureGeneratedTls(args)
-}
-
-function ensureGeneratedTls(args: ResolveHttpsOptionsArgs): ResolvedHttpsOptions {
-  const tlsDir = path.join(args.configDir, "tls")
-  const caKeyPath = path.join(tlsDir, "ca-key.pem")
-  const caCertPath = path.join(tlsDir, "ca-cert.pem")
-  const keyPath = path.join(tlsDir, "server-key.pem")
-  const certPath = path.join(tlsDir, "server-cert.pem")
-
-  fs.mkdirSync(tlsDir, { recursive: true })
-
-  const shouldRotateLeaf = () => {
-    try {
-      if (!fs.existsSync(certPath)) return true
-      const pem = fs.readFileSync(certPath, "utf-8")
-      const x509 = new crypto.X509Certificate(pem)
-      const validToMs = Date.parse(x509.validTo)
-      if (!Number.isFinite(validToMs)) return true
-      const rotateAt = validToMs - ROTATE_IF_EXPIRES_WITHIN_DAYS * 24 * 60 * 60 * 1000
-      return Date.now() >= rotateAt
-    } catch {
-      return true
-    }
-  }
-
-  const shouldRotateCa = () => {
-    try {
-      if (!fs.existsSync(caCertPath)) return true
-      const pem = fs.readFileSync(caCertPath, "utf-8")
-      const x509 = new crypto.X509Certificate(pem)
-      const validToMs = Date.parse(x509.validTo)
-      if (!Number.isFinite(validToMs)) return true
-      // CA rotates only when expired.
-      return Date.now() >= validToMs
-    } catch {
-      return true
-    }
-  }
-
-  if (shouldRotateCa() || !fs.existsSync(caKeyPath)) {
-    const { caKeyPem, caCertPem } = generateCaCertificate()
-    writePemFile(caKeyPath, caKeyPem, 0o600)
-    writePemFile(caCertPath, caCertPem, 0o644)
-    args.logger.info({ caCertPath }, "Generated self-signed CodeNomad CA certificate")
-  }
-
-  if (shouldRotateLeaf() || !fs.existsSync(keyPath)) {
-    const caKeyPem = fs.readFileSync(caKeyPath, "utf-8")
-    const caCertPem = fs.readFileSync(caCertPath, "utf-8")
-
-    const { keyPem, certPem } = generateServerCertificate({
-      host: args.host,
-      tlsSANs: args.tlsSANs,
-      caKeyPem,
-      caCertPem,
-    })
-
-    writePemFile(keyPath, keyPem, 0o600)
-    writePemFile(certPath, certPem, 0o644)
-    args.logger.info({ certPath }, "Generated CodeNomad HTTPS certificate")
-  }
-
-  const key = fs.readFileSync(keyPath, "utf-8")
-  const cert = fs.readFileSync(certPath, "utf-8")
-  const ca = fs.readFileSync(caCertPath, "utf-8")
-
-  // Present the CA as part of the chain.
-  const chainedCert = `${cert.trim()}\n${ca.trim()}\n`
-
-  return {
-    httpsOptions: {
-      key,
-      cert: chainedCert,
-    },
-    caCertPath,
-    mode: "generated",
-  }
-}
-
-function writePemFile(filePath: string, content: string, mode: number) {
-  fs.writeFileSync(filePath, content, { encoding: "utf-8", mode })
-  try {
-    fs.chmodSync(filePath, mode)
-  } catch {
-    // best effort on platforms that ignore chmod
-  }
-}
-
-function generateCaCertificate(): { caKeyPem: string; caCertPem: string } {
-  const forge = loadForge()
-
-  const keys = forge.pki.rsa.generateKeyPair(2048)
-  const cert = forge.pki.createCertificate()
-  cert.publicKey = keys.publicKey
-  cert.serialNumber = crypto.randomBytes(16).toString("hex")
-
-  const now = new Date()
-  const notBefore = new Date(now.getTime() - 60_000)
-  const notAfter = new Date(now.getTime() + CA_VALIDITY_DAYS * 24 * 60 * 60 * 1000)
-  cert.validity.notBefore = notBefore
-  cert.validity.notAfter = notAfter
-
-  const attrs = [{ name: "commonName", value: "CodeNomad Local CA" }]
-  cert.setSubject(attrs)
-  cert.setIssuer(attrs)
-
-  cert.setExtensions([
-    { name: "basicConstraints", cA: true },
-    { name: "keyUsage", keyCertSign: true, cRLSign: true, digitalSignature: true },
-    { name: "subjectKeyIdentifier" },
-  ])
-
-  cert.sign(keys.privateKey, forge.md.sha256.create())
-
-  return {
-    caKeyPem: forge.pki.privateKeyToPem(keys.privateKey),
-    caCertPem: forge.pki.certificateToPem(cert),
-  }
-}
-
-function generateServerCertificate(args: {
-  host: string
-  tlsSANs?: string
-  caKeyPem: string
-  caCertPem: string
-}): { keyPem: string; certPem: string } {
-  const forge = loadForge()
-
-  const caKey = forge.pki.privateKeyFromPem(args.caKeyPem)
-  const caCert = forge.pki.certificateFromPem(args.caCertPem)
-
-  const keys = forge.pki.rsa.generateKeyPair(2048)
-  const cert = forge.pki.createCertificate()
-  cert.publicKey = keys.publicKey
-  cert.serialNumber = crypto.randomBytes(16).toString("hex")
-
-  const now = new Date()
-  const notBefore = new Date(now.getTime() - 60_000)
-  const notAfter = new Date(now.getTime() + LEAF_VALIDITY_DAYS * 24 * 60 * 60 * 1000)
-  cert.validity.notBefore = notBefore
-  cert.validity.notAfter = notAfter
-
-  const commonName = pickCommonName(args.host)
-  cert.setSubject([{ name: "commonName", value: commonName }])
-  cert.setIssuer(caCert.subject.attributes)
-
-  const san = buildSubjectAltNames(args.host, args.tlsSANs)
-
-  cert.setExtensions([
-    { name: "basicConstraints", cA: false },
-    { name: "keyUsage", digitalSignature: true, keyEncipherment: true },
-    { name: "extKeyUsage", serverAuth: true },
-    { name: "subjectAltName", altNames: san },
-    { name: "subjectKeyIdentifier" },
-  ])
-
-  cert.sign(caKey, forge.md.sha256.create())
-
-  return {
-    keyPem: forge.pki.privateKeyToPem(keys.privateKey),
-    certPem: forge.pki.certificateToPem(cert),
-  }
-}
-
-function pickCommonName(host: string): string {
-  if (!host || host === "0.0.0.0") {
-    return "localhost"
-  }
-  if (host === "127.0.0.1") {
-    return "localhost"
-  }
-  return host
-}
-
-function buildSubjectAltNames(host: string, tlsSANs?: string): Array<{ type: number; value?: string; ip?: string }> {
-  const dns = new Set<string>()
-  const ips = new Set<string>()
-
-  dns.add("localhost")
-  ips.add("127.0.0.1")
-
-  if (host && host !== "0.0.0.0") {
-    if (isIPv4(host)) {
-      ips.add(host)
-    } else {
-      dns.add(host)
-    }
-  }
-
-  for (const token of splitList(tlsSANs)) {
-    if (isIPv4(token)) {
-      ips.add(token)
-    } else if (token) {
-      dns.add(token)
-    }
-  }
-
-  const altNames: Array<{ type: number; value?: string; ip?: string }> = []
-
-  // 2 = DNS, 7 = IP
-  for (const name of Array.from(dns)) {
-    altNames.push({ type: 2, value: name })
-  }
-  for (const ip of Array.from(ips)) {
-    altNames.push({ type: 7, ip })
-  }
-
-  return altNames
-}
-
-function splitList(input: string | undefined): string[] {
-  if (!input) return []
-  return input
-    .split(",")
-    .map((part) => part.trim())
-    .filter(Boolean)
-}
-
-function isIPv4(value: string): boolean {
-  const parts = value.split(".")
-  if (parts.length !== 4) return false
-  return parts.every((part) => {
-    if (!/^[0-9]+$/.test(part)) return false
-    const num = Number(part)
-    return Number.isInteger(num) && num >= 0 && num <= 255
-  })
-}

packages/server/src/workspaces/git-worktrees.ts

@@ -1,241 +0,0 @@
-import path from "path"
-import { spawn } from "child_process"
-import type { WorktreeDescriptor } from "../api-types"
-import { promises as fsp } from "fs"
-
-export interface LogLike {
-  debug?: (obj: any, msg?: string) => void
-  warn?: (obj: any, msg?: string) => void
-}
-
-type GitResult = { ok: true; stdout: string } | { ok: false; error: Error; stdout?: string; stderr?: string }
-
-function runGit(args: string[], cwd: string): Promise<GitResult> {
-  return new Promise((resolve) => {
-    const child = spawn("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] })
-    let stdout = ""
-    let stderr = ""
-
-    child.stdout?.on("data", (chunk) => {
-      stdout += chunk.toString()
-    })
-    child.stderr?.on("data", (chunk) => {
-      stderr += chunk.toString()
-    })
-    child.once("error", (error) => {
-      resolve({ ok: false, error, stdout, stderr })
-    })
-    child.once("close", (code) => {
-      if (code === 0) {
-        resolve({ ok: true, stdout })
-      } else {
-        const error = new Error(stderr.trim() || `git ${args.join(" ")} failed with code ${code}`)
-        resolve({ ok: false, error, stdout, stderr })
-      }
-    })
-  })
-}
-
-export async function resolveRepoRoot(folder: string, logger?: LogLike): Promise<{ repoRoot: string; isGitRepo: boolean }> {
-  const result = await runGit(["rev-parse", "--show-toplevel"], folder)
-  if (!result.ok) {
-    logger?.debug?.({ folder, err: result.error }, "Folder is not a Git repository; using workspace folder as root")
-    return { repoRoot: folder, isGitRepo: false }
-  }
-  const repoRoot = result.stdout.trim()
-  if (!repoRoot) {
-    return { repoRoot: folder, isGitRepo: false }
-  }
-  return { repoRoot, isGitRepo: true }
-}
-
-function parseWorktreePorcelain(output: string): Array<{ worktree: string; branch?: string; head?: string; detached?: boolean }> {
-  const records: Array<{ worktree: string; branch?: string; head?: string; detached?: boolean }> = []
-  const lines = output.split(/\r?\n/)
-  let current: { worktree?: string; branch?: string; head?: string; detached?: boolean } = {}
-
-  const flush = () => {
-    if (current.worktree) {
-      records.push({ worktree: current.worktree, branch: current.branch })
-    }
-    current = {}
-  }
-
-  for (const line of lines) {
-    const trimmed = line.trim()
-    if (!trimmed) {
-      flush()
-      continue
-    }
-    const [key, ...rest] = trimmed.split(" ")
-    const value = rest.join(" ").trim()
-    if (key === "worktree") {
-      current.worktree = value
-    } else if (key === "branch") {
-      // branch is like refs/heads/foo
-      current.branch = value.replace(/^refs\/heads\//, "")
-    } else if (key === "HEAD") {
-      current.head = value
-    } else if (key === "detached") {
-      current.detached = true
-    }
-  }
-  flush()
-  return records
-}
-
-export async function listWorktrees(params: {
-  repoRoot: string
-  workspaceFolder: string
-  logger?: LogLike
-}): Promise<WorktreeDescriptor[]> {
-  const { repoRoot, workspaceFolder, logger } = params
-  const rootDescriptor: WorktreeDescriptor = { slug: "root", directory: repoRoot, kind: "root" }
-
-  const result = await runGit(["worktree", "list", "--porcelain"], workspaceFolder)
-  if (!result.ok) {
-    logger?.debug?.({ repoRoot, err: result.error }, "Failed to list git worktrees; returning root only")
-    return [rootDescriptor]
-  }
-
-  const records = parseWorktreePorcelain(result.stdout)
-
-  const worktrees: WorktreeDescriptor[] = [rootDescriptor]
-  const seen = new Set<string>(["root"])
-
-  const normalizeSlug = (record: { branch?: string; head?: string; detached?: boolean; worktree: string }): string => {
-    const branch = (record.branch ?? "").trim()
-    if (branch) {
-      return branch
-    }
-    const head = (record.head ?? "").trim()
-    if (head && /^[0-9a-f]{7,40}$/i.test(head)) {
-      return `detached-${head.slice(0, 7)}`
-    }
-    // Fallback: stable-ish identifier derived from directory basename.
-    const base = path.basename(record.worktree || "")
-    return base ? `worktree-${base}` : "worktree"
-  }
-
-
-  for (const record of records) {
-    const abs = record.worktree
-    if (!abs || typeof abs !== "string") continue
-
-    // Skip the root record (we always expose it as slug="root").
-    if (path.resolve(abs) === path.resolve(repoRoot)) {
-      continue
-    }
-
-    const slug = normalizeSlug(record)
-    if (!slug || slug === "root") {
-      continue
-    }
-    if (seen.has(slug)) {
-      continue
-    }
-    seen.add(slug)
-    worktrees.push({ slug, directory: abs, kind: "worktree", branch: record.branch })
-  }
-
-  return worktrees
-}
-
-export function isValidWorktreeSlug(slug: string): boolean {
-  if (!slug) return false
-  const trimmed = slug.trim()
-  if (!trimmed) return false
-  if (trimmed.length > 200) return false
-  // Disallow control characters; allow branch-like slugs including '/'.
-  if (/[\x00-\x1F\x7F]/.test(trimmed)) return false
-  return true
-}
-
-export async function createManagedWorktree(params: {
-  repoRoot: string
-  workspaceFolder: string
-  slug: string
-  logger?: LogLike
-}): Promise<{ slug: string; directory: string; branch?: string }> {
-  const { repoRoot, workspaceFolder, logger } = params
-  const branch = params.slug.trim()
-
-  if (!branch || branch === "root" || !isValidWorktreeSlug(branch)) {
-    throw new Error("Invalid worktree slug")
-  }
-
-  const sanitizeDirName = (input: string): string => {
-    const normalized = input
-      .trim()
-      .replace(/[\\/]+/g, "-")
-      .replace(/\s+/g, "-")
-      .replace(/[^a-zA-Z0-9_.-]+/g, "-")
-      .replace(/-{2,}/g, "-")
-      .replace(/^-+|-+$/g, "")
-    return normalized || "worktree"
-  }
-
-  const worktreesDir = path.join(repoRoot, ".codenomad", "worktrees")
-  const targetDir = path.join(worktreesDir, sanitizeDirName(branch))
-  await fsp.mkdir(worktreesDir, { recursive: true })
-
-  try {
-    const stat = await fsp.stat(targetDir)
-    if (stat.isDirectory()) {
-      throw new Error("Worktree directory already exists")
-    }
-  } catch (error) {
-    const code = (error as NodeJS.ErrnoException).code
-    if (code !== "ENOENT") {
-      throw error
-    }
-  }
-
-  logger?.debug?.({ slug: branch, branch, targetDir }, "Creating managed git worktree")
-
-  // Prefer creating a new branch from HEAD.
-  const first = await runGit(["worktree", "add", "-b", branch, targetDir, "HEAD"], workspaceFolder)
-  if (first.ok) {
-    return { slug: branch, directory: targetDir, branch }
-  }
-
-  const message = first.stderr?.toLowerCase() ?? first.error.message.toLowerCase()
-  if (message.includes("already exists")) {
-    // If the branch already exists, add worktree for that branch.
-    const second = await runGit(["worktree", "add", targetDir, branch], workspaceFolder)
-    if (second.ok) {
-      return { slug: branch, directory: targetDir, branch }
-    }
-    throw second.error
-  }
-
-  throw first.error
-}
-
-export async function removeWorktree(params: {
-  workspaceFolder: string
-  directory: string
-  force?: boolean
-  logger?: LogLike
-}): Promise<void> {
-  const { workspaceFolder, logger } = params
-  const directory = (params.directory ?? "").trim()
-  if (!directory) {
-    throw new Error("Invalid worktree directory")
-  }
-  logger?.debug?.({ directory, force: Boolean(params.force) }, "Removing git worktree")
-
-  const args = ["worktree", "remove"]
-  if (params.force) {
-    args.push("--force")
-  }
-  args.push(directory)
-
-  const result = await runGit(args, workspaceFolder)
-  if (!result.ok) {
-    throw result.error
-  }
-
-  // Best-effort cleanup of stale metadata.
-  await runGit(["worktree", "prune"], workspaceFolder).catch(() => undefined)
-}

packages/server/src/workspaces/instance-events.ts

@@ -95,7 +95,7 @@ export class InstanceEventBridge {
   }
 
   private async consumeStream(workspaceId: string, port: number, signal: AbortSignal) {
-    const url = `http://${INSTANCE_HOST}:${port}/global/event`
+    const url = `http://${INSTANCE_HOST}:${port}/event`
 
     const headers: Record<string, string> = { Accept: "text/event-stream" }
     const authHeader = this.options.workspaceManager.getInstanceAuthorizationHeader(workspaceId)
@@ -165,32 +165,8 @@ export class InstanceEventBridge {
     }
 
     try {
-      const parsed = JSON.parse(payload) as any
-      if (!parsed || typeof parsed !== "object") {
-        this.options.logger.warn({ workspaceId, chunk: payload }, "Dropped malformed instance event")
-        return
-      }
-
-      // OpenCode SSE payload shapes vary across versions.
-      // Common variants:
-      // - { type, properties, ... }
-      // - { payload: { type, properties, ... }, directory: "/abs/path" }
-      // - { payload: { type, properties, ... } }
-      const base = parsed.payload && typeof parsed.payload === "object" ? parsed.payload : parsed
-
-      const event: InstanceStreamEvent | null = base && typeof base === "object" ? ({ ...base } as any) : null
-
-      // Attach directory when available (don't overwrite if already present).
-      if (event && !(event as any).directory && typeof (parsed as any).directory === "string") {
-        ;(event as any).directory = (parsed as any).directory
-      }
-
-      if (!event || typeof (event as any).type !== "string") {
-        this.options.logger.warn({ workspaceId, chunk: payload }, "Dropped malformed instance event")
-        return
-      }
-
-      this.options.logger.debug({ workspaceId, eventType: (event as any).type }, "Instance SSE event received")
+      const event = JSON.parse(payload) as InstanceStreamEvent
+      this.options.logger.debug({ workspaceId, eventType: event.type }, "Instance SSE event received")
       if (this.options.logger.isLevelEnabled("trace")) {
         this.options.logger.trace({ workspaceId, event }, "Instance SSE event payload")
       }

packages/server/src/workspaces/manager.ts

@@ -28,8 +28,6 @@ interface WorkspaceManagerOptions {
   eventBus: EventBus
   logger: Logger
   getServerBaseUrl: () => string
-  /** Optional CA bundle path to trust CodeNomad HTTPS certs. */
-  nodeExtraCaCertsPath?: string
 }
 
 interface WorkspaceRecord extends WorkspaceDescriptor {}
@@ -93,7 +91,7 @@ export class WorkspaceManager {
 
     this.options.logger.info({ workspaceId: id, folder: workspacePath, binary: resolvedBinaryPath }, "Creating workspace")
 
-    const proxyPath = `/workspaces/${id}/worktrees/root/instance`
+    const proxyPath = `/workspaces/${id}/instance`
 
 
     const descriptor: WorkspaceRecord = {
@@ -134,7 +132,6 @@ export class WorkspaceManager {
       OPENCODE_CONFIG_DIR: this.opencodeConfigDir,
       CODENOMAD_INSTANCE_ID: id,
       CODENOMAD_BASE_URL: this.options.getServerBaseUrl(),
-      ...(this.options.nodeExtraCaCertsPath ? { NODE_EXTRA_CA_CERTS: this.options.nodeExtraCaCertsPath } : {}),
       [OPENCODE_SERVER_USERNAME_ENV]: opencodeUsername,
       [OPENCODE_SERVER_PASSWORD_ENV]: opencodePassword,
     }

packages/server/src/workspaces/worktree-map.ts

@@ -1,129 +0,0 @@
-import fs from "fs"
-import { promises as fsp } from "fs"
-import path from "path"
-import type { WorktreeMap } from "../api-types"
-import { resolveRepoRoot } from "./git-worktrees"
-import type { LogLike } from "./git-worktrees"
-
-const DEFAULT_MAP: WorktreeMap = {
-  version: 1,
-  defaultWorktreeSlug: "root",
-  parentSessionWorktreeSlug: {},
-}
-
-function getMapPath(repoRoot: string): string {
-  return path.join(repoRoot, ".codenomad", "worktreeMap.json")
-}
-
-function getGitExcludePath(repoRoot: string): string {
-  return path.join(repoRoot, ".git", "info", "exclude")
-}
-
-async function ensureGitExclude(repoRoot: string, logger?: LogLike): Promise<void> {
-  const excludePath = getGitExcludePath(repoRoot)
-  try {
-    await fsp.mkdir(path.dirname(excludePath), { recursive: true })
-  } catch {
-    return
-  }
-
-  const entries = [
-    ".codenomad/worktrees/",
-    ".codenomad/worktreeMap.json",
-  ]
-
-  let existing = ""
-  try {
-    existing = await fsp.readFile(excludePath, "utf-8")
-  } catch (error) {
-    const code = (error as NodeJS.ErrnoException).code
-    if (code !== "ENOENT") {
-      logger?.debug?.({ err: error, excludePath }, "Failed to read .git/info/exclude")
-      return
-    }
-    existing = ""
-  }
-
-  const lines = new Set(existing.split(/\r?\n/).map((l) => l.trim()).filter(Boolean))
-  const missing = entries.filter((e) => !lines.has(e))
-  if (missing.length === 0) {
-    return
-  }
-
-  const header = existing.includes("# codenomad") ? "" : (existing.trim() ? "\n" : "") + "# codenomad\n"
-  const suffix = missing.map((e) => `${e}\n`).join("")
-  await fsp.writeFile(excludePath, `${existing}${header}${suffix}`, "utf-8")
-}
-
-export async function ensureCodenomadGitExclude(workspaceFolder: string, logger?: LogLike): Promise<void> {
-  const { repoRoot, isGitRepo } = await resolveRepoRoot(workspaceFolder, logger)
-  if (!isGitRepo) {
-    return
-  }
-  await ensureGitExclude(repoRoot, logger)
-}
-
-export async function readWorktreeMap(workspaceFolder: string, logger?: LogLike): Promise<WorktreeMap> {
-  const { repoRoot, isGitRepo } = await resolveRepoRoot(workspaceFolder, logger)
-  const filePath = getMapPath(repoRoot)
-  try {
-    const raw = await fsp.readFile(filePath, "utf-8")
-    const parsed = JSON.parse(raw)
-    if (!parsed || typeof parsed !== "object") {
-      return DEFAULT_MAP
-    }
-    const version = (parsed as any).version
-    if (version !== 1) {
-      return DEFAULT_MAP
-    }
-    const defaultWorktreeSlug = typeof (parsed as any).defaultWorktreeSlug === "string" ? (parsed as any).defaultWorktreeSlug : "root"
-    const parentSessionWorktreeSlug = (parsed as any).parentSessionWorktreeSlug
-    const mapping = parentSessionWorktreeSlug && typeof parentSessionWorktreeSlug === "object" ? parentSessionWorktreeSlug : {}
-    return {
-      version: 1,
-      defaultWorktreeSlug,
-      parentSessionWorktreeSlug: { ...mapping },
-    }
-  } catch (error) {
-    const code = (error as NodeJS.ErrnoException).code
-    if (code === "ENOENT") {
-      if (isGitRepo) {
-        // Best-effort ignore setup on first use.
-        await ensureGitExclude(repoRoot, logger).catch(() => undefined)
-      }
-      return DEFAULT_MAP
-    }
-    logger?.warn?.({ err: error, filePath }, "Failed to read worktree map")
-    return DEFAULT_MAP
-  }
-}
-
-export async function writeWorktreeMap(workspaceFolder: string, next: WorktreeMap, logger?: LogLike): Promise<void> {
-  const { repoRoot, isGitRepo } = await resolveRepoRoot(workspaceFolder, logger)
-  const filePath = getMapPath(repoRoot)
-  await fsp.mkdir(path.dirname(filePath), { recursive: true })
-
-  // Ensure ignore rules are present (local-only).
-  if (isGitRepo) {
-    await ensureGitExclude(repoRoot, logger).catch(() => undefined)
-  }
-
-  const payload: WorktreeMap = {
-    version: 1,
-    defaultWorktreeSlug: next.defaultWorktreeSlug || "root",
-    parentSessionWorktreeSlug: next.parentSessionWorktreeSlug ?? {},
-  }
-
-  // Write atomically.
-  const tmpPath = `${filePath}.${process.pid}.tmp`
-  await fsp.writeFile(tmpPath, JSON.stringify(payload, null, 2), "utf-8")
-  await fsp.rename(tmpPath, filePath)
-}
-
-export function worktreeMapExists(repoRoot: string): boolean {
-  try {
-    return fs.existsSync(getMapPath(repoRoot))
-  } catch {
-    return false
-  }
-}

packages/tauri-app/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@codenomad/tauri-app",
-  "version": "0.10.2",
+  "version": "0.9.2",
   "private": true,
-  "license": "MIT",
   "scripts": {
     "dev": "tauri dev",
     "dev:ui": "npm run dev --workspace @codenomad/ui",

packages/tauri-app/src-tauri/Cargo.toml

@@ -2,7 +2,6 @@
 name = "codenomad-tauri"
 version = "0.1.0"
 edition = "2021"
-license = "MIT"
 
 [build-dependencies]
 tauri-build = { version = "2.5.2", features = [] }
@@ -22,5 +21,3 @@ tauri-plugin-dialog = "2"
 dirs = "5"
 tauri-plugin-opener = "2"
 url = "2"
-tauri-plugin-keepawake = "0.1.1"
-tauri-plugin-notification = "2"

packages/tauri-app/src-tauri/capabilities/main-window.json

@@ -3,7 +3,7 @@
   "identifier": "main-window-native-dialogs",
   "description": "Grant the main window access to required core features and native dialog commands.",
   "remote": {
-    "urls": ["http://127.0.0.1:*", "http://localhost:*", "http://tauri.localhost/*", "https://tauri.localhost/*"]
+    "urls": ["http://127.0.0.1:*", "http://localhost:*"]
   },
   "windows": ["main"],
   "permissions": [
@@ -11,10 +11,6 @@
     "core:menu:default",
     "dialog:allow-open",
     "opener:allow-default-urls",
-    "notification:allow-is-permission-granted",
-    "notification:allow-request-permission",
-    "notification:allow-notify",
-    "notification:allow-show",
     "core:webview:allow-set-webview-zoom"
   ]
 }

packages/tauri-app/src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"main-window-native-dialogs":{"identifier":"main-window-native-dialogs","description":"Grant the main window access to required core features and native dialog commands.","remote":{"urls":["http://127.0.0.1:*","http://localhost:*","http://tauri.localhost/*","https://tauri.localhost/*"]},"local":true,"windows":["main"],"permissions":["core:default","core:menu:default","dialog:allow-open","opener:allow-default-urls","notification:allow-is-permission-granted","notification:allow-request-permission","notification:allow-notify","notification:allow-show","core:webview:allow-set-webview-zoom"]}}
+{"main-window-native-dialogs":{"identifier":"main-window-native-dialogs","description":"Grant the main window access to required core features and native dialog commands.","remote":{"urls":["http://127.0.0.1:*","http://localhost:*"]},"local":true,"windows":["main"],"permissions":["core:default","core:menu:default","dialog:allow-open","opener:allow-default-urls","core:webview:allow-set-webview-zoom"]}}

packages/tauri-app/src-tauri/gen/schemas/desktop-schema.json

@@ -2378,234 +2378,6 @@
           "const": "dialog:deny-save",
           "markdownDescription": "Denies the save command without any pre-configured scope."
         },
-        {
-          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`",
-          "type": "string",
-          "const": "keepawake:default",
-          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`"
-        },
-        {
-          "description": "Enables the start command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:allow-start",
-          "markdownDescription": "Enables the start command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the stop command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:allow-stop",
-          "markdownDescription": "Enables the stop command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the start command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:deny-start",
-          "markdownDescription": "Denies the start command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the stop command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:deny-stop",
-          "markdownDescription": "Denies the stop command without any pre-configured scope."
-        },
-        {
-          "description": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`",
-          "type": "string",
-          "const": "notification:default",
-          "markdownDescription": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`"
-        },
-        {
-          "description": "Enables the batch command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-batch",
-          "markdownDescription": "Enables the batch command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the cancel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-cancel",
-          "markdownDescription": "Enables the cancel command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the check_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-check-permissions",
-          "markdownDescription": "Enables the check_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the create_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-create-channel",
-          "markdownDescription": "Enables the create_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the delete_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-delete-channel",
-          "markdownDescription": "Enables the delete_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the get_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-get-active",
-          "markdownDescription": "Enables the get_active command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the get_pending command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-get-pending",
-          "markdownDescription": "Enables the get_pending command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the is_permission_granted command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-is-permission-granted",
-          "markdownDescription": "Enables the is_permission_granted command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the list_channels command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-list-channels",
-          "markdownDescription": "Enables the list_channels command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the notify command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-notify",
-          "markdownDescription": "Enables the notify command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the permission_state command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-permission-state",
-          "markdownDescription": "Enables the permission_state command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register_action_types command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-register-action-types",
-          "markdownDescription": "Enables the register_action_types command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register_listener command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-register-listener",
-          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the remove_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-remove-active",
-          "markdownDescription": "Enables the remove_active command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the request_permission command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-request-permission",
-          "markdownDescription": "Enables the request_permission command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the show command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-show",
-          "markdownDescription": "Enables the show command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the batch command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-batch",
-          "markdownDescription": "Denies the batch command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the cancel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-cancel",
-          "markdownDescription": "Denies the cancel command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the check_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-check-permissions",
-          "markdownDescription": "Denies the check_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the create_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-create-channel",
-          "markdownDescription": "Denies the create_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the delete_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-delete-channel",
-          "markdownDescription": "Denies the delete_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the get_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-get-active",
-          "markdownDescription": "Denies the get_active command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the get_pending command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-get-pending",
-          "markdownDescription": "Denies the get_pending command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the is_permission_granted command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-is-permission-granted",
-          "markdownDescription": "Denies the is_permission_granted command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the list_channels command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-list-channels",
-          "markdownDescription": "Denies the list_channels command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the notify command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-notify",
-          "markdownDescription": "Denies the notify command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the permission_state command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-permission-state",
-          "markdownDescription": "Denies the permission_state command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register_action_types command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-register-action-types",
-          "markdownDescription": "Denies the register_action_types command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register_listener command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-register-listener",
-          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the remove_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-remove-active",
-          "markdownDescription": "Denies the remove_active command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the request_permission command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-request-permission",
-          "markdownDescription": "Denies the request_permission command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the show command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-show",
-          "markdownDescription": "Denies the show command without any pre-configured scope."
-        },
         {
           "description": "This permission set allows opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application\nas well as reveal file in directories using default file explorer\n#### This default permission set includes:\n\n- `allow-open-url`\n- `allow-reveal-item-in-dir`\n- `allow-default-urls`",
           "type": "string",

packages/tauri-app/src-tauri/gen/schemas/macOS-schema.json

@@ -2378,234 +2378,6 @@
           "const": "dialog:deny-save",
           "markdownDescription": "Denies the save command without any pre-configured scope."
         },
-        {
-          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`",
-          "type": "string",
-          "const": "keepawake:default",
-          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`"
-        },
-        {
-          "description": "Enables the start command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:allow-start",
-          "markdownDescription": "Enables the start command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the stop command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:allow-stop",
-          "markdownDescription": "Enables the stop command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the start command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:deny-start",
-          "markdownDescription": "Denies the start command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the stop command without any pre-configured scope.",
-          "type": "string",
-          "const": "keepawake:deny-stop",
-          "markdownDescription": "Denies the stop command without any pre-configured scope."
-        },
-        {
-          "description": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`",
-          "type": "string",
-          "const": "notification:default",
-          "markdownDescription": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`"
-        },
-        {
-          "description": "Enables the batch command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-batch",
-          "markdownDescription": "Enables the batch command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the cancel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-cancel",
-          "markdownDescription": "Enables the cancel command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the check_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-check-permissions",
-          "markdownDescription": "Enables the check_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the create_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-create-channel",
-          "markdownDescription": "Enables the create_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the delete_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-delete-channel",
-          "markdownDescription": "Enables the delete_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the get_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-get-active",
-          "markdownDescription": "Enables the get_active command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the get_pending command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-get-pending",
-          "markdownDescription": "Enables the get_pending command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the is_permission_granted command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-is-permission-granted",
-          "markdownDescription": "Enables the is_permission_granted command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the list_channels command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-list-channels",
-          "markdownDescription": "Enables the list_channels command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the notify command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-notify",
-          "markdownDescription": "Enables the notify command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the permission_state command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-permission-state",
-          "markdownDescription": "Enables the permission_state command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register_action_types command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-register-action-types",
-          "markdownDescription": "Enables the register_action_types command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register_listener command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-register-listener",
-          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the remove_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-remove-active",
-          "markdownDescription": "Enables the remove_active command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the request_permission command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-request-permission",
-          "markdownDescription": "Enables the request_permission command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the show command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:allow-show",
-          "markdownDescription": "Enables the show command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the batch command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-batch",
-          "markdownDescription": "Denies the batch command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the cancel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-cancel",
-          "markdownDescription": "Denies the cancel command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the check_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-check-permissions",
-          "markdownDescription": "Denies the check_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the create_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-create-channel",
-          "markdownDescription": "Denies the create_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the delete_channel command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-delete-channel",
-          "markdownDescription": "Denies the delete_channel command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the get_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-get-active",
-          "markdownDescription": "Denies the get_active command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the get_pending command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-get-pending",
-          "markdownDescription": "Denies the get_pending command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the is_permission_granted command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-is-permission-granted",
-          "markdownDescription": "Denies the is_permission_granted command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the list_channels command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-list-channels",
-          "markdownDescription": "Denies the list_channels command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the notify command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-notify",
-          "markdownDescription": "Denies the notify command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the permission_state command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-permission-state",
-          "markdownDescription": "Denies the permission_state command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register_action_types command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-register-action-types",
-          "markdownDescription": "Denies the register_action_types command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register_listener command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-register-listener",
-          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the remove_active command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-remove-active",
-          "markdownDescription": "Denies the remove_active command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the request_permission command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-request-permission",
-          "markdownDescription": "Denies the request_permission command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the show command without any pre-configured scope.",
-          "type": "string",
-          "const": "notification:deny-show",
-          "markdownDescription": "Denies the show command without any pre-configured scope."
-        },
         {
           "description": "This permission set allows opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application\nas well as reveal file in directories using default file explorer\n#### This default permission set includes:\n\n- `allow-open-url`\n- `allow-reveal-item-in-dir`\n- `allow-default-urls`",
           "type": "string",

packages/tauri-app/src-tauri/src/cli_manager.rs

@@ -464,33 +464,13 @@ impl CliProcessManager {
         let status_clone = status.clone();
         let app_clone = app.clone();
         thread::spawn(move || {
-            // Do not hold the child mutex while waiting for process exit.
-            // Holding the lock across `wait()` deadlocks `stop()`, which needs the
-            // same lock to send SIGTERM/SIGKILL when the user quits the app.
-            let code = loop {
-                let maybe_exited = {
-                    let mut guard = child_holder.lock();
-                    if guard.is_none() {
-                        return;
-                    }
-                    match guard
-                        .as_mut()
-                        .and_then(|child| child.try_wait().ok().flatten())
-                    {
-                        Some(status) => {
-                            // Drop the handle after the process exits so other callers
-                            // don't attempt to stop/kill a finished process.
-                            *guard = None;
-                            Some(status)
-                        }
-                        None => None,
-                    }
-                };
-
-                if let Some(status) = maybe_exited {
-                    break Some(status);
+            let code = {
+                let mut guard = child_holder.lock();
+                if let Some(child) = guard.as_mut() {
+                    child.wait().ok()
+                } else {
+                    None
                 }
-                thread::sleep(Duration::from_millis(100));
             };
 
             let mut locked = status_clone.lock();
@@ -531,7 +511,7 @@ impl CliProcessManager {
         bootstrap_token: &Arc<Mutex<Option<String>>>,
     ) {
         let mut buffer = String::new();
-        let local_url_regex = Regex::new(r"^Local\s+Connection\s+URL\s*:\s*(https?://\S+)").ok();
+        let port_regex = Regex::new(r"CodeNomad Server is ready at http://[^:]+:(\d+)").ok();
         let http_regex = Regex::new(r":(\d{2,5})(?!.*:\d)").ok();
         let token_prefix = "CODENOMAD_BOOTSTRAP_TOKEN:";
 
@@ -559,12 +539,12 @@ impl CliProcessManager {
                             continue;
                         }
 
-                        if let Some(url) = local_url_regex
+                        if let Some(port) = port_regex
                             .as_ref()
                             .and_then(|re| re.captures(line).and_then(|c| c.get(1)))
-                            .map(|m| m.as_str().to_string())
+                            .and_then(|m| m.as_str().parse::<u16>().ok())
                         {
-                            Self::mark_ready(app, status, ready, bootstrap_token, url);
+                            Self::mark_ready(app, status, ready, bootstrap_token, port);
                             continue;
                         }
 
@@ -574,13 +554,13 @@ impl CliProcessManager {
                                 .and_then(|re| re.captures(line).and_then(|c| c.get(1)))
                                 .and_then(|m| m.as_str().parse::<u16>().ok())
                             {
-                                Self::mark_ready(app, status, ready, bootstrap_token, format!("http://localhost:{port}"));
+                                Self::mark_ready(app, status, ready, bootstrap_token, port);
                                 continue;
                             }
 
                             if let Ok(value) = serde_json::from_str::<serde_json::Value>(line) {
                                 if let Some(port) = value.get("port").and_then(|p| p.as_u64()) {
-                                    Self::mark_ready(app, status, ready, bootstrap_token, format!("http://localhost:{}", port));
+                                    Self::mark_ready(app, status, ready, bootstrap_token, port as u16);
                                     continue;
                                 }
                             }
@@ -597,15 +577,12 @@ impl CliProcessManager {
         status: &Arc<Mutex<CliStatus>>,
         ready: &Arc<AtomicBool>,
         bootstrap_token: &Arc<Mutex<Option<String>>>,
-        base_url: String,
+        port: u16,
     ) {
         ready.store(true, Ordering::SeqCst);
-        let port = Url::parse(&base_url)
-            .ok()
-            .and_then(|u| u.port_or_known_default())
-            .map(|p| p as u16);
+        let base_url = format!("http://127.0.0.1:{port}");
         let mut locked = status.lock();
-        locked.port = port;
+        locked.port = Some(port);
         locked.url = Some(base_url.clone());
         locked.state = CliState::Ready;
         locked.error = None;
@@ -614,30 +591,23 @@ impl CliProcessManager {
         let token = bootstrap_token.lock().take();
 
         if let Some(token) = token {
-            // Token exchange is only implemented for loopback HTTP. If localUrl is HTTPS,
-            // skip the exchange and let the user authenticate normally.
-            let scheme = Url::parse(&base_url).ok().map(|u| u.scheme().to_string());
-            if scheme.as_deref() != Some("http") {
-                navigate_main(app, &base_url);
-            } else {
-                match exchange_bootstrap_token(&base_url, &token) {
-                    Ok(Some(session_id)) => {
-                        if let Err(err) = set_session_cookie(app, &base_url, &session_id) {
-                            log_line(&format!("failed to set session cookie: {err}"));
-                            navigate_main(app, &format!("{base_url}/login"));
-                        } else {
-                            navigate_main(app, &base_url);
-                        }
-                    }
-                    Ok(None) => {
-                        log_line("bootstrap token exchange failed (invalid token)");
-                        navigate_main(app, &format!("{base_url}/login"));
-                    }
-                    Err(err) => {
-                        log_line(&format!("bootstrap token exchange failed: {err}"));
+            match exchange_bootstrap_token(&base_url, &token) {
+                Ok(Some(session_id)) => {
+                    if let Err(err) = set_session_cookie(app, &base_url, &session_id) {
+                        log_line(&format!("failed to set session cookie: {err}"));
                         navigate_main(app, &format!("{base_url}/login"));
+                    } else {
+                        navigate_main(app, &base_url);
                     }
                 }
+                Ok(None) => {
+                    log_line("bootstrap token exchange failed (invalid token)");
+                    navigate_main(app, &format!("{base_url}/login"));
+                }
+                Err(err) => {
+                    log_line(&format!("bootstrap token exchange failed: {err}"));
+                    navigate_main(app, &format!("{base_url}/login"));
+                }
             }
         } else {
             navigate_main(app, &base_url);
@@ -719,24 +689,19 @@ impl CliEntry {
     }
 
     fn build_args(&self, dev: bool, host: &str) -> Vec<String> {
-        let mut args = vec!["serve".to_string(), "--host".to_string(), host.to_string(), "--generate-token".to_string()];
-
+        let mut args = vec![
+            "serve".to_string(),
+            "--host".to_string(),
+            host.to_string(),
+            "--port".to_string(),
+            "0".to_string(),
+            "--generate-token".to_string(),
+        ];
         if dev {
-            // Dev: plain HTTP + Vite dev server proxy.
-            args.push("--https".to_string());
-            args.push("false".to_string());
-            args.push("--http".to_string());
-            args.push("true".to_string());
             args.push("--ui-dev-server".to_string());
             args.push("http://localhost:3000".to_string());
             args.push("--log-level".to_string());
             args.push("debug".to_string());
-        } else {
-            // Prod desktop: always keep loopback HTTP enabled.
-            args.push("--https".to_string());
-            args.push("true".to_string());
-            args.push("--http".to_string());
-            args.push("true".to_string());
         }
         args
     }

packages/tauri-app/src-tauri/src/main.rs

@@ -4,7 +4,6 @@ mod cli_manager;
 
 use cli_manager::{CliProcessManager, CliStatus};
 use serde_json::json;
-use std::sync::atomic::{AtomicBool, Ordering};
 use tauri::menu::{MenuBuilder, MenuItem, SubmenuBuilder};
 use tauri::plugin::{Builder as PluginBuilder, TauriPlugin};
 use tauri::webview::Webview;
@@ -12,8 +11,6 @@ use tauri::{AppHandle, Emitter, Manager, Runtime, Wry};
 use tauri_plugin_opener::OpenerExt;
 use url::Url;
 
-static QUIT_REQUESTED: AtomicBool = AtomicBool::new(false);
-
 #[derive(Clone)]
 pub struct AppState {
     pub manager: CliProcessManager,
@@ -35,7 +32,6 @@ fn cli_restart(app: AppHandle, state: tauri::State<AppState>) -> Result<CliStatu
     Ok(state.manager.status())
 }
 
-
 fn is_dev_mode() -> bool {
     cfg!(debug_assertions) || std::env::var("TAURI_DEV").is_ok()
 }
@@ -43,10 +39,7 @@ fn is_dev_mode() -> bool {
 fn should_allow_internal(url: &Url) -> bool {
     match url.scheme() {
         "tauri" | "asset" | "file" => true,
-        // On Windows/WebView2, Tauri serves the app assets from `tauri.localhost`.
-        // This must be treated as an internal origin or the navigation guard will
-        // redirect it to the system browser and the app will appear blank.
-        "http" | "https" => matches!(url.host_str(), Some("127.0.0.1" | "localhost" | "tauri.localhost")),
+        "http" | "https" => matches!(url.host_str(), Some("127.0.0.1" | "localhost")),
         _ => false,
     }
 }
@@ -74,8 +67,6 @@ fn main() {
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_opener::init())
-        .plugin(tauri_plugin_keepawake::init())
-        .plugin(tauri_plugin_notification::init())
         .plugin(navigation_guard)
         .manage(AppState {
             manager: CliProcessManager::new(),
@@ -173,11 +164,6 @@ fn main() {
         .expect("error while building tauri application")
         .run(|app_handle, event| match event {
             tauri::RunEvent::ExitRequested { api, .. } => {
-                // `app_handle.exit(0)` triggers another `ExitRequested`. Without a guard, we can
-                // prevent exit forever and the app never quits (Cmd+Q / Quit menu appears stuck).
-                if QUIT_REQUESTED.swap(true, Ordering::SeqCst) {
-                    return;
-                }
                 api.prevent_exit();
                 let app = app_handle.clone();
                 std::thread::spawn(move || {
@@ -192,9 +178,6 @@ fn main() {
                 ..
             } => {
                 // Ensure we have time to stop the CLI process before the app exits.
-                if QUIT_REQUESTED.swap(true, Ordering::SeqCst) {
-                    return;
-                }
                 api.prevent_close();
                 let app = app_handle.clone();
                 std::thread::spawn(move || {

packages/ui/.gitignore

@@ -1,4 +1,3 @@
 node_modules/
 dist/
 .vite/
-src/renderer/public/logo.png

packages/ui/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@codenomad/ui",
-  "version": "0.10.2",
+  "version": "0.9.2",
   "private": true,
-  "license": "MIT",
   "type": "module",
   "scripts": {
     "dev": "vite dev",
@@ -18,8 +17,6 @@
     "@suid/icons-material": "^0.9.0",
     "@suid/material": "^0.19.0",
     "@suid/system": "^0.14.0",
-    "@tauri-apps/plugin-opener": "^2.5.3",
-    "@tauri-apps/plugin-notification": "^2.3.3",
     "ansi-sequence-parser": "^1.1.3",
     "debug": "^4.4.3",
     "github-markdown-css": "^5.8.1",
@@ -28,17 +25,14 @@
     "qrcode": "^1.5.3",
     "shiki": "^3.13.0",
     "solid-js": "^1.8.0",
-    "solid-toast": "^0.5.0",
-    "tauri-plugin-keepawake-api": "^0.1.0"
+    "solid-toast": "^0.5.0"
   },
   "devDependencies": {
-    "@vite-pwa/assets-generator": "^1.0.2",
     "autoprefixer": "10.4.21",
     "postcss": "8.5.6",
     "tailwindcss": "3",
     "typescript": "^5.3.0",
     "vite": "^5.0.0",
-    "vite-plugin-pwa": "^1.2.0",
     "vite-plugin-solid": "^2.10.0"
   }
 }

packages/ui/src/App.tsx

@@ -19,7 +19,6 @@ import { getLogger } from "./lib/logger"
 import { initReleaseNotifications } from "./stores/releases"
 import { runtimeEnv } from "./lib/runtime-env"
 import { useI18n } from "./lib/i18n"
-import { setWakeLockDesired } from "./lib/native/wake-lock"
 import {
   hasInstances,
   isSelectingFolder,
@@ -49,8 +48,6 @@ import {
   updateSessionModel,
 } from "./stores/sessions"
 
-import { getInstanceSessionIndicatorStatus } from "./stores/session-status"
-
 const log = getLogger("actions")
 
 const App: Component = () => {
@@ -63,7 +60,6 @@ const App: Component = () => {
     toggleShowTimelineTools,
     toggleAutoCleanupBlankSessions,
     toggleUsageMetrics,
-    togglePromptSubmitOnEnter,
     setDiffViewMode,
     setToolOutputExpansion,
     setDiagnosticsExpansion,
@@ -94,26 +90,6 @@ const App: Component = () => {
     initReleaseNotifications()
   })
 
-  const shouldHoldWakeLock = createMemo(() => {
-    const map = instances()
-    for (const id of map.keys()) {
-      const status = getInstanceSessionIndicatorStatus(id)
-      if (status !== "idle") {
-        return true
-      }
-    }
-    return false
-  })
-
-  createEffect(() => {
-    const hold = shouldHoldWakeLock()
-    void setWakeLockDesired(hold)
-  })
-
-  onCleanup(() => {
-    void setWakeLockDesired(false)
-  })
-
   createEffect(() => {
     instances()
     hasInstances()
@@ -295,7 +271,6 @@ const App: Component = () => {
     toggleShowThinkingBlocks,
     toggleShowTimelineTools,
     toggleUsageMetrics,
-    togglePromptSubmitOnEnter,
     setDiffViewMode,
     setToolOutputExpansion,
     setDiagnosticsExpansion,
@@ -354,34 +329,32 @@ const App: Component = () => {
       <Dialog open={Boolean(launchError())} modal>
         <Dialog.Portal>
           <Dialog.Overlay class="modal-overlay" />
-           <div class="fixed inset-0 z-50 flex items-center justify-center p-4">
-             <Dialog.Content class="modal-surface w-full max-w-3xl p-6 flex flex-col gap-6 max-h-[80vh] min-h-0 overflow-hidden">
-               <div>
-                 <Dialog.Title class="text-xl font-semibold text-primary">{t("app.launchError.title")}</Dialog.Title>
-                 <Dialog.Description class="text-sm text-secondary mt-2 break-words">
-                   {t("app.launchError.description")}
-                 </Dialog.Description>
-               </div>
+          <div class="fixed inset-0 z-50 flex items-center justify-center p-4">
+            <Dialog.Content class="modal-surface w-full max-w-md p-6 flex flex-col gap-6">
+              <div>
+                <Dialog.Title class="text-xl font-semibold text-primary">{t("app.launchError.title")}</Dialog.Title>
+                <Dialog.Description class="text-sm text-secondary mt-2 break-words">
+                  {t("app.launchError.description")}
+                </Dialog.Description>
+              </div>
 
-               <div class={`flex flex-col gap-4 ${launchErrorMessage() ? "flex-1 min-h-0" : ""}`}>
-                 <div class="rounded-lg border border-base bg-surface-secondary p-4 flex-shrink-0">
-                   <p class="text-xs font-medium text-muted uppercase tracking-wide mb-1">{t("app.launchError.binaryPathLabel")}</p>
-                   <p class="text-sm font-mono text-primary break-all">{launchErrorPath()}</p>
-                 </div>
- 
-                 <Show when={launchErrorMessage()}>
-                   <div class="rounded-lg border border-base bg-surface-secondary p-4 flex flex-col gap-2 flex-1 min-h-0">
-                     <p class="text-xs font-medium text-muted uppercase tracking-wide">{t("app.launchError.errorOutputLabel")}</p>
-                     <pre class="text-sm font-mono text-primary whitespace-pre-wrap break-words overflow-auto flex-1 min-h-0">{launchErrorMessage()}</pre>
-                   </div>
-                 </Show>
-               </div>
+              <div class="rounded-lg border border-base bg-surface-secondary p-4">
+                <p class="text-xs font-medium text-muted uppercase tracking-wide mb-1">{t("app.launchError.binaryPathLabel")}</p>
+                <p class="text-sm font-mono text-primary break-all">{launchErrorPath()}</p>
+              </div>
 
-               <div class="flex justify-end gap-2">
-                 <Show when={launchError()?.missingBinary}>
-                   <button
-                     type="button"
-                     class="selector-button selector-button-secondary"
+              <Show when={launchErrorMessage()}>
+                <div class="rounded-lg border border-base bg-surface-secondary p-4">
+                  <p class="text-xs font-medium text-muted uppercase tracking-wide mb-1">{t("app.launchError.errorOutputLabel")}</p>
+                  <pre class="text-sm font-mono text-primary whitespace-pre-wrap break-words max-h-48 overflow-y-auto">{launchErrorMessage()}</pre>
+                </div>
+              </Show>
+
+              <div class="flex justify-end gap-2">
+                <Show when={launchError()?.missingBinary}>
+                  <button
+                    type="button"
+                    class="selector-button selector-button-secondary"
                     onClick={handleLaunchErrorAdvanced}
                   >
                     {t("app.launchError.openAdvancedSettings")}

packages/ui/src/components/agent-selector.tsx

@@ -5,6 +5,7 @@ import { ChevronDown } from "lucide-solid"
 import type { Agent } from "../types/session"
 import { useI18n } from "../lib/i18n"
 import { getLogger } from "../lib/logger"
+import Kbd from "./kbd"
 const log = getLogger("session")
 
 
@@ -112,6 +113,9 @@ export default function AgentSelector(props: AgentSelectorProps) {
               )}
             </Select.Value>
           </div>
+          <span class="selector-trigger-hint selector-trigger-hint--top" aria-hidden="true">
+            <Kbd shortcut="cmd+shift+a" />
+          </span>
           <Select.Icon class="selector-trigger-icon">
             <ChevronDown class="w-3 h-3" />
           </Select.Icon>

packages/ui/src/components/code-block-inline.tsx

@@ -55,7 +55,7 @@ export function CodeBlockInline(props: CodeBlockInlineProps) {
 
       const highlighted = highlighter.codeToHtml(props.code, {
         lang: props.language as CodeToHtmlOptions["lang"],
-        theme: isDark() ? "github-dark" : "github-light-high-contrast",
+        theme: isDark() ? "github-dark" : "github-light",
       })
       setHtml(highlighted)
     } catch {

packages/ui/src/components/folder-selection-view.tsx

@@ -5,7 +5,6 @@ import { useConfig } from "../stores/preferences"
 import AdvancedSettingsModal from "./advanced-settings-modal"
 import DirectoryBrowserDialog from "./directory-browser-dialog"
 import Kbd from "./kbd"
-import { ThemeModeToggle } from "./theme-mode-toggle"
 import { openNativeFolderDialog, supportsNativeDialogs } from "../lib/native/native-functions"
 import VersionPill from "./version-pill"
 import { DiscordSymbolIcon, GitHubMarkIcon } from "./brand-icons"
@@ -314,9 +313,8 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
               </Select.Portal>
             </Select>
           </div>
-          <div class="absolute top-4 right-6 flex items-center gap-2">
-            <ThemeModeToggle class="selector-button selector-button-secondary w-auto p-2 inline-flex items-center justify-center" />
-            <Show when={props.onOpenRemoteAccess}>
+          <Show when={props.onOpenRemoteAccess}>
+            <div class="absolute top-4 right-6">
               <button
                 type="button"
                 class="selector-button selector-button-secondary w-auto p-2 inline-flex items-center justify-center"
@@ -324,8 +322,8 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
               >
                 <MonitorUp class="w-4 h-4" />
               </button>
-            </Show>
-          </div>
+            </div>
+          </Show>
           <div class="mb-6 text-center shrink-0">
             <div class="mb-3 flex justify-center">
               <img src={codeNomadLogo} alt={t("folderSelection.logoAlt")} class="h-32 w-auto sm:h-48" loading="lazy" />

packages/ui/src/components/instance-tabs.tsx

@@ -1,15 +1,10 @@
-import { Component, For, Show, createMemo, createSignal } from "solid-js"
-import { Dynamic } from "solid-js/web"
+import { Component, For, Show } from "solid-js"
 import type { Instance } from "../types/instance"
 import InstanceTab from "./instance-tab"
 import KeyboardHint from "./keyboard-hint"
-import { Plus, MonitorUp, Bell, BellOff } from "lucide-solid"
+import { Plus, MonitorUp } from "lucide-solid"
 import { keyboardRegistry } from "../lib/keyboard-registry"
 import { useI18n } from "../lib/i18n"
-import { ThemeModeToggle } from "./theme-mode-toggle"
-import NotificationsSettingsModal from "./notifications-settings-modal"
-import { isOsNotificationSupportedSync } from "../lib/os-notifications"
-import { useConfig } from "../stores/preferences"
 
 interface InstanceTabsProps {
   instances: Map<string, Instance>
@@ -22,21 +17,6 @@ interface InstanceTabsProps {
 
 const InstanceTabs: Component<InstanceTabsProps> = (props) => {
   const { t } = useI18n()
-  const { preferences } = useConfig()
-  const [notificationsOpen, setNotificationsOpen] = createSignal(false)
-
-  const notificationsSupported = createMemo(() => isOsNotificationSupportedSync())
-  const notificationsEnabled = createMemo(() => Boolean(preferences().osNotificationsEnabled))
-  const notificationIcon = createMemo(() => {
-    if (!notificationsSupported()) return BellOff
-    return notificationsEnabled() ? Bell : BellOff
-  })
-
-  const notificationTitle = createMemo(() => {
-    if (!notificationsSupported()) return "Notifications unsupported"
-    return notificationsEnabled() ? "Notifications enabled" : "Notifications disabled"
-  })
-
   return (
     <div class="tab-bar tab-bar-instance">
       <div class="tab-container" role="tablist">
@@ -72,17 +52,6 @@ const InstanceTabs: Component<InstanceTabsProps> = (props) => {
                 />
               </div>
             </Show>
-            <ThemeModeToggle class="new-tab-button" />
-
-            <button
-              class={`new-tab-button ${!notificationsSupported() ? "opacity-50" : ""}`}
-              onClick={() => setNotificationsOpen(true)}
-              title={notificationTitle()}
-              aria-label={notificationTitle()}
-            >
-              <Dynamic component={notificationIcon()} class="w-4 h-4" />
-            </button>
-
             <Show when={Boolean(props.onOpenRemoteAccess)}>
               <button
                 class="new-tab-button tab-remote-button"
@@ -96,8 +65,6 @@ const InstanceTabs: Component<InstanceTabsProps> = (props) => {
           </div>
         </div>
       </div>
-
-      <NotificationsSettingsModal open={notificationsOpen()} onClose={() => setNotificationsOpen(false)} />
     </div>
 
   )

packages/ui/src/components/instance/instance-shell2.tsx

@@ -12,14 +12,16 @@ import {
 } from "solid-js"
 import type { ToolState } from "@opencode-ai/sdk"
 import { Accordion } from "@kobalte/core"
-import { ChevronDown, Search, TerminalSquare, Trash2, XOctagon } from "lucide-solid"
+import { ChevronDown, TerminalSquare, Trash2, XOctagon } from "lucide-solid"
 import AppBar from "@suid/material/AppBar"
 import Box from "@suid/material/Box"
+import Divider from "@suid/material/Divider"
 import Drawer from "@suid/material/Drawer"
 import IconButton from "@suid/material/IconButton"
 import Toolbar from "@suid/material/Toolbar"
 import Typography from "@suid/material/Typography"
 import useMediaQuery from "@suid/material/useMediaQuery"
+import CloseIcon from "@suid/icons-material/Close"
 import MenuIcon from "@suid/icons-material/Menu"
 import MenuOpenIcon from "@suid/icons-material/MenuOpen"
 import PushPinIcon from "@suid/icons-material/PushPin"
@@ -35,7 +37,6 @@ import {
   getSessionFamily,
   getSessionInfo,
   getSessionThreads,
-  loadMessages,
   sessions,
   setActiveParentSession,
   setActiveSession,
@@ -64,7 +65,6 @@ import { formatTokenTotal } from "../../lib/formatters"
 import { sseManager } from "../../lib/sse-manager"
 import { getLogger } from "../../lib/logger"
 import { serverApi } from "../../lib/api-client"
-import WorktreeSelector from "../worktree-selector"
 import { getBackgroundProcesses, loadBackgroundProcesses } from "../../stores/background-processes"
 import { BackgroundProcessOutputDialog } from "../background-process-output-dialog"
 import { useI18n } from "../../lib/i18n"
@@ -88,13 +88,14 @@ interface InstanceShellProps {
   tabBarOffset: number
 }
 
-const DEFAULT_SESSION_SIDEBAR_WIDTH = 340
+const DEFAULT_SESSION_SIDEBAR_WIDTH = 280
 const MIN_SESSION_SIDEBAR_WIDTH = 220
-const MAX_SESSION_SIDEBAR_WIDTH = 400
+const MAX_SESSION_SIDEBAR_WIDTH = 360
 const RIGHT_DRAWER_WIDTH = 260
 const MIN_RIGHT_DRAWER_WIDTH = 200
 const MAX_RIGHT_DRAWER_WIDTH = 380
 const SESSION_CACHE_LIMIT = 5
+const APP_BAR_HEIGHT = 56
 const LEFT_DRAWER_STORAGE_KEY = "opencode-session-sidebar-width-v8"
 const RIGHT_DRAWER_STORAGE_KEY = "opencode-session-right-drawer-width-v1"
 const LEFT_PIN_STORAGE_KEY = "opencode-session-left-drawer-pinned-v1"
@@ -152,9 +153,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
   const [showBackgroundOutput, setShowBackgroundOutput] = createSignal(false)
   const [permissionModalOpen, setPermissionModalOpen] = createSignal(false)
 
-  // Worktree selector manages its own dialogs.
-  const [showSessionSearch, setShowSessionSearch] = createSignal(false)
-
   const messageStore = createMemo(() => messageStoreBus.getOrCreate(props.instance.id))
 
   const desktopQuery = useMediaQuery("(min-width: 1280px)")
@@ -217,8 +215,10 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     const host = drawerHost()
     if (!host) return
     const rect = host.getBoundingClientRect()
-    setFloatingDrawerTop(rect.top)
-    setFloatingDrawerHeight(Math.max(0, rect.height))
+    const toolbar = host.querySelector<HTMLElement>(".session-toolbar")
+    const toolbarHeight = toolbar?.offsetHeight ?? APP_BAR_HEIGHT
+    setFloatingDrawerTop(rect.top + toolbarHeight)
+    setFloatingDrawerHeight(Math.max(0, rect.height - toolbarHeight))
   }
 
   onMount(() => {
@@ -618,7 +618,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     return undefined
   }
 
-  const fallbackDrawerTop = () => props.tabBarOffset
+  const fallbackDrawerTop = () => APP_BAR_HEIGHT + props.tabBarOffset
   const floatingTop = () => {
     const measured = floatingDrawerTop()
     if (measured > 0) return measured
@@ -728,21 +728,27 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
   const leftAppBarButtonLabel = () => {
     const state = leftDrawerState()
     if (state === "pinned") return t("instanceShell.leftDrawer.toggle.pinned")
-    return t("instanceShell.leftDrawer.toggle.open")
+    if (state === "floating-closed") return t("instanceShell.leftDrawer.toggle.open")
+    return t("instanceShell.leftDrawer.toggle.close")
   }
 
   const rightAppBarButtonLabel = () => {
     const state = rightDrawerState()
     if (state === "pinned") return t("instanceShell.rightDrawer.toggle.pinned")
-    return t("instanceShell.rightDrawer.toggle.open")
+    if (state === "floating-closed") return t("instanceShell.rightDrawer.toggle.open")
+    return t("instanceShell.rightDrawer.toggle.close")
   }
 
   const leftAppBarButtonIcon = () => {
-    return <MenuIcon fontSize="small" />
+    const state = leftDrawerState()
+    if (state === "floating-closed") return <MenuIcon fontSize="small" />
+    return <MenuOpenIcon fontSize="small" />
   }
 
   const rightAppBarButtonIcon = () => {
-    return <MenuIcon fontSize="small" sx={{ transform: "scaleX(-1)" }} />
+    const state = rightDrawerState()
+    if (state === "floating-closed") return <MenuIcon fontSize="small" sx={{ transform: "scaleX(-1)" }} />
+    return <MenuOpenIcon fontSize="small" sx={{ transform: "scaleX(-1)" }} />
   }
 
 
@@ -790,15 +796,29 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
 
   const handleLeftAppBarButtonClick = () => {
     const state = leftDrawerState()
-    if (state !== "floating-closed") return
-    setLeftOpen(true)
+    if (state === "pinned") return
+    if (state === "floating-closed") {
+      setLeftOpen(true)
+      measureDrawerHost()
+      return
+    }
+    blurIfInside(leftDrawerContentEl())
+    setLeftOpen(false)
+    focusTarget(leftToggleButtonEl())
     measureDrawerHost()
   }
 
   const handleRightAppBarButtonClick = () => {
     const state = rightDrawerState()
-    if (state !== "floating-closed") return
-    setRightOpen(true)
+    if (state === "pinned") return
+    if (state === "floating-closed") {
+      setRightOpen(true)
+      measureDrawerHost()
+      return
+    }
+    blurIfInside(rightDrawerContentEl())
+    setRightOpen(false)
+    focusTarget(rightToggleButtonEl())
     measureDrawerHost()
   }
 
@@ -844,66 +864,39 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
 
   const LeftDrawerContent = () => (
     <div class="flex flex-col h-full min-h-0" ref={setLeftDrawerContentEl}>
-      <div class="flex flex-col gap-2 px-4 py-3 border-b border-base">
-        <div class="flex items-center justify-between gap-2">
+      <div class="flex items-start justify-between gap-2 px-4 py-3 border-b border-base">
+        <div class="flex flex-col gap-1">
           <span class="session-sidebar-title text-sm font-semibold uppercase text-primary">
             {t("instanceShell.leftPanel.sessionsTitle")}
           </span>
-          <div class="flex items-center gap-2 text-primary">
-            <IconButton
-              size="small"
-              color="inherit"
-              aria-label={t("sessionList.filter.ariaLabel")}
-              title={t("sessionList.filter.ariaLabel")}
-              aria-pressed={showSessionSearch()}
-              onClick={() => setShowSessionSearch((current) => !current)}
-              sx={{
-                color: showSessionSearch() ? "var(--text-primary)" : "inherit",
-                backgroundColor: showSessionSearch() ? "var(--surface-hover)" : "transparent",
-                "&:hover": {
-                  backgroundColor: "var(--surface-hover)",
-                },
-              }}
-            >
-              <Search class={showSessionSearch() ? "w-4 h-4" : "w-4 h-4 opacity-70"} />
-            </IconButton>
-            <IconButton
-              size="small"
-              color="inherit"
-              aria-label={t("instanceShell.leftPanel.instanceInfo")}
-              title={t("instanceShell.leftPanel.instanceInfo")}
-              onClick={() => handleSessionSelect("info")}
-            >
-              <InfoOutlinedIcon fontSize="small" />
-            </IconButton>
-            <Show when={!isPhoneLayout()}>
-              <IconButton
-                size="small"
-                color="inherit"
-                aria-label={leftPinned() ? t("instanceShell.leftDrawer.unpin") : t("instanceShell.leftDrawer.pin")}
-                onClick={() => (leftPinned() ? unpinLeftDrawer() : pinLeftDrawer())}
-              >
-                {leftPinned() ? <PushPinIcon fontSize="small" /> : <PushPinOutlinedIcon fontSize="small" />}
-              </IconButton>
-            </Show>
-            <Show when={leftDrawerState() === "floating-open"}>
-              <IconButton
-                size="small"
-                color="inherit"
-                aria-label={t("instanceShell.leftDrawer.toggle.close")}
-                title={t("instanceShell.leftDrawer.toggle.close")}
-                onClick={closeLeftDrawer}
-              >
-                <MenuOpenIcon fontSize="small" />
-              </IconButton>
+          <div class="session-sidebar-shortcuts">
+            <Show when={keyboardShortcuts().length}>
+              <KeyboardHint shortcuts={keyboardShortcuts()} separator=" " showDescription={false} />
             </Show>
           </div>
         </div>
-        <div class="session-sidebar-shortcuts">
-          <Show when={keyboardShortcuts().length}>
-            <KeyboardHint shortcuts={keyboardShortcuts()} separator=" " showDescription={false} />
+        <div class="flex items-center gap-2">
+          <IconButton
+            size="small"
+            color="inherit"
+            aria-label={t("instanceShell.leftPanel.instanceInfo")}
+            title={t("instanceShell.leftPanel.instanceInfo")}
+            onClick={() => handleSessionSelect("info")}
+          >
+            <InfoOutlinedIcon fontSize="small" />
+          </IconButton>
+          <Show when={!isPhoneLayout()}>
+            <IconButton
+              size="small"
+              color="inherit"
+              aria-label={leftPinned() ? t("instanceShell.leftDrawer.unpin") : t("instanceShell.leftDrawer.pin")}
+              onClick={() => (leftPinned() ? unpinLeftDrawer() : pinLeftDrawer())}
+            >
+              {leftPinned() ? <PushPinIcon fontSize="small" /> : <PushPinOutlinedIcon fontSize="small" />}
+            </IconButton>
           </Show>
         </div>
+
       </div>
 
       <div class="session-sidebar flex flex-col flex-1 min-h-0">
@@ -918,24 +911,22 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
               void result.catch((error) => log.error("Failed to create session:", error))
             }
           }}
-          enableFilterBar={showSessionSearch()}
           showHeader={false}
           showFooter={false}
         />
 
-        <div class="session-sidebar-separator" />
-          <Show when={activeSessionForInstance()}>
-            {(activeSession) => (
-              <>
-                <div class="session-sidebar-controls px-4 py-4 border-t border-base flex flex-col gap-3">
-                  <WorktreeSelector instanceId={props.instance.id} sessionId={activeSession().id} />
-
-                  <AgentSelector
-                    instanceId={props.instance.id}
-                    sessionId={activeSession().id}
-                    currentAgent={activeSession().agent}
-                    onAgentChange={(agent) => props.handleSidebarAgentChange(activeSession().id, agent)}
-                  />
+        <Divider />
+        <Show when={activeSessionForInstance()}>
+          {(activeSession) => (
+            <>
+              <ContextUsagePanel instanceId={props.instance.id} sessionId={activeSession().id} />
+              <div class="session-sidebar-controls px-4 py-4 border-t border-base flex flex-col gap-3">
+                <AgentSelector
+                  instanceId={props.instance.id}
+                  sessionId={activeSession().id}
+                  currentAgent={activeSession().agent}
+                  onAgentChange={(agent) => props.handleSidebarAgentChange(activeSession().id, agent)}
+                />
 
                 <ModelSelector
                   instanceId={props.instance.id}
@@ -945,12 +936,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                 />
 
                 <ThinkingSelector instanceId={props.instance.id} currentModel={activeSession().model} />
-
-                <div class="session-sidebar-selector-hints" aria-hidden="true">
-                  <Kbd shortcut="cmd+shift+a" />
-                  <Kbd shortcut="cmd+shift+m" />
-                  <Kbd shortcut="cmd+shift+t" />
-                </div>
               </div>
             </>
           )}
@@ -1096,46 +1081,22 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
 
     return (
       <div class="flex flex-col h-full" ref={setRightDrawerContentEl}>
-        <div class="border-b border-base text-primary">
-          <div class="relative flex items-center px-4 py-2">
-            <div class="flex items-center gap-2">
-              <Show when={rightDrawerState() === "floating-open"}>
-                <IconButton
-                  size="small"
-                  color="inherit"
-                  aria-label={t("instanceShell.rightDrawer.toggle.close")}
-                  title={t("instanceShell.rightDrawer.toggle.close")}
-                  onClick={closeRightDrawer}
-                >
-                  <MenuOpenIcon fontSize="small" sx={{ transform: "scaleX(-1)" }} />
-                </IconButton>
-              </Show>
-              <Show when={!isPhoneLayout()}>
-                <IconButton
-                  size="small"
-                  color="inherit"
-                  aria-label={rightPinned() ? t("instanceShell.rightDrawer.unpin") : t("instanceShell.rightDrawer.pin")}
-                  onClick={() => (rightPinned() ? unpinRightDrawer() : pinRightDrawer())}
-                >
-                  {rightPinned() ? <PushPinIcon fontSize="small" /> : <PushPinOutlinedIcon fontSize="small" />}
-                </IconButton>
-              </Show>
-            </div>
-            <div class="pointer-events-none absolute inset-0 flex items-center justify-center">
-              <span class="session-sidebar-title text-sm font-semibold uppercase text-primary">
-                {t("instanceShell.rightPanel.title")}
-              </span>
-            </div>
+        <div class="flex items-center justify-between px-4 py-2 border-b border-base">
+          <Typography variant="subtitle2" class="uppercase tracking-wide text-xs font-semibold">
+            {t("instanceShell.rightPanel.title")}
+          </Typography>
+          <div class="flex items-center gap-2">
+            <Show when={!isPhoneLayout()}>
+              <IconButton
+                size="small"
+                color="inherit"
+                aria-label={rightPinned() ? t("instanceShell.rightDrawer.unpin") : t("instanceShell.rightDrawer.pin")}
+                onClick={() => (rightPinned() ? unpinRightDrawer() : pinRightDrawer())}
+              >
+                {rightPinned() ? <PushPinIcon fontSize="small" /> : <PushPinOutlinedIcon fontSize="small" />}
+              </IconButton>
+            </Show>
           </div>
-          <Show when={activeSessionForInstance()}>
-            {(activeSession) => (
-              <ContextUsagePanel
-                instanceId={props.instance.id}
-                sessionId={activeSession().id}
-                class="border-t border-base"
-              />
-            )}
-          </Show>
         </div>
         <div class="flex-1 overflow-y-auto">
           <Accordion.Root
@@ -1296,93 +1257,19 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
 
   const sessionLayout = (
     <div
-      class="session-shell-panels flex flex-1 min-h-0 overflow-x-hidden"
+      class="session-shell-panels flex flex-col flex-1 min-h-0 overflow-x-hidden"
       ref={(element) => {
         setDrawerHost(element)
         measureDrawerHost()
       }}
     >
-      {renderLeftPanel()}
-
-      <Box sx={{ display: "flex", flexDirection: "column", flex: 1, minWidth: 0, minHeight: 0, overflowX: "hidden" }}>
-        <AppBar position="sticky" color="default" elevation={0} class="border-b border-base">
-          <Toolbar variant="dense" class="session-toolbar flex flex-wrap items-center gap-2 py-0 min-h-[40px]">
-            <Show
-              when={!isPhoneLayout()}
-              fallback={
-                <div class="flex flex-col w-full gap-1.5">
-                  <div class="flex flex-wrap items-center justify-between gap-2 w-full">
-                    <Show when={leftDrawerState() === "floating-closed"}>
-                      <IconButton
-                        ref={setLeftToggleButtonEl}
-                        color="inherit"
-                        onClick={handleLeftAppBarButtonClick}
-                        aria-label={leftAppBarButtonLabel()}
-                        size="small"
-                        aria-expanded={leftDrawerState() !== "floating-closed"}
-                      >
-                        {leftAppBarButtonIcon()}
-                      </IconButton>
-                    </Show>
-
-                    <div class="flex flex-wrap items-center gap-1 justify-center">
-                      <PermissionNotificationBanner
-                        instanceId={props.instance.id}
-                        onClick={() => setPermissionModalOpen(true)}
-                      />
-                      <button
-                        type="button"
-                        class="connection-status-button px-2 py-0.5 text-xs"
-                        onClick={handleCommandPaletteClick}
-                        aria-label={t("instanceShell.commandPalette.openAriaLabel")}
-                        style={{ flex: "0 0 auto", width: "auto" }}
-                      >
-                        {t("instanceShell.commandPalette.button")}
-                      </button>
-                      <span class="connection-status-shortcut-hint">
-                        <Kbd shortcut="cmd+shift+p" />
-                      </span>
-                      <span
-                        class={`status-indicator ${connectionStatusClass()}`}
-                        aria-label={t("instanceShell.connection.ariaLabel", { status: connectionStatusLabel() })}
-                      >
-                        <span class="status-dot" />
-                      </span>
-                    </div>
-
-                    <Show when={rightDrawerState() === "floating-closed"}>
-                      <IconButton
-                        ref={setRightToggleButtonEl}
-                        color="inherit"
-                        onClick={handleRightAppBarButtonClick}
-                        aria-label={rightAppBarButtonLabel()}
-                        size="small"
-                        aria-expanded={rightDrawerState() !== "floating-closed"}
-                      >
-                        {rightAppBarButtonIcon()}
-                      </IconButton>
-                    </Show>
-                  </div>
-
-                  <div class="flex flex-wrap items-center justify-center gap-2 pb-1">
-                    <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
-                      <span class="uppercase text-[10px] tracking-wide text-muted">
-                        {t("instanceShell.metrics.usedLabel")}
-                      </span>
-                      <span class="font-semibold text-primary">{formattedUsedTokens()}</span>
-                    </div>
-                    <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
-                      <span class="uppercase text-[10px] tracking-wide text-muted">
-                        {t("instanceShell.metrics.availableLabel")}
-                      </span>
-                      <span class="font-semibold text-primary">{formattedAvailableTokens()}</span>
-                    </div>
-                  </div>
-                </div>
-              }
-            >
-              <div class="session-toolbar-left flex items-center gap-3 min-w-0">
-                <Show when={leftDrawerState() === "floating-closed"}>
+      <AppBar position="sticky" color="default" elevation={0} class="border-b border-base">
+        <Toolbar variant="dense" class="session-toolbar flex flex-wrap items-center gap-2 py-0 min-h-[40px]">
+          <Show
+            when={!isPhoneLayout()}
+            fallback={
+              <div class="flex flex-col w-full gap-1.5">
+                <div class="flex flex-wrap items-center justify-between gap-2 w-full">
                   <IconButton
                     ref={setLeftToggleButtonEl}
                     color="inherit"
@@ -1390,68 +1277,38 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                     aria-label={leftAppBarButtonLabel()}
                     size="small"
                     aria-expanded={leftDrawerState() !== "floating-closed"}
+                    disabled={leftDrawerState() === "pinned"}
                   >
                     {leftAppBarButtonIcon()}
                   </IconButton>
-                </Show>
 
-                <Show when={!showingInfoView()}>
-                  <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
-                    <span class="uppercase text-[10px] tracking-wide text-muted">
-                      {t("instanceShell.metrics.usedLabel")}
+                  <div class="flex flex-wrap items-center gap-1 justify-center">
+                    <PermissionNotificationBanner
+                      instanceId={props.instance.id}
+                      onClick={() => setPermissionModalOpen(true)}
+                    />
+                    <button
+                      type="button"
+                      class="connection-status-button px-2 py-0.5 text-xs"
+                      onClick={handleCommandPaletteClick}
+                      aria-label={t("instanceShell.commandPalette.openAriaLabel")}
+                      style={{ flex: "0 0 auto", width: "auto" }}
+                    >
+                      {t("instanceShell.commandPalette.button")}
+                    </button>
+                    <span class="connection-status-shortcut-hint">
+                      <Kbd shortcut="cmd+shift+p" />
                     </span>
-                    <span class="font-semibold text-primary">{formattedUsedTokens()}</span>
+                    <span
+                      class={`status-indicator ${connectionStatusClass()}`}
+                      aria-label={t("instanceShell.connection.ariaLabel", { status: connectionStatusLabel() })}
+                    >
+                      <span class="status-dot" />
+                    </span>
+
+
                   </div>
-                  <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
-                    <span class="uppercase text-[10px] tracking-wide text-muted">
-                      {t("instanceShell.metrics.availableLabel")}
-                    </span>
-                    <span class="font-semibold text-primary">{formattedAvailableTokens()}</span>
-                  </div>
-                </Show>
-              </div>
 
-              <div class="session-toolbar-center flex-1 flex items-center justify-center gap-2 min-w-[160px]">
-                <PermissionNotificationBanner
-                  instanceId={props.instance.id}
-                  onClick={() => setPermissionModalOpen(true)}
-                />
-                <button
-                  type="button"
-                  class="connection-status-button px-2 py-0.5 text-xs"
-                  onClick={handleCommandPaletteClick}
-                  aria-label={t("instanceShell.commandPalette.openAriaLabel")}
-                  style={{ flex: "0 0 auto", width: "auto" }}
-                >
-                  {t("instanceShell.commandPalette.button")}
-                </button>
-                <span class="connection-status-shortcut-hint">
-                  <Kbd shortcut="cmd+shift+p" />
-                </span>
-              </div>
-
-              <div class="session-toolbar-right flex items-center gap-3">
-                <div class="connection-status-meta flex items-center gap-3">
-                  <Show when={connectionStatus() === "connected"}>
-                    <span class="status-indicator connected">
-                      <span class="status-dot" />
-                      <span class="status-text">{t("instanceShell.connection.connected")}</span>
-                    </span>
-                  </Show>
-                  <Show when={connectionStatus() === "connecting"}>
-                    <span class="status-indicator connecting">
-                      <span class="status-dot" />
-                      <span class="status-text">{t("instanceShell.connection.connecting")}</span>
-                    </span>
-                  </Show>
-                  <Show when={connectionStatus() === "error" || connectionStatus() === "disconnected"}>
-                    <span class="status-indicator disconnected">
-                      <span class="status-dot" />
-                      <span class="status-text">{t("instanceShell.connection.disconnected")}</span>
-                    </span>
-                  </Show>
-                </div>
-                <Show when={rightDrawerState() === "floating-closed"}>
                   <IconButton
                     ref={setRightToggleButtonEl}
                     color="inherit"
@@ -1459,14 +1316,120 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                     aria-label={rightAppBarButtonLabel()}
                     size="small"
                     aria-expanded={rightDrawerState() !== "floating-closed"}
+                    disabled={rightDrawerState() === "pinned"}
                   >
                     {rightAppBarButtonIcon()}
                   </IconButton>
+                </div>
+
+                <div class="flex flex-wrap items-center justify-center gap-2 pb-1">
+                  <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
+                    <span class="uppercase text-[10px] tracking-wide text-primary/70">
+                      {t("instanceShell.metrics.usedLabel")}
+                    </span>
+                    <span class="font-semibold text-primary">{formattedUsedTokens()}</span>
+                  </div>
+                  <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
+                    <span class="uppercase text-[10px] tracking-wide text-primary/70">
+                      {t("instanceShell.metrics.availableLabel")}
+                    </span>
+                    <span class="font-semibold text-primary">{formattedAvailableTokens()}</span>
+                  </div>
+                </div>
+              </div>
+            }
+          >
+            <div class="session-toolbar-left flex items-center gap-3 min-w-0">
+              <IconButton
+                ref={setLeftToggleButtonEl}
+                color="inherit"
+                onClick={handleLeftAppBarButtonClick}
+                aria-label={leftAppBarButtonLabel()}
+                size="small"
+                aria-expanded={leftDrawerState() !== "floating-closed"}
+                disabled={leftDrawerState() === "pinned"}
+              >
+                {leftAppBarButtonIcon()}
+              </IconButton>
+
+              <Show when={!showingInfoView()}>
+                <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
+                  <span class="uppercase text-[10px] tracking-wide text-primary/70">
+                    {t("instanceShell.metrics.usedLabel")}
+                  </span>
+                  <span class="font-semibold text-primary">{formattedUsedTokens()}</span>
+                </div>
+                <div class="inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary">
+                  <span class="uppercase text-[10px] tracking-wide text-primary/70">
+                    {t("instanceShell.metrics.availableLabel")}
+                  </span>
+                  <span class="font-semibold text-primary">{formattedAvailableTokens()}</span>
+                </div>
+              </Show>
+            </div>
+
+
+            <div class="session-toolbar-center flex-1 flex items-center justify-center gap-2 min-w-[160px]">
+              <PermissionNotificationBanner
+                instanceId={props.instance.id}
+                onClick={() => setPermissionModalOpen(true)}
+              />
+              <button
+                type="button"
+                class="connection-status-button px-2 py-0.5 text-xs"
+                onClick={handleCommandPaletteClick}
+                aria-label={t("instanceShell.commandPalette.openAriaLabel")}
+                style={{ flex: "0 0 auto", width: "auto" }}
+              >
+                {t("instanceShell.commandPalette.button")}
+              </button>
+              <span class="connection-status-shortcut-hint">
+                <Kbd shortcut="cmd+shift+p" />
+              </span>
+
+
+            </div>
+
+
+            <div class="session-toolbar-right flex items-center gap-3">
+              <div class="connection-status-meta flex items-center gap-3">
+                <Show when={connectionStatus() === "connected"}>
+                  <span class="status-indicator connected">
+                    <span class="status-dot" />
+                    <span class="status-text">{t("instanceShell.connection.connected")}</span>
+                  </span>
+                </Show>
+                <Show when={connectionStatus() === "connecting"}>
+                  <span class="status-indicator connecting">
+                    <span class="status-dot" />
+                    <span class="status-text">{t("instanceShell.connection.connecting")}</span>
+                  </span>
+                </Show>
+                <Show when={connectionStatus() === "error" || connectionStatus() === "disconnected"}>
+                  <span class="status-indicator disconnected">
+                    <span class="status-dot" />
+                    <span class="status-text">{t("instanceShell.connection.disconnected")}</span>
+                  </span>
                 </Show>
               </div>
-            </Show>
-          </Toolbar>
-        </AppBar>
+              <IconButton
+                ref={setRightToggleButtonEl}
+                color="inherit"
+                onClick={handleRightAppBarButtonClick}
+                aria-label={rightAppBarButtonLabel()}
+                size="small"
+                aria-expanded={rightDrawerState() !== "floating-closed"}
+                disabled={rightDrawerState() === "pinned"}
+              >
+                {rightAppBarButtonIcon()}
+              </IconButton>
+            </div>
+          </Show>
+        </Toolbar>
+      </AppBar>
+
+      <Box sx={{ display: "flex", flex: 1, minHeight: 0, overflowX: "hidden" }}>
+        {renderLeftPanel()}
 
         <Box
           component="main"
@@ -1520,9 +1483,9 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
             </div>
           </Show>
         </Box>
-      </Box>
 
-      {renderRightPanel()}
+        {renderRightPanel()}
+      </Box>
     </div>
   )
 

packages/ui/src/components/markdown.tsx

@@ -1,5 +1,5 @@
 import { createEffect, createMemo, createSignal, onCleanup, onMount } from "solid-js"
-import { renderMarkdown, onLanguagesLoaded, decodeHtmlEntities, setMarkdownTheme } from "../lib/markdown"
+import { renderMarkdown, onLanguagesLoaded, decodeHtmlEntities } from "../lib/markdown"
 import { useGlobalCache } from "../lib/hooks/use-global-cache"
 import type { TextPart, RenderCache } from "../types/message"
 import { getLogger } from "../lib/logger"
@@ -72,9 +72,6 @@ export function Markdown(props: MarkdownProps) {
   createEffect(async () => {
     const { part, text, themeKey, highlightEnabled, version } = resolved()
 
-    // Ensure the markdown highlighter theme matches the active UI theme.
-    setMarkdownTheme(themeKey === "dark")
-
     latestRequestedText = text
 
     const cacheMatches = (cache: RenderCache | undefined) => {
@@ -174,8 +171,6 @@ export function Markdown(props: MarkdownProps) {
 
       const { part, text, themeKey, version } = resolved()
 
-      setMarkdownTheme(themeKey === "dark")
-
       if (latestRequestedText !== text) {
         return
       }

packages/ui/src/components/message-block.tsx

@@ -1,5 +1,5 @@
 import { For, Match, Show, Switch, createEffect, createMemo, createSignal, untrack } from "solid-js"
-import { ExternalLink, FoldVertical, Trash2 } from "lucide-solid"
+import { FoldVertical } from "lucide-solid"
 import MessageItem from "./message-item"
 import ToolCall from "./tool-call"
 import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
@@ -11,8 +11,6 @@ import { messageStoreBus } from "../stores/message-v2/bus"
 import { formatTokenTotal } from "../lib/formatters"
 import { sessions, setActiveParentSession, setActiveSession } from "../stores/sessions"
 import { setActiveInstanceId } from "../stores/instances"
-import { showAlertDialog } from "../stores/alerts"
-import { deleteMessagePart } from "../stores/session-actions"
 import { useI18n } from "../lib/i18n"
 
 const TOOL_ICON = "🔧"
@@ -174,256 +172,21 @@ messageStoreBus.onInstanceDestroyed(clearInstanceCaches)
 interface ContentDisplayItem {
   type: "content"
   key: string
-  messageId: string
-  startPartId: string
+  record: MessageRecord
+  parts: ClientPart[]
+  messageInfo?: MessageInfo
+  isQueued: boolean
+  showAgentMeta?: boolean
 }
 
 interface ToolDisplayItem {
   type: "tool"
   key: string
+  toolPart: ToolCallPart
+  messageInfo?: MessageInfo
   messageId: string
-  partId: string
-}
-
-interface MessageContentItemProps {
-  instanceId: string
-  sessionId: string
-  store: () => InstanceMessageStore
-  messageId: string
-  startPartId: string
-  messageIndex: number
-  lastAssistantIndex: () => number
-  onRevert?: (messageId: string) => void
-  onFork?: (messageId?: string) => void
-  onContentRendered?: () => void
-}
-
-function MessageContentItem(props: MessageContentItemProps) {
-  const record = createMemo(() => props.store().getMessage(props.messageId))
-  const messageInfo = createMemo(() => props.store().getMessageInfo(props.messageId))
-
-  const isQueued = createMemo(() => {
-    const current = record()
-    if (!current) return false
-    if (current.role !== "user") return false
-    const lastAssistant = props.lastAssistantIndex()
-    return lastAssistant === -1 || props.messageIndex > lastAssistant
-  })
-
-  const parts = createMemo<ClientPart[]>(() => {
-    const current = record()
-    if (!current) return []
-    const ids = current.partIds
-    const startIndex = ids.indexOf(props.startPartId)
-    if (startIndex === -1) return []
-
-    const resolved: ClientPart[] = []
-    for (let idx = startIndex; idx < ids.length; idx++) {
-      const partId = ids[idx]
-      const part = current.parts[partId]?.data
-      if (!part) continue
-      if (
-        part.type === "tool" ||
-        part.type === "reasoning" ||
-        part.type === "compaction" ||
-        part.type === "step-start" ||
-        part.type === "step-finish"
-      ) {
-        break
-      }
-      resolved.push(part)
-    }
-
-    return resolved
-  })
-
-  const showAgentMeta = createMemo(() => {
-    const current = record()
-    if (!current) return false
-    if (current.role !== "assistant") return false
-
-    const currentParts = parts()
-    if (!currentParts.some((part) => partHasRenderableText(part))) {
-      return false
-    }
-
-    const ids = current.partIds
-    const startIndex = ids.indexOf(props.startPartId)
-    if (startIndex === -1) return false
-
-    // Only show agent meta on the first content segment that contains renderable content.
-    for (let idx = 0; idx < startIndex; idx++) {
-      const partId = ids[idx]
-      const part = current.parts[partId]?.data
-      if (!part) continue
-      if (
-        part.type === "tool" ||
-        part.type === "reasoning" ||
-        part.type === "compaction" ||
-        part.type === "step-start" ||
-        part.type === "step-finish"
-      ) {
-        continue
-      }
-      if (partHasRenderableText(part)) {
-        return false
-      }
-    }
-
-    return true
-  })
-
-  return (
-    <Show when={record()}>
-      {(resolvedRecord) => (
-        <MessageItem
-          record={resolvedRecord()}
-          messageInfo={messageInfo()}
-          parts={parts()}
-          instanceId={props.instanceId}
-          sessionId={props.sessionId}
-          isQueued={isQueued()}
-          showAgentMeta={showAgentMeta()}
-          onRevert={props.onRevert}
-          onFork={props.onFork}
-          onContentRendered={props.onContentRendered}
-        />
-      )}
-    </Show>
-  )
-}
-
-interface ToolCallItemProps {
-  instanceId: string
-  sessionId: string
-  store: () => InstanceMessageStore
-  messageId: string
-  partId: string
-  onContentRendered?: () => void
-}
-
-function ToolCallItem(props: ToolCallItemProps) {
-  const { t } = useI18n()
-  const [deleting, setDeleting] = createSignal(false)
-
-  const record = createMemo(() => props.store().getMessage(props.messageId))
-  const messageInfo = createMemo(() => props.store().getMessageInfo(props.messageId))
-  const partEntry = createMemo(() => record()?.parts?.[props.partId])
-
-  const toolPart = createMemo(() => {
-    const part = partEntry()?.data as ClientPart | undefined
-    if (!part || part.type !== "tool") return undefined
-    return part as ToolCallPart
-  })
-
-  const toolState = createMemo(() => toolPart()?.state as ToolState | undefined)
-  const toolName = createMemo(() => toolPart()?.tool || "")
-  const messageVersion = createMemo(() => record()?.revision ?? 0)
-  const partVersion = createMemo(() => partEntry()?.revision ?? 0)
-
-  const deleteDisabled = createMemo(() => {
-    if (deleting()) return true
-    // Avoid deleting while a tool is actively running to prevent confusing UI states.
-    if (isToolStateRunning(toolState())) return true
-    // Avoid deleting permission prompts from here; those are interactive.
-    return Boolean(toolPart()?.pendingPermission)
-  })
-
-  const taskSessionId = createMemo(() => {
-    const state = toolState()
-    if (!state) return ""
-    if (!(isToolStateRunning(state) || isToolStateCompleted(state) || isToolStateError(state))) {
-      return ""
-    }
-    return extractTaskSessionId(state)
-  })
-
-  const taskLocation = createMemo(() => {
-    const id = taskSessionId()
-    if (!id) return null
-    return findTaskSessionLocation(id, props.instanceId)
-  })
-
-  const handleGoToTaskSession = (event: MouseEvent) => {
-    event.preventDefault()
-    event.stopPropagation()
-    const location = taskLocation()
-    if (!location) return
-    navigateToTaskSession(location)
-  }
-
-  const handleDeleteToolPart = async (event: MouseEvent) => {
-    event.preventDefault()
-    event.stopPropagation()
-
-    if (deleteDisabled()) return
-
-    setDeleting(true)
-    try {
-      await deleteMessagePart(props.instanceId, props.sessionId, props.messageId, props.partId)
-    } catch (error) {
-      showAlertDialog(t("messageBlock.tool.deletePart.failed.message"), {
-        title: t("messageBlock.tool.deletePart.failed.title"),
-        detail: error instanceof Error ? error.message : String(error),
-        variant: "error",
-      })
-    } finally {
-      setDeleting(false)
-    }
-  }
-
-  return (
-    <Show when={toolPart()}>
-      {(resolvedToolPart) => (
-        <>
-          <div class="tool-call-header-label">
-            <div class="tool-call-header-meta">
-              <span class="tool-call-icon">{TOOL_ICON}</span>
-              <span>{t("messageBlock.tool.header")}</span>
-              <span class="tool-name">{toolName() || t("messageBlock.tool.unknown")}</span>
-            </div>
-
-            <div class="flex items-center gap-2">
-              <Show when={taskSessionId()}>
-                <button
-                  class="tool-call-header-button"
-                  type="button"
-                  disabled={!taskLocation()}
-                  onClick={handleGoToTaskSession}
-                  title={t("messageBlock.tool.goToSession.label")}
-                  aria-label={t("messageBlock.tool.goToSession.label")}
-                >
-                  <ExternalLink class="w-3.5 h-3.5" aria-hidden="true" />
-                </button>
-              </Show>
-
-              <button
-                class="tool-call-header-button"
-                type="button"
-                disabled={deleteDisabled()}
-                onClick={handleDeleteToolPart}
-                title={deleting() ? t("messageBlock.tool.deletePart.deleting") : t("messageBlock.tool.deletePart.label")}
-                aria-label={deleting() ? t("messageBlock.tool.deletePart.deleting") : t("messageBlock.tool.deletePart.label")}
-              >
-                <Trash2 class="w-3.5 h-3.5" aria-hidden="true" />
-              </button>
-            </div>
-          </div>
-
-          <ToolCall
-            toolCall={resolvedToolPart()}
-            toolCallId={props.partId}
-            messageId={props.messageId}
-            messageVersion={messageVersion()}
-            partVersion={partVersion()}
-            instanceId={props.instanceId}
-            sessionId={props.sessionId}
-            onContentRendered={props.onContentRendered}
-          />
-        </>
-      )}
-    </Show>
-  )
+  messageVersion: number
+  partVersion: number
 }
 
 interface StepDisplayItem {
@@ -441,8 +204,6 @@ type ReasoningDisplayItem = {
   messageInfo?: MessageInfo
   showAgentMeta?: boolean
   defaultExpanded: boolean
-  messageId: string
-  partId: string
 }
 
 type CompactionDisplayItem = {
@@ -451,8 +212,6 @@ type CompactionDisplayItem = {
   part: ClientPart
   messageInfo?: MessageInfo
   accentColor?: string
-  messageId: string
-  partId: string
 }
 
 type MessageBlockItem = ContentDisplayItem | ToolDisplayItem | StepDisplayItem | ReasoningDisplayItem | CompactionDisplayItem
@@ -513,6 +272,7 @@ export default function MessageBlock(props: MessageBlockProps) {
     const items: MessageBlockItem[] = []
     const blockContentKeys: string[] = []
     const blockToolKeys: string[] = []
+    let segmentIndex = 0
     let pendingParts: ClientPart[] = []
     let agentMetaAttached = current.role !== "assistant"
     const defaultAccentColor = current.role === "user" ? USER_BORDER_COLOR : ASSISTANT_BORDER_COLOR
@@ -520,28 +280,34 @@ export default function MessageBlock(props: MessageBlockProps) {
 
     const flushContent = () => {
       if (pendingParts.length === 0) return
-      const startPartId = typeof (pendingParts[0] as any)?.id === "string" ? ((pendingParts[0] as any).id as string) : ""
-      if (!startPartId) {
-        pendingParts = []
-        return
-      }
-
-      if (!agentMetaAttached && pendingParts.some((part) => partHasRenderableText(part))) {
-        agentMetaAttached = true
-      }
-
-      const segmentKey = `${current.id}:content:${startPartId}`
+      const segmentKey = `${current.id}:segment:${segmentIndex}`
+      segmentIndex += 1
+      const shouldShowAgentMeta =
+        current.role === "assistant" &&
+        !agentMetaAttached &&
+        pendingParts.some((part) => partHasRenderableText(part))
       let cached = sessionCache.messageItems.get(segmentKey)
       if (!cached) {
         cached = {
           type: "content",
           key: segmentKey,
-          messageId: current.id,
-          startPartId,
+          record: current,
+          parts: pendingParts.slice(),
+          messageInfo: info,
+          isQueued,
+          showAgentMeta: shouldShowAgentMeta,
         }
         sessionCache.messageItems.set(segmentKey, cached)
+      } else {
+        cached.record = current
+        cached.parts = pendingParts.slice()
+        cached.messageInfo = info
+        cached.isQueued = isQueued
+        cached.showAgentMeta = shouldShowAgentMeta
+      }
+      if (shouldShowAgentMeta) {
+        agentMetaAttached = true
       }
-
       items.push(cached)
       blockContentKeys.push(segmentKey)
       lastAccentColor = defaultAccentColor
@@ -551,26 +317,28 @@ export default function MessageBlock(props: MessageBlockProps) {
     orderedParts.forEach((part, partIndex) => {
       if (part.type === "tool") {
         flushContent()
-        const partId = part.id
-        if (!partId) {
-          // Tool parts are required to have ids; if one slips through, skip rendering
-          // to avoid unstable keys and accidental remount cascades.
-          return
-        }
-        const key = `${current.id}:${partId}`
+        const partVersion = typeof (part as any).revision === "number" ? (part as any).revision : 0
+        const messageVersion = current.revision
+        const key = `${current.id}:${part.id ?? partIndex}`
         let toolItem = sessionCache.toolItems.get(key)
         if (!toolItem) {
           toolItem = {
             type: "tool",
             key,
+            toolPart: part as ToolCallPart,
+            messageInfo: info,
             messageId: current.id,
-            partId,
+            messageVersion,
+            partVersion,
           }
           sessionCache.toolItems.set(key, toolItem)
         } else {
           toolItem.key = key
+          toolItem.toolPart = part as ToolCallPart
+          toolItem.messageInfo = info
           toolItem.messageId = current.id
-          toolItem.partId = partId
+          toolItem.messageVersion = messageVersion
+          toolItem.partVersion = partVersion
         }
         items.push(toolItem)
         blockToolKeys.push(key)
@@ -580,8 +348,7 @@ export default function MessageBlock(props: MessageBlockProps) {
 
       if (part.type === "compaction") {
         flushContent()
-        const partId = part.id ?? ""
-        const key = `${current.id}:${partId || partIndex}:compaction`
+        const key = `${current.id}:${part.id ?? partIndex}:compaction`
         const isAuto = Boolean((part as any)?.auto)
         items.push({
           type: "compaction",
@@ -589,8 +356,6 @@ export default function MessageBlock(props: MessageBlockProps) {
           part,
           messageInfo: info,
           accentColor: isAuto ? "var(--session-status-compacting-fg)" : USER_BORDER_COLOR,
-          messageId: current.id,
-          partId,
         })
         lastAccentColor = isAuto ? "var(--session-status-compacting-fg)" : USER_BORDER_COLOR
         return
@@ -615,8 +380,7 @@ export default function MessageBlock(props: MessageBlockProps) {
       if (part.type === "reasoning") {
         flushContent()
         if (props.showThinking() && reasoningHasRenderableContent(part)) {
-          const partId = part.id ?? ""
-          const key = `${current.id}:${partId || partIndex}:reasoning`
+          const key = `${current.id}:${part.id ?? partIndex}:reasoning`
           const showAgentMeta = current.role === "assistant" && !agentMetaAttached
           if (showAgentMeta) {
             agentMetaAttached = true
@@ -628,8 +392,6 @@ export default function MessageBlock(props: MessageBlockProps) {
             messageInfo: info,
             showAgentMeta,
             defaultExpanded: props.thinkingDefaultExpanded(),
-            messageId: current.id,
-            partId,
           })
           lastAccentColor = ASSISTANT_BORDER_COLOR
         }
@@ -665,21 +427,21 @@ export default function MessageBlock(props: MessageBlockProps) {
   })
 
   return (
-    <Show when={block()}>
+    <Show when={block()} keyed>
       {(resolvedBlock) => (
-        <div class="message-stream-block" data-message-id={resolvedBlock().record.id}>
-          <For each={resolvedBlock().items}>
+        <div class="message-stream-block" data-message-id={resolvedBlock.record.id}>
+          <For each={resolvedBlock.items}>
             {(item) => (
               <Switch>
                 <Match when={item.type === "content"}>
-                  <MessageContentItem
+                  <MessageItem
+                    record={(item as ContentDisplayItem).record}
+                    messageInfo={(item as ContentDisplayItem).messageInfo}
+                    parts={(item as ContentDisplayItem).parts}
                     instanceId={props.instanceId}
                     sessionId={props.sessionId}
-                    store={props.store}
-                    messageId={(item as ContentDisplayItem).messageId}
-                    startPartId={(item as ContentDisplayItem).startPartId}
-                    messageIndex={props.messageIndex}
-                    lastAssistantIndex={props.lastAssistantIndex}
+                    isQueued={(item as ContentDisplayItem).isQueued}
+                    showAgentMeta={(item as ContentDisplayItem).showAgentMeta}
                     onRevert={props.onRevert}
                     onFork={props.onFork}
                     onContentRendered={props.onContentRendered}
@@ -688,14 +450,46 @@ export default function MessageBlock(props: MessageBlockProps) {
                 <Match when={item.type === "tool"}>
                   {(() => {
                     const toolItem = item as ToolDisplayItem
+                    const toolState = toolItem.toolPart.state as ToolState | undefined
+                    const hasToolState =
+                      Boolean(toolState) && (isToolStateRunning(toolState) || isToolStateCompleted(toolState) || isToolStateError(toolState))
+                    const taskSessionId = hasToolState ? extractTaskSessionId(toolState) : ""
+                    const taskLocation = taskSessionId ? findTaskSessionLocation(taskSessionId, props.instanceId) : null
+                    const handleGoToTaskSession = (event: MouseEvent) => {
+                      event.preventDefault()
+                      event.stopPropagation()
+                      if (!taskLocation) return
+                      navigateToTaskSession(taskLocation)
+                    }
+
                     return (
                       <div class="tool-call-message" data-key={toolItem.key}>
-                        <ToolCallItem
+                        <div class="tool-call-header-label">
+                          <div class="tool-call-header-meta">
+                            <span class="tool-call-icon">{TOOL_ICON}</span>
+                            <span>{t("messageBlock.tool.header")}</span>
+                            <span class="tool-name">{toolItem.toolPart.tool || t("messageBlock.tool.unknown")}</span>
+                          </div>
+                          <Show when={taskSessionId}>
+                            <button
+                              class="tool-call-header-button"
+                              type="button"
+                              disabled={!taskLocation}
+                              onClick={handleGoToTaskSession}
+                              title={!taskLocation ? t("messageBlock.tool.goToSession.unavailableTitle") : t("messageBlock.tool.goToSession.title")}
+                            >
+                              {t("messageBlock.tool.goToSession.label")}
+                            </button>
+                          </Show>
+                        </div>
+                        <ToolCall
+                          toolCall={toolItem.toolPart}
+                          toolCallId={toolItem.toolPart.id}
+                          messageId={toolItem.messageId}
+                          messageVersion={toolItem.messageVersion}
+                          partVersion={toolItem.partVersion}
                           instanceId={props.instanceId}
                           sessionId={props.sessionId}
-                          store={props.store}
-                          messageId={toolItem.messageId}
-                          partId={toolItem.partId}
                           onContentRendered={props.onContentRendered}
                         />
                       </div>
@@ -703,12 +497,7 @@ export default function MessageBlock(props: MessageBlockProps) {
                   })()}
                 </Match>
                 <Match when={item.type === "step-start"}>
-                  <StepCard
-                    kind="start"
-                    part={(item as StepDisplayItem).part}
-                    messageInfo={(item as StepDisplayItem).messageInfo}
-                    showAgentMeta
-                  />
+                  <StepCard kind="start" part={(item as StepDisplayItem).part} messageInfo={(item as StepDisplayItem).messageInfo} showAgentMeta />
                 </Match>
                 <Match when={item.type === "step-finish"}>
                   <StepCard
@@ -720,15 +509,7 @@ export default function MessageBlock(props: MessageBlockProps) {
                   />
                 </Match>
                 <Match when={item.type === "compaction"}>
-                  <CompactionCard
-                    part={(item as CompactionDisplayItem).part}
-                    messageInfo={(item as CompactionDisplayItem).messageInfo}
-                    borderColor={(item as CompactionDisplayItem).accentColor}
-                    instanceId={props.instanceId}
-                    sessionId={props.sessionId}
-                    messageId={(item as CompactionDisplayItem).messageId}
-                    partId={(item as CompactionDisplayItem).partId}
-                  />
+                  <CompactionCard part={(item as CompactionDisplayItem).part} messageInfo={(item as CompactionDisplayItem).messageInfo} borderColor={(item as CompactionDisplayItem).accentColor} />
                 </Match>
                 <Match when={item.type === "reasoning"}>
                   <ReasoningCard
@@ -736,8 +517,6 @@ export default function MessageBlock(props: MessageBlockProps) {
                     messageInfo={(item as ReasoningDisplayItem).messageInfo}
                     instanceId={props.instanceId}
                     sessionId={props.sessionId}
-                    messageId={(item as ReasoningDisplayItem).messageId}
-                    partId={(item as ReasoningDisplayItem).partId}
                     showAgentMeta={(item as ReasoningDisplayItem).showAgentMeta}
                     defaultExpanded={(item as ReasoningDisplayItem).defaultExpanded}
                   />
@@ -760,19 +539,8 @@ interface StepCardProps {
   borderColor?: string
 }
 
-interface CompactionCardProps {
-  part: ClientPart
-  messageInfo?: MessageInfo
-  borderColor?: string
-  instanceId: string
-  sessionId: string
-  messageId: string
-  partId: string
-}
-
-function CompactionCard(props: CompactionCardProps) {
+function CompactionCard(props: { part: ClientPart; messageInfo?: MessageInfo; borderColor?: string }) {
   const { t } = useI18n()
-  const [deleting, setDeleting] = createSignal(false)
   const isAuto = () => Boolean((props.part as any)?.auto)
   const label = () => (isAuto() ? t("messageBlock.compaction.autoLabel") : t("messageBlock.compaction.manualLabel"))
   const borderColor = () => props.borderColor ?? (isAuto() ? "var(--session-status-compacting-fg)" : USER_BORDER_COLOR)
@@ -780,43 +548,13 @@ function CompactionCard(props: CompactionCardProps) {
   const containerClass = () =>
     `message-compaction-card ${isAuto() ? "message-compaction-card--auto" : "message-compaction-card--manual"}`
 
-  const canDelete = () => Boolean(props.partId) && !deleting()
-
-  const handleDelete = async (event: MouseEvent) => {
-    event.preventDefault()
-    event.stopPropagation()
-    if (!canDelete()) return
-    setDeleting(true)
-    try {
-      await deleteMessagePart(props.instanceId, props.sessionId, props.messageId, props.partId)
-    } catch (error) {
-      showAlertDialog(t("messagePart.actions.deleteFailedMessage"), {
-        title: t("messagePart.actions.deleteFailedTitle"),
-        detail: error instanceof Error ? error.message : String(error),
-        variant: "error",
-      })
-    } finally {
-      setDeleting(false)
-    }
-  }
-
   return (
     <div
-      class={`${containerClass()} relative`}
+      class={containerClass()}
       style={{ "border-left": `4px solid ${borderColor()}` }}
       role="status"
       aria-label={t("messageBlock.compaction.ariaLabel")}
     >
-      <button
-        type="button"
-        class="tool-call-header-button absolute right-2 top-1/2 -translate-y-1/2"
-        disabled={!canDelete()}
-        onClick={handleDelete}
-        title={t("messagePart.actions.deleteTitle")}
-      >
-        {deleting() ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
-      </button>
-
       <div class="message-compaction-row">
         <FoldVertical class="message-compaction-icon w-4 h-4" aria-hidden="true" />
         <span class="message-compaction-label">{label()}</span>
@@ -871,7 +609,6 @@ function StepCard(props: StepCardProps) {
 
   const finishStyle = () => (props.borderColor ? { "border-left-color": props.borderColor } : undefined)
 
-
   const renderUsageChips = (usage: NonNullable<ReturnType<typeof usageStats>>) => {
     const entries = [
       { label: t("messageBlock.usage.input"), value: usage.input, formatter: formatTokenTotal },
@@ -937,8 +674,6 @@ interface ReasoningCardProps {
   messageInfo?: MessageInfo
   instanceId: string
   sessionId: string
-  messageId: string
-  partId: string
   showAgentMeta?: boolean
   defaultExpanded?: boolean
 }
@@ -946,7 +681,6 @@ interface ReasoningCardProps {
 function ReasoningCard(props: ReasoningCardProps) {
   const { t } = useI18n()
   const [expanded, setExpanded] = createSignal(Boolean(props.defaultExpanded))
-  const [deleting, setDeleting] = createSignal(false)
 
   createEffect(() => {
     setExpanded(Boolean(props.defaultExpanded))
@@ -1010,27 +744,6 @@ function ReasoningCard(props: ReasoningCardProps) {
 
   const toggle = () => setExpanded((prev) => !prev)
 
-  const hasDeleteTarget = () => Boolean(props.partId)
-  const canDelete = () => hasDeleteTarget() && !deleting()
-
-  const handleDelete = async (event: Event) => {
-    event.preventDefault()
-    event.stopPropagation()
-    if (!canDelete()) return
-    setDeleting(true)
-    try {
-      await deleteMessagePart(props.instanceId, props.sessionId, props.messageId, props.partId)
-    } catch (error) {
-      showAlertDialog(t("messagePart.actions.deleteFailedMessage"), {
-        title: t("messagePart.actions.deleteFailedTitle"),
-        detail: error instanceof Error ? error.message : String(error),
-        variant: "error",
-      })
-    } finally {
-      setDeleting(false)
-    }
-  }
-
   return (
     <div class="message-reasoning-card">
       <button
@@ -1061,25 +774,6 @@ function ReasoningCard(props: ReasoningCardProps) {
           <span class="message-reasoning-indicator">
             {expanded() ? t("messageBlock.reasoning.indicator.hide") : t("messageBlock.reasoning.indicator.view")}
           </span>
-
-          <Show when={hasDeleteTarget()}>
-            <span
-              class={`message-reasoning-indicator${canDelete() ? "" : " opacity-50 pointer-events-none"}`}
-              role="button"
-              tabIndex={0}
-              onClick={handleDelete}
-              onKeyDown={(event) => {
-                if (event.key === "Enter" || event.key === " ") {
-                  handleDelete(event)
-                }
-              }}
-              aria-label={t("messagePart.actions.deleteTitle")}
-              title={t("messagePart.actions.deleteTitle")}
-            >
-              {deleting() ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
-            </span>
-          </Show>
-
           <span class="message-reasoning-time">{timestamp()}</span>
         </span>
       </button>

packages/ui/src/components/message-item.tsx

@@ -1,13 +1,10 @@
 import { For, Show, createSignal } from "solid-js"
-import { Copy, Split, Trash2, Undo } from "lucide-solid"
 import type { MessageInfo, ClientPart } from "../types/message"
 import { partHasRenderableText } from "../types/message"
 import type { MessageRecord } from "../stores/message-v2/types"
 import MessagePart from "./message-part"
 import { copyToClipboard } from "../lib/clipboard"
 import { useI18n } from "../lib/i18n"
-import { showAlertDialog } from "../stores/alerts"
-import { deleteMessagePart } from "../stores/session-actions"
 
 interface MessageItemProps {
   record: MessageRecord
@@ -25,7 +22,6 @@ interface MessageItemProps {
 export default function MessageItem(props: MessageItemProps) {
   const { t } = useI18n()
   const [copied, setCopied] = createSignal(false)
-  const [deletingParts, setDeletingParts] = createSignal<Set<string>>(new Set())
 
   const isUser = () => props.record.role === "user"
   const createdTimestamp = () => props.messageInfo?.time?.created ?? props.record.createdAt
@@ -141,17 +137,8 @@ export default function MessageItem(props: MessageItemProps) {
   }
 
   const isGenerating = () => {
-    if (hasContent()) {
-      return false
-    }
-
-    // Prefer the local record status for streaming placeholders.
-    if (!isUser() && props.record.status === "streaming") {
-      return true
-    }
-
     const info = props.messageInfo
-    return Boolean(info && info.role === "assistant" && info.time.completed !== undefined && info.time.completed === 0)
+    return !hasContent() && info && info.role === "assistant" && info.time.completed !== undefined && info.time.completed === 0
   }
 
   const handleRevert = () => {
@@ -160,8 +147,6 @@ export default function MessageItem(props: MessageItemProps) {
     }
   }
 
-  const copyLabel = () => (copied() ? t("messageItem.actions.copied") : t("messageItem.actions.copy"))
-
   const getRawContent = () => {
     return props.parts
       .filter(part => part.type === "text")
@@ -178,51 +163,7 @@ export default function MessageItem(props: MessageItemProps) {
     setTimeout(() => setCopied(false), 2000)
   }
 
-  const deletableTextPartId = () => {
-    const part = props.parts.find((candidate) => {
-      if (!candidate || candidate.type !== "text") return false
-      const id = (candidate as any).id
-      if (typeof id !== "string" || id.length === 0) return false
-      return !Boolean((candidate as any).synthetic)
-    })
-    return (part as any)?.id as string | undefined
-  }
-
-  const isDeletingPart = (partId?: string) => {
-    if (!partId) return false
-    return deletingParts().has(partId)
-  }
-
-  const setPartDeleting = (partId: string, value: boolean) => {
-    setDeletingParts((prev) => {
-      const next = new Set(prev)
-      if (value) {
-        next.add(partId)
-      } else {
-        next.delete(partId)
-      }
-      return next
-    })
-  }
-
-  const handleDeletePart = async (partId?: string) => {
-    if (!partId) return
-    if (isDeletingPart(partId)) return
-    setPartDeleting(partId, true)
-    try {
-      await deleteMessagePart(props.instanceId, props.sessionId, props.record.id, partId)
-    } catch (error) {
-      showAlertDialog(t("messagePart.actions.deleteFailedMessage"), {
-        title: t("messagePart.actions.deleteFailedTitle"),
-        detail: error instanceof Error ? error.message : String(error),
-        variant: "error",
-      })
-    } finally {
-      setPartDeleting(partId, false)
-    }
-  }
-
-  if (!isUser() && !hasContent() && !isGenerating()) {
+  if (!isUser() && !hasContent()) {
     return null
   }
 
@@ -281,70 +222,45 @@ export default function MessageItem(props: MessageItemProps) {
                 <button
                   class="message-action-button"
                   onClick={handleRevert}
-                  title={t("messageItem.actions.revert")}
-                  aria-label={t("messageItem.actions.revert")}
+                  title={t("messageItem.actions.revertTitle")}
+                  aria-label={t("messageItem.actions.revertTitle")}
                 >
-                  <Undo class="w-3.5 h-3.5" aria-hidden="true" />
+                  {t("messageItem.actions.revert")}
                 </button>
               </Show>
               <Show when={props.onFork}>
                 <button
                   class="message-action-button"
                   onClick={() => props.onFork?.(props.record.id)}
-                  title={t("messageItem.actions.fork")}
-                  aria-label={t("messageItem.actions.fork")}
+                  title={t("messageItem.actions.forkTitle")}
+                  aria-label={t("messageItem.actions.forkTitle")}
                 >
-                  <Split class="w-3.5 h-3.5" aria-hidden="true" />
+                  {t("messageItem.actions.fork")}
                 </button>
               </Show>
               <button
                 class="message-action-button"
                 onClick={handleCopy}
-                title={copyLabel()}
-                aria-label={copyLabel()}
+                title={t("messageItem.actions.copyTitle")}
+                aria-label={t("messageItem.actions.copyTitle")}
               >
-                <Copy class="w-3.5 h-3.5" aria-hidden="true" />
+                <Show when={copied()} fallback={t("messageItem.actions.copy")}>
+                  {t("messageItem.actions.copied")}
+                </Show>
               </button>
-              <Show when={deletableTextPartId()}>
-                {(partId) => (
-                  <button
-                    class="message-action-button"
-                    onClick={() => void handleDeletePart(partId())}
-                    disabled={isDeletingPart(partId())}
-                    title={isDeletingPart(partId()) ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
-                    aria-label={isDeletingPart(partId()) ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
-                  >
-                    <Trash2 class="w-3.5 h-3.5" aria-hidden="true" />
-                  </button>
-                )}
-              </Show>
             </div>
           </Show>
           <Show when={!isUser()}>
-            <div class="message-action-group">
-              <button
-                class="message-action-button"
-                onClick={handleCopy}
-                title={copyLabel()}
-                aria-label={copyLabel()}
-              >
-                <Copy class="w-3.5 h-3.5" aria-hidden="true" />
-              </button>
-
-              <Show when={deletableTextPartId()}>
-                {(partId) => (
-                  <button
-                    class="message-action-button"
-                    onClick={() => void handleDeletePart(partId())}
-                    disabled={isDeletingPart(partId())}
-                    title={isDeletingPart(partId()) ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
-                    aria-label={isDeletingPart(partId()) ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
-                  >
-                    <Trash2 class="w-3.5 h-3.5" aria-hidden="true" />
-                  </button>
-                )}
+            <button
+              class="message-action-button"
+              onClick={handleCopy}
+              title={t("messageItem.actions.copyTitle")}
+              aria-label={t("messageItem.actions.copyTitle")}
+            >
+              <Show when={copied()} fallback={t("messageItem.actions.copy")}>
+                {t("messageItem.actions.copied")}
               </Show>
-            </div>
+            </button>
           </Show>
           <time class="message-timestamp" dateTime={timestampIso()}>{timestamp()}</time>
         </div>
@@ -412,19 +328,6 @@ export default function MessageItem(props: MessageItemProps) {
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 12l4 4 4-4m-4-8v12" />
                       </svg>
                     </button>
-
-                    <button
-                      type="button"
-                      onClick={() => void handleDeletePart(attachment.id)}
-                      class="attachment-remove"
-                      disabled={isDeletingPart(attachment.id)}
-                      aria-label={t("messagePart.actions.deleteTitle")}
-                      title={t("messagePart.actions.deleteTitle")}
-                    >
-                      <svg class="h-3 w-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-                      </svg>
-                    </button>
                     <Show when={isImage}>
                       <div class="attachment-chip-preview">
                         <img src={attachment.url} alt={name} />

packages/ui/src/components/message-list-header.tsx

@@ -3,7 +3,7 @@ import Kbd from "./kbd"
 import { useI18n } from "../lib/i18n"
 
 const METRIC_CHIP_CLASS = "inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary"
-const METRIC_LABEL_CLASS = "uppercase text-[10px] tracking-wide text-muted"
+const METRIC_LABEL_CLASS = "uppercase text-[10px] tracking-wide text-primary/70"
 
 interface MessageListHeaderProps {
   usedTokens: number

packages/ui/src/components/message-part.tsx

@@ -15,7 +15,7 @@ interface MessagePartProps {
   sessionId: string
   onRendered?: () => void
  }
-  export default function MessagePart(props: MessagePartProps) {
+ export default function MessagePart(props: MessagePartProps) {
 
   const { isDark } = useTheme()
   const { preferences } = useConfig()
@@ -25,14 +25,6 @@ interface MessagePartProps {
   const isAssistantMessage = () => props.messageType === "assistant"
   const textContainerClass = () => (isAssistantMessage() ? "message-text message-text-assistant" : "message-text")
 
-  const shouldHideTextPart = () => {
-    const part = props.part
-    if (!part || part.type !== "text") return false
-    // Keep optimistic user prompts visible; hide synthetic assistant text.
-    return Boolean((part as any).synthetic) && props.messageType !== "user"
-  }
-
-
   const plainTextContent = () => {
     const part = props.part
 
@@ -102,23 +94,23 @@ interface MessagePartProps {
   return (
     <Switch>
       <Match when={partType() === "text"}>
-        <Show when={!shouldHideTextPart() && partHasRenderableText(props.part)}>
+        <Show when={!(props.part.type === "text" && props.part.synthetic) && partHasRenderableText(props.part)}>
           <div class={textContainerClass()}>
-                <Show
-                 when={isAssistantMessage()}
-                 fallback={<span class="text-primary">{plainTextContent()}</span>}
-               >
-                 <Markdown
-                   part={createTextPartForMarkdown()}
-                   instanceId={props.instanceId}
-                   sessionId={props.sessionId}
-                   isDark={isDark()}
-                 size={isAssistantMessage() ? "tight" : "base"}
-                 onRendered={props.onRendered}
-               />
-              </Show>
+            <Show
+               when={isAssistantMessage()}
+               fallback={<span>{plainTextContent()}</span>}
+             >
+              <Markdown
+                part={createTextPartForMarkdown()}
+                instanceId={props.instanceId}
+                sessionId={props.sessionId}
+                isDark={isDark()}
+                size={isAssistantMessage() ? "tight" : "base"}
+                onRendered={props.onRendered}
+              />
+             </Show>
 
-           </div>
+          </div>
         </Show>
       </Match>
 

packages/ui/src/components/message-section.tsx

@@ -7,8 +7,6 @@ import { getSessionInfo } from "../stores/sessions"
 import { messageStoreBus } from "../stores/message-v2/bus"
 import { useScrollCache } from "../lib/hooks/use-scroll-cache"
 import { useI18n } from "../lib/i18n"
-import { copyToClipboard } from "../lib/clipboard"
-import { showToastNotification } from "../lib/notifications"
 import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
 
 const SCROLL_SCOPE = "session"
@@ -96,9 +94,6 @@ export default function MessageSection(props: MessageSectionProps) {
 
   const seenTimelineMessageIds = new Set<string>()
   const seenTimelineSegmentKeys = new Set<string>()
-  const timelinePartCountsByMessageId = new Map<string, number>()
-  let pendingTimelineMessagePartUpdates = new Set<string>()
-  let pendingTimelinePartUpdateFrame: number | null = null
 
   function makeTimelineKey(segment: TimelineSegment) {
     return `${segment.messageId}:${segment.id}:${segment.type}`
@@ -107,7 +102,6 @@ export default function MessageSection(props: MessageSectionProps) {
   function seedTimeline() {
     seenTimelineMessageIds.clear()
     seenTimelineSegmentKeys.clear()
-    timelinePartCountsByMessageId.clear()
     const ids = untrack(messageIds)
     const resolvedStore = untrack(store)
     const segments: TimelineSegment[] = []
@@ -115,7 +109,6 @@ export default function MessageSection(props: MessageSectionProps) {
       const record = resolvedStore.getMessage(messageId)
       if (!record) return
       seenTimelineMessageIds.add(messageId)
-      timelinePartCountsByMessageId.set(messageId, record.partIds.length)
       const built = buildTimelineSegments(props.instanceId, record, t)
       built.forEach((segment) => {
         const key = makeTimelineKey(segment)
@@ -130,7 +123,6 @@ export default function MessageSection(props: MessageSectionProps) {
   function appendTimelineForMessage(messageId: string) {
     const record = untrack(() => store().getMessage(messageId))
     if (!record) return
-    timelinePartCountsByMessageId.set(messageId, record.partIds.length)
     const built = buildTimelineSegments(props.instanceId, record, t)
     if (built.length === 0) return
     const newSegments: TimelineSegment[] = []
@@ -383,9 +375,7 @@ export default function MessageSection(props: MessageSectionProps) {
     const anchorRect = rects.length > 0 ? rects[0] : range.getBoundingClientRect()
     const shellRect = shell.getBoundingClientRect()
     const relativeTop = Math.max(anchorRect.top - shellRect.top - 40, 8)
-    // Keep the popover within the stream shell. The quote popover currently
-    // renders 3 actions; keep enough horizontal room for the pill.
-    const maxLeft = Math.max(shell.clientWidth - 260, 8)
+    const maxLeft = Math.max(shell.clientWidth - 180, 8)
     const relativeLeft = Math.min(Math.max(anchorRect.left - shellRect.left, 8), maxLeft)
     setQuoteSelection({ text: limited, top: relativeTop, left: relativeLeft })
   }
@@ -404,24 +394,6 @@ export default function MessageSection(props: MessageSectionProps) {
       selection?.removeAllRanges()
     }
   }
-
-  async function handleCopySelectionRequest() {
-    const info = quoteSelection()
-    if (!info) return
-
-    const success = await copyToClipboard(info.text)
-    showToastNotification({
-      message: success ? t("messageSection.quote.copied") : t("messageSection.quote.copyFailed"),
-      variant: success ? "success" : "error",
-      duration: success ? 2000 : 6000,
-    })
-
-    clearQuoteSelection()
-    if (typeof window !== "undefined") {
-      const selection = window.getSelection()
-      selection?.removeAllRanges()
-    }
-  }
  
   function handleContentRendered() {
     if (props.loading) {
@@ -496,6 +468,8 @@ export default function MessageSection(props: MessageSectionProps) {
   })
 
   let previousTimelineIds: string[] = []
+  let previousLastTimelineMessageId: string | null = null
+  let previousLastTimelinePartCount = 0
 
   createEffect(() => {
     const loading = Boolean(props.loading)
@@ -503,15 +477,11 @@ export default function MessageSection(props: MessageSectionProps) {
 
     if (loading) {
       previousTimelineIds = []
+      previousLastTimelineMessageId = null
+      previousLastTimelinePartCount = 0
       setTimelineSegments([])
       seenTimelineMessageIds.clear()
       seenTimelineSegmentKeys.clear()
-      timelinePartCountsByMessageId.clear()
-      pendingTimelineMessagePartUpdates.clear()
-      if (pendingTimelinePartUpdateFrame !== null) {
-        cancelAnimationFrame(pendingTimelinePartUpdateFrame)
-        pendingTimelinePartUpdateFrame = null
-      }
       return
     }
 
@@ -553,14 +523,6 @@ export default function MessageSection(props: MessageSectionProps) {
             next.forEach((segment) => seenTimelineSegmentKeys.add(makeTimelineKey(segment)))
             return next
           })
-
-          // Keep part count tracking in sync with id replacement.
-          const existingPartCount = timelinePartCountsByMessageId.get(oldId)
-          if (existingPartCount !== undefined) {
-            timelinePartCountsByMessageId.delete(oldId)
-            timelinePartCountsByMessageId.set(newId, existingPartCount)
-          }
-
           previousTimelineIds = ids.slice()
           return
         }
@@ -584,95 +546,30 @@ export default function MessageSection(props: MessageSectionProps) {
     previousTimelineIds = ids.slice()
   })
 
-  function clearPendingTimelinePartUpdateFrame() {
-    if (pendingTimelinePartUpdateFrame !== null) {
-      cancelAnimationFrame(pendingTimelinePartUpdateFrame)
-      pendingTimelinePartUpdateFrame = null
-    }
-  }
-
-  function scheduleTimelinePartUpdateFlush() {
-    if (pendingTimelinePartUpdateFrame !== null) return
-    pendingTimelinePartUpdateFrame = requestAnimationFrame(() => {
-      pendingTimelinePartUpdateFrame = null
-      if (pendingTimelineMessagePartUpdates.size === 0) return
-      const changedIds = Array.from(pendingTimelineMessagePartUpdates)
-      pendingTimelineMessagePartUpdates = new Set<string>()
-
-      const ids = messageIds()
-      const resolvedStore = store()
-
-      setTimelineSegments((prev) => {
-        let next = prev
-
-        for (const changedId of changedIds) {
-          // Remove old segments for this message.
-          next = next.filter((segment) => segment.messageId !== changedId)
-
-          const record = resolvedStore.getMessage(changedId)
-          const rebuilt = record ? buildTimelineSegments(props.instanceId, record, t) : []
-
-          // Insert rebuilt segments in the correct place based on session message order.
-          if (rebuilt.length > 0) {
-            let insertAt = next.length
-            const changedIndex = ids.indexOf(changedId)
-            if (changedIndex >= 0) {
-              for (let i = changedIndex + 1; i < ids.length; i++) {
-                const followingId = ids[i]
-                const existingIndex = next.findIndex((segment) => segment.messageId === followingId)
-                if (existingIndex >= 0) {
-                  insertAt = existingIndex
-                  break
-                }
-              }
-            }
-            next = [...next.slice(0, insertAt), ...rebuilt, ...next.slice(insertAt)]
-          }
-        }
-
-        // Rebuild the segment key set since we may have removed/replaced segments.
-        seenTimelineSegmentKeys.clear()
-        next.forEach((segment) => seenTimelineSegmentKeys.add(makeTimelineKey(segment)))
-        return next
-      })
-    })
-  }
-
-  // Keep timeline segments in sync when message parts are added/removed.
-  // Part deletion does not remove message ids from the session, so we must
-  // explicitly replace segments for messages whose part count changed.
   createEffect(() => {
     if (props.loading) return
     const ids = messageIds()
-    const resolvedStore = store()
-
-    let hasChanges = false
-    for (const messageId of ids) {
-      const record = resolvedStore.getMessage(messageId)
-      const partCount = record?.partIds.length ?? 0
-      const previousCount = timelinePartCountsByMessageId.get(messageId)
-
-      if (previousCount === undefined) {
-        timelinePartCountsByMessageId.set(messageId, partCount)
-        continue
-      }
-
-      if (previousCount !== partCount) {
-        timelinePartCountsByMessageId.set(messageId, partCount)
-        pendingTimelineMessagePartUpdates.add(messageId)
-        hasChanges = true
-      }
+    if (ids.length === 0) return
+    const lastId = ids[ids.length - 1]
+    if (!lastId) return
+    const record = store().getMessage(lastId)
+    if (!record) return
+    const partCount = record.partIds.length
+    if (lastId === previousLastTimelineMessageId && partCount === previousLastTimelinePartCount) {
+      return
     }
-
-    // Drop tracking for ids that are no longer present.
-    for (const trackedId of Array.from(timelinePartCountsByMessageId.keys())) {
-      if (!ids.includes(trackedId)) {
-        timelinePartCountsByMessageId.delete(trackedId)
-      }
-    }
-
-    if (hasChanges) {
-      scheduleTimelinePartUpdateFlush()
+    previousLastTimelineMessageId = lastId
+    previousLastTimelinePartCount = partCount
+    const built = buildTimelineSegments(props.instanceId, record, t)
+    const newSegments: TimelineSegment[] = []
+    built.forEach((segment) => {
+      const key = makeTimelineKey(segment)
+      if (seenTimelineSegmentKeys.has(key)) return
+      seenTimelineSegmentKeys.add(key)
+      newSegments.push(segment)
+    })
+    if (newSegments.length > 0) {
+      setTimelineSegments((prev) => [...prev, ...newSegments])
     }
   })
 
@@ -839,7 +736,6 @@ export default function MessageSection(props: MessageSectionProps) {
       cancelAnimationFrame(pendingAnchorScroll)
     }
     clearScrollToBottomFrames()
-    clearPendingTimelinePartUpdateFrame()
     if (detachScrollIntentListeners) {
       detachScrollIntentListeners()
     }
@@ -939,9 +835,6 @@ export default function MessageSection(props: MessageSectionProps) {
                   <button type="button" class="message-quote-button" onClick={() => handleQuoteSelectionRequest("code")}>
                     {t("messageSection.quote.addAsCode")}
                   </button>
-                  <button type="button" class="message-quote-button" onClick={() => void handleCopySelectionRequest()}>
-                    {t("messageSection.quote.copy")}
-                  </button>
                 </div>
               </div>
             )}

packages/ui/src/components/message-timeline.tsx

@@ -276,7 +276,6 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
   const [tooltipSize, setTooltipSize] = createSignal<{ width: number; height: number }>({ width: 360, height: 420 })
   const [tooltipElement, setTooltipElement] = createSignal<HTMLDivElement | null>(null)
   let hoverTimer: number | null = null
-  let closeTimer: number | null = null
   const showTools = () => props.showToolSegments ?? true
  
   const registerButtonRef = (segmentId: string, element: HTMLButtonElement | null) => {
@@ -293,30 +292,10 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
       hoverTimer = null
     }
   }
-
-  const clearCloseTimer = () => {
-    if (closeTimer !== null && typeof window !== "undefined") {
-      window.clearTimeout(closeTimer)
-      closeTimer = null
-    }
-  }
-
-  const scheduleClose = () => {
-    if (typeof window === "undefined") return
-    clearHoverTimer()
-    clearCloseTimer()
-    // Small delay so the pointer can travel from the segment to the tooltip.
-    closeTimer = window.setTimeout(() => {
-      closeTimer = null
-      setHoveredSegment(null)
-      setHoverAnchorRect(null)
-    }, 160)
-  }
  
   const handleMouseEnter = (segment: TimelineSegment, event: MouseEvent) => {
     if (typeof window === "undefined") return
     clearHoverTimer()
-    clearCloseTimer()
     const target = event.currentTarget as HTMLButtonElement
     hoverTimer = window.setTimeout(() => {
       const rect = target.getBoundingClientRect()
@@ -326,7 +305,9 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
   }
 
   const handleMouseLeave = () => {
-    scheduleClose()
+    clearHoverTimer()
+    setHoveredSegment(null)
+    setHoverAnchorRect(null)
   }
  
   createEffect(() => {
@@ -345,10 +326,7 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
     setTooltipCoords({ top: clampedTop, left: clampedLeft })
   })
 
-  onCleanup(() => {
-    clearHoverTimer()
-    clearCloseTimer()
-  })
+  onCleanup(() => clearHoverTimer())
 
   createEffect(() => {
     const activeId = props.activeMessageId
@@ -454,8 +432,6 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
               ref={(element) => setTooltipElement(element)}
               class="message-timeline-tooltip"
               style={{ top: `${tooltipCoords().top}px`, left: `${tooltipCoords().left}px` }}
-              onMouseEnter={() => clearCloseTimer()}
-              onMouseLeave={() => scheduleClose()}
             >
               <MessagePreview
                 messageId={data().messageId}

packages/ui/src/components/model-selector.tsx

@@ -6,6 +6,7 @@ import type { Model } from "../types/session"
 import { useI18n } from "../lib/i18n"
 import { getLogger } from "../lib/logger"
 import { preferences, toggleFavoriteModelPreference } from "../stores/preferences"
+import Kbd from "./kbd"
 const log = getLogger("session")
 
 
@@ -294,12 +295,15 @@ export default function ModelSelector(props: ModelSelectorProps) {
               <span class="selector-trigger-primary selector-trigger-primary--align-left">
                 {t("modelSelector.trigger.primary", { model: currentModelValue()?.name ?? t("modelSelector.none") })}
               </span>
-          {currentModelValue() && (
+              {currentModelValue() && (
                 <span class="selector-trigger-secondary">
                   {currentModelValue()!.providerId}/{currentModelValue()!.id}
                 </span>
               )}
             </div>
+            <span class="selector-trigger-hint selector-trigger-hint--top" aria-hidden="true">
+              <Kbd shortcut="cmd+shift+m" />
+            </span>
             <Combobox.Icon class="selector-trigger-icon">
               <ChevronDown class="w-3 h-3" />
             </Combobox.Icon>

packages/ui/src/components/notifications-settings-modal.tsx

@@ -1,232 +0,0 @@
-import { Dialog } from "@kobalte/core/dialog"
-import { Component, Show, createEffect, createResource } from "solid-js"
-import { showToastNotification } from "../lib/notifications"
-import {
-  getOsNotificationCapability,
-  requestOsNotificationPermission,
-  type OsNotificationPermission,
-} from "../lib/os-notifications"
-import { useConfig } from "../stores/preferences"
-
-interface NotificationsSettingsModalProps {
-  open: boolean
-  onClose: () => void
-}
-
-function formatPermissionLabel(permission: OsNotificationPermission): string {
-  switch (permission) {
-    case "granted":
-      return "Granted"
-    case "denied":
-      return "Denied"
-    case "default":
-      return "Not granted"
-    case "unsupported":
-      return "Unsupported"
-    default:
-      return String(permission)
-  }
-}
-
-const NotificationsSettingsModal: Component<NotificationsSettingsModalProps> = (props) => {
-  const { preferences, updatePreferences } = useConfig()
-
-  const [capability, { refetch }] = createResource(() => getOsNotificationCapability())
-
-  createEffect(() => {
-    if (props.open) {
-      void refetch()
-    }
-  })
-
-  const handleEnableToggle = async (enabled: boolean) => {
-    if (!enabled) {
-      updatePreferences({ osNotificationsEnabled: false })
-      return
-    }
-
-    const cap = capability()
-    if (cap && !cap.supported) {
-      showToastNotification({
-        title: "Notifications",
-        message: cap.info ?? "OS notifications are not supported in this environment.",
-        variant: "warning",
-      })
-      updatePreferences({ osNotificationsEnabled: false })
-      return
-    }
-
-    const permission = await requestOsNotificationPermission()
-    if (permission !== "granted") {
-      showToastNotification({
-        title: "Notifications",
-        message:
-          permission === "denied"
-            ? "Notification permission denied. Enable notifications in your system/browser settings."
-            : "Notification permission not granted.",
-        variant: "warning",
-      })
-      updatePreferences({ osNotificationsEnabled: false })
-      return
-    }
-
-    updatePreferences({ osNotificationsEnabled: true })
-    void refetch()
-  }
-
-  const handleRequestPermission = async () => {
-    const cap = capability()
-    if (cap && !cap.supported) {
-      showToastNotification({
-        title: "Notifications",
-        message: cap.info ?? "Notifications are not supported in this environment.",
-        variant: "warning",
-      })
-      return
-    }
-
-    const permission = await requestOsNotificationPermission()
-    if (permission === "granted") {
-      showToastNotification({
-        title: "Notifications",
-        message: "Permission granted. You can now enable notifications.",
-        variant: "success",
-        duration: 6000,
-      })
-      void refetch()
-      return
-    }
-
-    showToastNotification({
-      title: "Notifications",
-      message:
-        permission === "denied"
-          ? "Permission denied. You may need to enable notifications in your system/browser settings."
-          : "Permission not granted.",
-      variant: "warning",
-    })
-    void refetch()
-  }
-
-  const supported = () => capability()?.supported ?? false
-  const permissionLabel = () => formatPermissionLabel(capability()?.permission ?? "unsupported")
-  const infoMessage = () => capability()?.info
-
-  return (
-    <Dialog open={props.open} onOpenChange={(open) => !open && props.onClose()}>
-      <Dialog.Portal>
-        <Dialog.Overlay class="modal-overlay" />
-        <div class="fixed inset-0 z-50 flex items-center justify-center p-4">
-          <Dialog.Content class="modal-surface w-full max-w-xl max-h-[90vh] flex flex-col overflow-hidden">
-            <header class="px-6 py-4 border-b" style={{ "border-color": "var(--border-base)" }}>
-              <Dialog.Title class="text-xl font-semibold text-primary">Notifications</Dialog.Title>
-            </header>
-
-            <div class="flex-1 overflow-y-auto p-6 space-y-6">
-              <div class="panel">
-                <div class="panel-header">
-                  <h3 class="panel-title">Session Status Notifications</h3>
-                </div>
-
-                <div class="panel-body space-y-4">
-                  <div class="flex items-center justify-between gap-4">
-                    <div>
-                      <div class="text-sm font-semibold text-primary">Enable</div>
-                      <div class="text-xs text-secondary">Permission: {permissionLabel()}</div>
-                    </div>
-                    <label class="inline-flex items-center gap-2">
-                      <input
-                        type="checkbox"
-                        checked={Boolean(preferences().osNotificationsEnabled)}
-                        disabled={!supported() && capability.state === "ready"}
-                        onChange={(e) => void handleEnableToggle(e.currentTarget.checked)}
-                      />
-                      <span class="text-sm">Enabled</span>
-                    </label>
-                  </div>
-
-                  <Show when={supported() && (capability()?.permission ?? "unsupported") !== "granted"}>
-                    <div class="flex items-center justify-between gap-4">
-                      <div class="text-sm text-primary">Request permission</div>
-                      <button
-                        type="button"
-                        class="selector-button selector-button-secondary w-auto whitespace-nowrap"
-                        onClick={() => void handleRequestPermission()}
-                      >
-                        Request
-                      </button>
-                    </div>
-                  </Show>
-
-                  <div class="flex items-center justify-between gap-4">
-                    <div>
-                      <div class="text-sm font-semibold text-primary">Notify when app is focused</div>
-                    </div>
-                    <label class="inline-flex items-center gap-2">
-                      <input
-                        type="checkbox"
-                        checked={Boolean(preferences().osNotificationsAllowWhenVisible)}
-                        disabled={!preferences().osNotificationsEnabled}
-                        onChange={(e) => updatePreferences({ osNotificationsAllowWhenVisible: e.currentTarget.checked })}
-                      />
-                      <span class="text-sm">Enabled</span>
-                    </label>
-                  </div>
-
-                  <Show when={Boolean(infoMessage())}>
-                    <div class="text-xs text-secondary">{infoMessage()}</div>
-                  </Show>
-
-                  <Show when={!supported() && capability.state === "ready"}>
-                    <div class="text-xs text-secondary">
-                      Notifications are not supported in this environment. The bell icon stays disabled.
-                    </div>
-                  </Show>
-
-                  <div class="border-t pt-4" style={{ "border-color": "var(--border-base)" }}>
-                    <div class="text-sm font-semibold text-primary mb-2">Notify me when</div>
-                    <div class="space-y-3">
-                      <div class="flex items-center justify-between gap-4">
-                        <div class="text-sm text-primary">Session needs input</div>
-                        <label class="inline-flex items-center gap-2">
-                          <input
-                            type="checkbox"
-                            checked={Boolean(preferences().notifyOnNeedsInput)}
-                            disabled={!preferences().osNotificationsEnabled}
-                            onChange={(e) => updatePreferences({ notifyOnNeedsInput: e.currentTarget.checked })}
-                          />
-                          <span class="text-sm">Enabled</span>
-                        </label>
-                      </div>
-
-                      <div class="flex items-center justify-between gap-4">
-                        <div class="text-sm text-primary">Session becomes idle</div>
-                        <label class="inline-flex items-center gap-2">
-                          <input
-                            type="checkbox"
-                            checked={Boolean(preferences().notifyOnIdle)}
-                            disabled={!preferences().osNotificationsEnabled}
-                            onChange={(e) => updatePreferences({ notifyOnIdle: e.currentTarget.checked })}
-                          />
-                          <span class="text-sm">Enabled</span>
-                        </label>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div class="px-6 py-4 border-t flex justify-end" style={{ "border-color": "var(--border-base)" }}>
-              <button type="button" class="selector-button selector-button-secondary" onClick={props.onClose}>
-                Close
-              </button>
-            </div>
-          </Dialog.Content>
-        </div>
-      </Dialog.Portal>
-    </Dialog>
-  )
-}
-
-export default NotificationsSettingsModal

packages/ui/src/components/prompt-input.tsx

@@ -16,7 +16,6 @@ import { getCommands } from "../stores/commands"
 import { showAlertDialog } from "../stores/alerts"
 import { useI18n } from "../lib/i18n"
 import { getLogger } from "../lib/logger"
-import { preferences } from "../stores/preferences"
 const log = getLogger("actions")
 
 
@@ -543,46 +542,13 @@ export default function PromptInput(props: PromptInputProps) {
       }
     }
 
-    if (e.key === "Enter") {
-      const isModified = e.metaKey || e.ctrlKey
-
-      // If the picker is open, Enter should select from it.
-      if (!isModified && showPicker()) {
-        return
-      }
-
-      if (submitOnEnter()) {
-        // Swapped mode: Enter submits, Cmd/Ctrl+Enter inserts a newline.
-        if (isModified) {
-          e.preventDefault()
-          e.stopPropagation()
-          insertNewlineAtCursor()
-          return
-        }
-
-        // Shift+Enter always inserts a newline.
-        if (e.shiftKey) {
-          // If the picker is open, avoid selecting an item on Enter.
-          if (showPicker()) {
-            e.stopPropagation()
-          }
-          return
-        }
-
-        e.preventDefault()
-        handleSend()
-        return
-      }
-
-      // Default: Cmd/Ctrl+Enter submits.
-      if (isModified) {
-        e.preventDefault()
-        if (showPicker()) {
-          handlePickerClose()
-        }
-        handleSend()
-        return
+    if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+      e.preventDefault()
+      if (showPicker()) {
+        handlePickerClose()
       }
+      handleSend()
+      return
     }
 
     if (e.key === "ArrowUp") {
@@ -1055,7 +1021,7 @@ export default function PromptInput(props: PromptInputProps) {
     const blockquote = lines.map((line) => `> ${line}`).join("\n")
     if (!blockquote) return
 
-    insertBlockContent(`${blockquote}\n`)
+    insertBlockContent(`${blockquote}\n\n`)
   }
 
   function insertCodeSelection(rawText: string) {
@@ -1090,25 +1056,6 @@ export default function PromptInput(props: PromptInputProps) {
       : { key: "!", text: t("promptInput.hints.shell.enable") }
   const commandHint = () => ({ key: "/", text: t("promptInput.hints.commands") })
 
-  const submitOnEnter = () => preferences().promptSubmitOnEnter
-
-  function insertNewlineAtCursor() {
-    const textarea = textareaRef
-    const current = prompt()
-    const start = textarea ? textarea.selectionStart : current.length
-    const end = textarea ? textarea.selectionEnd : current.length
-    const nextValue = current.substring(0, start) + "\n" + current.substring(end)
-    const nextCursor = start + 1
-
-    setPrompt(nextValue)
-
-    setTimeout(() => {
-      if (!textareaRef) return
-      textareaRef.focus()
-      textareaRef.setSelectionRange(nextCursor, nextCursor)
-    }, 0)
-  }
-
   const shouldShowOverlay = () => prompt().length === 0
 
   const instance = () => getActiveInstance()
@@ -1195,19 +1142,7 @@ export default function PromptInput(props: PromptInputProps) {
                     fallback={
                       <>
                         <span class="prompt-overlay-text">
-                          <Show
-                            when={submitOnEnter()}
-                            fallback={
-                              <>
-                                <Kbd>Enter</Kbd> {t("promptInput.overlay.newLine")} • <Kbd shortcut="cmd+enter" /> {t("promptInput.overlay.send")}
-                              </>
-                            }
-                          >
-                            <>
-                              <Kbd>Enter</Kbd> {t("promptInput.overlay.send")} • <Kbd shortcut="cmd+enter" /> {t("promptInput.overlay.newLine")}
-                            </>
-                          </Show>
-                          {" "}• <Kbd>@</Kbd> {t("promptInput.overlay.filesAgents")} • <Kbd>↑↓</Kbd> {t("promptInput.overlay.history")}
+                          <Kbd>Enter</Kbd> {t("promptInput.overlay.newLine")} • <Kbd shortcut="cmd+enter" /> {t("promptInput.overlay.send")} • <Kbd>@</Kbd> {t("promptInput.overlay.filesAgents")} • <Kbd>↑↓</Kbd> {t("promptInput.overlay.history")}
                         </span>
                         <Show when={attachments().length > 0}>
                           <span class="prompt-overlay-text prompt-overlay-muted">{t("promptInput.overlay.attachments", { count: attachments().length })}</span>

packages/ui/src/components/remote-access-overlay.tsx

@@ -37,11 +37,10 @@ export function RemoteAccessOverlay(props: RemoteAccessOverlayProps) {
   const allowExternalConnections = createMemo(() => currentMode() === "all")
   const displayAddresses = createMemo(() => {
     const list = addresses()
-    if (!allowExternalConnections()) {
-      return []
+    if (allowExternalConnections()) {
+      return list.filter((address) => address.scope !== "loopback")
     }
-    // Local URL is displayed separately; list only remote-friendly addresses.
-    return list.filter((address) => address.scope !== "loopback")
+    return list.filter((address) => address.scope === "loopback")
   })
 
   const refreshMeta = async () => {
@@ -312,56 +311,10 @@ export function RemoteAccessOverlay(props: RemoteAccessOverlayProps) {
                   <Show when={!error()} fallback={<div class="remote-error">{error()}</div>}>
                     <Show when={displayAddresses().length > 0} fallback={<div class="remote-card">{t("remoteAccess.addresses.none")}</div>}>
                       <div class="remote-address-list">
-                        <Show when={meta()?.localUrl}>
-                          {(url) => {
-                            const value = () => url()
-                            const expandedState = () => expandedUrl() === value()
-                            const qr = () => qrCodes()[value()]
-                            return (
-                              <div class="remote-address">
-                                <div class="remote-address-main">
-                                  <div>
-                                    <p class="remote-address-url">{value()}</p>
-                                    <p class="remote-address-meta">{t("remoteAccess.address.scope.loopback")}</p>
-                                  </div>
-                                  <div class="remote-actions">
-                                    <button class="remote-pill" type="button" onClick={() => handleOpenUrl(value())}>
-                                      <ExternalLink class="remote-icon" />
-                                      {t("remoteAccess.address.open")}
-                                    </button>
-                                    <button
-                                      class="remote-pill"
-                                      type="button"
-                                      onClick={() => void toggleExpanded(value())}
-                                      aria-expanded={expandedState()}
-                                    >
-                                      <Link2 class="remote-icon" />
-                                      {expandedState() ? t("remoteAccess.address.hideQr") : t("remoteAccess.address.showQr")}
-                                    </button>
-                                  </div>
-                                </div>
-                                <Show when={expandedState()}>
-                                  <div class="remote-qr">
-                                    <Show when={qr()} fallback={<Loader2 class="remote-icon remote-spin" aria-hidden="true" />}>
-                                      {(dataUrl) => (
-                                        <img
-                                          src={dataUrl()}
-                                          alt={t("remoteAccess.address.qrAlt", { url: value() })}
-                                          class="remote-qr-img"
-                                        />
-                                      )}
-                                    </Show>
-                                  </div>
-                                </Show>
-                              </div>
-                            )
-                          }}
-                        </Show>
                         <For each={displayAddresses()}>
                           {(address) => {
-                            const url = address.remoteUrl
-                            const expandedState = () => expandedUrl() === url
-                            const qr = () => qrCodes()[url]
+                            const expandedState = () => expandedUrl() === address.url
+                            const qr = () => qrCodes()[address.url]
                             const scopeLabel = () =>
                               address.scope === "external"
                                 ? t("remoteAccess.address.scope.network")
@@ -372,20 +325,20 @@ export function RemoteAccessOverlay(props: RemoteAccessOverlayProps) {
                               <div class="remote-address">
                                 <div class="remote-address-main">
                                   <div>
-                                    <p class="remote-address-url">{url}</p>
+                                    <p class="remote-address-url">{address.url}</p>
                                     <p class="remote-address-meta">
                                       {address.family.toUpperCase()} • {scopeLabel()} • {address.ip}
                                     </p>
                                   </div>
                                   <div class="remote-actions">
-                                    <button class="remote-pill" type="button" onClick={() => handleOpenUrl(url)}>
+                                    <button class="remote-pill" type="button" onClick={() => handleOpenUrl(address.url)}>
                                       <ExternalLink class="remote-icon" />
                                       {t("remoteAccess.address.open")}
                                     </button>
                                     <button
                                       class="remote-pill"
                                       type="button"
-                                      onClick={() => void toggleExpanded(url)}
+                                      onClick={() => void toggleExpanded(address.url)}
                                       aria-expanded={expandedState()}
                                     >
                                       <Link2 class="remote-icon" />
@@ -399,7 +352,7 @@ export function RemoteAccessOverlay(props: RemoteAccessOverlayProps) {
                                       {(dataUrl) => (
                                         <img
                                           src={dataUrl()}
-                                          alt={t("remoteAccess.address.qrAlt", { url })}
+                                          alt={t("remoteAccess.address.qrAlt", { url: address.url })}
                                           class="remote-qr-img"
                                         />
                                       )}

packages/ui/src/components/session-list.tsx

@@ -2,13 +2,12 @@ import { Component, For, Show, createSignal, createMemo, createEffect, JSX, onCl
 import type { SessionStatus } from "../types/session"
 import type { SessionThread } from "../stores/session-state"
 import { getSessionStatus } from "../stores/session-status"
-import { Bot, User, Copy, Trash2, Pencil, ShieldAlert, ChevronDown, Search, Square, CheckSquare, MinusSquare, Split } from "lucide-solid"
+import { Bot, User, Copy, Trash2, Pencil, ShieldAlert, ChevronDown } from "lucide-solid"
 import KeyboardHint from "./keyboard-hint"
 import SessionRenameDialog from "./session-rename-dialog"
 import { keyboardRegistry } from "../lib/keyboard-registry"
 import { showToastNotification } from "../lib/notifications"
 import { useI18n } from "../lib/i18n"
-import { showConfirmDialog } from "../stores/alerts"
 import {
   deleteSession,
   ensureSessionParentExpanded,
@@ -20,7 +19,6 @@ import {
   setActiveSessionFromList,
   toggleSessionParentExpanded,
 } from "../stores/sessions"
-import { getGitRepoStatus, getWorktreeSlugForParentSession } from "../stores/worktrees"
 import { getLogger } from "../lib/logger"
 import { copyToClipboard } from "../lib/clipboard"
 const log = getLogger("session")
@@ -37,7 +35,6 @@ interface SessionListProps {
   showFooter?: boolean
   headerContent?: JSX.Element
   footerContent?: JSX.Element
-  enableFilterBar?: boolean
 }
 
 function formatSessionStatus(status: SessionStatus): string {
@@ -49,70 +46,6 @@ const SessionList: Component<SessionListProps> = (props) => {
   const [renameTarget, setRenameTarget] = createSignal<{ id: string; title: string; label: string } | null>(null)
   const [isRenaming, setIsRenaming] = createSignal(false)
 
-  const [filterQuery, setFilterQuery] = createSignal("")
-  const normalizedQuery = createMemo(() => (props.enableFilterBar ? filterQuery().trim().toLowerCase() : ""))
-
-  const [selectedSessionIds, setSelectedSessionIds] = createSignal<Set<string>>(new Set())
-
-  const normalizeSessionLabel = (sessionId: string) => {
-    const session = sessionStateSessions().get(props.instanceId)?.get(sessionId)
-    const title = (session?.title ?? "").trim()
-    return title || t("sessionList.session.untitled")
-  }
-
-  const sessionMatchesQuery = (sessionId: string, query: string) => {
-    if (!query) return true
-    const label = normalizeSessionLabel(sessionId).toLowerCase()
-    if (label.includes(query)) return true
-    return sessionId.toLowerCase().includes(query)
-  }
-
-  const filteredThreads = createMemo<SessionThread[]>(() => {
-    const query = normalizedQuery()
-    if (!query) return props.threads
-
-    const next: SessionThread[] = []
-    for (const thread of props.threads) {
-      const parentMatches = sessionMatchesQuery(thread.parent.id, query)
-      const matchingChildren = thread.children.filter((child) => sessionMatchesQuery(child.id, query))
-
-      if (!parentMatches && matchingChildren.length === 0) continue
-
-      next.push({
-        parent: thread.parent,
-        children: matchingChildren,
-        latestUpdated: thread.latestUpdated,
-      })
-    }
-
-    return next
-  })
-
-  const allMatchingSessionIds = createMemo<string[]>(() => {
-    const ids: string[] = []
-    for (const thread of filteredThreads()) {
-      ids.push(thread.parent.id)
-      for (const child of thread.children) ids.push(child.id)
-    }
-    return ids
-  })
-
-  const selectedCount = createMemo(() => selectedSessionIds().size)
-
-  const isAllSelected = createMemo(() => {
-    const ids = allMatchingSessionIds()
-    if (ids.length === 0) return false
-    const selected = selectedSessionIds()
-    return ids.every((id) => selected.has(id))
-  })
-  const isSelectAllIndeterminate = createMemo(() => {
-    const ids = allMatchingSessionIds()
-    const total = ids.length
-    if (total === 0) return false
-    const count = selectedCount()
-    return count > 0 && count < total
-  })
-
   const isSessionDeleting = (sessionId: string) => {
     const deleting = loading().deletingSession.get(props.instanceId)
     return deleting ? deleting.has(sessionId) : false
@@ -121,10 +54,9 @@ const SessionList: Component<SessionListProps> = (props) => {
 
   const selectSession = (sessionId: string) => {
     const session = sessionStateSessions().get(props.instanceId)?.get(sessionId)
-    // If the user selects a child session, make sure its parent thread is expanded.
-    // For parent sessions we don't force expansion; user can collapse/expand freely.
-    if (session?.parentId) {
-      ensureSessionParentExpanded(props.instanceId, session.parentId)
+    const parentId = session?.parentId ?? session?.id
+    if (parentId) {
+      ensureSessionParentExpanded(props.instanceId, parentId)
     }
 
     props.onSelect(sessionId)
@@ -150,17 +82,6 @@ const SessionList: Component<SessionListProps> = (props) => {
     event.stopPropagation()
     if (isSessionDeleting(sessionId)) return
 
-    const confirmed = await showConfirmDialog(
-      t("sessionList.delete.confirmMessage", { label: normalizeSessionLabel(sessionId) }),
-      {
-        title: t("sessionList.delete.title"),
-        variant: "warning",
-        confirmLabel: t("sessionList.delete.confirmLabel"),
-        cancelLabel: t("sessionList.delete.cancelLabel"),
-      },
-    )
-    if (!confirmed) return
-
     const shouldSelectFallback = props.activeSessionId === sessionId
     let fallbackSessionId: string | undefined
 
@@ -231,115 +152,6 @@ const SessionList: Component<SessionListProps> = (props) => {
       setIsRenaming(false)
     }
   }
-
-  const setSelectedMany = (sessionIds: string[], checked: boolean) => {
-    if (sessionIds.length === 0) return
-    setSelectedSessionIds((prev) => {
-      const next = new Set(prev)
-      sessionIds.forEach((id) => {
-        if (checked) next.add(id)
-        else next.delete(id)
-      })
-      return next
-    })
-  }
-
-  const getSelectableThreadIds = (parentId: string): string[] => {
-    const query = normalizedQuery()
-    const source = query ? filteredThreads() : props.threads
-    const thread = source.find((t) => t.parent.id === parentId)
-    if (!thread) return [parentId]
-    return [thread.parent.id, ...thread.children.map((c) => c.id)]
-  }
-
-  const getAllSessionIdsInOrder = (threads: SessionThread[]): string[] => {
-    const ids: string[] = []
-    threads.forEach((thread) => {
-      ids.push(thread.parent.id)
-      thread.children.forEach((child) => ids.push(child.id))
-    })
-    return ids
-  }
-
-  const handleToggleSelectAll = (checked: boolean) => {
-    const ids = allMatchingSessionIds()
-    setSelectedMany(ids, checked)
-  }
-
-  const toggleSelectAll = () => {
-    if (isAllSelected()) {
-      handleToggleSelectAll(false)
-      return
-    }
-    handleToggleSelectAll(true)
-  }
-
-  const handleBulkDelete = async () => {
-    const selected = Array.from(selectedSessionIds())
-    if (selected.length === 0) return
-
-    const confirmed = await showConfirmDialog(
-      t("sessionList.bulkDelete.confirmMessage", { count: selected.length }),
-      {
-        title: t("sessionList.bulkDelete.title"),
-        variant: "warning",
-        confirmLabel: t("sessionList.bulkDelete.confirmLabel"),
-        cancelLabel: t("sessionList.bulkDelete.cancelLabel"),
-      },
-    )
-
-    if (!confirmed) return
-
-    const deletedSet = new Set(selected)
-    const currentActiveId = props.activeSessionId
-
-    let fallbackSessionId: string | undefined
-    if (currentActiveId && deletedSet.has(currentActiveId)) {
-      const ordered = getAllSessionIdsInOrder(props.threads)
-      const currentIndex = ordered.indexOf(currentActiveId)
-
-      for (let i = Math.max(0, currentIndex); i < ordered.length; i++) {
-        const candidate = ordered[i]
-        if (candidate && !deletedSet.has(candidate)) {
-          fallbackSessionId = candidate
-          break
-        }
-      }
-      if (!fallbackSessionId) {
-        for (let i = currentIndex - 1; i >= 0; i--) {
-          const candidate = ordered[i]
-          if (candidate && !deletedSet.has(candidate)) {
-            fallbackSessionId = candidate
-            break
-          }
-        }
-      }
-    }
-
-    let failed = 0
-    for (const sessionId of selected) {
-      try {
-        // eslint-disable-next-line no-await-in-loop
-        await deleteSession(props.instanceId, sessionId)
-      } catch (error) {
-        failed += 1
-        log.error(`Failed to delete session ${sessionId}:`, error)
-      }
-    }
-
-    setSelectedSessionIds(new Set<string>())
-
-    if (fallbackSessionId) {
-      setActiveSessionFromList(props.instanceId, fallbackSessionId)
-    }
-
-    if (failed > 0) {
-      showToastNotification({
-        message: t("sessionList.bulkDelete.error", { count: failed }),
-        variant: "error",
-      })
-    }
-  }
  
 
   const SessionRow: Component<{
@@ -354,19 +166,6 @@ const SessionList: Component<SessionListProps> = (props) => {
     if (!session()) {
       return <></>
     }
-
-    const worktreeSlug = createMemo(() => {
-      if (rowProps.isChild) return "root"
-      return getWorktreeSlugForParentSession(props.instanceId, rowProps.sessionId)
-    })
-
-    const showWorktreeBadge = createMemo(() => {
-      if (rowProps.isChild) return false
-      if (getGitRepoStatus(props.instanceId) === false) return false
-      const slug = worktreeSlug()
-      return Boolean(slug) && slug !== "root"
-    })
-
     const isActive = () => props.activeSessionId === rowProps.sessionId
     const title = () => session()?.title || t("sessionList.session.untitled")
     const status = () => getSessionStatus(props.instanceId, rowProps.sessionId)
@@ -391,31 +190,9 @@ const SessionList: Component<SessionListProps> = (props) => {
           ? t("sessionList.status.needsInput")
           : statusLabel()
  
-    const isSelected = () => selectedSessionIds().has(rowProps.sessionId)
-
-    const parentGroupState = createMemo(() => {
-      if (rowProps.isChild) {
-        return { checked: isSelected(), indeterminate: false, ids: [rowProps.sessionId] }
-      }
-
-      const ids = getSelectableThreadIds(rowProps.sessionId)
-      const selected = selectedSessionIds()
-      const selectedInGroup = ids.reduce((count, id) => (selected.has(id) ? count + 1 : count), 0)
-      return {
-        checked: selectedInGroup > 0 && selectedInGroup === ids.length,
-        indeterminate: selectedInGroup > 0 && selectedInGroup < ids.length,
-        ids,
-      }
-    })
-
-    let rowCheckboxEl: HTMLInputElement | null = null
-    createEffect(() => {
-      if (!rowCheckboxEl) return
-      rowCheckboxEl.indeterminate = parentGroupState().indeterminate
-    })
-
     return (
-      <div class="session-list-item group">
+       <div class="session-list-item group">
+
         <button
           class={`session-item-base ${rowProps.isChild ? `session-item-child${rowProps.isLastChild ? " session-item-child-last" : ""} session-item-border-assistant session-item-kind-assistant` : "session-item-border-user session-item-kind-user"} ${isActive() ? "session-item-active" : "session-item-inactive"}`}
           data-session-id={rowProps.sessionId}
@@ -427,23 +204,11 @@ const SessionList: Component<SessionListProps> = (props) => {
         >
           <div class="session-item-row session-item-header">
             <div class="session-item-title-row">
-              <Show when={props.enableFilterBar}>
-                <input
-                  ref={(el) => {
-                    rowCheckboxEl = el
-                  }}
-                  type="checkbox"
-                  checked={parentGroupState().checked}
-                  onClick={(event) => event.stopPropagation()}
-                  onChange={(event) => {
-                    event.stopPropagation()
-                    setSelectedMany(parentGroupState().ids, event.currentTarget.checked)
-                  }}
-                  aria-label={t("sessionList.selection.checkboxAriaLabel")}
-                />
-              </Show>
-
-              {rowProps.isChild ? <Bot class="w-4 h-4 flex-shrink-0" /> : <User class="w-4 h-4 flex-shrink-0" />}
+              {rowProps.isChild ? (
+                <Bot class="w-4 h-4 flex-shrink-0" />
+              ) : (
+                <User class="w-4 h-4 flex-shrink-0" />
+              )}
               <span class="session-item-title session-item-title--clamp">{title()}</span>
             </div>
           </div>
@@ -451,7 +216,9 @@ const SessionList: Component<SessionListProps> = (props) => {
             <div class="flex items-center gap-2 min-w-0">
               <Show
                 when={rowProps.hasChildren && !rowProps.isChild}
-                fallback={rowProps.isChild ? null : <span class="session-item-expander session-item-expander--spacer" aria-hidden="true" />}
+                fallback={
+                  rowProps.isChild ? null : <span class="session-item-expander session-item-expander--spacer" aria-hidden="true" />
+                }
               >
                 <span
                   class={`session-item-expander opacity-80 hover:opacity-100 ${isActive() ? "hover:bg-white/20" : "hover:bg-surface-hover"}`}
@@ -461,24 +228,20 @@ const SessionList: Component<SessionListProps> = (props) => {
                   }}
                   role="button"
                   tabIndex={0}
-                  aria-label={
-                    rowProps.expanded ? t("sessionList.expand.collapseAriaLabel") : t("sessionList.expand.expandAriaLabel")
-                  }
+                  aria-label={rowProps.expanded ? t("sessionList.expand.collapseAriaLabel") : t("sessionList.expand.expandAriaLabel")}
                   title={rowProps.expanded ? t("sessionList.expand.collapseTitle") : t("sessionList.expand.expandTitle")}
                 >
                   <ChevronDown class={`w-3.5 h-3.5 transition-transform ${rowProps.expanded ? "" : "-rotate-90"}`} />
                 </span>
               </Show>
               <span class={`status-indicator session-status session-status-list ${statusClassName()}`}>
-                {needsInput() ? <ShieldAlert class="w-3.5 h-3.5" aria-hidden="true" /> : <span class="status-dot" />}
+                {needsInput() ? (
+                  <ShieldAlert class="w-3.5 h-3.5" aria-hidden="true" />
+                ) : (
+                  <span class="status-dot" />
+                )}
                 {statusText()}
               </span>
-              <Show when={showWorktreeBadge()}>
-                <span class="status-indicator session-status-list worktree-indicator" title={`Worktree: ${worktreeSlug()}`}>
-                  <Split class="w-3.5 h-3.5" aria-hidden="true" />
-                  <span class="worktree-indicator-label">{worktreeSlug()}</span>
-                </span>
-              </Show>
             </div>
             <div class="session-item-actions">
               <span
@@ -546,13 +309,6 @@ const SessionList: Component<SessionListProps> = (props) => {
   })
 
   createEffect(() => {
-    // Keep the active child session visible by ensuring its parent is expanded.
-    // Don't force-expanding when the active session itself is a parent lets users collapse it.
-    const activeId = props.activeSessionId
-    if (!activeId || activeId === "info") return
-    const activeSession = sessionStateSessions().get(props.instanceId)?.get(activeId)
-    if (!activeSession) return
-    if (!activeSession.parentId) return
     const parentId = activeParentId()
     if (!parentId) return
     ensureSessionParentExpanded(props.instanceId, parentId)
@@ -609,63 +365,6 @@ const SessionList: Component<SessionListProps> = (props) => {
     <div
       class="session-list-container bg-surface-secondary border-r border-base flex flex-col w-full"
     >
-      <Show when={props.enableFilterBar}>
-        <div class="p-3 border-b border-base">
-          <div class="flex items-center gap-2">
-            <div class="relative flex-1 min-w-0">
-              <span class="absolute left-3 top-1/2 -translate-y-1/2 text-muted" aria-hidden="true">
-                <Search class="w-4 h-4" />
-              </span>
-              <input
-                type="text"
-                class="form-input pl-9"
-                value={filterQuery()}
-                onInput={(e) => setFilterQuery(e.currentTarget.value)}
-                placeholder={t("sessionList.filter.placeholder")}
-                aria-label={t("sessionList.filter.ariaLabel")}
-              />
-            </div>
-
-            <button
-              type="button"
-              class="button-tertiary p-2 inline-flex items-center justify-center"
-              onClick={toggleSelectAll}
-              disabled={allMatchingSessionIds().length === 0}
-              aria-label={t("sessionList.selection.selectAllAriaLabel")}
-              title={t("sessionList.selection.selectAllLabel")}
-            >
-              <Show
-                when={isSelectAllIndeterminate()}
-                fallback={isAllSelected() ? <CheckSquare class="w-4 h-4" /> : <Square class="w-4 h-4" />}
-              >
-                <MinusSquare class="w-4 h-4" />
-              </Show>
-            </button>
-          </div>
-
-          <Show when={selectedCount() > 0}>
-            <div class="mt-2 flex items-center justify-end gap-2">
-              <button
-                type="button"
-                class="button-tertiary"
-                onClick={handleBulkDelete}
-                aria-label={t("sessionList.bulkDelete.ariaLabel", { count: selectedCount() })}
-              >
-                {t("sessionList.bulkDelete.button", { count: selectedCount() })}
-              </button>
-              <button
-                type="button"
-                class="button-tertiary"
-                onClick={() => setSelectedSessionIds(new Set<string>())}
-                aria-label={t("sessionList.selection.clearAriaLabel")}
-              >
-                {t("sessionList.selection.clearLabel")}
-              </button>
-            </div>
-          </Show>
-        </div>
-      </Show>
-
       <Show when={props.showHeader !== false}>
         <div class="session-list-header p-3 border-b border-base">
           {props.headerContent ?? (
@@ -679,33 +378,33 @@ const SessionList: Component<SessionListProps> = (props) => {
         </div>
       </Show>
 
-       <div class="session-list flex-1 overflow-y-auto" ref={(el) => listEl[1](el)}>
+      <div class="session-list flex-1 overflow-y-auto" ref={(el) => listEl[1](el)}>
 
-          <Show when={filteredThreads().length > 0}>
-            <div class="session-section">
-              <For each={filteredThreads()}>
+         <Show when={props.threads.length > 0}>
+           <div class="session-section">
+             <For each={props.threads}>
 
-               {(thread) => {
-                 const expanded = () => (normalizedQuery() ? true : isSessionParentExpanded(props.instanceId, thread.parent.id))
-                 return (
-                   <>
-                       <SessionRow
-                         sessionId={thread.parent.id}
-                         hasChildren={thread.children.length > 0}
-                         expanded={expanded()}
-                         onToggleExpand={() => toggleSessionParentExpanded(props.instanceId, thread.parent.id)}
-                       />
+              {(thread) => {
+                const expanded = () => isSessionParentExpanded(props.instanceId, thread.parent.id)
+                return (
+                  <>
+                      <SessionRow
+                        sessionId={thread.parent.id}
+                        hasChildren={thread.children.length > 0}
+                        expanded={expanded()}
+                        onToggleExpand={() => toggleSessionParentExpanded(props.instanceId, thread.parent.id)}
+                      />
 
-                     <Show when={expanded() && thread.children.length > 0}>
-                       <For each={thread.children}>
-                         {(child, index) => (
-                           <SessionRow sessionId={child.id} isChild isLastChild={index() === thread.children.length - 1} />
-                         )}
-                       </For>
-                     </Show>
-                   </>
-                 )
-               }}
+                    <Show when={expanded() && thread.children.length > 0}>
+                      <For each={thread.children}>
+                        {(child, index) => (
+                          <SessionRow sessionId={child.id} isChild isLastChild={index() === thread.children.length - 1} />
+                        )}
+                      </For>
+                    </Show>
+                  </>
+                )
+              }}
             </For>
           </div>
         </Show>

packages/ui/src/components/session/context-usage-panel.tsx

@@ -6,11 +6,11 @@ import { useI18n } from "../../lib/i18n"
 interface ContextUsagePanelProps {
   instanceId: string
   sessionId: string
-  class?: string
 }
 
 const chipClass = "inline-flex items-center gap-1 rounded-full border border-base px-2 py-0.5 text-xs text-primary"
-const chipLabelClass = "uppercase text-[10px] tracking-wide text-muted"
+const chipLabelClass = "uppercase text-[10px] tracking-wide text-primary/70"
+const headingClass = "text-xs font-semibold text-primary/70 uppercase tracking-wide"
 
 const ContextUsagePanel: Component<ContextUsagePanelProps> = (props) => {
   const { t } = useI18n()
@@ -31,16 +31,26 @@ const ContextUsagePanel: Component<ContextUsagePanelProps> = (props) => {
 
   const inputTokens = createMemo(() => info().inputTokens ?? 0)
   const outputTokens = createMemo(() => info().outputTokens ?? 0)
+  const actualUsageTokens = createMemo(() => info().actualUsageTokens ?? 0)
+  const availableTokens = createMemo(() => info().contextAvailableTokens)
+  const outputLimit = createMemo(() => info().modelOutputLimit ?? 0)
   const costValue = createMemo(() => {
     const value = info().isSubscriptionModel ? 0 : info().cost
     return value > 0 ? value : 0
   })
 
+
+  const formatTokenValue = (value: number | null | undefined) => {
+    if (value === null || value === undefined) return t("contextUsagePanel.unavailable")
+    return formatTokenTotal(value)
+  }
+
   const costDisplay = createMemo(() => `$${costValue().toFixed(2)}`)
 
   return (
-    <div class={`session-context-panel px-4 py-2 ${props.class ?? ""}`}>
-      <div class="flex flex-wrap items-center gap-2 text-xs text-primary">
+    <div class="session-context-panel border-r border-base border-b px-3 py-3 space-y-3">
+      <div class="flex flex-wrap items-center gap-2 text-xs text-primary/90">
+        <div class={headingClass}>{t("contextUsagePanel.headings.tokens")}</div>
         <div class={chipClass}>
           <span class={chipLabelClass}>{t("contextUsagePanel.labels.input")}</span>
           <span class="font-semibold text-primary">{formatTokenTotal(inputTokens())}</span>
@@ -54,6 +64,18 @@ const ContextUsagePanel: Component<ContextUsagePanelProps> = (props) => {
           <span class="font-semibold text-primary">{costDisplay()}</span>
         </div>
       </div>
+
+      <div class="flex flex-wrap items-center gap-2 text-xs text-primary/90">
+        <div class={headingClass}>{t("contextUsagePanel.headings.context")}</div>
+        <div class={chipClass}>
+          <span class={chipLabelClass}>{t("contextUsagePanel.labels.used")}</span>
+          <span class="font-semibold text-primary">{formatTokenTotal(actualUsageTokens())}</span>
+        </div>
+        <div class={chipClass}>
+          <span class={chipLabelClass}>{t("contextUsagePanel.labels.available")}</span>
+          <span class="font-semibold text-primary">{formatTokenValue(availableTokens())}</span>
+        </div>
+      </div>
     </div>
   )
 }

packages/ui/src/components/session/session-view.tsx

@@ -1,4 +1,4 @@
-import { Show, For, createMemo, createEffect, on, type Component } from "solid-js"
+import { Show, For, createMemo, createEffect, type Component } from "solid-js"
 import { Expand } from "lucide-solid"
 import type { Session } from "../../types/session"
 import type { Attachment } from "../../types/attachment"
@@ -9,7 +9,7 @@ import PromptInput from "../prompt-input"
 import type { Attachment as PromptAttachment } from "../../types/attachment"
 import { getAttachments, removeAttachment } from "../../stores/attachments"
 import { instances } from "../../stores/instances"
-import { loadMessages, sendMessage, forkSession, renameSession, isSessionMessagesLoading, setActiveParentSession, setActiveSession, runShellCommand, abortSession } from "../../stores/sessions"
+import { loadMessages, sendMessage, forkSession, isSessionMessagesLoading, setActiveParentSession, setActiveSession, runShellCommand, abortSession } from "../../stores/sessions"
 import { isSessionBusy as getSessionBusyStatus } from "../../stores/session-status"
 import { showAlertDialog } from "../../stores/alerts"
 import { getLogger } from "../../lib/logger"
@@ -112,43 +112,6 @@ export const SessionView: Component<SessionViewProps> = (props) => {
     if (!props.isActive) return
     scheduleScrollToBottom()
   })
-
-  createEffect(
-    on(
-      () => props.isActive,
-      (isActive) => {
-        if (!isActive) return
-
-        // Don't steal focus from other inputs (command palette, dialogs, selectors, etc.)
-        if (typeof document === "undefined") return
-        const activeEl = document.activeElement as HTMLElement | null
-        const activeIsInput =
-          activeEl?.tagName === "INPUT" ||
-          activeEl?.tagName === "TEXTAREA" ||
-          activeEl?.tagName === "SELECT" ||
-          Boolean(activeEl?.isContentEditable)
-        if (activeIsInput) return
-
-        const modalOpen = Boolean(document.querySelector('[role="dialog"][aria-modal="true"]'))
-        if (modalOpen) return
-
-        // Defer until the session pane is visible and the textarea is mounted.
-        requestAnimationFrame(() => {
-          requestAnimationFrame(() => {
-            const textarea = rootRef?.querySelector<HTMLTextAreaElement>(".prompt-input")
-            if (!textarea) return
-            if (textarea.disabled) return
-
-            try {
-              textarea.focus({ preventScroll: true } as any)
-            } catch {
-              textarea.focus()
-            }
-          })
-        })
-      },
-    ),
-  )
   let quoteHandler: ((text: string, mode: "quote" | "code") => void) | null = null
  
   createEffect(() => {
@@ -254,15 +217,10 @@ export const SessionView: Component<SessionViewProps> = (props) => {
     }
 
     const restoredText = getUserMessageText(messageId)
-    const parentTitle = (session()?.title ?? "").trim() || t("sessionList.session.untitled")
 
     try {
       const forkedSession = await forkSession(props.instanceId, props.sessionId, { messageId })
 
-      renameSession(props.instanceId, forkedSession.id, `Fork: ${parentTitle}`).catch((error) => {
-        log.error("Failed to rename forked session", error)
-      })
-
       const parentToActivate = forkedSession.parentId ?? forkedSession.id
       setActiveParentSession(props.instanceId, parentToActivate)
       if (forkedSession.parentId) {

packages/ui/src/components/theme-mode-toggle.tsx

@@ -1,39 +0,0 @@
-import { createMemo, type Component } from "solid-js"
-import { Laptop, Moon, Sun } from "lucide-solid"
-import { useI18n } from "../lib/i18n"
-import { useTheme } from "../lib/theme"
-
-interface ThemeModeToggleProps {
-  class?: string
-}
-
-export const ThemeModeToggle: Component<ThemeModeToggleProps> = (props) => {
-  const { t } = useI18n()
-  const { themeMode, cycleThemeMode } = useTheme()
-
-  const modeLabel = () => {
-    const mode = themeMode()
-    if (mode === "system") return t("theme.mode.system")
-    if (mode === "light") return t("theme.mode.light")
-    return t("theme.mode.dark")
-  }
-
-  const icon = createMemo(() => {
-    const mode = themeMode()
-    if (mode === "system") return <Laptop class="w-4 h-4" />
-    if (mode === "light") return <Sun class="w-4 h-4" />
-    return <Moon class="w-4 h-4" />
-  })
-
-  return (
-    <button
-      type="button"
-      class={props.class ?? "new-tab-button"}
-      onClick={cycleThemeMode}
-      aria-label={t("theme.toggle.ariaLabel", { mode: modeLabel() })}
-      title={t("theme.toggle.title", { mode: modeLabel() })}
-    >
-      {icon()}
-    </button>
-  )
-}

packages/ui/src/components/thinking-selector.tsx

@@ -5,6 +5,7 @@ import { ChevronDown } from "lucide-solid"
 import { getLogger } from "../lib/logger"
 import { getModelThinkingSelection, setModelThinkingSelection } from "../stores/preferences"
 import { useI18n } from "../lib/i18n"
+import Kbd from "./kbd"
 
 const log = getLogger("session")
 
@@ -92,6 +93,9 @@ export default function ThinkingSelector(props: ThinkingSelectorProps) {
             <div class="selector-trigger-label selector-trigger-label--stacked flex-1 min-w-0">
               <span class="selector-trigger-primary selector-trigger-primary--align-left">{triggerPrimary()}</span>
             </div>
+            <span class="selector-trigger-hint" aria-hidden="true">
+              <Kbd shortcut="cmd+shift+t" />
+            </span>
             <Combobox.Icon class="selector-trigger-icon">
               <ChevronDown class="w-3 h-3" />
             </Combobox.Icon>

packages/ui/src/components/tool-call.tsx

@@ -1,11 +1,9 @@
 import { createSignal, Show, createEffect, createMemo, onCleanup } from "solid-js"
-import { Copy } from "lucide-solid"
 import { messageStoreBus } from "../stores/message-v2/bus"
 import { useTheme } from "../lib/theme"
 import { useGlobalCache } from "../lib/hooks/use-global-cache"
 import { useConfig } from "../stores/preferences"
 import { activeInterruption, sendPermissionResponse, sendQuestionReject, sendQuestionReply } from "../stores/instances"
-import { copyToClipboard } from "../lib/clipboard"
 import type { PermissionRequestLike } from "../types/permission"
 import { getPermissionSessionId } from "../types/permission"
 import type { QuestionRequest } from "@opencode-ai/sdk/v2"
@@ -61,11 +59,6 @@ interface ToolCallProps {
   instanceId: string
   sessionId: string
   onContentRendered?: () => void
-  /**
-   * When true, tool call starts collapsed regardless of user preferences.
-   * Users can still expand/collapse manually.
-   */
-  forceCollapsed?: boolean
  }
 
 
@@ -149,9 +142,6 @@ export default function ToolCall(props: ToolCallProps) {
   const diagnosticsDefaultExpanded = createMemo(() => (preferences().diagnosticsExpansion || "expanded") === "expanded")
 
   const defaultExpandedForTool = createMemo(() => {
-    if (props.forceCollapsed) {
-      return false
-    }
     const prefExpanded = toolOutputDefaultExpanded()
     const toolName = toolCallMemo()?.tool || ""
     if (toolName === "read") {
@@ -245,16 +235,12 @@ export default function ToolCall(props: ToolCallProps) {
     requestAnimationFrame(() => {
       restoreScrollPosition(autoScroll())
       if (!expanded()) return
-      scheduleAnchorScroll(true)
+      scheduleAnchorScroll()
     })
   }
 
   const initializeScrollContainer = (element: HTMLDivElement | null | undefined) => {
-    const next = element || undefined
-    if (next === scrollContainerRef) {
-      return
-    }
-    scrollContainerRef = next
+    scrollContainerRef = element || undefined
     setScrollContainer(scrollContainerRef)
     if (scrollContainerRef) {
       restoreScrollPosition(autoScroll())
@@ -585,29 +571,12 @@ export default function ToolCall(props: ToolCallProps) {
     toolCall: toolCallMemo,
     toolState,
     toolName,
-    instanceId: props.instanceId,
-    sessionId: props.sessionId,
     t,
     messageVersion: messageVersionAccessor,
     partVersion: partVersionAccessor,
     renderMarkdown: renderMarkdownContent,
     renderAnsi: renderAnsiContent,
     renderDiff: renderDiffContent,
-    renderToolCall: (options) => {
-      if (!options?.toolCall) return null
-      return (
-        <ToolCall
-          toolCall={options.toolCall}
-          toolCallId={options.toolCall.id}
-          messageId={options.messageId}
-          messageVersion={options.messageVersion}
-          partVersion={options.partVersion}
-          instanceId={props.instanceId}
-          sessionId={options.sessionId}
-          forceCollapsed={options.forceCollapsed}
-        />
-      )
-    },
     scrollHelpers,
   }
 
@@ -624,7 +593,7 @@ export default function ToolCall(props: ToolCallProps) {
       return
     }
     previousPartVersion = version
-    scheduleAnchorScroll(true)
+    scheduleAnchorScroll()
   })
 
   createEffect(() => {
@@ -661,19 +630,6 @@ export default function ToolCall(props: ToolCallProps) {
     return getToolName(currentTool)
   }
 
-  const headerText = createMemo(() => {
-    // Keep this as a memo so copy always matches what's rendered.
-    return renderToolTitle()
-  })
-
-  const handleCopyHeader = async (event: MouseEvent) => {
-    event.preventDefault()
-    event.stopPropagation()
-    const text = headerText()
-    if (!text) return
-    await copyToClipboard(text)
-  }
-
   const renderToolBody = () => {
     return renderer().renderBody(rendererContext)
   }
@@ -777,32 +733,16 @@ export default function ToolCall(props: ToolCallProps) {
       }}
       class={`tool-call ${combinedStatusClass()}`}
     >
-      <div class="tool-call-header">
-        <button
-          type="button"
-          class="tool-call-header-toggle"
-          onClick={toggle}
-          aria-expanded={expanded()}
-        >
-          <span class="tool-call-summary" data-tool-icon={getToolIcon(toolName())}>
-            {headerText()}
-          </span>
-        </button>
-
-        <button
-          type="button"
-          class="tool-call-header-copy"
-          onClick={handleCopyHeader}
-          aria-label={t("toolCall.header.copyAriaLabel")}
-          title={t("toolCall.header.copyTitle")}
-        >
-          <Copy class="w-3.5 h-3.5" />
-        </button>
-
-        <span class="tool-call-header-status" aria-hidden="true">
-          {statusIcon()}
+      <button
+        class="tool-call-header"
+        onClick={toggle}
+        aria-expanded={expanded()}
+        data-status-icon={statusIcon()}
+      >
+        <span class="tool-call-summary" data-tool-icon={getToolIcon(toolName())}>
+          {renderToolTitle()}
         </span>
-      </div>
+      </button>
 
       {expanded() && (
         <div class="tool-call-details">

packages/ui/src/components/tool-call/ansi-render.tsx

@@ -87,7 +87,7 @@ export function createAnsiContentRenderer(params: {
     }
 
     return (
-      <div class={messageClass} ref={params.scrollHelpers.registerContainer} onScroll={params.scrollHelpers.handleScroll}>
+      <div class={messageClass} ref={(element) => params.scrollHelpers.registerContainer(element)} onScroll={params.scrollHelpers.handleScroll}>
         <pre class="tool-call-content tool-call-ansi" innerHTML={nextCache.html} />
         {params.scrollHelpers.renderSentinel()}
       </div>

packages/ui/src/components/tool-call/diff-render.tsx

@@ -26,14 +26,6 @@ export function createDiffContentRenderer(params: {
   handleScrollRendered: () => void
   onContentRendered?: () => void
 }) {
-  const registerTracked = (element: HTMLDivElement | null) => {
-    params.scrollHelpers.registerContainer(element)
-  }
-
-  const registerUntracked = (element: HTMLDivElement | null) => {
-    params.scrollHelpers.registerContainer(element, { disableTracking: true })
-  }
-
   function renderDiffContent(payload: DiffPayload, options?: DiffRenderOptions): JSXElement | null {
     const relativePath = payload.filePath ? getRelativePath(payload.filePath) : ""
     const toolbarLabel = options?.label || (relativePath
@@ -43,8 +35,6 @@ export function createDiffContentRenderer(params: {
     const cacheHandle = selectedVariant === "permission-diff" ? params.permissionDiffCache : params.diffCache
     const diffMode = () => (params.preferences().diffViewMode || "split") as DiffViewMode
     const themeKey = params.isDark() ? "dark" : "light"
-    const disableScrollTracking = Boolean(options?.disableScrollTracking)
-    const registerRef = disableScrollTracking ? registerUntracked : registerTracked
 
     const baseEntryParams = cacheHandle.params() as any
     const cacheEntryParams = (() => {
@@ -68,7 +58,7 @@ export function createDiffContentRenderer(params: {
     }
 
     const handleDiffRendered = () => {
-      if (!disableScrollTracking) {
+      if (!options?.disableScrollTracking) {
         params.handleScrollRendered()
       }
       params.onContentRendered?.()
@@ -77,8 +67,8 @@ export function createDiffContentRenderer(params: {
     return (
       <div
         class="message-text tool-call-markdown tool-call-markdown-large tool-call-diff-shell"
-        ref={registerRef}
-        onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}
+        ref={(element) => params.scrollHelpers.registerContainer(element, { disableTracking: options?.disableScrollTracking })}
+        onScroll={options?.disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}
       >
         <div class="tool-call-diff-toolbar" role="group" aria-label={params.t("toolCall.diff.viewMode.ariaLabel")}>
           <span class="tool-call-diff-toolbar-label">{toolbarLabel}</span>
@@ -110,7 +100,7 @@ export function createDiffContentRenderer(params: {
           cacheEntryParams={cacheEntryParams as any}
           onRendered={handleDiffRendered}
         />
-        {params.scrollHelpers.renderSentinel({ disableTracking: disableScrollTracking })}
+        {params.scrollHelpers.renderSentinel({ disableTracking: options?.disableScrollTracking })}
       </div>
     )
   }

packages/ui/src/components/tool-call/markdown-render.tsx

@@ -15,14 +15,6 @@ export function createMarkdownContentRenderer(params: {
   handleScrollRendered: () => void
   onContentRendered?: () => void
 }) {
-  const registerTracked = (element: HTMLDivElement | null) => {
-    params.scrollHelpers.registerContainer(element)
-  }
-
-  const registerUntracked = (element: HTMLDivElement | null) => {
-    params.scrollHelpers.registerContainer(element, { disableTracking: true })
-  }
-
   function renderMarkdownContent(options: MarkdownRenderOptions): JSXElement | null {
     if (!options.content) {
       return null
@@ -32,7 +24,6 @@ export function createMarkdownContentRenderer(params: {
     const disableHighlight = options.disableHighlight || false
     const messageClass = `message-text tool-call-markdown${size === "large" ? " tool-call-markdown-large" : ""}`
     const disableScrollTracking = options.disableScrollTracking || false
-    const registerRef = disableScrollTracking ? registerUntracked : registerTracked
 
     const state = params.toolState()
     const shouldDeferMarkdown = Boolean(state && (state.status === "running" || state.status === "pending") && disableHighlight)
@@ -40,7 +31,7 @@ export function createMarkdownContentRenderer(params: {
       return (
         <div
           class={messageClass}
-          ref={registerRef}
+          ref={(element) => params.scrollHelpers.registerContainer(element, { disableTracking: disableScrollTracking })}
           onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}
         >
           <pre class="whitespace-pre-wrap break-words text-sm font-mono">{options.content}</pre>
@@ -65,7 +56,7 @@ export function createMarkdownContentRenderer(params: {
     return (
       <div
         class={messageClass}
-        ref={registerRef}
+        ref={(element) => params.scrollHelpers.registerContainer(element, { disableTracking: disableScrollTracking })}
         onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}
       >
         <Markdown

packages/ui/src/components/tool-call/question-block.tsx

@@ -80,19 +80,6 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
     return Array.isArray(draft) ? draft : []
   })
 
-  const hasFinalAnswers = createMemo(() => {
-    const state = props.toolState()
-    if ((state as any)?.status === "completed") return true
-
-    const request = props.request()
-    const requestAnswers = request?.questions?.map((q) => (q as any)?.answer)
-    if (Array.isArray(requestAnswers) && requestAnswers.length > 0) {
-      return requestAnswers.every((row) => Array.isArray(row) && row.length > 0)
-    }
-
-    return false
-  })
-
   const updateAnswer = (questionIndex: number, next: string[]) => {
     if (!props.active()) return
     props.setDraftAnswers((prev) => {
@@ -125,23 +112,28 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
     if (!props.active()) return
     const rawValue = input?.value ?? ""
     const value = rawValue
-    if (value.trim().length === 0) return
 
     const info = questions()[questionIndex]
     const multi = info?.multiple === true
     if (!multi) {
       // When switching a radio to custom, clear existing selection first.
       updateAnswer(questionIndex, [])
-      toggleOption(questionIndex, value)
+    }
+
+    // If the custom field is empty, treat it as unanswered.
+    // This prevents submitting a previously selected option when the user
+    // has explicitly switched focus to the custom input.
+    if (value.trim().length === 0) return
+
+    if (multi) {
+      const existing = answers()[questionIndex] ?? []
+      if (!existing.includes(value)) {
+        updateAnswer(questionIndex, [...existing, value])
+      }
       return
     }
 
-    // For multi-select, focusing the input should never toggle an existing custom value off.
-    // Ensure the current input value is selected; removal is handled by unchecking Custom.
-    const existing = answers()[questionIndex] ?? []
-    if (!existing.includes(value)) {
-      updateAnswer(questionIndex, [...existing, value])
-    }
+    toggleOption(questionIndex, value)
   }
 
   const clearCustomAnswer = (questionIndex: number, valuesToRemove: string[]) => {
@@ -190,11 +182,22 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
 
   return (
     <Show when={isVisible() && questions().length > 0}>
-      <div
-        class={`tool-call-permission p-0 gap-2 ${props.active() ? "tool-call-permission-active" : "tool-call-permission-queued"} ${hasFinalAnswers() ? "tool-call-permission-answered" : ""}`}
-      >
+      <div class={`tool-call-permission ${props.active() ? "tool-call-permission-active" : "tool-call-permission-queued"}`}>
+        <div class="tool-call-permission-header">
+          <span class="tool-call-permission-label">
+            {props.active()
+              ? t("toolCall.question.status.required")
+              : props.request()
+                ? t("toolCall.question.status.queued")
+                : t("toolCall.question.status.questions")}
+          </span>
+          <span class="tool-call-permission-type">
+            {questions().length === 1 ? t("toolCall.question.type.one") : t("toolCall.question.type.other")}
+          </span>
+        </div>
+
         <div class="tool-call-permission-body">
-          <div class="flex flex-col gap-2">
+          <div class="flex flex-col gap-4">
             <For each={questions()}>
               {(q, index) => {
                 const i = () => index()
@@ -208,9 +211,9 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
                 const customChecked = () => customValue().length > 0
 
                 return (
-                  <div class="border border-base bg-surface-secondary p-3 text-primary">
+                  <div class="rounded-md border border-base/60 bg-surface/30 p-3">
                     <div class="flex items-baseline justify-between gap-2">
-                      <div class="text-sm text-primary">
+                      <div class="text-xs">
                         {t("toolCall.question.number", { number: i() + 1 })} <span class="font-semibold">{q?.header}</span>
                       </div>
                       <Show when={multi()}>
@@ -218,7 +221,7 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
                       </Show>
                     </div>
 
-                    <div class="mt-1 text-sm font-medium text-primary">{q?.question}</div>
+                    <div class="mt-1 text-sm font-medium">{q?.question}</div>
 
                     <div class="mt-3 flex flex-col gap-1">
                       <For each={q?.options ?? []}>
@@ -235,13 +238,12 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
                                 }}
                                 type={inputType()}
                                 name={groupName()}
-                                class="mt-0.5 accent-[var(--accent-primary)]"
                                 checked={checked()}
                                 disabled={!props.active() || props.submitting()}
                                 onChange={() => toggleOption(i(), opt.label)}
                               />
                               <div class="flex flex-col">
-                                <div class="text-sm leading-tight text-primary">{opt.label}</div>
+                                <div class="text-sm leading-tight">{opt.label}</div>
                                 <div class="text-xs text-muted leading-tight">{opt.description}</div>
                               </div>
                             </label>
@@ -259,7 +261,6 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
                           }}
                           type={inputType()}
                           name={groupName()}
-                          class="mt-0.5 accent-[var(--accent-primary)]"
                           checked={customChecked()}
                           disabled={!props.active() || props.submitting()}
                           onChange={(e) => {
@@ -277,13 +278,13 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
                           }}
                         />
                         <div class="flex flex-1 flex-col gap-2">
-                          <div class="text-sm leading-tight text-primary">{t("toolCall.question.custom.label")}</div>
+                          <div class="text-sm leading-tight">{t("toolCall.question.custom.label")}</div>
                           <input
-                            class="w-full rounded-md border border-base bg-surface-base px-2 py-1 text-sm text-primary"
+                            class="w-full rounded-md border border-base/50 bg-surface px-2 py-1 text-sm"
                             type="text"
                             placeholder={t("toolCall.question.custom.placeholder")}
-                              disabled={!props.active() || props.submitting()}
-                              value={customValue()}
+                            disabled={!props.active() || props.submitting()}
+                            value={customValue()}
                             onFocus={(e) => {
                               if (!props.active()) return
                               // Keep the radio/checkbox selected while editing.
@@ -292,6 +293,9 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
                             onInput={(e) => handleCustomTyping(i(), e.currentTarget)}
                             onKeyDown={(e) => {
                               if (e.key === "Enter" && !e.isComposing) {
+                                // Don't submit if the custom field is empty (common when switching to it).
+                                if (e.currentTarget.value.trim().length === 0) return
+                                e.preventDefault()
                                 if (!submitDisabled()) {
                                   props.onSubmit()
                                 }
@@ -307,7 +311,7 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
             </For>
 
             <Show when={props.active()}>
-              <div class="tool-call-permission-actions px-3 pb-3">
+              <div class="tool-call-permission-actions">
                 <div class="tool-call-permission-buttons">
                   <button
                     type="button"
@@ -341,7 +345,7 @@ export function QuestionToolBlock(props: QuestionToolBlockProps) {
             </Show>
 
             <Show when={!props.active() && props.request()}>
-              <p class="tool-call-permission-queued-text px-3 pb-3">{t("toolCall.question.queuedText")}</p>
+              <p class="tool-call-permission-queued-text">{t("toolCall.question.queuedText")}</p>
             </Show>
           </div>
         </div>

packages/ui/src/components/tool-call/renderers/task.tsx

@@ -1,11 +1,8 @@
-import { For, Show, createEffect, createMemo, createSignal, untrack } from "solid-js"
+import { For, Show, createMemo } from "solid-js"
 import type { ToolState } from "@opencode-ai/sdk"
 import type { ToolRenderer } from "../types"
 import { ensureMarkdownContent, getDefaultToolAction, getToolIcon, getToolName, readToolStatePayload } from "../utils"
 import { resolveTitleForTool } from "../tool-title"
-import { messageStoreBus } from "../../../stores/message-v2/bus"
-import { loadMessages } from "../../../stores/session-api"
-import { loading, messagesLoaded } from "../../../stores/session-state"
 
 interface TaskSummaryItem {
   id: string
@@ -17,70 +14,6 @@ interface TaskSummaryItem {
   title?: string
 }
 
-function extractSessionIdFromTaskState(state?: ToolState): string {
-  if (!state) return ""
-  const metadata = (state as unknown as { metadata?: Record<string, unknown> }).metadata ?? {}
-  const directId = (metadata as any)?.sessionId ?? (metadata as any)?.sessionID
-  return typeof directId === "string" ? directId : ""
-}
-
-function splitToolKey(key: string): { messageId: string; partId: string } | null {
-  const separator = "::"
-  const index = key.lastIndexOf(separator)
-  if (index <= 0) return null
-  const messageId = key.slice(0, index)
-  const partId = key.slice(index + separator.length)
-  if (!messageId || !partId) return null
-  return { messageId, partId }
-}
-
-function TaskToolCallRow(props: {
-  toolKey: string
-  store: ReturnType<typeof messageStoreBus.getOrCreate>
-  sessionId: string
-  renderToolCall: NonNullable<import("../types").ToolRendererContext["renderToolCall"]>
-}) {
-  const parts = createMemo(() => splitToolKey(props.toolKey))
-  const messageId = createMemo(() => parts()?.messageId ?? "")
-  const partId = createMemo(() => parts()?.partId ?? "")
-
-  const record = createMemo(() => {
-    const id = messageId()
-    if (!id) return undefined
-    return props.store.getMessage(id)
-  })
-
-  const partEntry = createMemo(() => {
-    const rec = record()
-    const pid = partId()
-    if (!rec || !pid) return undefined
-    return rec.parts?.[pid]
-  })
-
-  const toolPart = createMemo(() => {
-    const data = partEntry()?.data
-    return data && (data as any).type === "tool" ? (data as any) : undefined
-  })
-
-  const messageVersion = createMemo(() => record()?.revision ?? 0)
-  const partVersion = createMemo(() => partEntry()?.revision ?? 0)
-
-  const rendered = createMemo(() => {
-    const part = toolPart()
-    if (!part) return null
-    return props.renderToolCall({
-      toolCall: part as any,
-      messageId: messageId(),
-      messageVersion: messageVersion(),
-      partVersion: partVersion(),
-      sessionId: props.sessionId,
-      forceCollapsed: true,
-    })
-  })
-
-  return <>{rendered()}</>
-}
-
 function normalizeStatus(status?: string | null): ToolState["status"] | undefined {
   if (status === "pending" || status === "running" || status === "completed" || status === "error") {
     return status
@@ -145,63 +78,7 @@ export const taskRenderer: ToolRenderer = {
     const { input } = readToolStatePayload(state)
     return describeTaskTitle(input)
   },
-  renderBody({ toolState, instanceId, renderToolCall, messageVersion, partVersion, scrollHelpers, renderMarkdown, t }) {
-    const store = messageStoreBus.getOrCreate(instanceId)
-    const [requestedChildLoad, setRequestedChildLoad] = createSignal(false)
-
-    const childSessionId = createMemo(() => {
-      const state = toolState()
-      return extractSessionIdFromTaskState(state)
-    })
-
-    const childSessionLoaded = createMemo(() => {
-      const id = childSessionId()
-      if (!id) return false
-      const loadedForInstance = messagesLoaded().get(instanceId)
-      return loadedForInstance?.has(id) ?? false
-    })
-
-    const childSessionLoading = createMemo(() => {
-      const id = childSessionId()
-      if (!id) return false
-      const loadingSet = loading().loadingMessages.get(instanceId)
-      return loadingSet?.has(id) ?? false
-    })
-
-    createEffect(() => {
-      const id = childSessionId()
-      if (!id) return
-      if (requestedChildLoad()) return
-      if (childSessionLoaded()) return
-      if (childSessionLoading()) return
-      setRequestedChildLoad(true)
-      void loadMessages(instanceId, id)
-    })
-
-    const childToolKeys = createMemo(() => {
-      const id = childSessionId()
-      if (!id) return [] as string[]
-      if (!childSessionLoaded()) return [] as string[]
-
-      // React to session changes, but do the scan untracked to avoid
-      // subscribing to every message/part node in the store.
-      store.getSessionRevision(id)
-      return untrack(() => {
-        const messageIds = store.getSessionMessageIds(id)
-        const keys: string[] = []
-        for (const messageId of messageIds) {
-          const record = store.getMessage(messageId)
-          if (!record) continue
-          for (const partId of record.partIds) {
-            const entry = record.parts?.[partId]
-            const data = entry?.data
-            if (!data || (data as any).type !== "tool") continue
-            keys.push(`${messageId}::${partId}`)
-          }
-        }
-        return keys
-      })
-    })
+  renderBody({ toolState, messageVersion, partVersion, scrollHelpers, renderMarkdown, t }) {
     const promptContent = createMemo(() => {
       const state = toolState()
       if (!state) return null
@@ -246,7 +123,7 @@ export const taskRenderer: ToolRenderer = {
       return null
     })
 
-    const legacyItems = createMemo(() => {
+    const items = createMemo(() => {
       // Track the reactive change points so we only recompute when the part/message changes
       messageVersion?.()
       partVersion?.()
@@ -254,9 +131,6 @@ export const taskRenderer: ToolRenderer = {
       const state = toolState()
       if (!state) return []
 
-      // Prefer deriving steps from the child session when loaded.
-      if (childSessionLoaded()) return []
-
       const { metadata } = readToolStatePayload(state)
       const summary = Array.isArray((metadata as any).summary) ? ((metadata as any).summary as any[]) : []
 
@@ -293,84 +167,51 @@ export const taskRenderer: ToolRenderer = {
           </section>
         </Show>
 
-        <Show when={childToolKeys().length > 0 || legacyItems().length > 0}>
+        <Show when={items().length > 0}>
           <section class="tool-call-task-section">
             <header class="tool-call-task-section-header">
               <span class="tool-call-task-section-title">{t("toolCall.task.sections.steps")}</span>
-              <span class="tool-call-task-section-meta">
-                {t("toolCall.task.steps.count", { count: childToolKeys().length > 0 ? childToolKeys().length : legacyItems().length })}
-              </span>
+              <span class="tool-call-task-section-meta">{t("toolCall.task.steps.count", { count: items().length })}</span>
             </header>
             <div class="tool-call-task-section-body">
-              <Show
-                when={childToolKeys().length > 0}
-                fallback={
-                  <div
-                    class="message-text tool-call-markdown tool-call-task-container"
-                    ref={scrollHelpers?.registerContainer}
-                    onScroll={
-                      scrollHelpers ? (event) => scrollHelpers.handleScroll(event as Event & { currentTarget: HTMLDivElement }) : undefined
-                    }
-                  >
-                    <div class="tool-call-task-summary">
-                      <For each={legacyItems()}>
-                        {(item) => {
-                          const icon = getToolIcon(item.tool)
-                          const description = describeToolTitle(item)
-                          const toolLabel = getToolName(item.tool)
-                          const status = normalizeStatus(item.status ?? item.state?.status)
-                          const statusIcon = summarizeStatusIcon(status)
-                          const statusKey = summarizeStatusLabel(status)
-                          const statusLabel = statusKey
-                            ? t(`toolCall.status.${statusKey}`)
-                            : t("toolCall.status.unknown")
-                          const statusAttr = status ?? "pending"
-                          return (
-                            <div class="tool-call-task-item" data-task-id={item.id} data-task-status={statusAttr}>
-                              <span class="tool-call-task-icon">{icon}</span>
-                              <span class="tool-call-task-label">{toolLabel}</span>
-                              <span class="tool-call-task-separator" aria-hidden="true">—</span>
-                              <span class="tool-call-task-text">{description}</span>
-                              <Show when={statusIcon}>
-                                <span class="tool-call-task-status" aria-label={statusLabel} title={statusLabel}>
-                                  {statusIcon}
-                                </span>
-                              </Show>
-                            </div>
-                          )
-                        }}
-                      </For>
-                    </div>
-                    {scrollHelpers?.renderSentinel?.()}
-                  </div>
+              <div
+                class="message-text tool-call-markdown tool-call-task-container"
+                ref={(element) => scrollHelpers?.registerContainer(element)}
+                onScroll={
+                  scrollHelpers ? (event) => scrollHelpers.handleScroll(event as Event & { currentTarget: HTMLDivElement }) : undefined
                 }
               >
-                <div
-                  class="message-text tool-call-markdown tool-call-task-container"
-                  ref={scrollHelpers?.registerContainer}
-                  onScroll={
-                    scrollHelpers ? (event) => scrollHelpers.handleScroll(event as Event & { currentTarget: HTMLDivElement }) : undefined
-                  }
-                >
-                  <div class="tool-call-task-summary">
-                    <For each={childToolKeys()}>
-                      {(key) => (
-                        <Show when={renderToolCall}>
-                          {(render) => (
-                            <TaskToolCallRow
-                              toolKey={key}
-                              store={store}
-                              sessionId={childSessionId()}
-                              renderToolCall={render()}
-                            />
-                          )}
-                        </Show>
-                      )}
-                    </For>
-                  </div>
-                  {scrollHelpers?.renderSentinel?.()}
+                <div class="tool-call-task-summary">
+                  <For each={items()}>
+                    {(item) => {
+                      const icon = getToolIcon(item.tool)
+                      const description = describeToolTitle(item)
+                      const toolLabel = getToolName(item.tool)
+                      const status = normalizeStatus(item.status ?? item.state?.status)
+                      const statusIcon = summarizeStatusIcon(status)
+                      const statusKey = summarizeStatusLabel(status)
+                      const statusLabel = statusKey
+                        ? t(`toolCall.status.${statusKey}`)
+                        : t("toolCall.status.unknown")
+                      const statusAttr = status ?? "pending"
+                      return (
+                        <div class="tool-call-task-item" data-task-id={item.id} data-task-status={statusAttr}>
+                          <span class="tool-call-task-icon">{icon}</span>
+                          <span class="tool-call-task-label">{toolLabel}</span>
+                          <span class="tool-call-task-separator" aria-hidden="true">—</span>
+                          <span class="tool-call-task-text">{description}</span>
+                          <Show when={statusIcon}>
+                            <span class="tool-call-task-status" aria-label={statusLabel} title={statusLabel}>
+                              {statusIcon}
+                            </span>
+                          </Show>
+                        </div>
+                      )
+                    }}
+                  </For>
                 </div>
-              </Show>
+                {scrollHelpers?.renderSentinel?.()}
+              </div>
             </div>
           </section>
         </Show>

packages/ui/src/components/tool-call/tool-title.ts

@@ -74,15 +74,12 @@ function createStaticContext(snapshot: TitleSnapshot): ToolRendererContext {
     toolCall: toolCallAccessor,
     toolState: toolStateAccessor,
     toolName: toolNameAccessor,
-    instanceId: "",
-    sessionId: "",
     t,
     messageVersion: messageVersionAccessor,
     partVersion: partVersionAccessor,
     renderMarkdown,
     renderAnsi,
     renderDiff,
-    renderToolCall: () => null,
     scrollHelpers: undefined,
   }
 }

packages/ui/src/components/tool-call/types.ts

@@ -53,26 +53,12 @@ export interface ToolRendererContext {
   toolCall: Accessor<ToolCallPart>
   toolState: Accessor<ToolState | undefined>
   toolName: Accessor<string>
-  instanceId: string
-  sessionId: string
   t: (key: string, params?: Record<string, unknown>) => string
   messageVersion?: Accessor<number | undefined>
   partVersion?: Accessor<number | undefined>
   renderMarkdown(options: MarkdownRenderOptions): JSXElement | null
   renderAnsi(options: AnsiRenderOptions): JSXElement | null
   renderDiff(payload: DiffPayload, options?: DiffRenderOptions): JSXElement | null
-  /**
-   * Render another tool call inline. This is provided by the ToolCall shell
-   * to avoid renderer-level imports that would create cyclic dependencies.
-   */
-  renderToolCall?: (options: {
-    toolCall: ToolCallPart
-    messageId?: string
-    messageVersion?: number
-    partVersion?: number
-    sessionId: string
-    forceCollapsed?: boolean
-  }) => JSXElement | null
   scrollHelpers?: ToolScrollHelpers
 }
 

packages/ui/src/components/unified-picker.tsx

@@ -103,7 +103,6 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
   let scrollContainerRef: HTMLDivElement | undefined
   let lastWorkspaceId: string | null = null
   let lastQuery = ""
-  let lastCommandQuery = ""
   let inflightWorkspaceId: string | null = null
   let inflightSnapshotPromise: Promise<FileItem[]> | null = null
   let activeRequestId = 0
@@ -244,7 +243,6 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
     setLoadingState("idle")
     lastWorkspaceId = null
     lastQuery = ""
-    lastCommandQuery = ""
     activeRequestId = 0
   }
 
@@ -275,6 +273,8 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
     }
   })
 
+
+
   createEffect(() => {
     if (!props.open) return
     if (mode() !== "mention") return
@@ -303,37 +303,6 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
     })
   })
 
-  createEffect(() => {
-    if (!props.open) return
-    if (mode() !== "command") return
-
-    const query = props.searchQuery
-    const count = filteredCommands().length
-
-    if (query !== lastCommandQuery) {
-      lastCommandQuery = query
-      setSelectedIndex(0)
-      resetScrollPosition()
-      return
-    }
-
-    if (count <= 0) {
-      if (selectedIndex() !== 0) {
-        setSelectedIndex(0)
-      }
-      return
-    }
-
-    const current = selectedIndex()
-    if (current < 0) {
-      setSelectedIndex(0)
-      return
-    }
-    if (current >= count) {
-      setSelectedIndex(count - 1)
-    }
-  })
-
   const allItems = (): PickerItem[] => {
     const items: PickerItem[] = []
     if (mode() === "command") {
@@ -366,24 +335,20 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
 
     if (e.key === "ArrowDown") {
       e.preventDefault()
-      e.stopPropagation()
       setSelectedIndex((prev) => Math.min(prev + 1, items.length - 1))
       scrollToSelected()
     } else if (e.key === "ArrowUp") {
       e.preventDefault()
-      e.stopPropagation()
       setSelectedIndex((prev) => Math.max(prev - 1, 0))
       scrollToSelected()
     } else if (e.key === "Enter" || e.key === "Tab") {
       e.preventDefault()
-      e.stopPropagation()
       const selected = items[selectedIndex()]
       if (selected) {
         handleSelect(selected)
       }
     } else if (e.key === "Escape") {
       e.preventDefault()
-      e.stopPropagation()
       props.onClose()
     }
   }
@@ -437,12 +402,12 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
           <Show when={mode() === "command" && commandCount() > 0}>
             <div class="dropdown-section-header">{t("unifiedPicker.sections.commands")}</div>
             <For each={filteredCommands()}>
-              {(command, index) => {
-                const isSelected = () => index() === selectedIndex()
+              {(command) => {
+                const itemIndex = allItems().findIndex((item) => item.type === "command" && item.command.name === command.name)
                 return (
                   <div
-                    class={`dropdown-item ${isSelected() ? "dropdown-item-highlight" : ""}`}
-                    data-picker-selected={isSelected()}
+                    class={`dropdown-item ${itemIndex === selectedIndex() ? "dropdown-item-highlight" : ""}`}
+                    data-picker-selected={itemIndex === selectedIndex()}
                     onClick={() => handleSelect({ type: "command", command })}
                   >
                     <div class="flex items-start gap-2">

packages/ui/src/components/worktree-selector.tsx

@@ -1,429 +0,0 @@
-import { Select } from "@kobalte/core/select"
-import { Dialog } from "@kobalte/core/dialog"
-import { For, Show, createMemo, createSignal } from "solid-js"
-import { ChevronDown, Copy, Trash2 } from "lucide-solid"
-import type { WorktreeDescriptor } from "../../../server/src/api-types"
-import { getLogger } from "../lib/logger"
-import { copyToClipboard } from "../lib/clipboard"
-import { showToastNotification } from "../lib/notifications"
-import {
-  createWorktree,
-  deleteWorktree,
-  getParentSessionId,
-  getGitRepoStatus,
-  getWorktreeSlugForParentSession,
-  getWorktrees,
-  reloadWorktreeMap,
-  reloadWorktrees,
-  setWorktreeSlugForParentSession,
-} from "../stores/worktrees"
-import { sessions } from "../stores/sessions"
-
-const log = getLogger("session")
-
-type WorktreeOption =
-  | { kind: "action"; key: "__create__"; label: string }
-  | { kind: "worktree"; key: string; slug: string; directory: string; raw: WorktreeDescriptor }
-
-const CREATE_OPTION: WorktreeOption = { kind: "action", key: "__create__", label: "+ Create worktree" }
-
-function preventSelectPress(event: PointerEvent | MouseEvent) {
-  // Prevent Select.Item from treating this as a selection.
-  // We intentionally prevent default to stop Kobalte's internal press handling.
-  event.preventDefault()
-  event.stopImmediatePropagation?.()
-  event.stopPropagation()
-}
-
-function normalizePath(input: string): string {
-  return (input ?? "").replace(/\\/g, "/").replace(/\/+$/, "")
-}
-
-function relativePath(fromDir: string, toDir: string): string {
-  const from = normalizePath(fromDir)
-  const to = normalizePath(toDir)
-  if (!from || !to) return to || from || ""
-  if (from === to) return "."
-
-  const fromParts = from.split("/").filter(Boolean)
-  const toParts = to.split("/").filter(Boolean)
-
-  let i = 0
-  while (i < fromParts.length && i < toParts.length) {
-    const a = fromParts[i]
-    const b = toParts[i]
-    if (!a || !b) break
-    if (a.toLowerCase() !== b.toLowerCase()) break
-    i++
-  }
-
-  const up = fromParts.length - i
-  const down = toParts.slice(i)
-  const relParts: string[] = []
-  for (let j = 0; j < up; j++) relParts.push("..")
-  relParts.push(...down)
-  return relParts.join("/") || "."
-}
-
-interface WorktreeSelectorProps {
-  instanceId: string
-  sessionId: string
-}
-
-export default function WorktreeSelector(props: WorktreeSelectorProps) {
-  const [isOpen, setIsOpen] = createSignal(false)
-  const [createOpen, setCreateOpen] = createSignal(false)
-  const [createSlug, setCreateSlug] = createSignal("")
-  const [isCreating, setIsCreating] = createSignal(false)
-
-  const [deleteOpen, setDeleteOpen] = createSignal(false)
-  const [deleteTarget, setDeleteTarget] = createSignal<WorktreeOption & { kind: "worktree" } | null>(null)
-  const [forceDelete, setForceDelete] = createSignal(false)
-  const [isDeleting, setIsDeleting] = createSignal(false)
-
-  const session = createMemo(() => sessions().get(props.instanceId)?.get(props.sessionId))
-  const isChildSession = createMemo(() => Boolean(session()?.parentId))
-  const parentId = createMemo(() => getParentSessionId(props.instanceId, props.sessionId))
-  const currentSlug = createMemo(() => getWorktreeSlugForParentSession(props.instanceId, parentId()))
-
-  const gitRepoStatus = createMemo(() => getGitRepoStatus(props.instanceId))
-  const worktreesUnavailable = createMemo(() => gitRepoStatus() === false)
-  const dropdownDisabled = createMemo(() => isChildSession() || worktreesUnavailable())
-
-  const worktreeOptions = createMemo<WorktreeOption[]>(() => {
-    const list = getWorktrees(props.instanceId)
-    const mapped: WorktreeOption[] = list.map((wt) => ({
-      kind: "worktree",
-      key: wt.slug,
-      slug: wt.slug,
-      directory: wt.directory,
-      raw: wt,
-    }))
-    return [CREATE_OPTION, ...mapped]
-  })
-
-  const selectedOption = createMemo<WorktreeOption | undefined>(() => {
-    const slug = currentSlug()
-    const match = worktreeOptions().find((opt) => opt.kind === "worktree" && opt.slug === slug)
-    if (match) return match
-    // Fallback to root if mapped slug is missing.
-    return worktreeOptions().find((opt) => opt.kind === "worktree" && opt.slug === "root")
-  })
-
-  const openDeleteDialog = (opt: WorktreeOption & { kind: "worktree" }) => {
-    if (opt.slug === "root") return
-    setForceDelete(false)
-    setDeleteTarget(opt)
-    setDeleteOpen(true)
-  }
-
-  const repoRoot = createMemo(() => {
-    const list = getWorktrees(props.instanceId)
-    return list.find((wt) => wt.slug === "root")?.directory ?? ""
-  })
-
-  const displayPathFor = (directory: string) => {
-    const base = repoRoot()
-    if (!base) return directory
-    return relativePath(base, directory)
-  }
-
-  const handleCopyPath = async (directory: string) => {
-    try {
-      const ok = await copyToClipboard(directory)
-      showToastNotification({ message: ok ? "Copied worktree path" : "Failed to copy path", variant: ok ? "success" : "error" })
-    } catch (error) {
-      log.error("Failed to copy worktree path", error)
-      showToastNotification({ message: "Failed to copy path", variant: "error" })
-    }
-  }
-
-  const handleChange = async (value: WorktreeOption | null) => {
-    if (worktreesUnavailable()) return
-    if (!value) return
-    if (value.kind === "action") {
-      setIsOpen(false)
-      setCreateSlug("")
-      setCreateOpen(true)
-      return
-    }
-    await setWorktreeSlugForParentSession(props.instanceId, parentId(), value.slug)
-  }
-
-  return (
-    <div class="sidebar-selector">
-      <Select<WorktreeOption>
-        open={isOpen()}
-        onOpenChange={setIsOpen}
-        value={selectedOption() ?? null}
-        onChange={(value) => {
-          void handleChange(value).catch((error) => log.warn("Failed to change worktree", error))
-        }}
-        options={worktreeOptions()}
-        optionValue="key"
-        optionTextValue={(opt) => (opt.kind === "action" ? opt.label : opt.slug)}
-        placeholder="Worktree"
-        disabled={dropdownDisabled()}
-        itemComponent={(itemProps) => {
-          const opt = itemProps.item.rawValue
-          if (opt.kind === "action") {
-            return (
-              <Select.Item item={itemProps.item} class="selector-option worktree-selector-item">
-                <div class="selector-option-content w-full">
-                  <Select.ItemLabel class="selector-option-label">{opt.label}</Select.ItemLabel>
-                  <Select.ItemDescription class="selector-option-description">New from current branch</Select.ItemDescription>
-                </div>
-              </Select.Item>
-            )
-          }
-
-          return (
-            <Select.Item item={itemProps.item} class="selector-option worktree-selector-item">
-              <div class="flex flex-col gap-1 flex-1 min-w-0">
-                <div class="flex items-center gap-2">
-                  <Select.ItemLabel class="selector-option-label flex-1 min-w-0 truncate">
-                    {opt.slug === "root" ? "Workspace" : opt.slug}
-                  </Select.ItemLabel>
-                  <Show when={opt.slug !== "root"}>
-                    <button
-                      type="button"
-                      class="session-item-close opacity-80 hover:opacity-100 hover:bg-surface-hover"
-                      aria-label="Delete worktree"
-                      title="Delete worktree"
-                      onPointerDown={(event) => {
-                        preventSelectPress(event)
-                        setIsOpen(false)
-                        openDeleteDialog(opt)
-                      }}
-                      onPointerUp={preventSelectPress}
-                      onMouseDown={preventSelectPress}
-                      onMouseUp={preventSelectPress}
-                      onClick={preventSelectPress}
-                    >
-                      <Trash2 class="w-3 h-3" />
-                    </button>
-                  </Show>
-                </div>
-                <div class="flex items-center gap-2 min-w-0">
-                  <span
-                    class="selector-option-description flex-1 min-w-0 truncate font-mono"
-                    title={opt.directory}
-                  >
-                    {displayPathFor(opt.directory)}
-                  </span>
-                  <button
-                    type="button"
-                    class="session-item-close opacity-80 hover:opacity-100 hover:bg-surface-hover"
-                    aria-label="Copy path"
-                    title="Copy path"
-                    onPointerDown={(event) => {
-                      preventSelectPress(event)
-                      void (async () => {
-                        await handleCopyPath(opt.directory)
-                        setIsOpen(false)
-                      })()
-                    }}
-                    onPointerUp={preventSelectPress}
-                    onMouseDown={preventSelectPress}
-                    onMouseUp={preventSelectPress}
-                    onClick={preventSelectPress}
-                  >
-                    <Copy class="w-3 h-3" />
-                  </button>
-                </div>
-              </div>
-            </Select.Item>
-          )
-        }}
-      >
-        <Select.Trigger class="selector-trigger">
-          <div class="flex-1 min-w-0">
-            <Select.Value<WorktreeOption>>
-              {(state) => {
-                if (worktreesUnavailable()) {
-                  return (
-                    <div class="selector-trigger-label selector-trigger-label--stacked">
-                      <span class="selector-trigger-primary selector-trigger-primary--align-left">Worktree: Unavailable</span>
-                    </div>
-                  )
-                }
-
-                const value = state.selectedOption()
-                const label = value && value.kind === "worktree" ? (value.slug === "root" ? "Workspace" : value.slug) : "Workspace"
-                return (
-                  <div class="selector-trigger-label selector-trigger-label--stacked">
-                    <span class="selector-trigger-primary selector-trigger-primary--align-left">Worktree: {label}</span>
-                  </div>
-                )
-              }}
-            </Select.Value>
-          </div>
-          <Select.Icon class="selector-trigger-icon">
-            <ChevronDown class="w-3 h-3" />
-          </Select.Icon>
-        </Select.Trigger>
-
-        <Select.Portal>
-          <Select.Content class="selector-popover max-h-80 overflow-auto p-1">
-            <Select.Listbox class="selector-listbox" />
-          </Select.Content>
-        </Select.Portal>
-      </Select>
-
-      <Dialog open={createOpen()} onOpenChange={(open) => !open && setCreateOpen(false)}>
-        <Dialog.Portal>
-          <Dialog.Overlay class="modal-overlay" />
-          <div class="fixed inset-0 z-50 flex items-center justify-center p-4">
-            <Dialog.Content class="modal-surface w-full max-w-md p-6 flex flex-col gap-5">
-              <div>
-                <Dialog.Title class="text-xl font-semibold text-primary">Create worktree</Dialog.Title>
-                <Dialog.Description class="text-sm text-secondary mt-2">Creates a git worktree</Dialog.Description>
-              </div>
-
-              <div class="space-y-2">
-                <label class="text-xs font-medium text-muted uppercase tracking-wide">Name</label>
-                <input
-                  class="form-input w-full"
-                  value={createSlug()}
-                  onInput={(e) => setCreateSlug(e.currentTarget.value)}
-                  placeholder="worktree-name"
-                  disabled={isCreating()}
-                  spellcheck={false}
-                  autocapitalize="off"
-                  autocomplete="off"
-                />
-              </div>
-
-              <div class="flex justify-end gap-2">
-                <button
-                  type="button"
-                  class="selector-button selector-button-secondary"
-                  onClick={() => setCreateOpen(false)}
-                  disabled={isCreating()}
-                >
-                  Cancel
-                </button>
-                <button
-                  type="button"
-                  class="selector-button selector-button-primary"
-                  disabled={
-                    isCreating() ||
-                    !createSlug().trim() ||
-                    createSlug().trim() === "root" ||
-                    /[\x00-\x1F\x7F]/.test(createSlug())
-                  }
-                  onClick={() => {
-                    const slug = createSlug().trim()
-                    void (async () => {
-                      setIsCreating(true)
-                      await createWorktree(props.instanceId, slug)
-                      await reloadWorktrees(props.instanceId)
-                      await setWorktreeSlugForParentSession(props.instanceId, parentId(), slug)
-                      setCreateOpen(false)
-                      showToastNotification({ message: `Created worktree ${slug}`, variant: "success" })
-                    })()
-                      .catch((error) => {
-                        log.warn("Failed to create worktree", error)
-                        showToastNotification({
-                          message: error instanceof Error ? error.message : "Failed to create worktree",
-                          variant: "error",
-                        })
-                      })
-                      .finally(() => {
-                        setIsCreating(false)
-                      })
-                  }}
-                >
-                  {isCreating() ? "Creating..." : "Create"}
-                </button>
-              </div>
-            </Dialog.Content>
-          </div>
-        </Dialog.Portal>
-      </Dialog>
-
-      <Dialog open={deleteOpen()} onOpenChange={(open) => !open && setDeleteOpen(false)}>
-        <Dialog.Portal>
-          <Dialog.Overlay class="modal-overlay" />
-          <div class="fixed inset-0 z-50 flex items-center justify-center p-4">
-            <Dialog.Content class="modal-surface w-full max-w-md p-6 flex flex-col gap-5">
-              <div>
-                <Dialog.Title class="text-xl font-semibold text-primary">Delete worktree</Dialog.Title>
-                <Dialog.Description class="text-sm text-secondary mt-2">Removes the git worktree checkout directory for this branch.</Dialog.Description>
-              </div>
-
-              <Show when={deleteTarget()}>
-                {(target) => (
-                  <div class="rounded-lg border border-base bg-surface-secondary p-4">
-                    <p class="text-xs font-medium text-muted uppercase tracking-wide mb-1">Worktree</p>
-                    <p class="text-sm font-mono text-primary break-all">{target().slug}</p>
-                    <p class="text-[11px] text-secondary mt-2 break-all font-mono">{target().directory}</p>
-                  </div>
-                )}
-              </Show>
-
-              <label class="flex items-center gap-2 text-sm text-secondary">
-                <input
-                  type="checkbox"
-                  checked={forceDelete()}
-                  onChange={(e) => setForceDelete(e.currentTarget.checked)}
-                  disabled={isDeleting()}
-                />
-                Force delete (discard local changes)
-              </label>
-
-              <div class="flex justify-end gap-2">
-                <button
-                  type="button"
-                  class="selector-button selector-button-secondary"
-                  onClick={() => setDeleteOpen(false)}
-                  disabled={isDeleting()}
-                >
-                  Cancel
-                </button>
-                <button
-                  type="button"
-                  class="selector-button selector-button-primary"
-                  disabled={isDeleting() || !deleteTarget()}
-                  onClick={() => {
-                    const target = deleteTarget()
-                    if (!target) {
-                      setDeleteOpen(false)
-                      return
-                    }
-
-                    void (async () => {
-                      setIsDeleting(true)
-                      await deleteWorktree(props.instanceId, target.slug, { force: forceDelete() })
-                      await reloadWorktrees(props.instanceId)
-                      await reloadWorktreeMap(props.instanceId)
-
-                      if (currentSlug() === target.slug) {
-                        await setWorktreeSlugForParentSession(props.instanceId, parentId(), "root")
-                      }
-
-                      setDeleteOpen(false)
-                      showToastNotification({ message: `Deleted worktree ${target.slug}`, variant: "success" })
-                    })()
-                      .catch((error) => {
-                        log.warn("Failed to delete worktree", error)
-                        showToastNotification({
-                          message: error instanceof Error ? error.message : "Failed to delete worktree",
-                          variant: "error",
-                        })
-                      })
-                      .finally(() => {
-                        setIsDeleting(false)
-                      })
-                  }}
-                >
-                  {isDeleting() ? "Deleting..." : "Delete"}
-                </button>
-              </div>
-            </Dialog.Content>
-          </div>
-        </Dialog.Portal>
-      </Dialog>
-    </div>
-  )
-}

packages/ui/src/lib/api-client.ts

@@ -20,14 +20,12 @@ import type {
   WorkspaceLogEntry,
   WorkspaceEventPayload,
   WorkspaceEventType,
-  WorktreeListResponse,
-  WorktreeMap,
-  WorktreeCreateRequest,
 } from "../../../server/src/api-types"
 import { getLogger } from "./logger"
 
+const FALLBACK_API_BASE = "http://127.0.0.1:9898"
 const RUNTIME_BASE = typeof window !== "undefined" ? window.location?.origin : undefined
-const DEFAULT_BASE = typeof window !== "undefined" ? window.__CODENOMAD_API_BASE__ ?? RUNTIME_BASE : undefined
+const DEFAULT_BASE = typeof window !== "undefined" ? window.__CODENOMAD_API_BASE__ ?? RUNTIME_BASE ?? FALLBACK_API_BASE : FALLBACK_API_BASE
 const DEFAULT_EVENTS_PATH = typeof window !== "undefined" ? window.__CODENOMAD_EVENTS_URL__ ?? "/api/events" : "/api/events"
 const API_BASE = import.meta.env.VITE_CODENOMAD_API_BASE ?? DEFAULT_BASE
 const EVENTS_URL = buildEventsUrl(API_BASE, DEFAULT_EVENTS_PATH)
@@ -129,39 +127,6 @@ export const serverApi = {
   fetchWorkspaces(): Promise<WorkspaceDescriptor[]> {
     return request<WorkspaceDescriptor[]>("/api/workspaces")
   },
-
-  fetchWorktrees(id: string): Promise<WorktreeListResponse> {
-    return request<WorktreeListResponse>(`/api/workspaces/${encodeURIComponent(id)}/worktrees`)
-  },
-
-  createWorktree(id: string, payload: WorktreeCreateRequest): Promise<{ slug: string; directory: string; branch?: string }> {
-    return request<{ slug: string; directory: string; branch?: string }>(`/api/workspaces/${encodeURIComponent(id)}/worktrees`, {
-      method: "POST",
-      body: JSON.stringify(payload),
-    })
-  },
-
-  deleteWorktree(id: string, slug: string, options?: { force?: boolean }): Promise<void> {
-    const params = new URLSearchParams()
-    if (options?.force) {
-      params.set("force", "true")
-    }
-    const suffix = params.toString() ? `?${params.toString()}` : ""
-    return request(`/api/workspaces/${encodeURIComponent(id)}/worktrees/${encodeURIComponent(slug)}${suffix}`, {
-      method: "DELETE",
-    })
-  },
-
-  readWorktreeMap(id: string): Promise<WorktreeMap> {
-    return request<WorktreeMap>(`/api/workspaces/${encodeURIComponent(id)}/worktrees/map`)
-  },
-
-  writeWorktreeMap(id: string, map: WorktreeMap): Promise<void> {
-    return request(`/api/workspaces/${encodeURIComponent(id)}/worktrees/map`, {
-      method: "PUT",
-      body: JSON.stringify(map),
-    })
-  },
   createWorkspace(payload: WorkspaceCreateRequest): Promise<WorkspaceDescriptor> {
     return request<WorkspaceDescriptor>("/api/workspaces", {
       method: "POST",

packages/ui/src/lib/hooks/use-commands.ts

@@ -31,7 +31,6 @@ export interface UseCommandsOptions {
   toggleShowTimelineTools: () => void
   toggleUsageMetrics: () => void
   toggleAutoCleanupBlankSessions: () => void
-  togglePromptSubmitOnEnter: () => void
   setDiffViewMode: (mode: "split" | "unified") => void
   setToolOutputExpansion: (mode: ExpansionPreference) => void
   setDiagnosticsExpansion: (mode: ExpansionPreference) => void
@@ -424,18 +423,6 @@ export function useCommands(options: UseCommandsOptions) {
       },
     })
 
-    commandRegistry.register({
-      id: "prompt-submit-shortcut",
-      label: () =>
-        options.preferences().promptSubmitOnEnter
-          ? tGlobal("commands.promptSubmitShortcut.label.swapped")
-          : tGlobal("commands.promptSubmitShortcut.label.default"),
-      description: () => tGlobal("commands.promptSubmitShortcut.description"),
-      category: "Input & Focus",
-      keywords: () => splitKeywords("commands.promptSubmitShortcut.keywords"),
-      action: options.togglePromptSubmitOnEnter,
-    })
-
     commandRegistry.register({
       id: "thinking",
       label: () => tGlobal(options.preferences().showThinkingBlocks ? "commands.thinkingBlocks.label.hide" : "commands.thinkingBlocks.label.show"),

packages/ui/src/lib/i18n/messages/en/app.ts

@@ -29,10 +29,4 @@ export const appMessages = {
 
   "releases.uiUpdated.title": "UI updated",
   "releases.uiUpdated.message": "UI is now updated to {version}.",
-
-  "theme.mode.system": "System",
-  "theme.mode.light": "Light",
-  "theme.mode.dark": "Dark",
-  "theme.toggle.title": "Theme: {mode}",
-  "theme.toggle.ariaLabel": "Theme: {mode}",
 } as const

packages/ui/src/lib/i18n/messages/en/commands.ts

@@ -82,14 +82,9 @@ export const commandMessages = {
   "commands.clearInput.description": "Clear the prompt textarea",
   "commands.clearInput.keywords": "clear, reset",
 
-  "commands.promptSubmitShortcut.label.default": "Enter: New Line, Cmd/Ctrl+Enter: Submit Prompt",
-  "commands.promptSubmitShortcut.label.swapped": "Enter: Submit Prompt, Cmd/Ctrl+Enter: New Line",
-  "commands.promptSubmitShortcut.description": "Swap Enter and Cmd/Ctrl+Enter behavior in the prompt input",
-  "commands.promptSubmitShortcut.keywords": "enter, cmd, ctrl, submit, send, newline, shortcut, keybind, prompt",
-
-  "commands.thinkingBlocks.label.show": "Show Thinking",
-  "commands.thinkingBlocks.label.hide": "Hide Thinking",
-  "commands.thinkingBlocks.description": "Show or hide AI thinking sections",
+  "commands.thinkingBlocks.label.show": "Show Thinking Blocks",
+  "commands.thinkingBlocks.label.hide": "Hide Thinking Blocks",
+  "commands.thinkingBlocks.description": "Show/hide AI thinking process",
   "commands.thinkingBlocks.keywords": "thinking, reasoning, toggle, show, hide",
 
   "commands.timelineToolCalls.label.show": "Show Timeline Tool Calls",
@@ -104,8 +99,8 @@ export const commandMessages = {
   "commands.common.enabled": "Enabled",
   "commands.common.disabled": "Disabled",
 
-  "commands.thinkingBlocksDefault.label": "Thinking View: {state}",
-  "commands.thinkingBlocksDefault.description": "Collapse / Expand AI thinking sections when shown",
+  "commands.thinkingBlocksDefault.label": "Thinking Blocks Default · {state}",
+  "commands.thinkingBlocksDefault.description": "Toggle whether thinking blocks start expanded",
   "commands.thinkingBlocksDefault.keywords": "thinking, reasoning, expand, collapse, default",
 
   "commands.diffViewSplit.label": "Use Split Diff View",

packages/ui/src/lib/i18n/messages/en/messaging.ts

@@ -20,9 +20,6 @@ export const messagingMessages = {
   "messageSection.scroll.toLatestAriaLabel": "Scroll to latest message",
   "messageSection.quote.addAsQuote": "Add as quote",
   "messageSection.quote.addAsCode": "Add as code",
-  "messageSection.quote.copy": "Copy",
-  "messageSection.quote.copied": "Copied!",
-  "messageSection.quote.copyFailed": "Copy failed",
 
   "messageTimeline.ariaLabel": "Message timeline",
   "messageTimeline.segment.user.label": "You",
@@ -41,11 +38,6 @@ export const messagingMessages = {
   "messageBlock.tool.goToSession.label": "Go to Session",
   "messageBlock.tool.goToSession.title": "Go to session",
   "messageBlock.tool.goToSession.unavailableTitle": "Session not available yet",
-  "messageBlock.tool.deletePart.label": "Delete",
-  "messageBlock.tool.deletePart.deleting": "Deleting...",
-  "messageBlock.tool.deletePart.title": "Delete this tool call output",
-  "messageBlock.tool.deletePart.failed.title": "Delete failed",
-  "messageBlock.tool.deletePart.failed.message": "Failed to delete tool call output",
 
   "messageBlock.compaction.ariaLabel": "Session compaction",
   "messageBlock.compaction.autoLabel": "Session auto-compacted",
@@ -81,11 +73,6 @@ export const messagingMessages = {
   "messageItem.status.generating": "Generating...",
   "messageItem.status.sending": "Sending...",
   "messageItem.status.failedToSend": "Message failed to send",
-  "messagePart.actions.delete": "Delete",
-  "messagePart.actions.deleting": "Deleting...",
-  "messagePart.actions.deleteTitle": "Delete this item",
-  "messagePart.actions.deleteFailedTitle": "Delete failed",
-  "messagePart.actions.deleteFailedMessage": "Failed to delete item",
   "messageItem.attachment.defaultName": "attachment",
   "messageItem.attachment.downloadAriaLabel": "Download {name}",
   "messageItem.agentMeta.agentLabel": "Agent: {agent}",

packages/ui/src/lib/i18n/messages/en/session.ts

@@ -30,27 +30,8 @@ export const sessionMessages = {
   "sessionList.copyId.success": "Session ID copied",
   "sessionList.copyId.error": "Unable to copy session ID",
   "sessionList.delete.error": "Unable to delete session",
-  "sessionList.delete.title": "Delete session",
-  "sessionList.delete.confirmMessage": "Delete \"{label}\"? This cannot be undone.",
-  "sessionList.delete.confirmLabel": "Delete",
-  "sessionList.delete.cancelLabel": "Cancel",
   "sessionList.rename.error": "Unable to rename session",
 
-  "sessionList.filter.placeholder": "Search sessions…",
-  "sessionList.filter.ariaLabel": "Search sessions",
-  "sessionList.selection.selectAllLabel": "Select all",
-  "sessionList.selection.selectAllAriaLabel": "Select all sessions",
-  "sessionList.selection.clearLabel": "Clear",
-  "sessionList.selection.clearAriaLabel": "Clear selection",
-  "sessionList.selection.checkboxAriaLabel": "Select session",
-  "sessionList.bulkDelete.button": "Delete {count}",
-  "sessionList.bulkDelete.ariaLabel": "Delete {count} selected sessions",
-  "sessionList.bulkDelete.title": "Delete sessions",
-  "sessionList.bulkDelete.confirmMessage": "Delete {count} selected sessions? This cannot be undone.",
-  "sessionList.bulkDelete.confirmLabel": "Delete",
-  "sessionList.bulkDelete.cancelLabel": "Cancel",
-  "sessionList.bulkDelete.error": "Unable to delete {count} sessions",
-
   "sessionRenameDialog.title": "Rename Session",
   "sessionRenameDialog.description.withLabel": "Update the title for \"{label}\".",
   "sessionRenameDialog.description.default": "Set a new title for this session.",

packages/ui/src/lib/i18n/messages/en/toolCall.ts

@@ -2,9 +2,6 @@ export const toolCallMessages = {
   "toolCall.pending.waitingToRun": "Waiting to run...",
   "toolCall.error.label": "Error:",
 
-  "toolCall.header.copyTitle": "Copy tool call title",
-  "toolCall.header.copyAriaLabel": "Copy tool call title",
-
   "toolCall.diff.label": "Diff",
   "toolCall.diff.label.withPath": "Diff · {path}",
   "toolCall.diff.viewMode.ariaLabel": "Diff view mode",

packages/ui/src/lib/i18n/messages/es/commands.ts

@@ -82,14 +82,9 @@ export const commandMessages = {
   "commands.clearInput.description": "Borrar el área de texto del prompt",
   "commands.clearInput.keywords": "limpiar, reiniciar",
 
-  "commands.promptSubmitShortcut.label.default": "Enter: Nueva linea, Cmd/Ctrl+Enter: Enviar prompt",
-  "commands.promptSubmitShortcut.label.swapped": "Enter: Enviar prompt, Cmd/Ctrl+Enter: Nueva linea",
-  "commands.promptSubmitShortcut.description": "Intercambiar el comportamiento de Enter y Cmd/Ctrl+Enter en la entrada de prompt",
-  "commands.promptSubmitShortcut.keywords": "enter, enviar, salto de linea, atajo, teclado, cmd, ctrl, prompt",
-
-  "commands.thinkingBlocks.label.show": "Mostrar pensamiento",
-  "commands.thinkingBlocks.label.hide": "Ocultar pensamiento",
-  "commands.thinkingBlocks.description": "Mostrar u ocultar secciones de pensamiento de IA",
+  "commands.thinkingBlocks.label.show": "Mostrar bloques de pensamiento",
+  "commands.thinkingBlocks.label.hide": "Ocultar bloques de pensamiento",
+  "commands.thinkingBlocks.description": "Mostrar/ocultar el proceso de pensamiento de la IA",
   "commands.thinkingBlocks.keywords": "pensamiento, razonamiento, alternar, mostrar, ocultar",
 
   "commands.timelineToolCalls.label.show": "Mostrar llamadas de herramienta en la línea de tiempo",
@@ -104,8 +99,8 @@ export const commandMessages = {
   "commands.common.enabled": "Activado",
   "commands.common.disabled": "Desactivado",
 
-  "commands.thinkingBlocksDefault.label": "Vista de pensamiento: {state}",
-  "commands.thinkingBlocksDefault.description": "Contraer / Expandir secciones de pensamiento de IA cuando se muestran",
+  "commands.thinkingBlocksDefault.label": "Bloques de pensamiento por defecto · {state}",
+  "commands.thinkingBlocksDefault.description": "Alternar si los bloques de pensamiento empiezan expandidos",
   "commands.thinkingBlocksDefault.keywords": "pensamiento, razonamiento, expandir, colapsar, por defecto",
 
   "commands.diffViewSplit.label": "Usar vista de diff dividida",

packages/ui/src/lib/i18n/messages/es/messaging.ts

@@ -20,9 +20,6 @@ export const messagingMessages = {
   "messageSection.scroll.toLatestAriaLabel": "Desplazarse al último mensaje",
   "messageSection.quote.addAsQuote": "Añadir como cita",
   "messageSection.quote.addAsCode": "Añadir como código",
-  "messageSection.quote.copy": "Copiar",
-  "messageSection.quote.copied": "¡Copiado!",
-  "messageSection.quote.copyFailed": "No se pudo copiar",
 
   "messageTimeline.ariaLabel": "Línea de tiempo de mensajes",
   "messageTimeline.segment.user.label": "Tú",
@@ -41,11 +38,6 @@ export const messagingMessages = {
   "messageBlock.tool.goToSession.label": "Ir a sesión",
   "messageBlock.tool.goToSession.title": "Ir a la sesión",
   "messageBlock.tool.goToSession.unavailableTitle": "La sesión aún no está disponible",
-  "messageBlock.tool.deletePart.label": "Eliminar",
-  "messageBlock.tool.deletePart.deleting": "Eliminando...",
-  "messageBlock.tool.deletePart.title": "Eliminar esta salida de herramienta",
-  "messageBlock.tool.deletePart.failed.title": "Error al eliminar",
-  "messageBlock.tool.deletePart.failed.message": "No se pudo eliminar la salida de herramienta",
 
   "messageBlock.compaction.ariaLabel": "Compactación de sesión",
   "messageBlock.compaction.autoLabel": "Sesión compactada automáticamente",
@@ -81,11 +73,6 @@ export const messagingMessages = {
   "messageItem.status.generating": "Generando...",
   "messageItem.status.sending": "Enviando...",
   "messageItem.status.failedToSend": "No se pudo enviar el mensaje",
-  "messagePart.actions.delete": "Eliminar",
-  "messagePart.actions.deleting": "Eliminando...",
-  "messagePart.actions.deleteTitle": "Eliminar este elemento",
-  "messagePart.actions.deleteFailedTitle": "Error al eliminar",
-  "messagePart.actions.deleteFailedMessage": "No se pudo eliminar el elemento",
   "messageItem.attachment.defaultName": "adjunto",
   "messageItem.attachment.downloadAriaLabel": "Descargar {name}",
   "messageItem.agentMeta.agentLabel": "Agente: {agent}",

packages/ui/src/lib/i18n/messages/es/session.ts

@@ -30,27 +30,8 @@ export const sessionMessages = {
   "sessionList.copyId.success": "ID de sesión copiado",
   "sessionList.copyId.error": "No se pudo copiar el ID de sesión",
   "sessionList.delete.error": "No se pudo eliminar la sesión",
-  "sessionList.delete.title": "Eliminar sesión",
-  "sessionList.delete.confirmMessage": "¿Eliminar \"{label}\"? Esto no se puede deshacer.",
-  "sessionList.delete.confirmLabel": "Eliminar",
-  "sessionList.delete.cancelLabel": "Cancelar",
   "sessionList.rename.error": "No se pudo renombrar la sesión",
 
-  "sessionList.filter.placeholder": "Buscar sesiones…",
-  "sessionList.filter.ariaLabel": "Buscar sesiones",
-  "sessionList.selection.selectAllLabel": "Seleccionar todo",
-  "sessionList.selection.selectAllAriaLabel": "Seleccionar todas las sesiones",
-  "sessionList.selection.clearLabel": "Limpiar",
-  "sessionList.selection.clearAriaLabel": "Limpiar selección",
-  "sessionList.selection.checkboxAriaLabel": "Seleccionar sesión",
-  "sessionList.bulkDelete.button": "Eliminar {count}",
-  "sessionList.bulkDelete.ariaLabel": "Eliminar {count} sesiones seleccionadas",
-  "sessionList.bulkDelete.title": "Eliminar sesiones",
-  "sessionList.bulkDelete.confirmMessage": "¿Eliminar {count} sesiones seleccionadas? Esto no se puede deshacer.",
-  "sessionList.bulkDelete.confirmLabel": "Eliminar",
-  "sessionList.bulkDelete.cancelLabel": "Cancelar",
-  "sessionList.bulkDelete.error": "No se pudieron eliminar {count} sesiones",
-
   "sessionRenameDialog.title": "Renombrar sesión",
   "sessionRenameDialog.description.withLabel": "Actualiza el título de \"{label}\".",
   "sessionRenameDialog.description.default": "Establece un nuevo título para esta sesión.",

packages/ui/src/lib/i18n/messages/es/toolCall.ts

@@ -2,9 +2,6 @@ export const toolCallMessages = {
   "toolCall.pending.waitingToRun": "Esperando para ejecutar...",
   "toolCall.error.label": "Error:",
 
-  "toolCall.header.copyTitle": "Copy tool call title",
-  "toolCall.header.copyAriaLabel": "Copy tool call title",
-
   "toolCall.diff.label": "Diff",
   "toolCall.diff.label.withPath": "Diff · {path}",
   "toolCall.diff.viewMode.ariaLabel": "Modo de vista de diff",

packages/ui/src/lib/i18n/messages/fr/commands.ts

@@ -82,14 +82,9 @@ export const commandMessages = {
   "commands.clearInput.description": "Effacer la zone de texte du prompt",
   "commands.clearInput.keywords": "effacer, réinitialiser, prompt",
 
-  "commands.promptSubmitShortcut.label.default": "Entree: Nouvelle ligne, Cmd/Ctrl+Entree: Envoyer le prompt",
-  "commands.promptSubmitShortcut.label.swapped": "Entree: Envoyer le prompt, Cmd/Ctrl+Entree: Nouvelle ligne",
-  "commands.promptSubmitShortcut.description": "Echanger le comportement de Entree et Cmd/Ctrl+Entree dans la saisie du prompt",
-  "commands.promptSubmitShortcut.keywords": "entree, envoyer, nouvelle ligne, raccourci, cmd, ctrl, prompt",
-
-  "commands.thinkingBlocks.label.show": "Afficher la réflexion",
-  "commands.thinkingBlocks.label.hide": "Masquer la réflexion",
-  "commands.thinkingBlocks.description": "Afficher ou masquer les sections de réflexion de l'IA",
+  "commands.thinkingBlocks.label.show": "Afficher les blocs de réflexion",
+  "commands.thinkingBlocks.label.hide": "Masquer les blocs de réflexion",
+  "commands.thinkingBlocks.description": "Afficher/masquer le processus de réflexion de l'IA",
   "commands.thinkingBlocks.keywords": "réflexion, raisonnement, basculer, afficher, masquer",
 
   "commands.timelineToolCalls.label.show": "Afficher les appels d'outil dans la timeline",
@@ -104,8 +99,8 @@ export const commandMessages = {
   "commands.common.enabled": "Activé",
   "commands.common.disabled": "Désactivé",
 
-  "commands.thinkingBlocksDefault.label": "Vue de la réflexion: {state}",
-  "commands.thinkingBlocksDefault.description": "Réduire / Développer les sections de réflexion de l'IA lorsqu'elles sont affichées",
+  "commands.thinkingBlocksDefault.label": "Blocs de réflexion par défaut · {state}",
+  "commands.thinkingBlocksDefault.description": "Choisir si les blocs de réflexion démarrent développés",
   "commands.thinkingBlocksDefault.keywords": "réflexion, raisonnement, développer, réduire, défaut",
 
   "commands.diffViewSplit.label": "Utiliser la vue diff côte à côte",

packages/ui/src/lib/i18n/messages/fr/messaging.ts

@@ -20,9 +20,6 @@ export const messagingMessages = {
   "messageSection.scroll.toLatestAriaLabel": "Aller au dernier message",
   "messageSection.quote.addAsQuote": "Ajouter en citation",
   "messageSection.quote.addAsCode": "Ajouter en code",
-  "messageSection.quote.copy": "Copier",
-  "messageSection.quote.copied": "Copié !",
-  "messageSection.quote.copyFailed": "Impossible de copier",
 
   "messageTimeline.ariaLabel": "Chronologie des messages",
   "messageTimeline.segment.user.label": "Vous",
@@ -41,11 +38,6 @@ export const messagingMessages = {
   "messageBlock.tool.goToSession.label": "Aller à la session",
   "messageBlock.tool.goToSession.title": "Aller à la session",
   "messageBlock.tool.goToSession.unavailableTitle": "Session pas encore disponible",
-  "messageBlock.tool.deletePart.label": "Supprimer",
-  "messageBlock.tool.deletePart.deleting": "Suppression...",
-  "messageBlock.tool.deletePart.title": "Supprimer cette sortie d'outil",
-  "messageBlock.tool.deletePart.failed.title": "Échec de suppression",
-  "messageBlock.tool.deletePart.failed.message": "Impossible de supprimer la sortie d'outil",
 
   "messageBlock.compaction.ariaLabel": "Compaction de la session",
   "messageBlock.compaction.autoLabel": "Session compactée automatiquement",
@@ -81,11 +73,6 @@ export const messagingMessages = {
   "messageItem.status.generating": "Génération...",
   "messageItem.status.sending": "Envoi...",
   "messageItem.status.failedToSend": "Échec de l'envoi du message",
-  "messagePart.actions.delete": "Supprimer",
-  "messagePart.actions.deleting": "Suppression...",
-  "messagePart.actions.deleteTitle": "Supprimer cet élément",
-  "messagePart.actions.deleteFailedTitle": "Échec de suppression",
-  "messagePart.actions.deleteFailedMessage": "Impossible de supprimer l'élément",
   "messageItem.attachment.defaultName": "piece-jointe",
   "messageItem.attachment.downloadAriaLabel": "Télécharger {name}",
   "messageItem.agentMeta.agentLabel": "Agent : {agent}",

packages/ui/src/lib/i18n/messages/fr/session.ts

@@ -30,27 +30,8 @@ export const sessionMessages = {
   "sessionList.copyId.success": "ID de session copié",
   "sessionList.copyId.error": "Impossible de copier l'ID de session",
   "sessionList.delete.error": "Impossible de supprimer la session",
-  "sessionList.delete.title": "Supprimer la session",
-  "sessionList.delete.confirmMessage": "Supprimer \"{label}\" ? Cette action est irréversible.",
-  "sessionList.delete.confirmLabel": "Supprimer",
-  "sessionList.delete.cancelLabel": "Annuler",
   "sessionList.rename.error": "Impossible de renommer la session",
 
-  "sessionList.filter.placeholder": "Rechercher des sessions…",
-  "sessionList.filter.ariaLabel": "Rechercher des sessions",
-  "sessionList.selection.selectAllLabel": "Tout sélectionner",
-  "sessionList.selection.selectAllAriaLabel": "Sélectionner toutes les sessions",
-  "sessionList.selection.clearLabel": "Effacer",
-  "sessionList.selection.clearAriaLabel": "Effacer la sélection",
-  "sessionList.selection.checkboxAriaLabel": "Sélectionner la session",
-  "sessionList.bulkDelete.button": "Supprimer {count}",
-  "sessionList.bulkDelete.ariaLabel": "Supprimer {count} sessions sélectionnées",
-  "sessionList.bulkDelete.title": "Supprimer des sessions",
-  "sessionList.bulkDelete.confirmMessage": "Supprimer {count} sessions sélectionnées ? Cette action est irréversible.",
-  "sessionList.bulkDelete.confirmLabel": "Supprimer",
-  "sessionList.bulkDelete.cancelLabel": "Annuler",
-  "sessionList.bulkDelete.error": "Impossible de supprimer {count} sessions",
-
   "sessionRenameDialog.title": "Renommer la session",
   "sessionRenameDialog.description.withLabel": "Mettre à jour le titre de \"{label}\".",
   "sessionRenameDialog.description.default": "Définir un nouveau titre pour cette session.",

packages/ui/src/lib/i18n/messages/fr/toolCall.ts

@@ -2,9 +2,6 @@ export const toolCallMessages = {
   "toolCall.pending.waitingToRun": "En attente d'exécution...",
   "toolCall.error.label": "Erreur :",
 
-  "toolCall.header.copyTitle": "Copy tool call title",
-  "toolCall.header.copyAriaLabel": "Copy tool call title",
-
   "toolCall.diff.label": "Diff",
   "toolCall.diff.label.withPath": "Diff · {path}",
   "toolCall.diff.viewMode.ariaLabel": "Mode d'affichage du diff",

packages/ui/src/lib/i18n/messages/ja/commands.ts

@@ -82,14 +82,9 @@ export const commandMessages = {
   "commands.clearInput.description": "プロンプト入力欄をクリア",
   "commands.clearInput.keywords": "クリア, リセット, clear, reset",
 
-  "commands.promptSubmitShortcut.label.default": "Enter: 改行, Cmd/Ctrl+Enter: プロンプト送信",
-  "commands.promptSubmitShortcut.label.swapped": "Enter: プロンプト送信, Cmd/Ctrl+Enter: 改行",
-  "commands.promptSubmitShortcut.description": "プロンプト入力で Enter と Cmd/Ctrl+Enter の動作を入れ替え",
-  "commands.promptSubmitShortcut.keywords": "enter, 送信, 改行, ショートカット, cmd, ctrl, プロンプト",
-
-  "commands.thinkingBlocks.label.show": "思考を表示",
-  "commands.thinkingBlocks.label.hide": "思考を非表示",
-  "commands.thinkingBlocks.description": "AI の思考セクションを表示/非表示",
+  "commands.thinkingBlocks.label.show": "思考ブロックを表示",
+  "commands.thinkingBlocks.label.hide": "思考ブロックを非表示",
+  "commands.thinkingBlocks.description": "AI の思考過程を表示/非表示",
   "commands.thinkingBlocks.keywords": "思考, 推論, 切り替え, 表示, 非表示, thinking, reasoning, toggle, show, hide",
 
   "commands.timelineToolCalls.label.show": "タイムラインのツールコールを表示",
@@ -104,8 +99,8 @@ export const commandMessages = {
   "commands.common.enabled": "有効",
   "commands.common.disabled": "無効",
 
-  "commands.thinkingBlocksDefault.label": "思考ビュー: {state}",
-  "commands.thinkingBlocksDefault.description": "表示中は AI の思考セクションを折りたたみ / 展開",
+  "commands.thinkingBlocksDefault.label": "思考ブロックの既定 · {state}",
+  "commands.thinkingBlocksDefault.description": "思考ブロックを既定で展開するか切り替え",
   "commands.thinkingBlocksDefault.keywords": "思考, 推論, 展開, 折りたたみ, 既定, thinking, reasoning, expand, collapse, default",
 
   "commands.diffViewSplit.label": "分割 diff 表示を使用",

packages/ui/src/lib/i18n/messages/ja/messaging.ts

@@ -20,9 +20,6 @@ export const messagingMessages = {
   "messageSection.scroll.toLatestAriaLabel": "最新のメッセージへスクロール",
   "messageSection.quote.addAsQuote": "引用として追加",
   "messageSection.quote.addAsCode": "コードとして追加",
-  "messageSection.quote.copy": "コピー",
-  "messageSection.quote.copied": "コピーしました",
-  "messageSection.quote.copyFailed": "コピーできませんでした",
 
   "messageTimeline.ariaLabel": "メッセージタイムライン",
   "messageTimeline.segment.user.label": "あなた",
@@ -41,11 +38,6 @@ export const messagingMessages = {
   "messageBlock.tool.goToSession.label": "セッションへ移動",
   "messageBlock.tool.goToSession.title": "セッションへ移動",
   "messageBlock.tool.goToSession.unavailableTitle": "セッションはまだ利用できません",
-  "messageBlock.tool.deletePart.label": "削除",
-  "messageBlock.tool.deletePart.deleting": "削除中...",
-  "messageBlock.tool.deletePart.title": "このツール出力を削除",
-  "messageBlock.tool.deletePart.failed.title": "削除に失敗しました",
-  "messageBlock.tool.deletePart.failed.message": "ツール出力の削除に失敗しました",
 
   "messageBlock.compaction.ariaLabel": "セッションのコンパクト化",
   "messageBlock.compaction.autoLabel": "セッションを自動でコンパクト化しました",
@@ -81,11 +73,6 @@ export const messagingMessages = {
   "messageItem.status.generating": "生成中...",
   "messageItem.status.sending": "送信中...",
   "messageItem.status.failedToSend": "メッセージの送信に失敗しました",
-  "messagePart.actions.delete": "削除",
-  "messagePart.actions.deleting": "削除中...",
-  "messagePart.actions.deleteTitle": "この項目を削除",
-  "messagePart.actions.deleteFailedTitle": "削除に失敗しました",
-  "messagePart.actions.deleteFailedMessage": "項目の削除に失敗しました",
   "messageItem.attachment.defaultName": "添付ファイル",
   "messageItem.attachment.downloadAriaLabel": "{name} をダウンロード",
   "messageItem.agentMeta.agentLabel": "エージェント: {agent}",

packages/ui/src/lib/i18n/messages/ja/session.ts

@@ -30,27 +30,8 @@ export const sessionMessages = {
   "sessionList.copyId.success": "セッション ID をコピーしました",
   "sessionList.copyId.error": "セッション ID をコピーできません",
   "sessionList.delete.error": "セッションを削除できません",
-  "sessionList.delete.title": "セッションを削除",
-  "sessionList.delete.confirmMessage": "\"{label}\" を削除しますか？この操作は元に戻せません。",
-  "sessionList.delete.confirmLabel": "削除",
-  "sessionList.delete.cancelLabel": "キャンセル",
   "sessionList.rename.error": "セッション名を変更できません",
 
-  "sessionList.filter.placeholder": "セッションを検索…",
-  "sessionList.filter.ariaLabel": "セッションを検索",
-  "sessionList.selection.selectAllLabel": "すべて選択",
-  "sessionList.selection.selectAllAriaLabel": "すべてのセッションを選択",
-  "sessionList.selection.clearLabel": "クリア",
-  "sessionList.selection.clearAriaLabel": "選択をクリア",
-  "sessionList.selection.checkboxAriaLabel": "セッションを選択",
-  "sessionList.bulkDelete.button": "{count} 件を削除",
-  "sessionList.bulkDelete.ariaLabel": "選択した {count} 件のセッションを削除",
-  "sessionList.bulkDelete.title": "セッションを削除",
-  "sessionList.bulkDelete.confirmMessage": "選択した {count} 件のセッションを削除しますか？この操作は元に戻せません。",
-  "sessionList.bulkDelete.confirmLabel": "削除",
-  "sessionList.bulkDelete.cancelLabel": "キャンセル",
-  "sessionList.bulkDelete.error": "{count} 件のセッションを削除できません",
-
   "sessionRenameDialog.title": "セッション名を変更",
   "sessionRenameDialog.description.withLabel": "\"{label}\" のタイトルを更新します。",
   "sessionRenameDialog.description.default": "このセッションの新しいタイトルを設定します。",

packages/ui/src/lib/i18n/messages/ja/toolCall.ts

@@ -2,9 +2,6 @@ export const toolCallMessages = {
   "toolCall.pending.waitingToRun": "実行待ち...",
   "toolCall.error.label": "エラー:",
 
-  "toolCall.header.copyTitle": "Copy tool call title",
-  "toolCall.header.copyAriaLabel": "Copy tool call title",
-
   "toolCall.diff.label": "Diff",
   "toolCall.diff.label.withPath": "Diff · {path}",
   "toolCall.diff.viewMode.ariaLabel": "diff 表示モード",

packages/ui/src/lib/i18n/messages/ru/commands.ts

@@ -82,14 +82,9 @@ export const commandMessages = {
   "commands.clearInput.description": "Очистить поле prompt",
   "commands.clearInput.keywords": "очистить, сброс",
 
-  "commands.promptSubmitShortcut.label.default": "Enter: Новая строка, Cmd/Ctrl+Enter: Отправить промпт",
-  "commands.promptSubmitShortcut.label.swapped": "Enter: Отправить промпт, Cmd/Ctrl+Enter: Новая строка",
-  "commands.promptSubmitShortcut.description": "Поменять местами Enter и Cmd/Ctrl+Enter в поле ввода промпта",
-  "commands.promptSubmitShortcut.keywords": "enter, отправить, новая строка, сочетание, cmd, ctrl, промпт",
-
-  "commands.thinkingBlocks.label.show": "Показать размышления",
-  "commands.thinkingBlocks.label.hide": "Скрыть размышления",
-  "commands.thinkingBlocks.description": "Показать или скрыть секции размышлений ИИ",
+  "commands.thinkingBlocks.label.show": "Показать блоки размышлений",
+  "commands.thinkingBlocks.label.hide": "Скрыть блоки размышлений",
+  "commands.thinkingBlocks.description": "Показать/скрыть процесс рассуждений AI",
   "commands.thinkingBlocks.keywords": "thinking, reasoning, переключить, показать, скрыть",
 
   "commands.timelineToolCalls.label.show": "Показать Tool Calls в таймлайне",
@@ -104,8 +99,8 @@ export const commandMessages = {
   "commands.common.enabled": "Включено",
   "commands.common.disabled": "Выключено",
 
-  "commands.thinkingBlocksDefault.label": "Вид размышлений: {state}",
-  "commands.thinkingBlocksDefault.description": "Свернуть / Развернуть секции размышлений ИИ, когда они показаны",
+  "commands.thinkingBlocksDefault.label": "Блоки размышлений по умолчанию · {state}",
+  "commands.thinkingBlocksDefault.description": "Переключить, разворачивать ли блоки размышлений по умолчанию",
   "commands.thinkingBlocksDefault.keywords": "thinking, reasoning, развернуть, свернуть, по умолчанию",
 
   "commands.diffViewSplit.label": "Раздельный просмотр diff",

packages/ui/src/lib/i18n/messages/ru/messaging.ts

@@ -20,9 +20,6 @@ export const messagingMessages = {
   "messageSection.scroll.toLatestAriaLabel": "Прокрутить к последнему сообщению",
   "messageSection.quote.addAsQuote": "Добавить как цитату",
   "messageSection.quote.addAsCode": "Добавить как код",
-  "messageSection.quote.copy": "Копировать",
-  "messageSection.quote.copied": "Скопировано!",
-  "messageSection.quote.copyFailed": "Не удалось скопировать",
 
   "messageTimeline.ariaLabel": "Таймлайн сообщений",
   "messageTimeline.segment.user.label": "Вы",
@@ -41,11 +38,6 @@ export const messagingMessages = {
   "messageBlock.tool.goToSession.label": "Перейти к сессии",
   "messageBlock.tool.goToSession.title": "Перейти к сессии",
   "messageBlock.tool.goToSession.unavailableTitle": "Сессия пока недоступна",
-  "messageBlock.tool.deletePart.label": "Удалить",
-  "messageBlock.tool.deletePart.deleting": "Удаление...",
-  "messageBlock.tool.deletePart.title": "Удалить этот вывод инструмента",
-  "messageBlock.tool.deletePart.failed.title": "Ошибка удаления",
-  "messageBlock.tool.deletePart.failed.message": "Не удалось удалить вывод инструмента",
 
   "messageBlock.compaction.ariaLabel": "Компактация сессии",
   "messageBlock.compaction.autoLabel": "Сессия автоматически компактирована",
@@ -81,11 +73,6 @@ export const messagingMessages = {
   "messageItem.status.generating": "Генерация…",
   "messageItem.status.sending": "Отправка…",
   "messageItem.status.failedToSend": "Не удалось отправить сообщение",
-  "messagePart.actions.delete": "Удалить",
-  "messagePart.actions.deleting": "Удаление...",
-  "messagePart.actions.deleteTitle": "Удалить этот элемент",
-  "messagePart.actions.deleteFailedTitle": "Ошибка удаления",
-  "messagePart.actions.deleteFailedMessage": "Не удалось удалить элемент",
   "messageItem.attachment.defaultName": "вложение",
   "messageItem.attachment.downloadAriaLabel": "Скачать {name}",
   "messageItem.agentMeta.agentLabel": "Агент: {agent}",

packages/ui/src/lib/i18n/messages/ru/session.ts

@@ -30,27 +30,8 @@ export const sessionMessages = {
   "sessionList.copyId.success": "ID сессии скопирован",
   "sessionList.copyId.error": "Не удалось скопировать ID сессии",
   "sessionList.delete.error": "Не удалось удалить сессию",
-  "sessionList.delete.title": "Удалить сессию",
-  "sessionList.delete.confirmMessage": "Удалить \"{label}\"? Это действие нельзя отменить.",
-  "sessionList.delete.confirmLabel": "Удалить",
-  "sessionList.delete.cancelLabel": "Отмена",
   "sessionList.rename.error": "Не удалось переименовать сессию",
 
-  "sessionList.filter.placeholder": "Поиск сессий…",
-  "sessionList.filter.ariaLabel": "Поиск сессий",
-  "sessionList.selection.selectAllLabel": "Выбрать все",
-  "sessionList.selection.selectAllAriaLabel": "Выбрать все сессии",
-  "sessionList.selection.clearLabel": "Очистить",
-  "sessionList.selection.clearAriaLabel": "Очистить выбор",
-  "sessionList.selection.checkboxAriaLabel": "Выбрать сессию",
-  "sessionList.bulkDelete.button": "Удалить {count}",
-  "sessionList.bulkDelete.ariaLabel": "Удалить {count} выбранных сессий",
-  "sessionList.bulkDelete.title": "Удалить сессии",
-  "sessionList.bulkDelete.confirmMessage": "Удалить {count} выбранных сессий? Это действие нельзя отменить.",
-  "sessionList.bulkDelete.confirmLabel": "Удалить",
-  "sessionList.bulkDelete.cancelLabel": "Отмена",
-  "sessionList.bulkDelete.error": "Не удалось удалить {count} сессий",
-
   "sessionRenameDialog.title": "Переименовать сессию",
   "sessionRenameDialog.description.withLabel": "Обновите название для \"{label}\".",
   "sessionRenameDialog.description.default": "Установите новое название для этой сессии.",

packages/ui/src/lib/i18n/messages/ru/toolCall.ts

@@ -2,9 +2,6 @@ export const toolCallMessages = {
   "toolCall.pending.waitingToRun": "Ожидание запуска…",
   "toolCall.error.label": "Ошибка:",
 
-  "toolCall.header.copyTitle": "Copy tool call title",
-  "toolCall.header.copyAriaLabel": "Copy tool call title",
-
   "toolCall.diff.label": "Diff",
   "toolCall.diff.label.withPath": "Diff · {path}",
   "toolCall.diff.viewMode.ariaLabel": "Режим просмотра diff",

packages/ui/src/lib/i18n/messages/zh-Hans/commands.ts

@@ -82,14 +82,9 @@ export const commandMessages = {
   "commands.clearInput.description": "清空 prompt 输入框",
   "commands.clearInput.keywords": "clear, reset, 清空, 重置",
 
-  "commands.promptSubmitShortcut.label.default": "Enter: 换行, Cmd/Ctrl+Enter: 提交提示词",
-  "commands.promptSubmitShortcut.label.swapped": "Enter: 提交提示词, Cmd/Ctrl+Enter: 换行",
-  "commands.promptSubmitShortcut.description": "在提示词输入框中交换 Enter 与 Cmd/Ctrl+Enter 的行为",
-  "commands.promptSubmitShortcut.keywords": "enter, 换行, 提交, 发送, 快捷键, cmd, ctrl, 提示词",
-
-  "commands.thinkingBlocks.label.show": "显示思考",
-  "commands.thinkingBlocks.label.hide": "隐藏思考",
-  "commands.thinkingBlocks.description": "显示或隐藏 AI 思考部分",
+  "commands.thinkingBlocks.label.show": "显示思考块",
+  "commands.thinkingBlocks.label.hide": "隐藏思考块",
+  "commands.thinkingBlocks.description": "显示/隐藏 AI 思考过程",
   "commands.thinkingBlocks.keywords": "thinking, reasoning, toggle, show, hide, 思考, 推理, 切换, 显示, 隐藏",
 
   "commands.timelineToolCalls.label.show": "显示时间轴工具调用",
@@ -104,8 +99,8 @@ export const commandMessages = {
   "commands.common.enabled": "启用",
   "commands.common.disabled": "禁用",
 
-  "commands.thinkingBlocksDefault.label": "思考视图: {state}",
-  "commands.thinkingBlocksDefault.description": "在显示时折叠 / 展开 AI 思考部分",
+  "commands.thinkingBlocksDefault.label": "思考块默认 · {state}",
+  "commands.thinkingBlocksDefault.description": "切换思考块是否默认展开",
   "commands.thinkingBlocksDefault.keywords": "thinking, reasoning, expand, collapse, default, 思考, 推理, 展开, 折叠, 默认",
 
   "commands.diffViewSplit.label": "使用分栏 Diff 视图",

packages/ui/src/lib/i18n/messages/zh-Hans/messaging.ts

@@ -20,9 +20,6 @@ export const messagingMessages = {
   "messageSection.scroll.toLatestAriaLabel": "滚动到最新消息",
   "messageSection.quote.addAsQuote": "作为引用添加",
   "messageSection.quote.addAsCode": "作为代码添加",
-  "messageSection.quote.copy": "复制",
-  "messageSection.quote.copied": "已复制！",
-  "messageSection.quote.copyFailed": "无法复制",
 
   "messageTimeline.ariaLabel": "消息时间线",
   "messageTimeline.segment.user.label": "你",
@@ -41,11 +38,6 @@ export const messagingMessages = {
   "messageBlock.tool.goToSession.label": "前往会话",
   "messageBlock.tool.goToSession.title": "前往会话",
   "messageBlock.tool.goToSession.unavailableTitle": "会话尚不可用",
-  "messageBlock.tool.deletePart.label": "删除",
-  "messageBlock.tool.deletePart.deleting": "正在删除...",
-  "messageBlock.tool.deletePart.title": "删除此工具输出",
-  "messageBlock.tool.deletePart.failed.title": "删除失败",
-  "messageBlock.tool.deletePart.failed.message": "删除工具输出失败",
 
   "messageBlock.compaction.ariaLabel": "会话压缩",
   "messageBlock.compaction.autoLabel": "会话已自动压缩",
@@ -81,11 +73,6 @@ export const messagingMessages = {
   "messageItem.status.generating": "正在生成...",
   "messageItem.status.sending": "正在发送...",
   "messageItem.status.failedToSend": "消息发送失败",
-  "messagePart.actions.delete": "删除",
-  "messagePart.actions.deleting": "正在删除...",
-  "messagePart.actions.deleteTitle": "删除此项",
-  "messagePart.actions.deleteFailedTitle": "删除失败",
-  "messagePart.actions.deleteFailedMessage": "删除失败",
   "messageItem.attachment.defaultName": "附件",
   "messageItem.attachment.downloadAriaLabel": "下载 {name}",
   "messageItem.agentMeta.agentLabel": "智能体：{agent}",

packages/ui/src/lib/i18n/messages/zh-Hans/session.ts

@@ -30,27 +30,8 @@ export const sessionMessages = {
   "sessionList.copyId.success": "已复制会话 ID",
   "sessionList.copyId.error": "无法复制会话 ID",
   "sessionList.delete.error": "无法删除会话",
-  "sessionList.delete.title": "删除会话",
-  "sessionList.delete.confirmMessage": "删除“{label}”？此操作无法撤销。",
-  "sessionList.delete.confirmLabel": "删除",
-  "sessionList.delete.cancelLabel": "取消",
   "sessionList.rename.error": "无法重命名会话",
 
-  "sessionList.filter.placeholder": "搜索会话…",
-  "sessionList.filter.ariaLabel": "搜索会话",
-  "sessionList.selection.selectAllLabel": "全选",
-  "sessionList.selection.selectAllAriaLabel": "选择所有会话",
-  "sessionList.selection.clearLabel": "清除",
-  "sessionList.selection.clearAriaLabel": "清除选择",
-  "sessionList.selection.checkboxAriaLabel": "选择会话",
-  "sessionList.bulkDelete.button": "删除 {count}",
-  "sessionList.bulkDelete.ariaLabel": "删除已选择的 {count} 个会话",
-  "sessionList.bulkDelete.title": "删除会话",
-  "sessionList.bulkDelete.confirmMessage": "删除已选择的 {count} 个会话？此操作无法撤销。",
-  "sessionList.bulkDelete.confirmLabel": "删除",
-  "sessionList.bulkDelete.cancelLabel": "取消",
-  "sessionList.bulkDelete.error": "无法删除 {count} 个会话",
-
   "sessionRenameDialog.title": "重命名会话",
   "sessionRenameDialog.description.withLabel": "更新“{label}”的标题。",
   "sessionRenameDialog.description.default": "为此会话设置新标题。",