fix(i18n): preserve global locale state across provider updates

refactor(ui): drop bootstrap config cache layer
refactor(ui): keep bootstrap config in global cache
2026-03-23 14:40:51 +00:00 · 2026-03-23 11:10:33 +01:00 · 2026-03-23 10:37:57 +01:00 · 2026-03-23 10:11:13 +01:00 · 2026-03-23 09:29:29 +01:00 · 2026-03-19 21:21:00 +01:00
151 changed files with 1961 additions and 6895 deletions
--- a/.github/workflows/build-and-upload.yml
+++ b/.github/workflows/build-and-upload.yml
@@ -28,21 +28,6 @@ on:
        required: false
        default: true
        type: boolean
-      upload_actions_artifacts:
-        description: "Upload built artifacts to GitHub Actions run artifacts"
-        required: false
-        default: false
-        type: boolean
-      actions_artifacts_retention_days:
-        description: "Retention (days) for GitHub Actions artifacts"
-        required: false
-        default: 7
-        type: number
-      actions_artifacts_name_prefix:
-        description: "Optional prefix for Actions artifact names"
-        required: false
-        default: ""
-        type: string
      set_versions:
        description: "Run npm version to set workspace versions"
        required: false
@@ -218,15 +203,6 @@ jobs:
            gh release upload "$TAG" "$file" --clobber
          done

-      - name: Upload Actions artifacts (Electron macOS)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}electron-macos
-          path: packages/electron-app/release/*.zip
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: error
-
  build-windows:
    runs-on: windows-2025
    env:
@@ -268,15 +244,6 @@ jobs:
            gh release upload $env:TAG $_.FullName --clobber
          }

-      - name: Upload Actions artifacts (Electron Windows)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}electron-windows
-          path: packages/electron-app/release/*.zip
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: error
-
  build-linux:
    runs-on: ubuntu-24.04
    env:
@@ -319,15 +286,6 @@ jobs:
            gh release upload "$TAG" "$file" --clobber
          done

-      - name: Upload Actions artifacts (Electron Linux)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}electron-linux
-          path: packages/electron-app/release/*.zip
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: error
-
  build-tauri-macos:
    runs-on: macos-15-intel
    env:
@@ -381,7 +339,7 @@ jobs:
        run: npm exec -- tauri build

      - name: Package Tauri artifacts (macOS)
-        if: ${{ inputs.upload || inputs.upload_actions_artifacts }}
+        if: ${{ inputs.upload }}
        run: |
          set -euo pipefail
          BUNDLE_ROOT="packages/tauri-app/target/release/bundle"
@@ -392,15 +350,6 @@ jobs:
            ditto -ck --sequesterRsrc --keepParent "$BUNDLE_ROOT/macos/CodeNomad.app" "$ARTIFACT_DIR/CodeNomad-Tauri-${VERSION}-macos-x64.zip"
          fi

-      - name: Upload Actions artifacts (Tauri macOS)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}tauri-macos
-          path: packages/tauri-app/release-tauri/*.zip
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: warn
-
      - name: Upload Tauri release assets (macOS)
        if: ${{ inputs.upload && inputs.tag != '' }}
        run: |
@@ -465,7 +414,7 @@ jobs:
        run: npm exec -- tauri build

      - name: Package Tauri artifacts (macOS arm64)
-        if: ${{ inputs.upload || inputs.upload_actions_artifacts }}
+        if: ${{ inputs.upload }}
        run: |
          set -euo pipefail
          BUNDLE_ROOT="packages/tauri-app/target/release/bundle"
@@ -476,15 +425,6 @@ jobs:
            ditto -ck --sequesterRsrc --keepParent "$BUNDLE_ROOT/macos/CodeNomad.app" "$ARTIFACT_DIR/CodeNomad-Tauri-${VERSION}-macos-arm64.zip"
          fi

-      - name: Upload Actions artifacts (Tauri macOS arm64)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}tauri-macos-arm64
-          path: packages/tauri-app/release-tauri/*.zip
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: warn
-
      - name: Upload Tauri release assets (macOS arm64)
        if: ${{ inputs.upload && inputs.tag != '' }}
        run: |
@@ -552,7 +492,7 @@ jobs:
        run: npm exec -- tauri build

      - name: Package Tauri artifacts (Windows)
-        if: ${{ inputs.upload || inputs.upload_actions_artifacts }}
+        if: ${{ inputs.upload }}
        shell: pwsh
        run: |
          $bundleRoot = "packages/tauri-app/target/release/bundle"
@@ -565,15 +505,6 @@ jobs:
            Compress-Archive -Path $exe.Directory.FullName -DestinationPath $dest -Force
          }

-      - name: Upload Actions artifacts (Tauri Windows)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}tauri-windows
-          path: packages/tauri-app/release-tauri/*.zip
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: warn
-
      - name: Upload Tauri release assets (Windows)
        if: ${{ inputs.upload && inputs.tag != '' }}
        shell: pwsh
@@ -651,7 +582,7 @@ jobs:
        run: npm exec -- tauri build

      - name: Package Tauri artifacts (Linux)
-        if: ${{ inputs.upload || inputs.upload_actions_artifacts }}
+        if: ${{ inputs.upload }}
        run: |
          set -euo pipefail
          SEARCH_ROOT="packages/tauri-app/target"
@@ -677,15 +608,6 @@ jobs:
          cp "$deb" "$ARTIFACT_DIR/CodeNomad-Tauri-${VERSION}-linux-x64.deb"
          cp "$rpm" "$ARTIFACT_DIR/CodeNomad-Tauri-${VERSION}-linux-x64.rpm"

-      - name: Upload Actions artifacts (Tauri Linux)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}tauri-linux
-          path: packages/tauri-app/release-tauri/*
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: warn
-
      - name: Upload Tauri release assets (Linux)
        if: ${{ inputs.upload && inputs.tag != '' }}
        run: |
@@ -844,12 +766,3 @@ jobs:
            echo "Uploading $file"
            gh release upload "$TAG" "$file" --clobber
          done
-
-      - name: Upload Actions artifacts (Electron Linux RPM)
-        if: ${{ inputs.upload_actions_artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.actions_artifacts_name_prefix }}electron-linux-rpm
-          path: packages/electron-app/release/*.rpm
-          retention-days: ${{ inputs.actions_artifacts_retention_days }}
-          if-no-files-found: error
--- a/.github/workflows/comment-pr-artifacts.yml
+++ b/.github/workflows/comment-pr-artifacts.yml
@@ -1,121 +0,0 @@
-name: Comment PR Artifacts
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-
-permissions:
-  actions: read
-  contents: read
-  issues: write
-  pull-requests: write
-
-jobs:
-  comment:
-    runs-on: ubuntu-latest
-    env:
-      ALLOWED_ACTORS: ${{ vars.ALLOWED_NON_DEV_PR_ACTORS }}
-      ACTOR: ${{ github.actor }}
-      BASE_REF: ${{ github.event.pull_request.base.ref }}
-      IS_DRAFT: ${{ github.event.pull_request.draft }}
-      PR_NUMBER: ${{ github.event.pull_request.number }}
-      HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-      RETENTION_DAYS: 7
-    steps:
-      - name: Check PR authorization
-        id: auth
-        shell: bash
-        run: |
-          set -euo pipefail
-          if [ "$BASE_REF" = "dev" ]; then
-            echo "allowed=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          normalized=",${ALLOWED_ACTORS},"
-          if [[ "$normalized" == *",${ACTOR},"* ]]; then
-            echo "allowed=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "allowed=false" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Wait for PR build and comment
-        if: ${{ steps.auth.outputs.allowed == 'true' && env.IS_DRAFT != 'true' }}
-        uses: actions/github-script@v8
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-            const prNumber = Number(process.env.PR_NUMBER);
-            const headSha = process.env.HEAD_SHA;
-            const retentionDays = Number(process.env.RETENTION_DAYS || '7');
-            const marker = '<!-- codenomad-pr-artifacts -->';
-
-            const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
-            let matchedRun = null;
-            for (let attempt = 1; attempt <= 30; attempt += 1) {
-              const runs = await github.paginate(github.rest.actions.listWorkflowRuns, {
-                owner,
-                repo,
-                workflow_id: 'pr-build.yml',
-                event: 'pull_request',
-                per_page: 100,
-              });
-
-              const matchingRuns = runs
-                .filter((run) => run.head_sha === headSha)
-                .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
-
-              matchedRun = matchingRuns[0] || null;
-              if (matchedRun && matchedRun.status === 'completed') {
-                break;
-              }
-
-              core.info(`Waiting for PR Build Validation run for ${headSha} (attempt ${attempt}/30)`);
-              await sleep(10000);
-            }
-
-            if (!matchedRun) {
-              core.setFailed(`Could not find PR Build Validation run for ${headSha}.`);
-              return;
-            }
-
-            if (matchedRun.status !== 'completed') {
-              core.setFailed(`PR Build Validation run ${matchedRun.id} did not complete in time.`);
-              return;
-            }
-
-            const artifacts = await github.paginate(
-              github.rest.actions.listWorkflowRunArtifacts,
-              { owner, repo, run_id: matchedRun.id, per_page: 100 }
-            );
-            const active = artifacts.filter((artifact) => !artifact.expired);
-
-            const runUrl = matchedRun.html_url;
-            const artifactsBlock = active.length
-              ? ['Artifacts:', ...active.map((artifact) => `- ${artifact.name}`)].join('\n')
-              : 'Artifacts: (none found on this run)';
-
-            const body = [
-              marker,
-              'PR builds are available as GitHub Actions artifacts:',
-              '',
-              runUrl,
-              '',
-              `Artifacts expire in ${retentionDays} days.`,
-              artifactsBlock,
-            ].join('\n');
-
-            const created = await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: prNumber,
-              body,
-            });
-            core.info(`Created artifacts comment: ${created.data.html_url}`);
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -6,11 +6,9 @@ on:
      - opened
      - synchronize
      - reopened
-      - ready_for_review

 permissions:
  contents: read
-  actions: write

 concurrency:
  group: pr-build-${{ github.event.pull_request.number }}
@@ -46,12 +44,9 @@ jobs:

  build:
    needs: authorize
-    if: ${{ needs.authorize.outputs.allowed == 'true' && !github.event.pull_request.draft }}
+    if: ${{ needs.authorize.outputs.allowed == 'true' }}
    uses: ./.github/workflows/build-and-upload.yml
    with:
      ref: ${{ github.event.pull_request.head.sha }}
      upload: false
-      upload_actions_artifacts: true
-      actions_artifacts_retention_days: 7
-      actions_artifacts_name_prefix: pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-
      set_versions: false
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "codenomad-workspace",
-  "version": "0.13.1",
+  "version": "0.12.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "codenomad-workspace",
-      "version": "0.13.1",
+      "version": "0.12.3",
      "license": "MIT",
      "dependencies": {
        "7zip-bin": "^5.2.0",
@@ -8240,27 +8240,6 @@
        "regex-recursion": "^6.0.2"
      }
    },
-    "node_modules/openai": {
-      "version": "6.27.0",
-      "resolved": "https://registry.npmjs.org/openai/-/openai-6.27.0.tgz",
-      "integrity": "sha512-osTKySlrdYrLYTt0zjhY8yp0JUBmWDCN+Q+QxsV4xMQnnoVFpylgKGgxwN8sSdTNw0G4y+WUXs4eCMWpyDNWZQ==",
-      "license": "Apache-2.0",
-      "bin": {
-        "openai": "bin/cli"
-      },
-      "peerDependencies": {
-        "ws": "^8.18.0",
-        "zod": "^3.25 || ^4.0"
-      },
-      "peerDependenciesMeta": {
-        "ws": {
-          "optional": true
-        },
-        "zod": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/own-keys": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
@@ -11005,36 +10984,6 @@
        "url": "https://opencollective.com/unified"
      }
    },
-    "node_modules/virtua": {
-      "version": "0.48.8",
-      "resolved": "https://registry.npmjs.org/virtua/-/virtua-0.48.8.tgz",
-      "integrity": "sha512-jpsxOw5V4B6hg44JePRLo9DL0TV7N1lBEVtPjKpAJebXyhI2s9lfiXJESaLapNtr3vtiSk/pWHiLf7B2a6UcgQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": ">=16.14.0",
-        "react-dom": ">=16.14.0",
-        "solid-js": ">=1.0",
-        "svelte": ">=5.0",
-        "vue": ">=3.2"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        },
-        "solid-js": {
-          "optional": true
-        },
-        "svelte": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/vite": {
      "version": "5.4.21",
      "dev": true,
@@ -12040,7 +11989,6 @@
    "node_modules/zod": {
      "version": "3.25.76",
      "license": "MIT",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
@@ -12055,7 +12003,7 @@
    },
    "packages/electron-app": {
      "name": "@neuralnomads/codenomad-electron-app",
-      "version": "0.13.1",
+      "version": "0.12.3",
      "license": "MIT",
      "dependencies": {
        "@codenomad/ui": "file:../ui",
@@ -12092,7 +12040,7 @@
    },
    "packages/server": {
      "name": "@neuralnomads/codenomad",
-      "version": "0.13.1",
+      "version": "0.12.3",
      "license": "MIT",
      "dependencies": {
        "@fastify/cors": "^8.5.0",
@@ -12102,7 +12050,6 @@
        "fastify": "^4.28.1",
        "fuzzysort": "^2.0.4",
        "node-forge": "^1.3.3",
-        "openai": "^6.27.0",
        "pino": "^9.4.0",
        "undici": "^6.19.8",
        "yaml": "^2.4.2",
@@ -12134,7 +12081,7 @@
    },
    "packages/tauri-app": {
      "name": "@codenomad/tauri-app",
-      "version": "0.13.1",
+      "version": "0.12.3",
      "license": "MIT",
      "devDependencies": {
        "@tauri-apps/cli": "^2.9.4"
@@ -12142,7 +12089,7 @@
    },
    "packages/ui": {
      "name": "@codenomad/ui",
-      "version": "0.13.1",
+      "version": "0.12.3",
      "license": "MIT",
      "dependencies": {
        "@git-diff-view/solid": "^0.0.8",
@@ -12166,7 +12113,6 @@
        "shiki": "^3.13.0",
        "solid-js": "^1.8.0",
        "solid-toast": "^0.5.0",
-        "virtua": "^0.48.8",
        "yaml": "^2.4.2"
      },
      "devDependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "codenomad-workspace",
-  "version": "0.13.1",
+  "version": "0.12.3",
  "private": true,
  "description": "CodeNomad monorepo workspace",
  "license": "MIT",
--- a/packages/cloudflare/release-config.json
+++ b/packages/cloudflare/release-config.json
@@ -1,4 +1,4 @@
 {
-  "minServerVersion": "0.13.1",
+  "minServerVersion": "0.12.3",
  "latestServerUrl": "https://github.com/NeuralNomadsAI/CodeNomad/releases/latest"
 }
--- a/packages/electron-app/.gitignore
+++ b/packages/electron-app/.gitignore
@@ -2,4 +2,3 @@ node_modules/
 dist/
 release/
 .vite/
-electron/resources/server/
--- a/packages/electron-app/electron/main/ipc.ts
+++ b/packages/electron-app/electron/main/ipc.ts
@@ -1,6 +1,5 @@
 import { BrowserWindow, Notification, dialog, ipcMain, powerSaveBlocker, type OpenDialogOptions } from "electron"
 import fs from "fs"
-import { requestMicrophoneAccess } from "./permissions"
 import type { CliProcessManager, CliStatus } from "./process-manager"

 let wakeLockId: number | null = null
@@ -112,11 +111,6 @@ export function setupCliIPC(mainWindow: BrowserWindow, cliManager: CliProcessMan
    return { enabled: false }
  })

-  ipcMain.handle(
-    "media:requestMicrophoneAccess",
-    async (): Promise<{ granted: boolean }> => ({ granted: await requestMicrophoneAccess() }),
-  )
-
  ipcMain.handle(
    "notifications:show",
    async (_event, payload: { title?: unknown; body?: unknown }): Promise<{ ok: boolean; reason?: string }> => {
--- a/packages/electron-app/electron/main/main.ts
+++ b/packages/electron-app/electron/main/main.ts
@@ -6,7 +6,6 @@ import { dirname, join } from "path"
 import { fileURLToPath } from "url"
 import { createApplicationMenu } from "./menu"
 import { setupCliIPC } from "./ipc"
-import { configureMediaPermissionHandlers } from "./permissions"
 import { CliProcessManager } from "./process-manager"

 const mainFilename = fileURLToPath(import.meta.url)
@@ -490,7 +489,6 @@ app.whenReady().then(() => {

  if (isMac) {
    session.defaultSession.setSpellCheckerEnabled(false)
-    configureMediaPermissionHandlers(getAllowedRendererOrigins)
    app.on("browser-window-created", (_, window) => {
      window.webContents.session.setSpellCheckerEnabled(false)
    })
--- a/packages/electron-app/electron/main/permissions.ts
+++ b/packages/electron-app/electron/main/permissions.ts
@@ -1,58 +0,0 @@
-import { session, systemPreferences } from "electron"
-
-const isMac = process.platform === "darwin"
-
-export function isAllowedRendererOrigin(origin: string | undefined | null, allowedOrigins: string[]): boolean {
-  if (!origin) {
-    return false
-  }
-
-  try {
-    const normalized = new URL(origin).origin
-    return allowedOrigins.includes(normalized)
-  } catch {
-    return false
-  }
-}
-
-export function configureMediaPermissionHandlers(getAllowedOrigins: () => string[]) {
-  const isAudioMediaRequest = (permission: string, details?: unknown) => {
-    if (permission !== "media") {
-      return false
-    }
-
-    const mediaTypes = (details as { mediaTypes?: string[] } | undefined)?.mediaTypes ?? []
-    return mediaTypes.length === 0 || mediaTypes.includes("audio")
-  }
-
-  session.defaultSession.setPermissionCheckHandler((_webContents, permission, requestingOrigin, details) => {
-    if (!isAudioMediaRequest(permission, details)) {
-      return false
-    }
-
-    return isAllowedRendererOrigin(requestingOrigin, getAllowedOrigins())
-  })
-
-  session.defaultSession.setPermissionRequestHandler((webContents, permission, callback, details) => {
-    if (!isAudioMediaRequest(permission, details)) {
-      callback(false)
-      return
-    }
-
-    const requestingOrigin = (details as { requestingOrigin?: string } | undefined)?.requestingOrigin || webContents.getURL()
-    callback(isAllowedRendererOrigin(requestingOrigin, getAllowedOrigins()))
-  })
-}
-
-export async function requestMicrophoneAccess(): Promise<boolean> {
-  if (!isMac) {
-    return true
-  }
-
-  const status = systemPreferences.getMediaAccessStatus("microphone")
-  if (status === "granted") {
-    return true
-  }
-
-  return systemPreferences.askForMediaAccess("microphone")
-}
--- a/packages/electron-app/electron/main/process-manager.ts
+++ b/packages/electron-app/electron/main/process-manager.ts
@@ -1,17 +1,14 @@
 import { spawn, spawnSync, type ChildProcess } from "child_process"
-import { app, utilityProcess, type UtilityProcess } from "electron"
+import { app } from "electron"
 import { createRequire } from "module"
 import { EventEmitter } from "events"
 import { existsSync, readFileSync } from "fs"
 import os from "os"
 import path from "path"
-import { fileURLToPath } from "url"
 import { parse as parseYaml } from "yaml"
 import { buildUserShellCommand, getUserShellEnv, supportsUserShell } from "./user-shell"

 const nodeRequire = createRequire(import.meta.url)
-const mainFilename = fileURLToPath(import.meta.url)
-const mainDirname = path.dirname(mainFilename)

 const BOOTSTRAP_TOKEN_PREFIX = "CODENOMAD_BOOTSTRAP_TOKEN:"

@@ -41,9 +38,6 @@ interface CliEntryResolution {
  runnerPath?: string
 }

-type ManagedChild = ChildProcess | UtilityProcess
-type ChildLaunchMode = "spawn" | "utility"
-
 const DEFAULT_CONFIG_PATH = "~/.config/codenomad/config.json"

 function isYamlPath(filePath: string): boolean {
@@ -123,8 +117,7 @@ export declare interface CliProcessManager {
 }

 export class CliProcessManager extends EventEmitter {
-  private child?: ManagedChild
-  private childLaunchMode: ChildLaunchMode = "spawn"
+  private child?: ChildProcess
  private status: CliStatus = { state: "stopped" }
  private stdoutBuffer = ""
  private stderrBuffer = ""
@@ -142,63 +135,33 @@ export class CliProcessManager extends EventEmitter {
    this.requestedStop = false
    this.updateStatus({ state: "starting", port: undefined, pid: undefined, url: undefined, error: undefined })

+    const cliEntry = this.resolveCliEntry(options)
    const listeningMode = this.resolveListeningMode()
    const host = resolveHostForMode(listeningMode)
    const args = this.buildCliArgs(options, host)

-    let child: ManagedChild
+    console.info(
+      `[cli] launching CodeNomad CLI (${options.dev ? "dev" : "prod"}) using ${cliEntry.runner} at ${cliEntry.entry} (host=${host})`,
+    )

-    if (this.shouldUsePackagedShellSupervisor(options)) {
-      const runtimePath = this.resolveShellNodeCommand()
-      const entryPath = this.resolveBundledProdEntry()
-      const supervisorPath = this.resolveCliSupervisorPath()
-      const shellEnv = supportsUserShell() ? getUserShellEnv() : { ...process.env }
-      const shellCommand = buildUserShellCommand(`exec ${this.buildExecutableCommand(runtimePath, [entryPath, ...args])}`)
-      const supervisorPayload = JSON.stringify({
-        command: shellCommand.command,
-        args: shellCommand.args,
-        cwd: process.cwd(),
-      })
+    const env = supportsUserShell() ? getUserShellEnv() : { ...process.env }
+    env.ELECTRON_RUN_AS_NODE = "1"

-      console.info(
-        `[cli] launching CodeNomad CLI (${options.dev ? "dev" : "prod"}) via utility supervisor using node at ${runtimePath} (host=${host})`,
-      )
-      console.info(`[cli] utility supervisor: ${supervisorPath}`)
-      console.info(`[cli] shell command: ${shellCommand.command} ${shellCommand.args.join(" ")}`)
+    const spawnDetails = supportsUserShell()
+      ? buildUserShellCommand(`ELECTRON_RUN_AS_NODE=1 exec ${this.buildCommand(cliEntry, args)}`)
+      : this.buildDirectSpawn(cliEntry, args)

-      child = utilityProcess.fork(supervisorPath, [supervisorPayload], {
-        env: shellEnv,
-        stdio: "pipe",
-        serviceName: "CodeNomad CLI Supervisor",
-      })
-      this.childLaunchMode = "utility"
-    } else {
-      const cliEntry = this.resolveCliEntry(options)
-      console.info(
-        `[cli] launching CodeNomad CLI (${options.dev ? "dev" : "prod"}) using ${cliEntry.runner} at ${cliEntry.entry} (host=${host})`,
-      )
+    const detached = process.platform !== "win32"
+    const child = spawn(spawnDetails.command, spawnDetails.args, {
+      cwd: process.cwd(),
+      stdio: ["ignore", "pipe", "pipe"],
+      env,
+      shell: false,
+      detached,
+    })

-      const env = supportsUserShell() ? getUserShellEnv() : { ...process.env }
-      env.ELECTRON_RUN_AS_NODE = "1"
-
-      const spawnDetails = supportsUserShell()
-        ? buildUserShellCommand(`ELECTRON_RUN_AS_NODE=1 exec ${this.buildCommand(cliEntry, args)}`)
-        : this.buildDirectSpawn(cliEntry, args)
-
-      const detached = process.platform !== "win32"
-      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(" ")}`)
-      this.childLaunchMode = "spawn"
-    }
-
-    if (this.childLaunchMode === "spawn" && !child.pid) {
+    console.info(`[cli] spawn command: ${spawnDetails.command} ${spawnDetails.args.join(" ")}`)
+    if (!child.pid) {
      console.error("[cli] spawn failed: no pid")
    }

@@ -213,48 +176,23 @@ export class CliProcessManager extends EventEmitter {
      this.handleStream(data.toString(), "stderr")
    })

-    if (this.childLaunchMode === "utility") {
-      const utilityChild = child as UtilityProcess
+    child.on("error", (error) => {
+      console.error("[cli] failed to start CLI:", error)
+      this.updateStatus({ state: "error", error: error.message })
+      this.emit("error", error)
+    })

-      utilityChild.on("error", (error) => {
-        const message = this.describeUtilityProcessError(error)
-        console.error("[cli] utility supervisor failed:", error)
-        this.updateStatus({ state: "error", error: message })
-        this.emit("error", new Error(message))
-      })
-
-      utilityChild.on("exit", (code) => {
-        const failed = this.status.state !== "ready"
-        const error = failed ? this.status.error ?? `CLI exited with code ${code ?? 0}` : undefined
-        console.info(`[cli] exit (code=${code ?? ""})${error ? ` error=${error}` : ""}`)
-        this.updateStatus({ state: failed ? "error" : "stopped", error })
-        if (failed && error) {
-          this.emit("error", new Error(error))
-        }
-        this.emit("exit", this.status)
-        this.child = undefined
-      })
-    } else {
-      const spawnedChild = child as ChildProcess
-
-      spawnedChild.on("error", (error) => {
-        console.error("[cli] failed to start CLI:", error)
-        this.updateStatus({ state: "error", error: error.message })
-        this.emit("error", error)
-      })
-
-      spawnedChild.on("exit", (code, signal) => {
-        const failed = this.status.state !== "ready"
-        const error = failed ? this.status.error ?? `CLI exited with code ${code ?? 0}${signal ? ` (${signal})` : ""}` : undefined
-        console.info(`[cli] exit (code=${code}, signal=${signal || ""})${error ? ` error=${error}` : ""}`)
-        this.updateStatus({ state: failed ? "error" : "stopped", error })
-        if (failed && error) {
-          this.emit("error", new Error(error))
-        }
-        this.emit("exit", this.status)
-        this.child = undefined
-      })
-    }
+    child.on("exit", (code, signal) => {
+      const failed = this.status.state !== "ready"
+      const error = failed ? this.status.error ?? `CLI exited with code ${code ?? 0}${signal ? ` (${signal})` : ""}` : undefined
+      console.info(`[cli] exit (code=${code}, signal=${signal || ""})${error ? ` error=${error}` : ""}`)
+      this.updateStatus({ state: failed ? "error" : "stopped", error })
+      if (failed && error) {
+        this.emit("error", new Error(error))
+      }
+      this.emit("exit", this.status)
+      this.child = undefined
+    })

    return new Promise<CliStatus>((resolve, reject) => {
      const timeout = setTimeout(() => {
@@ -281,22 +219,16 @@ export class CliProcessManager extends EventEmitter {
      return
    }

-    if (this.childLaunchMode === "utility") {
-      return this.stopUtilityChild(child as UtilityProcess)
-    }
-
-    const spawnedChild = child as ChildProcess
-
    this.requestedStop = true

-    const pid = spawnedChild.pid
+    const pid = child.pid
    if (!pid) {
      this.child = undefined
      this.updateStatus({ state: "stopped" })
      return
    }

-    const isAlreadyExited = () => spawnedChild.exitCode !== null || spawnedChild.signalCode !== null
+    const isAlreadyExited = () => child.exitCode !== null || child.signalCode !== null

    const tryKillPosixGroup = (signal: NodeJS.Signals) => {
      try {
@@ -372,7 +304,7 @@ export class CliProcessManager extends EventEmitter {
        sendStopSignal("SIGKILL")
      }, 30000)

-      spawnedChild.on("exit", () => {
+      child.on("exit", () => {
        clearTimeout(killTimeout)
        this.child = undefined
        console.info("[cli] CLI process exited")
@@ -392,46 +324,6 @@ export class CliProcessManager extends EventEmitter {
    })
  }

-  private stopUtilityChild(child: UtilityProcess): Promise<void> {
-    this.requestedStop = true
-
-    const pid = child.pid
-    if (!pid) {
-      this.child = undefined
-      this.updateStatus({ state: "stopped" })
-      return Promise.resolve()
-    }
-
-    return new Promise((resolve) => {
-      const killTimeout = setTimeout(() => {
-        console.warn(`[cli] stop timed out after 30000ms; sending SIGKILL (pid=${pid})`)
-        try {
-          process.kill(pid, "SIGKILL")
-        } catch {
-          // no-op
-        }
-      }, 30000)
-
-      child.once("exit", () => {
-        clearTimeout(killTimeout)
-        this.child = undefined
-        console.info("[cli] CLI process exited")
-        this.updateStatus({ state: "stopped" })
-        resolve()
-      })
-
-      if (child.pid === undefined) {
-        clearTimeout(killTimeout)
-        this.child = undefined
-        this.updateStatus({ state: "stopped" })
-        resolve()
-        return
-      }
-
-      child.kill()
-    })
-  }
-
  getStatus(): CliStatus {
    return { ...this.status }
  }
@@ -443,22 +335,14 @@ export class CliProcessManager extends EventEmitter {
  private handleTimeout() {
    if (this.child) {
      const pid = this.child.pid
-      if (this.childLaunchMode === "utility") {
-        if (pid) {
-          try {
-            process.kill(pid, "SIGKILL")
-          } catch {
-            // no-op
-          }
-        }
-      } else if (pid && process.platform !== "win32") {
+      if (pid && process.platform !== "win32") {
        try {
          process.kill(-pid, "SIGKILL")
        } catch {
-          ;(this.child as ChildProcess).kill("SIGKILL")
+          this.child.kill("SIGKILL")
        }
      } else {
-        ;(this.child as ChildProcess).kill("SIGKILL")
+        this.child.kill("SIGKILL")
      }
      this.child = undefined
    }
@@ -565,10 +449,6 @@ export class CliProcessManager extends EventEmitter {
    return parts.join(" ")
  }

-  private buildExecutableCommand(command: string, args: string[]): string {
-    return [JSON.stringify(command), ...args.map((arg) => JSON.stringify(arg))].join(" ")
-  }
-
  private buildDirectSpawn(cliEntry: CliEntryResolution, args: string[]) {
    if (cliEntry.runner === "tsx") {
      return { command: process.execPath, args: [cliEntry.runnerPath!, cliEntry.entry, ...args] }
@@ -639,58 +519,4 @@ export class CliProcessManager extends EventEmitter {
    }
    throw new Error("Unable to locate CodeNomad CLI build (dist/bin.js). Run npm run build --workspace @neuralnomads/codenomad.")
  }
-
-  private shouldUsePackagedShellSupervisor(options: StartOptions): boolean {
-    return !options.dev && app.isPackaged && process.platform === "darwin"
-  }
-
-  private resolveCliSupervisorPath(): string {
-    const candidates = [
-      path.join(process.resourcesPath, "cli-supervisor.cjs"),
-      path.join(mainDirname, "../resources/cli-supervisor.cjs"),
-    ]
-
-    for (const candidate of candidates) {
-      if (existsSync(candidate)) {
-        return candidate
-      }
-    }
-
-    throw new Error("Unable to locate CodeNomad CLI supervisor script.")
-  }
-
-  private resolveShellNodeCommand(): string {
-    const configured = process.env.NODE_BINARY?.trim()
-    return configured && configured.length > 0 ? configured : "node"
-  }
-
-  private resolveBundledProdEntry(): string {
-    const candidates = [
-      path.join(process.resourcesPath, "server", "dist", "bin.js"),
-      path.join(mainDirname, "../resources/server/dist/bin.js"),
-    ]
-
-    for (const candidate of candidates) {
-      if (existsSync(candidate)) {
-        return candidate
-      }
-    }
-
-    throw new Error("Unable to locate bundled CodeNomad CLI build in app resources.")
-  }
-
-  private describeUtilityProcessError(error: unknown): string {
-    if (error instanceof Error && error.message) {
-      return error.message
-    }
-
-    if (error && typeof error === "object") {
-      const typed = error as { type?: unknown; location?: unknown }
-      if (typeof typed.type === "string") {
-        return typeof typed.location === "string" ? `${typed.type} at ${typed.location}` : typed.type
-      }
-    }
-
-    return String(error)
-  }
 }
--- a/packages/electron-app/electron/preload/index.cjs
+++ b/packages/electron-app/electron/preload/index.cjs
@@ -20,7 +20,6 @@ const electronAPI = {
      return null
    }
  },
-  requestMicrophoneAccess: () => ipcRenderer.invoke("media:requestMicrophoneAccess"),
  setWakeLock: (enabled) => ipcRenderer.invoke("power:setWakeLock", Boolean(enabled)),
  showNotification: (payload) => ipcRenderer.invoke("notifications:show", payload),
 }
--- a/packages/electron-app/electron/resources/cli-supervisor.cjs
+++ b/packages/electron-app/electron/resources/cli-supervisor.cjs
@@ -1,131 +0,0 @@
-#!/usr/bin/env node
-
-const { spawn } = require("child_process")
-
-const SHUTDOWN_GRACE_MS = 30_000
-
-let child = null
-let shutdownTimer = null
-
-function log(message, error) {
-  if (error) {
-    console.error(`[cli-supervisor] ${message}`, error)
-    return
-  }
-  console.log(`[cli-supervisor] ${message}`)
-}
-
-function clearShutdownTimer() {
-  if (shutdownTimer) {
-    clearTimeout(shutdownTimer)
-    shutdownTimer = null
-  }
-}
-
-function forwardStream(stream, target) {
-  if (!stream) return
-  stream.on("data", (chunk) => {
-    target.write(chunk)
-  })
-}
-
-function terminateChild(force) {
-  if (!child || child.exitCode !== null || child.signalCode !== null) {
-    return
-  }
-
-  try {
-    child.kill(force ? "SIGKILL" : "SIGTERM")
-  } catch {
-    // no-op
-  }
-}
-
-function requestShutdown(force = false) {
-  if (!child) {
-    process.exit(force ? 1 : 0)
-    return
-  }
-
-  terminateChild(force)
-  if (force) {
-    process.exit(1)
-    return
-  }
-
-  clearShutdownTimer()
-  shutdownTimer = setTimeout(() => {
-    log(`shutdown timed out after ${SHUTDOWN_GRACE_MS}ms; forcing child termination`)
-    terminateChild(true)
-  }, SHUTDOWN_GRACE_MS)
-  shutdownTimer.unref()
-}
-
-function installShutdownHandlers() {
-  process.on("SIGTERM", () => requestShutdown(false))
-  process.on("SIGINT", () => requestShutdown(false))
-  process.on("disconnect", () => requestShutdown(false))
-  process.on("uncaughtException", (error) => {
-    log("uncaught exception", error)
-    requestShutdown(true)
-  })
-  process.on("unhandledRejection", (error) => {
-    log("unhandled rejection", error)
-    requestShutdown(true)
-  })
-}
-
-function parsePayload() {
-  const raw = process.argv[2]
-  if (!raw) {
-    throw new Error("Supervisor payload is required")
-  }
-
-  const parsed = JSON.parse(raw)
-  if (!parsed || typeof parsed !== "object") {
-    throw new Error("Supervisor payload must be an object")
-  }
-  if (typeof parsed.command !== "string" || parsed.command.trim().length === 0) {
-    throw new Error("Supervisor payload command is required")
-  }
-  if (!Array.isArray(parsed.args) || !parsed.args.every((value) => typeof value === "string")) {
-    throw new Error("Supervisor payload args must be a string array")
-  }
-
-  return {
-    command: parsed.command,
-    args: parsed.args,
-    cwd: typeof parsed.cwd === "string" && parsed.cwd.trim().length > 0 ? parsed.cwd : process.cwd(),
-  }
-}
-
-function main() {
-  installShutdownHandlers()
-
-  const payload = parsePayload()
-  log(`launching shell command: ${payload.command} ${payload.args.join(" ")}`)
-
-  child = spawn(payload.command, payload.args, {
-    cwd: payload.cwd,
-    env: process.env,
-    shell: false,
-    stdio: ["ignore", "pipe", "pipe"],
-  })
-
-  forwardStream(child.stdout, process.stdout)
-  forwardStream(child.stderr, process.stderr)
-
-  child.on("error", (error) => {
-    log("failed to spawn shell command", error)
-    process.exit(1)
-  })
-
-  child.on("exit", (code, signal) => {
-    clearShutdownTimer()
-    log(`child exited code=${code ?? ""} signal=${signal ?? ""}`)
-    process.exitCode = typeof code === "number" ? code : signal ? 1 : 0
-    process.exit()
-  })
-}
-
-main()
--- a/packages/electron-app/electron/resources/entitlements.mac.plist
+++ b/packages/electron-app/electron/resources/entitlements.mac.plist
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>com.apple.security.cs.allow-jit</key>
-  <true/>
-  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-  <true/>
-  <key>com.apple.security.cs.disable-library-validation</key>
-  <true/>
-  <key>com.apple.security.device.audio-input</key>
-  <true/>
-</dict>
-</plist>
--- a/packages/electron-app/package.json
+++ b/packages/electron-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@neuralnomads/codenomad-electron-app",
-  "version": "0.13.1",
+  "version": "0.12.3",
  "description": "CodeNomad - AI coding assistant",
  "license": "MIT",
  "author": {
@@ -20,8 +20,6 @@
    "dev:debug": "cross-env CLI_LOG_LEVEL=debug electron-vite dev",
    "dev:trace": "cross-env CLI_LOG_LEVEL=trace electron-vite dev",
    "dev:electron": "NODE_ENV=development ELECTRON_ENABLE_LOGGING=1 NODE_OPTIONS=\"--import tsx\" electron electron/main/main.ts",
-    "prepare:resources": "node scripts/prepare-resources.js",
-    "prebuild": "npm run prepare:resources",
    "build": "electron-vite build",
    "typecheck": "tsc --noEmit -p tsconfig.json",
    "preview": "electron-vite preview",
@@ -35,11 +33,8 @@
    "build:linux-arm64": "node scripts/build.js linux-arm64",
    "build:linux-rpm": "node scripts/build.js linux-rpm",
    "build:all": "node scripts/build.js all",
-    "prepackage:mac": "npm run prepare:resources",
    "package:mac": "electron-builder --mac",
-    "prepackage:win": "npm run prepare:resources",
    "package:win": "electron-builder --win",
-    "prepackage:linux": "npm run prepare:resources",
    "package:linux": "electron-builder --linux"
  },
  "dependencies": {
@@ -87,12 +82,6 @@
      }
    ],
    "mac": {
-      "entitlements": "electron/resources/entitlements.mac.plist",
-      "entitlementsInherit": "electron/resources/entitlements.mac.plist",
-      "extendInfo": {
-        "NSMicrophoneUsageDescription": "CodeNomad needs microphone access for speech-to-text prompt input.",
-        "NSLocalNetworkUsageDescription": "CodeNomad needs local network access to connect to locally hosted AI and speech services."
-      },
      "category": "public.app-category.developer-tools",
      "target": [
        {
--- a/packages/electron-app/scripts/build.js
+++ b/packages/electron-app/scripts/build.js
@@ -111,12 +111,6 @@ async function build(platform) {
      env: { NODE_PATH: workspaceNodeModulesPath },
    })

-    console.log("\n📦 Step 1.5/3: Preparing packaged server resources...\n")
-    await run(process.execPath, [join(appDir, "scripts", "prepare-resources.js")], {
-      cwd: workspaceRoot,
-      env: { NODE_PATH: workspaceNodeModulesPath },
-    })
-
    console.log("\n📦 Step 2/3: Building Electron app...\n")
    await run(npmCmd, ["run", "build"])

--- a/packages/electron-app/scripts/prepare-resources.js
+++ b/packages/electron-app/scripts/prepare-resources.js
@@ -1,132 +0,0 @@
-#!/usr/bin/env node
-
-import fs from "fs"
-import path, { join } from "path"
-import { spawnSync } from "child_process"
-import { fileURLToPath } from "url"
-
-const __dirname = fileURLToPath(new URL(".", import.meta.url))
-const appDir = join(__dirname, "..")
-const workspaceRoot = join(appDir, "..", "..")
-const serverRoot = join(appDir, "..", "server")
-const resourcesRoot = join(appDir, "electron", "resources")
-const serverDest = join(resourcesRoot, "server")
-const npmExecPath = process.env.npm_execpath
-const npmNodeExecPath = process.env.npm_node_execpath
-
-const serverSources = ["dist", "public", "node_modules", "package.json"]
-const serverDepsMarker = join(serverRoot, "node_modules", "fastify", "package.json")
-
-function log(message) {
-  console.log(`[prepare-resources] ${message}`)
-}
-
-function ensureServerBuild() {
-  const distPath = join(serverRoot, "dist")
-  const publicPath = join(serverRoot, "public")
-  if (!fs.existsSync(distPath) || !fs.existsSync(publicPath)) {
-    throw new Error("Server build artifacts are missing. Run the server build before packaging Electron.")
-  }
-}
-
-function ensureServerDependencies() {
-  if (fs.existsSync(serverDepsMarker)) {
-    return
-  }
-
-  log("installing production server dependencies")
-  const npmArgs = [
-    "install",
-    "--omit=dev",
-    "--ignore-scripts",
-    "--workspaces=false",
-    "--package-lock=false",
-    "--install-strategy=shallow",
-    "--fund=false",
-    "--audit=false",
-  ]
-
-  const env = {
-    ...process.env,
-    PATH: `${join(workspaceRoot, "node_modules", ".bin")}${path.delimiter}${process.env.PATH ?? ""}`,
-    npm_config_workspaces: "false",
-  }
-
-  const npmCli = npmExecPath && npmNodeExecPath ? [npmNodeExecPath, [npmExecPath, ...npmArgs]] : null
-  const result = npmCli
-    ? spawnSync(npmCli[0], npmCli[1], { cwd: serverRoot, stdio: "inherit", env })
-    : spawnSync("npm", npmArgs, { cwd: serverRoot, stdio: "inherit", env, shell: process.platform === "win32" })
-
-  if (result.status !== 0) {
-    if (result.error) {
-      throw result.error
-    }
-    throw new Error(`npm install exited with code ${result.status ?? 1}`)
-  }
-}
-
-function copyServerArtifacts() {
-  fs.rmSync(serverDest, { recursive: true, force: true })
-  fs.mkdirSync(serverDest, { recursive: true })
-
-  for (const name of serverSources) {
-    const from = join(serverRoot, name)
-    const to = join(serverDest, name)
-    if (!fs.existsSync(from)) {
-      throw new Error(`Missing required server artifact: ${from}`)
-    }
-    fs.cpSync(from, to, { recursive: true, dereference: true })
-    log(`copied ${name} to Electron resources`) 
-  }
-}
-
-function stripNodeModuleBins() {
-  const root = join(serverDest, "node_modules")
-  if (!fs.existsSync(root)) {
-    return
-  }
-
-  const stack = [root]
-  let removed = 0
-
-  while (stack.length > 0) {
-    const current = stack.pop()
-    if (!current) break
-
-    let entries
-    try {
-      entries = fs.readdirSync(current, { withFileTypes: true })
-    } catch {
-      continue
-    }
-
-    for (const entry of entries) {
-      const full = join(current, entry.name)
-      if (entry.name === ".bin") {
-        fs.rmSync(full, { recursive: true, force: true })
-        removed += 1
-        continue
-      }
-
-      if (entry.isDirectory()) {
-        stack.push(full)
-      }
-    }
-  }
-
-  if (removed > 0) {
-    log(`removed ${removed} node_modules/.bin directories`)
-  }
-}
-
-async function main() {
-  ensureServerBuild()
-  ensureServerDependencies()
-  copyServerArtifacts()
-  stripNodeModuleBins()
-}
-
-main().catch((error) => {
-  console.error("[prepare-resources] failed:", error)
-  process.exit(1)
-})
--- a/packages/electron-app/tsconfig.json
+++ b/packages/electron-app/tsconfig.json
@@ -14,5 +14,5 @@
    "noEmit": true
  },
  "include": ["electron/**/*.ts", "electron.vite.config.ts"],
-  "exclude": ["node_modules", "dist", "electron/resources/server"]
+  "exclude": ["node_modules", "dist"]
 }
--- a/packages/opencode-config/package.json
+++ b/packages/opencode-config/package.json
@@ -4,6 +4,6 @@
  "private": true,
  "license": "MIT",
  "dependencies": {
-    "@opencode-ai/plugin": "1.3.2"
+    "@opencode-ai/plugin": "1.2.25"
  }
 }
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@neuralnomads/codenomad",
-  "version": "0.13.1",
+  "version": "0.12.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@neuralnomads/codenomad",
-      "version": "0.13.1",
+      "version": "0.12.3",
      "dependencies": {
        "@fastify/cors": "^8.5.0",
        "@fastify/reply-from": "^9.8.0",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@neuralnomads/codenomad",
-  "version": "0.13.1",
+  "version": "0.12.3",
  "description": "CodeNomad Server",
  "license": "MIT",
  "author": {
@@ -32,7 +32,6 @@
    "fastify": "^4.28.1",
    "fuzzysort": "^2.0.4",
    "node-forge": "^1.3.3",
-    "openai": "^6.27.0",
    "pino": "^9.4.0",
    "undici": "^6.19.8",
    "yaml": "^2.4.2",
--- a/packages/server/src/api-types.ts
+++ b/packages/server/src/api-types.ts
@@ -207,39 +207,6 @@ export interface BinaryValidationResult {
  error?: string
 }

-export interface SpeechSegment {
-  startMs: number
-  endMs: number
-  text: string
-}
-
-export interface SpeechCapabilitiesResponse {
-  available: boolean
-  configured: boolean
-  provider: string
-  supportsStt: boolean
-  supportsTts: boolean
-  supportsStreamingTts: boolean
-  baseUrl?: string
-  sttModel: string
-  ttsModel: string
-  ttsVoice: string
-  ttsFormats: string[]
-  streamingTtsFormats: string[]
-}
-
-export interface SpeechTranscriptionResponse {
-  text: string
-  language?: string
-  durationMs?: number
-  segments?: SpeechSegment[]
-}
-
-export interface SpeechSynthesisResponse {
-  audioBase64: string
-  mimeType: string
-}
-
 export type WorkspaceEventType =
  | "workspace.created"
  | "workspace.started"
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -23,7 +23,6 @@ import { AuthManager, BOOTSTRAP_TOKEN_STDOUT_PREFIX, DEFAULT_AUTH_USERNAME } fro
 import { resolveHttpsOptions } from "./server/tls"
 import { resolveNetworkAddresses } from "./server/network-addresses"
 import { startDevReleaseMonitor } from "./releases/dev-release-monitor"
-import { SpeechService } from "./speech/service"

 const require = createRequire(import.meta.url)

@@ -305,7 +304,6 @@ async function main() {
  })
  const fileSystemBrowser = new FileSystemBrowser({ rootDir: options.rootDir, unrestricted: options.unrestrictedRoot })
  const instanceStore = new InstanceStore(configLocation.instancesDir)
-  const speechService = new SpeechService(settings, logger.child({ component: "speech" }))
  const instanceEventBridge = new InstanceEventBridge({
    workspaceManager,
    eventBus,
@@ -390,7 +388,6 @@ async function main() {
        eventBus,
        serverMeta,
        instanceStore,
-        speechService,
        authManager,
        uiStaticDir: uiResolution.uiStaticDir ?? DEFAULT_UI_STATIC_DIR,
        uiDevServerUrl: uiResolution.uiDevServerUrl,
@@ -411,7 +408,6 @@ async function main() {
        eventBus,
        serverMeta,
        instanceStore,
-        speechService,
        authManager,
        uiStaticDir: uiResolution.uiStaticDir ?? DEFAULT_UI_STATIC_DIR,
        uiDevServerUrl: undefined,
--- a/packages/server/src/server/http-server.ts
+++ b/packages/server/src/server/http-server.ts
@@ -21,14 +21,12 @@ import { registerStorageRoutes } from "./routes/storage"
 import { registerPluginRoutes } from "./routes/plugin"
 import { registerBackgroundProcessRoutes } from "./routes/background-processes"
 import { registerWorktreeRoutes } from "./routes/worktrees"
-import { registerSpeechRoutes } from "./routes/speech"
 import { ServerMeta } from "../api-types"
 import { InstanceStore } from "../storage/instance-store"
 import { BackgroundProcessManager } from "../background-processes/manager"
 import type { AuthManager } from "../auth/manager"
 import { registerAuthRoutes } from "./routes/auth"
 import { sendUnauthorized, wantsHtml } from "../auth/http-auth"
-import type { SpeechService } from "../speech/service"

 interface HttpServerDeps {
  bindHost: string
@@ -43,7 +41,6 @@ interface HttpServerDeps {
  eventBus: EventBus
  serverMeta: ServerMeta
  instanceStore: InstanceStore
-  speechService: SpeechService
  authManager: AuthManager
  uiStaticDir: string
  uiDevServerUrl?: string
@@ -255,7 +252,6 @@ export function createHttpServer(deps: HttpServerDeps) {
    eventBus: deps.eventBus,
    workspaceManager: deps.workspaceManager,
  })
-  registerSpeechRoutes(app, { speechService: deps.speechService })
  registerPluginRoutes(app, { workspaceManager: deps.workspaceManager, eventBus: deps.eventBus, logger: proxyLogger })
  registerBackgroundProcessRoutes(app, { backgroundProcessManager })
  registerInstanceProxyRoutes(app, { workspaceManager: deps.workspaceManager, logger: proxyLogger })
--- a/packages/server/src/server/routes/settings.ts
+++ b/packages/server/src/server/routes/settings.ts
@@ -3,7 +3,6 @@ import { z } from "zod"
 import { probeBinaryVersion } from "../../workspaces/runtime"
 import type { SettingsService } from "../../settings/service"
 import type { Logger } from "../../logger"
-import { sanitizeConfigDoc, sanitizeConfigOwner } from "../../settings/public-config"

 interface RouteDeps {
  settings: SettingsService
@@ -21,10 +20,10 @@ function validateBinaryPath(binaryPath: string): { valid: boolean; version?: str

 export function registerSettingsRoutes(app: FastifyInstance, deps: RouteDeps) {
  // Full-document access
-  app.get("/api/storage/config", async () => sanitizeConfigDoc(deps.settings.getDoc("config")))
+  app.get("/api/storage/config", async () => deps.settings.getDoc("config"))
  app.patch("/api/storage/config", async (request, reply) => {
    try {
-      return sanitizeConfigDoc(deps.settings.mergePatchDoc("config", request.body ?? {}))
+      return deps.settings.mergePatchDoc("config", request.body ?? {})
    } catch (error) {
      reply.code(400)
      return { error: error instanceof Error ? error.message : "Invalid patch" }
@@ -32,15 +31,12 @@ export function registerSettingsRoutes(app: FastifyInstance, deps: RouteDeps) {
  })

  app.get<{ Params: { owner: string } }>("/api/storage/config/:owner", async (request) => {
-    return sanitizeConfigOwner(request.params.owner, deps.settings.getOwner("config", request.params.owner))
+    return deps.settings.getOwner("config", request.params.owner)
  })

  app.patch<{ Params: { owner: string } }>("/api/storage/config/:owner", async (request, reply) => {
    try {
-      return sanitizeConfigOwner(
-        request.params.owner,
-        deps.settings.mergePatchOwner("config", request.params.owner, request.body ?? {}),
-      )
+      return deps.settings.mergePatchOwner("config", request.params.owner, request.body ?? {})
    } catch (error) {
      reply.code(400)
      return { error: error instanceof Error ? error.message : "Invalid patch" }
--- a/packages/server/src/server/routes/speech.ts
+++ b/packages/server/src/server/routes/speech.ts
@@ -1,74 +0,0 @@
-import type { FastifyInstance } from "fastify"
-import { z } from "zod"
-import type { SpeechService } from "../../speech/service"
-
-interface RouteDeps {
-  speechService: SpeechService
-}
-
-const TranscribeBodySchema = z.object({
-  audioBase64: z.string().min(1, "Audio payload is required"),
-  mimeType: z.string().min(1, "Audio MIME type is required"),
-  filename: z.string().optional(),
-  language: z.string().optional(),
-  prompt: z.string().optional(),
-})
-
-const SynthesizeBodySchema = z.object({
-  text: z.string().trim().min(1, "Text is required"),
-  format: z.enum(["mp3", "wav", "opus", "aac"]).optional(),
-})
-
-function getSpeechErrorStatus(error: unknown): number {
-  if (error instanceof z.ZodError) {
-    return 400
-  }
-  if (error instanceof Error && /not configured/i.test(error.message)) {
-    return 503
-  }
-  return 502
-}
-
-function getSpeechErrorMessage(error: unknown, fallback: string): string {
-  return error instanceof Error ? error.message : fallback
-}
-
-export function registerSpeechRoutes(app: FastifyInstance, deps: RouteDeps) {
-  app.get("/api/speech/capabilities", async () => deps.speechService.getCapabilities())
-
-  app.post("/api/speech/transcribe", async (request, reply) => {
-    try {
-      const body = TranscribeBodySchema.parse(request.body ?? {})
-      return await deps.speechService.transcribe(body)
-    } catch (error) {
-      request.log.error({ err: error }, "Failed to transcribe audio")
-      reply.code(getSpeechErrorStatus(error))
-      return { error: getSpeechErrorMessage(error, "Failed to transcribe audio") }
-    }
-  })
-
-  app.post("/api/speech/synthesize", async (request, reply) => {
-    try {
-      const body = SynthesizeBodySchema.parse(request.body ?? {})
-      return await deps.speechService.synthesize(body)
-    } catch (error) {
-      request.log.error({ err: error }, "Failed to synthesize audio")
-      reply.code(getSpeechErrorStatus(error))
-      return { error: getSpeechErrorMessage(error, "Failed to synthesize audio") }
-    }
-  })
-
-  app.post("/api/speech/synthesize/stream", async (request, reply) => {
-    try {
-      const body = SynthesizeBodySchema.parse(request.body ?? {})
-      const result = await deps.speechService.synthesizeStream(body)
-      reply.header("Content-Type", result.mimeType)
-      reply.header("Cache-Control", "no-store")
-      return reply.send(result.stream)
-    } catch (error) {
-      request.log.error({ err: error }, "Failed to stream synthesized audio")
-      reply.code(getSpeechErrorStatus(error))
-      return { error: getSpeechErrorMessage(error, "Failed to stream synthesized audio") }
-    }
-  })
-}
--- a/packages/server/src/settings/public-config.ts
+++ b/packages/server/src/settings/public-config.ts
@@ -1,40 +0,0 @@
-import type { SettingsDoc } from "./yaml-doc-store"
-
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
-
-function sanitizeServerOwner(value: SettingsDoc): SettingsDoc {
-  const next: SettingsDoc = { ...value }
-  const speech = isPlainObject(next.speech) ? { ...next.speech } : null
-
-  if (!speech) {
-    return next
-  }
-
-  const rawApiKey = typeof speech.apiKey === "string" ? speech.apiKey.trim() : ""
-  if (rawApiKey) {
-    delete speech.apiKey
-    speech.hasApiKey = true
-  } else if (!("hasApiKey" in speech)) {
-    speech.hasApiKey = false
-  }
-
-  next.speech = speech
-  return next
-}
-
-export function sanitizeConfigOwner(owner: string, value: SettingsDoc): SettingsDoc {
-  if (owner !== "server") {
-    return value
-  }
-  return sanitizeServerOwner(value)
-}
-
-export function sanitizeConfigDoc(value: SettingsDoc): SettingsDoc {
-  const next: SettingsDoc = { ...value }
-  if (isPlainObject(next.server)) {
-    next.server = sanitizeServerOwner(next.server)
-  }
-  return next
-}
--- a/packages/server/src/settings/service.ts
+++ b/packages/server/src/settings/service.ts
@@ -4,7 +4,6 @@ import type { ConfigLocation } from "../config/location"
 import { YamlDocStore, type SettingsDoc } from "./yaml-doc-store"
 import { migrateSettingsLayout } from "./migrate"
 import type { WorkspaceEventPayload } from "../api-types"
-import { sanitizeConfigOwner } from "./public-config"

 export type DocKind = "config" | "state"

@@ -46,11 +45,10 @@ export class SettingsService {
  private publish(kind: DocKind, owner: string, value?: SettingsDoc) {
    if (!this.eventBus) return
    const type = kind === "config" ? "storage.configChanged" : "storage.stateChanged"
-    const nextValue = value ?? this.getOwner(kind, owner)
    const payload: WorkspaceEventPayload = {
      type,
      owner,
-      value: kind === "config" ? sanitizeConfigOwner(owner, nextValue) : nextValue,
+      value: value ?? this.getOwner(kind, owner),
    } as any
    this.eventBus.publish(payload)
  }
--- a/packages/server/src/speech/providers/openai-compatible.ts
+++ b/packages/server/src/speech/providers/openai-compatible.ts
@@ -1,234 +0,0 @@
-import { Readable } from "node:stream"
-import OpenAI from "openai"
-import { toFile } from "openai/uploads"
-import type { SpeechSynthesisResponse, SpeechTranscriptionResponse } from "../../api-types"
-import type { Logger } from "../../logger"
-import type { NormalizedSpeechSettings, SpeechSynthesisStreamResponse, SynthesizeSpeechInput, TranscribeAudioInput } from "../service"
-
-interface OpenAICompatibleSpeechProviderOptions {
-  settings: NormalizedSpeechSettings
-  logger: Logger
-}
-
-export class OpenAICompatibleSpeechProvider {
-  constructor(private readonly options: OpenAICompatibleSpeechProviderOptions) {}
-
-  getCapabilities() {
-    const { settings } = this.options
-    return {
-      available: true,
-      configured: Boolean(settings.apiKey),
-      provider: settings.provider,
-      supportsStt: true,
-      supportsTts: true,
-      supportsStreamingTts: true,
-      baseUrl: settings.baseUrl,
-      sttModel: settings.sttModel,
-      ttsModel: settings.ttsModel,
-      ttsVoice: settings.ttsVoice,
-      ttsFormats: ["mp3", "wav", "opus", "aac"],
-      streamingTtsFormats: ["mp3", "wav", "opus", "aac"],
-    }
-  }
-
-  async transcribe(input: TranscribeAudioInput): Promise<SpeechTranscriptionResponse> {
-    const client = this.createClient()
-    const startedAt = Date.now()
-    const extension = extensionForMime(input.mimeType)
-    const buffer = Buffer.from(input.audioBase64, "base64")
-    const filename = input.filename?.trim() || `prompt-input.${extension}`
-
-    this.options.logger.info(
-      {
-        mimeType: input.mimeType,
-        bytes: buffer.byteLength,
-        language: input.language,
-        model: this.options.settings.sttModel,
-      },
-      "speech.transcribe",
-    )
-
-    const response = await this.requestTranscription(client, buffer, filename, input)
-
-    return {
-      text: typeof response?.text === "string" ? response.text : "",
-      language: typeof response?.language === "string" ? response.language : input.language,
-      durationMs: Number.isFinite(response?.duration) ? Math.round(Number(response.duration) * 1000) : Date.now() - startedAt,
-      segments: Array.isArray(response?.segments)
-        ? response.segments
-            .filter((segment: any) => typeof segment?.text === "string")
-            .map((segment: any) => ({
-              startMs: Math.max(0, Math.round(Number(segment.start ?? 0) * 1000)),
-              endMs: Math.max(0, Math.round(Number(segment.end ?? 0) * 1000)),
-              text: String(segment.text),
-            }))
-        : undefined,
-    }
-  }
-
-  private async requestTranscription(
-    client: OpenAI,
-    buffer: Buffer,
-    filename: string,
-    input: TranscribeAudioInput,
-  ): Promise<any> {
-    const baseRequest = {
-      model: this.options.settings.sttModel,
-      ...(input.language ? { language: input.language } : {}),
-      ...(input.prompt ? { prompt: input.prompt } : {}),
-    }
-
-    try {
-      const file = await toFile(buffer, filename, { type: input.mimeType })
-      return (await client.audio.transcriptions.create({
-        ...baseRequest,
-        file,
-        response_format: "verbose_json" as any,
-      } as any)) as any
-    } catch (error) {
-      this.options.logger.warn({ err: error }, "speech.transcribe verbose_json failed; retrying default format")
-      const retryFile = await toFile(buffer, filename, { type: input.mimeType })
-      return (await client.audio.transcriptions.create({
-        ...baseRequest,
-        file: retryFile,
-      } as any)) as any
-    }
-  }
-
-  async synthesize(input: SynthesizeSpeechInput): Promise<SpeechSynthesisResponse> {
-    const format = input.format ?? this.options.settings.ttsFormat
-
-    this.options.logger.info(
-      {
-        model: this.options.settings.ttsModel,
-        voice: this.options.settings.ttsVoice,
-        format,
-      },
-      "speech.synthesize",
-    )
-
-    const response = await this.requestSpeechAudio(input.text, format)
-    const mimeType = response.headers.get("content-type") || mimeTypeForFormat(format)
-
-    const audioBuffer = Buffer.from(await response.arrayBuffer())
-    return {
-      audioBase64: audioBuffer.toString("base64"),
-      mimeType,
-    }
-  }
-
-  async synthesizeStream(input: SynthesizeSpeechInput): Promise<SpeechSynthesisStreamResponse> {
-    const format = input.format ?? this.options.settings.ttsFormat
-
-    this.options.logger.info(
-      {
-        model: this.options.settings.ttsModel,
-        voice: this.options.settings.ttsVoice,
-        format,
-      },
-      "speech.synthesize.stream",
-    )
-
-    const response = await this.requestSpeechAudio(input.text, format)
-    if (!response.body) {
-      throw new Error("Speech provider did not return a stream.")
-    }
-
-    return {
-      stream: Readable.fromWeb(response.body as any),
-      mimeType: response.headers.get("content-type") || mimeTypeForFormat(format),
-    }
-  }
-
-  private async requestSpeechAudio(text: string, format: "mp3" | "wav" | "opus" | "aac"): Promise<Response> {
-    const { settings } = this.options
-    if (!settings.apiKey) {
-      throw new Error("Speech provider is not configured. Add an API key in Speech settings.")
-    }
-
-    const endpoint = new URL("audio/speech", ensureTrailingSlash(settings.baseUrl ?? "https://api.openai.com/v1"))
-    let response: Response
-    try {
-      response = await fetch(endpoint, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${settings.apiKey}`,
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          model: settings.ttsModel,
-          voice: settings.ttsVoice,
-          input: text,
-          response_format: format,
-        }),
-      })
-    } catch (error) {
-      const detailedError = error as Error & {
-        cause?: unknown
-        code?: string
-        errno?: number | string
-        syscall?: string
-        address?: string
-        port?: number
-      }
-      this.options.logger.error(
-        {
-          err: error,
-          endpoint: endpoint.toString(),
-          baseUrl: settings.baseUrl,
-          model: settings.ttsModel,
-          voice: settings.ttsVoice,
-          format,
-          cause: detailedError.cause,
-          code: detailedError.code,
-          errno: detailedError.errno,
-          syscall: detailedError.syscall,
-          address: detailedError.address,
-          port: detailedError.port,
-        },
-        "speech.synthesize fetch failed",
-      )
-      throw error
-    }
-
-    if (!response.ok) {
-      const detail = await response.text()
-      throw new Error(detail || `Speech synthesis failed with ${response.status}`)
-    }
-
-    return response
-  }
-
-  private createClient(): OpenAI {
-    const { settings } = this.options
-    if (!settings.apiKey) {
-      throw new Error("Speech provider is not configured. Add an API key in Speech settings.")
-    }
-
-    return new OpenAI({
-      apiKey: settings.apiKey,
-      baseURL: settings.baseUrl,
-    })
-  }
-}
-
-function extensionForMime(mimeType: string): string {
-  const normalized = mimeType.toLowerCase()
-  if (normalized.includes("webm")) return "webm"
-  if (normalized.includes("ogg")) return "ogg"
-  if (normalized.includes("wav")) return "wav"
-  if (normalized.includes("mpeg") || normalized.includes("mp3")) return "mp3"
-  if (normalized.includes("mp4") || normalized.includes("aac")) return "m4a"
-  return "webm"
-}
-
-function mimeTypeForFormat(format: "mp3" | "wav" | "opus" | "aac"): string {
-  if (format === "wav") return "audio/wav"
-  if (format === "opus") return 'audio/ogg; codecs="opus"'
-  if (format === "aac") return "audio/aac"
-  return "audio/mpeg"
-}
-
-function ensureTrailingSlash(value: string): string {
-  return value.endsWith("/") ? value : `${value}/`
-}
--- a/packages/server/src/speech/service.ts
+++ b/packages/server/src/speech/service.ts
@@ -1,106 +0,0 @@
-import { z } from "zod"
-import type { Readable } from "node:stream"
-import type { Logger } from "../logger"
-import type { SettingsService } from "../settings/service"
-import type { SpeechCapabilitiesResponse, SpeechSynthesisResponse, SpeechTranscriptionResponse } from "../api-types"
-import { OpenAICompatibleSpeechProvider } from "./providers/openai-compatible"
-
-const ServerSpeechSettingsSchema = z.object({
-  speech: z
-    .object({
-      provider: z.string().optional(),
-      apiKey: z.string().optional(),
-      baseUrl: z.string().optional(),
-      sttModel: z.string().optional(),
-      ttsModel: z.string().optional(),
-      ttsVoice: z.string().optional(),
-      ttsFormat: z.enum(["mp3", "wav", "opus", "aac"]).optional(),
-    })
-    .optional(),
-})
-
-export interface TranscribeAudioInput {
-  audioBase64: string
-  mimeType: string
-  filename?: string
-  language?: string
-  prompt?: string
-}
-
-export interface SynthesizeSpeechInput {
-  text: string
-  format?: "mp3" | "wav" | "opus" | "aac"
-}
-
-export interface SpeechSynthesisStreamResponse {
-  stream: Readable
-  mimeType: string
-}
-
-export interface SpeechProvider {
-  getCapabilities(): SpeechCapabilitiesResponse
-  transcribe(input: TranscribeAudioInput): Promise<SpeechTranscriptionResponse>
-  synthesize(input: SynthesizeSpeechInput): Promise<SpeechSynthesisResponse>
-  synthesizeStream(input: SynthesizeSpeechInput): Promise<SpeechSynthesisStreamResponse>
-}
-
-export interface NormalizedSpeechSettings {
-  provider: string
-  apiKey?: string
-  baseUrl?: string
-  sttModel: string
-  ttsModel: string
-  ttsVoice: string
-  ttsFormat: "mp3" | "wav" | "opus" | "aac"
-}
-
-const DEFAULT_PROVIDER = "openai-compatible"
-const DEFAULT_STT_MODEL = "gpt-4o-mini-transcribe"
-const DEFAULT_TTS_MODEL = "gpt-4o-mini-tts"
-const DEFAULT_TTS_VOICE = "alloy"
-const DEFAULT_TTS_FORMAT = "mp3"
-export class SpeechService {
-  constructor(
-    private readonly settings: SettingsService,
-    private readonly logger: Logger,
-  ) {}
-
-  getCapabilities(): SpeechCapabilitiesResponse {
-    return this.createProvider().getCapabilities()
-  }
-
-  async transcribe(input: TranscribeAudioInput): Promise<SpeechTranscriptionResponse> {
-    return this.createProvider().transcribe(input)
-  }
-
-  async synthesize(input: SynthesizeSpeechInput): Promise<SpeechSynthesisResponse> {
-    return this.createProvider().synthesize(input)
-  }
-
-  async synthesizeStream(input: SynthesizeSpeechInput): Promise<SpeechSynthesisStreamResponse> {
-    return this.createProvider().synthesizeStream(input)
-  }
-
-  private createProvider(): SpeechProvider {
-    const settings = this.resolveSettings()
-    return new OpenAICompatibleSpeechProvider({
-      settings,
-      logger: this.logger.child({ provider: settings.provider }),
-    })
-  }
-
-  private resolveSettings(): NormalizedSpeechSettings {
-    const parsed = ServerSpeechSettingsSchema.parse(this.settings.getOwner("config", "server") ?? {})
-    const speech = parsed.speech ?? {}
-
-    return {
-      provider: speech.provider?.trim() || DEFAULT_PROVIDER,
-      apiKey: speech.apiKey?.trim() || process.env.OPENAI_API_KEY,
-      baseUrl: speech.baseUrl?.trim() || process.env.OPENAI_BASE_URL || undefined,
-      sttModel: speech.sttModel?.trim() || DEFAULT_STT_MODEL,
-      ttsModel: speech.ttsModel?.trim() || DEFAULT_TTS_MODEL,
-      ttsVoice: speech.ttsVoice?.trim() || DEFAULT_TTS_VOICE,
-      ttsFormat: speech.ttsFormat ?? DEFAULT_TTS_FORMAT,
-    }
-  }
-}
--- a/packages/tauri-app/Cargo.lock
+++ b/packages/tauri-app/Cargo.lock
@@ -473,7 +473,6 @@ dependencies = [
 "tauri",
 "tauri-build",
 "tauri-plugin-dialog",
- "tauri-plugin-global-shortcut",
 "tauri-plugin-notification",
 "tauri-plugin-opener",
 "thiserror 1.0.69",
@@ -1351,16 +1350,6 @@ dependencies = [
 "version_check",
 ]

-[[package]]
-name = "gethostname"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
-dependencies = [
- "rustix 1.1.4",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -1493,24 +1482,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"

-[[package]]
-name = "global-hotkey"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9247516746aa8e53411a0db9b62b0e24efbcf6a76e0ba73e5a91b512ddabed7"
-dependencies = [
- "crossbeam-channel",
- "keyboard-types",
- "objc2",
- "objc2-app-kit",
- "once_cell",
- "serde",
- "thiserror 2.0.18",
- "windows-sys 0.59.0",
- "x11rb",
- "xkeysym",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -4084,21 +4055,6 @@ dependencies = [
 "url",
 ]

-[[package]]
-name = "tauri-plugin-global-shortcut"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "424af23c7e88d05e4a1a6fc2c7be077912f8c76bd7900fd50aa2b7cbf5a2c405"
-dependencies = [
- "global-hotkey",
- "log",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "tauri-plugin-notification"
 version = "2.3.3"
@@ -5779,29 +5735,6 @@ dependencies = [
 "pkg-config",
 ]

-[[package]]
-name = "x11rb"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
-dependencies = [
- "gethostname",
- "rustix 1.1.4",
- "x11rb-protocol",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
-
-[[package]]
-name = "xkeysym"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
-
 [[package]]
 name = "yoke"
 version = "0.8.1"
--- a/packages/tauri-app/package.json
+++ b/packages/tauri-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@codenomad/tauri-app",
-  "version": "0.13.1",
+  "version": "0.12.3",
  "private": true,
  "license": "MIT",
  "scripts": {
--- a/packages/tauri-app/src-tauri/Cargo.toml
+++ b/packages/tauri-app/src-tauri/Cargo.toml
@@ -23,7 +23,6 @@ keepawake = "0.6"
 tauri-plugin-dialog = "2"
 dirs = "5"
 tauri-plugin-opener = "2"
-tauri-plugin-global-shortcut = "2"
 url = "2"
 tauri-plugin-notification = "2"

--- a/packages/tauri-app/src-tauri/Info.plist
+++ b/packages/tauri-app/src-tauri/Info.plist
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>NSMicrophoneUsageDescription</key>
-  <string>CodeNomad needs microphone access for speech-to-text prompt input.</string>
-  <key>NSLocalNetworkUsageDescription</key>
-  <string>CodeNomad needs local network access to connect to locally hosted AI and speech services.</string>
-</dict>
-</plist>
--- a/packages/tauri-app/src-tauri/capabilities/main-window.json
+++ b/packages/tauri-app/src-tauri/capabilities/main-window.json
@@ -11,7 +11,6 @@
    "core:menu:default",
    "dialog:allow-open",
    "opener:allow-default-urls",
-    "opener:allow-open-url",
    "notification:allow-is-permission-granted",
    "notification:allow-request-permission",
    "notification:allow-notify",
--- a/packages/tauri-app/src-tauri/gen/schemas/acl-manifests.json
+++ b/packages/tauri-app/src-tauri/gen/schemas/acl-manifests.json
--- a/packages/tauri-app/src-tauri/gen/schemas/capabilities.json
+++ b/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","opener:allow-open-url","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:*","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"]}}
--- a/packages/tauri-app/src-tauri/gen/schemas/desktop-schema.json
+++ b/packages/tauri-app/src-tauri/gen/schemas/desktop-schema.json
@@ -2378,72 +2378,6 @@
          "const": "dialog:deny-save",
          "markdownDescription": "Denies the save command without any pre-configured scope."
        },
-        {
-          "description": "No features are enabled by default, as we believe\nthe shortcuts can be inherently dangerous and it is\napplication specific if specific shortcuts should be\nregistered or unregistered.\n",
-          "type": "string",
-          "const": "global-shortcut:default",
-          "markdownDescription": "No features are enabled by default, as we believe\nthe shortcuts can be inherently dangerous and it is\napplication specific if specific shortcuts should be\nregistered or unregistered.\n"
-        },
-        {
-          "description": "Enables the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-is-registered",
-          "markdownDescription": "Enables the is_registered command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-register",
-          "markdownDescription": "Enables the register command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-register-all",
-          "markdownDescription": "Enables the register_all command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the unregister command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-unregister",
-          "markdownDescription": "Enables the unregister command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the unregister_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-unregister-all",
-          "markdownDescription": "Enables the unregister_all command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-is-registered",
-          "markdownDescription": "Denies the is_registered command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-register",
-          "markdownDescription": "Denies the register command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-register-all",
-          "markdownDescription": "Denies the register_all command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the unregister command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-unregister",
-          "markdownDescription": "Denies the unregister command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the unregister_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-unregister-all",
-          "markdownDescription": "Denies the unregister_all 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",
--- a/packages/tauri-app/src-tauri/src/cli_manager.rs
+++ b/packages/tauri-app/src-tauri/src/cli_manager.rs
@@ -51,8 +51,6 @@ fn workspace_root() -> Option<PathBuf> {
 const SESSION_COOKIE_NAME: &str = "codenomad_session";

 const CLI_STOP_GRACE_SECS: u64 = 30;
-#[cfg(windows)]
-const CLI_WINDOWS_FORCE_GRACE_MS: u64 = 2_000;

 #[cfg(unix)]
 fn configure_posix_process_group(command: &mut Command) {
@@ -404,8 +402,6 @@ impl CliProcessManager {
        let mut child_opt = self.child.lock();
        if let Some(mut child) = child_opt.take() {
            log_line(&format!("stopping CLI pid={}", child.id()));
-            #[cfg(windows)]
-            let mut forced_tree_shutdown = false;
            #[cfg(unix)]
            unsafe {
                let pid = child.id() as i32;
@@ -418,7 +414,9 @@ impl CliProcessManager {
            }
            #[cfg(windows)]
            {
-                let _ = kill_process_tree_windows(child.id(), false);
+                if !kill_process_tree_windows(child.id(), false) {
+                    let _ = child.kill();
+                }
            }

            let start = Instant::now();
@@ -426,21 +424,6 @@ impl CliProcessManager {
                match child.try_wait() {
                    Ok(Some(_)) => break,
                    Ok(None) => {
-                        #[cfg(windows)]
-                        if !forced_tree_shutdown
-                            && start.elapsed() > Duration::from_millis(CLI_WINDOWS_FORCE_GRACE_MS)
-                        {
-                            log_line(&format!(
-                                "regular Windows shutdown still running after {}ms; escalating pid={}",
-                                CLI_WINDOWS_FORCE_GRACE_MS,
-                                child.id()
-                            ));
-                            forced_tree_shutdown = true;
-                            if !kill_process_tree_windows(child.id(), true) {
-                                let _ = child.kill();
-                            }
-                        }
-
                        if start.elapsed() > Duration::from_secs(CLI_STOP_GRACE_SECS) {
                            log_line(&format!(
                                "stop timed out after {}s; sending SIGKILL pid={}",
@@ -457,11 +440,7 @@ impl CliProcessManager {
                            }
                            #[cfg(windows)]
                            {
-                                if !forced_tree_shutdown
-                                    && !kill_process_tree_windows(child.id(), true)
-                                {
-                                    let _ = child.kill();
-                                } else if forced_tree_shutdown {
+                                if !kill_process_tree_windows(child.id(), true) {
                                    let _ = child.kill();
                                }
                            }
--- a/packages/tauri-app/src-tauri/src/main.rs
+++ b/packages/tauri-app/src-tauri/src/main.rs
@@ -8,14 +8,10 @@ use serde::Deserialize;
 use serde_json::json;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
-use std::time::{SystemTime, UNIX_EPOCH};
 use tauri::menu::{MenuBuilder, MenuItem, SubmenuBuilder};
 use tauri::plugin::{Builder as PluginBuilder, TauriPlugin};
 use tauri::webview::Webview;
-use tauri::{AppHandle, Emitter, Manager, Runtime, WindowEvent, Wry};
-use tauri_plugin_global_shortcut::{
-    Code as ShortcutCode, GlobalShortcutExt, Shortcut, ShortcutState,
-};
+use tauri::{AppHandle, Emitter, Manager, Runtime, Wry};
 use tauri_plugin_opener::OpenerExt;
 use url::Url;

@@ -29,10 +25,6 @@ use std::os::windows::ffi::OsStrExt;
 use windows_sys::Win32::UI::Shell::SetCurrentProcessExplicitAppUserModelID;

 static QUIT_REQUESTED: AtomicBool = AtomicBool::new(false);
-const DEFAULT_ZOOM_LEVEL: f64 = 1.0;
-const ZOOM_STEP: f64 = 0.2;
-const MIN_ZOOM_LEVEL: f64 = 0.2;
-const MAX_ZOOM_LEVEL: f64 = 5.0;

 #[cfg(windows)]
 const WINDOWS_APP_USER_MODEL_ID: &str = "ai.neuralnomads.codenomad.client";
@@ -40,7 +32,6 @@ const WINDOWS_APP_USER_MODEL_ID: &str = "ai.neuralnomads.codenomad.client";
 pub struct AppState {
    pub manager: CliProcessManager,
    pub wake_lock: Mutex<Option<KeepAwake>>,
-    pub zoom_level: Mutex<f64>,
 }

 #[derive(Debug, Default, Deserialize)]
@@ -166,83 +157,6 @@ fn emit_folder_drop_event(
    }
 }

-fn clamp_zoom_level(value: f64) -> f64 {
-    value.clamp(MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL)
-}
-
-fn set_main_window_zoom(app_handle: &AppHandle, next_zoom: f64) {
-    if let Some(window) = app_handle.get_webview_window("main") {
-        let normalized = clamp_zoom_level(next_zoom);
-        if window.set_zoom(normalized).is_ok() {
-            if let Ok(mut zoom_level) = app_handle.state::<AppState>().zoom_level.lock() {
-                *zoom_level = normalized;
-            }
-        }
-    }
-}
-
-fn reload_main_window(app_handle: &AppHandle) {
-    if let Some(window) = app_handle.get_webview_window("main") {
-        let _ = window.reload();
-    }
-}
-
-fn force_reload_main_window(app_handle: &AppHandle) {
-    if let Some(window) = app_handle.get_webview_window("main") {
-        if let Ok(mut url) = window.url() {
-            if should_allow_internal(&url) {
-                let reload_token = SystemTime::now()
-                    .duration_since(UNIX_EPOCH)
-                    .unwrap_or_default()
-                    .as_millis()
-                    .to_string();
-
-                let existing_pairs: Vec<(String, String)> = url
-                    .query_pairs()
-                    .into_owned()
-                    .filter(|(key, _)| key != "__codenomad_force_reload")
-                    .collect();
-
-                {
-                    let mut pairs = url.query_pairs_mut();
-                    pairs.clear();
-                    for (key, value) in existing_pairs {
-                        pairs.append_pair(&key, &value);
-                    }
-                    pairs.append_pair("__codenomad_force_reload", &reload_token);
-                }
-
-                let _ = window.navigate(url);
-                return;
-            }
-        }
-
-        let _ = window.reload();
-    }
-}
-
-fn toggle_fullscreen_window(app_handle: &AppHandle) {
-    if let Some(window) = app_handle.get_webview_window("main") {
-        let next_fullscreen = !window.is_fullscreen().unwrap_or(false);
-        let _ = window.set_fullscreen(next_fullscreen);
-        if cfg!(not(target_os = "macos")) {
-            if next_fullscreen {
-                let _ = window.hide_menu();
-            } else {
-                let _ = window.show_menu();
-            }
-        }
-    }
-}
-
-fn fullscreen_shortcut() -> Option<Shortcut> {
-    if cfg!(target_os = "macos") {
-        None
-    } else {
-        Some(Shortcut::new(None, ShortcutCode::F11))
-    }
-}
-
 #[cfg(windows)]
 fn set_windows_app_user_model_id() {
    let app_id: Vec<u16> = OsStr::new(WINDOWS_APP_USER_MODEL_ID)
@@ -267,48 +181,15 @@ fn main() {
    tauri::Builder::default()
        .plugin(tauri_plugin_dialog::init())
        .plugin(tauri_plugin_opener::init())
-        .plugin(
-            tauri_plugin_global_shortcut::Builder::new()
-                .with_handler(|app, shortcut, event| {
-                    if event.state() != ShortcutState::Pressed {
-                        return;
-                    }
-
-                    if fullscreen_shortcut().as_ref() == Some(shortcut) {
-                        toggle_fullscreen_window(app);
-                    }
-                })
-                .build(),
-        )
        .plugin(tauri_plugin_notification::init())
        .plugin(navigation_guard)
        .manage(AppState {
            manager: CliProcessManager::new(),
            wake_lock: Mutex::new(None),
-            zoom_level: Mutex::new(DEFAULT_ZOOM_LEVEL),
        })
        .setup(|app| {
            set_windows_app_user_model_id();
            build_menu(&app.handle())?;
-            if let Some(shortcut) = fullscreen_shortcut() {
-                let shortcut_manager = app.handle().global_shortcut();
-                let _ = shortcut_manager.register(shortcut.clone());
-
-                if let Some(window) = app.get_webview_window("main") {
-                    let app_handle = app.handle().clone();
-                    window.on_window_event(move |event| {
-                        if let WindowEvent::Focused(focused) = event {
-                            let shortcut_manager = app_handle.global_shortcut();
-                            if *focused {
-                                let _ = shortcut_manager.register(shortcut.clone());
-                            } else {
-                                let _ = shortcut_manager.unregister(shortcut.clone());
-                            }
-                        }
-                    });
-                }
-            }
-
            let dev_mode = is_dev_mode();
            let app_handle = app.handle().clone();
            let manager = app.state::<AppState>().manager.clone();
@@ -333,42 +214,36 @@ fn main() {
                        let _ = window.emit("menu:newInstance", ());
                    }
                }
+                "close" => {
+                    if let Some(window) = app_handle.get_webview_window("main") {
+                        let _ = window.close();
+                    }
+                }
                "quit" => {
                    app_handle.exit(0);
                }

                // View menu
                "reload" => {
-                    reload_main_window(app_handle);
+                    if let Some(window) = app_handle.get_webview_window("main") {
+                        let _ = window.eval("window.location.reload()");
+                    }
                }
                "force_reload" => {
-                    force_reload_main_window(app_handle);
+                    if let Some(window) = app_handle.get_webview_window("main") {
+                        let _ = window.eval("window.location.reload(true)");
+                    }
                }
                "toggle_devtools" => {
                    if let Some(window) = app_handle.get_webview_window("main") {
-                        if window.is_devtools_open() {
-                            window.close_devtools();
-                        } else {
-                            window.open_devtools();
-                        }
-                    }
-                }
-                "reset_zoom" => {
-                    set_main_window_zoom(app_handle, DEFAULT_ZOOM_LEVEL);
-                }
-                "zoom_in" => {
-                    if let Ok(zoom_level) = app_handle.state::<AppState>().zoom_level.lock() {
-                        set_main_window_zoom(app_handle, *zoom_level + ZOOM_STEP);
-                    }
-                }
-                "zoom_out" => {
-                    if let Ok(zoom_level) = app_handle.state::<AppState>().zoom_level.lock() {
-                        set_main_window_zoom(app_handle, *zoom_level - ZOOM_STEP);
+                        window.open_devtools();
                    }
                }

                "toggle_fullscreen" => {
-                    toggle_fullscreen_window(app_handle);
+                    if let Some(window) = app_handle.get_webview_window("main") {
+                        let _ = window.set_fullscreen(!window.is_fullscreen().unwrap_or(false));
+                    }
                }

                // Window menu
@@ -382,11 +257,6 @@ fn main() {
                        let _ = window.maximize();
                    }
                }
-                "close_window" => {
-                    if let Some(window) = app_handle.get_webview_window("main") {
-                        let _ = window.close();
-                    }
-                }

                // App menu (macOS)
                "about" => {
@@ -474,7 +344,6 @@ fn main() {

 fn build_menu(app: &AppHandle) -> tauri::Result<()> {
    let is_mac = cfg!(target_os = "macos");
-    let is_linux = cfg!(target_os = "linux");

    // Create submenus
    let mut submenus = Vec::new();
@@ -502,74 +371,16 @@ fn build_menu(app: &AppHandle) -> tauri::Result<()> {
        Some("CmdOrCtrl+N"),
    )?;

-    let file_menu = if is_mac {
-        SubmenuBuilder::new(app, "File")
-            .item(&new_instance_item)
-            .separator()
-            .close_window()
-            .build()?
-    } else {
-        SubmenuBuilder::new(app, "File")
-            .item(&new_instance_item)
-            .separator()
-            .text("quit", "Quit")
-            .build()?
-    };
+    let file_menu = SubmenuBuilder::new(app, "File")
+        .item(&new_instance_item)
+        .separator()
+        .text(
+            if is_mac { "close" } else { "quit" },
+            if is_mac { "Close" } else { "Quit" },
+        )
+        .build()?;
    submenus.push(file_menu);

-    let reload_item = MenuItem::with_id(app, "reload", "Reload", true, Some("CmdOrCtrl+R"))?;
-    let force_reload_item = MenuItem::with_id(
-        app,
-        "force_reload",
-        "Force Reload",
-        true,
-        Some("CmdOrCtrl+Shift+R"),
-    )?;
-    let toggle_devtools_item = MenuItem::with_id(
-        app,
-        "toggle_devtools",
-        "Toggle Developer Tools",
-        true,
-        Some("Alt+CmdOrCtrl+I"),
-    )?;
-    let reset_zoom_item =
-        MenuItem::with_id(app, "reset_zoom", "Actual Size", true, Some("CmdOrCtrl+0"))?;
-    let zoom_in_item = MenuItem::with_id(
-        app,
-        "zoom_in",
-        if is_mac { "Zoom In" } else { "Zoom In\tCtrl++" },
-        true,
-        None::<&str>,
-    )?;
-    let zoom_out_item = MenuItem::with_id(
-        app,
-        "zoom_out",
-        if is_mac {
-            "Zoom Out"
-        } else {
-            "Zoom Out\tCtrl+-"
-        },
-        true,
-        None::<&str>,
-    )?;
-    let toggle_fullscreen_item = MenuItem::with_id(
-        app,
-        "toggle_fullscreen",
-        if is_mac {
-            "Toggle Full Screen"
-        } else {
-            "Toggle Full Screen\tF11"
-        },
-        true,
-        if is_mac {
-            Some("Ctrl+Cmd+F")
-        } else {
-            None::<&str>
-        },
-    )?;
-    let close_window_item =
-        MenuItem::with_id(app, "close_window", "Close", true, Some("CmdOrCtrl+W"))?;
-
    // Edit menu with predefined items for standard functionality
    let edit_menu = SubmenuBuilder::new(app, "Edit")
        .undo()
@@ -585,39 +396,20 @@ fn build_menu(app: &AppHandle) -> tauri::Result<()> {

    // View menu
    let view_menu = SubmenuBuilder::new(app, "View")
-        .item(&reload_item)
-        .item(&force_reload_item)
-        .item(&toggle_devtools_item)
+        .text("reload", "Reload")
+        .text("force_reload", "Force Reload")
+        .text("toggle_devtools", "Toggle Developer Tools")
        .separator()
-        .item(&reset_zoom_item)
-        .item(&zoom_in_item)
-        .item(&zoom_out_item)
        .separator()
-        .item(&toggle_fullscreen_item)
+        .text("toggle_fullscreen", "Toggle Full Screen")
        .build()?;
    submenus.push(view_menu);

    // Window menu
-    let window_menu = if is_linux {
-        SubmenuBuilder::new(app, "Window")
-            .text("minimize", "Minimize")
-            .text("zoom", "Zoom")
-            .separator()
-            .item(&close_window_item)
-            .build()?
-    } else if is_mac {
-        SubmenuBuilder::new(app, "Window")
-            .minimize()
-            .maximize()
-            .build()?
-    } else {
-        SubmenuBuilder::new(app, "Window")
-            .minimize()
-            .maximize()
-            .separator()
-            .close_window()
-            .build()?
-    };
+    let window_menu = SubmenuBuilder::new(app, "Window")
+        .text("minimize", "Minimize")
+        .text("zoom", "Zoom")
+        .build()?;
    submenus.push(window_menu);

    // Build the main menu with all submenus
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@codenomad/ui",
-  "version": "0.13.1",
+  "version": "0.12.3",
  "private": true,
  "license": "MIT",
  "type": "module",
@@ -32,7 +32,6 @@
    "shiki": "^3.13.0",
    "solid-js": "^1.8.0",
    "solid-toast": "^0.5.0",
-    "virtua": "^0.48.8",
    "yaml": "^2.4.2"
  },
  "devDependencies": {
--- a/packages/ui/src/App.tsx
+++ b/packages/ui/src/App.tsx
@@ -11,8 +11,10 @@ import InstanceDisconnectedModal from "./components/instance-disconnected-modal"
 import InstanceShell from "./components/instance/instance-shell2"
 import { SettingsScreen } from "./components/settings-screen"
 import { InstanceMetadataProvider } from "./lib/contexts/instance-metadata-context"
+import { initMarkdown } from "./lib/markdown"
 import { initGithubStars } from "./stores/github-stars"

+import { useTheme } from "./lib/theme"
 import { useCommands } from "./lib/hooks/use-commands"
 import { useAppLifecycle } from "./lib/hooks/use-app-lifecycle"
 import { getLogger } from "./lib/logger"
@@ -57,6 +59,7 @@ import { openSettings } from "./stores/settings-screen"
 const log = getLogger("actions")

 const App: Component = () => {
+  const { isDark } = useTheme()
  const { t } = useI18n()
  const {
    preferences,
@@ -68,7 +71,6 @@ const App: Component = () => {
    toggleAutoCleanupBlankSessions,
    toggleUsageMetrics,
    togglePromptSubmitOnEnter,
-    toggleShowPromptVoiceInput,
    setDiffViewMode,
    setToolOutputExpansion,
    setDiagnosticsExpansion,
@@ -181,6 +183,10 @@ const App: Component = () => {
    }
  })

+  createEffect(() => {
+    void initMarkdown(isDark()).catch((error) => log.error("Failed to initialize markdown", error))
+  })
+
  createEffect(() => {
    initReleaseNotifications()
  })
@@ -354,7 +360,6 @@ const App: Component = () => {
    toggleShowTimelineTools,
    toggleUsageMetrics,
    togglePromptSubmitOnEnter,
-    toggleShowPromptVoiceInput,
    setDiffViewMode,
    setToolOutputExpansion,
    setDiagnosticsExpansion,
--- a/packages/ui/src/components/code-block-inline.tsx
+++ b/packages/ui/src/components/code-block-inline.tsx
@@ -1,8 +1,7 @@
 import { createSignal, onMount, Show, createEffect } from "solid-js"
 import type { Highlighter } from "shiki/bundle/full"
 import { useTheme } from "../lib/theme"
-import { getSharedHighlighter } from "../lib/markdown"
-import { escapeHtml } from "../lib/text-render-utils"
+import { getSharedHighlighter, escapeHtml } from "../lib/markdown"
 import { copyToClipboard } from "../lib/clipboard"
 import { useI18n } from "../lib/i18n"

--- a/packages/ui/src/components/diff-viewer.tsx
+++ b/packages/ui/src/components/diff-viewer.tsx
@@ -1,10 +1,9 @@
 import { createMemo, Show, createEffect, onCleanup } from "solid-js"
 import { DiffView, DiffModeEnum } from "@git-diff-view/solid"
-import "@git-diff-view/solid/styles/diff-view-pure.css"
 import { disableCache } from "@git-diff-view/core"
 import type { DiffHighlighterLang } from "@git-diff-view/core"
 import { ErrorBoundary } from "solid-js"
-import { getLanguageFromPath } from "../lib/text-render-utils"
+import { getLanguageFromPath } from "../lib/markdown"
 import { normalizeDiffText } from "../lib/diff-utils"
 import { setCacheEntry } from "../lib/global-cache"
 import type { CacheEntryParams } from "../lib/global-cache"
@@ -135,4 +134,4 @@ export function ToolCallDiffViewer(props: ToolCallDiffViewerProps) {
      </Show>
    </div>
  )
-}
+}
--- a/packages/ui/src/components/folder-selection-view.tsx
+++ b/packages/ui/src/components/folder-selection-view.tsx
@@ -13,11 +13,8 @@ import { formatCompactCount } from "../lib/formatters"
 import { useI18n, type Locale } from "../lib/i18n"
 import { showAlertDialog } from "../stores/alerts"
 import { openSettings, settingsOpen } from "../stores/settings-screen"
-import { openExternalUrl } from "../lib/external-url"

 const codeNomadLogo = new URL("../images/CodeNomad-Icon.png", import.meta.url).href
-const GITHUB_URL = "https://github.com/NeuralNomadsAI/CodeNomad"
-const DISCORD_URL = "https://discord.com/channels/1391832426048651334/1458412028325793887/1464701235683917945"


 interface FolderSelectionViewProps {
@@ -45,7 +42,6 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
    { value: "ru", label: "Русский" },
    { value: "ja", label: "日本語" },
    { value: "zh-Hans", label: "简体中文" },
-    { value: "he", label: "עברית" },
  ]

  const selectedLanguageOption = () => languageOptions.find((opt) => opt.value === locale()) ?? languageOptions[0]
@@ -236,6 +232,11 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
    props.onSelectFolder(path, selectedBinary())
  }

+  const openExternalLink = (url: string) => {
+    if (typeof window === "undefined") return
+    window.open(url, "_blank", "noopener,noreferrer")
+  }
+ 
  async function handleBrowse() {
    if (isLoading()) return
    setFocusMode("new")
@@ -342,7 +343,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
          class="w-full max-w-5xl h-full px-4 sm:px-8 pb-2 flex flex-col overflow-hidden"
          aria-busy={isLoading() ? "true" : "false"}
        >
-          <div class="absolute top-4" style="inset-inline-start: 1.5rem;">
+          <div class="absolute top-4 left-6">
            <Select<LanguageOption>
              value={selectedLanguageOption()}
              onChange={(value) => {
@@ -386,7 +387,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
              </Select.Portal>
            </Select>
          </div>
-          <div class="absolute top-4 flex items-center gap-2" style="inset-inline-end: 1.5rem;">
+          <div class="absolute top-4 right-6 flex items-center gap-2">
            <button
              type="button"
              class="selector-button selector-button-secondary w-auto p-2 inline-flex items-center justify-center"
@@ -424,7 +425,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
            <h1 class="mb-2 text-3xl font-semibold text-primary">CodeNomad</h1>
            <div class="mt-3 flex justify-center gap-2">
              <a
-                href={GITHUB_URL}
+                href="https://github.com/NeuralNomadsAI/CodeNomad"
                target="_blank"
                rel="noreferrer"
                class="selector-button selector-button-secondary w-auto p-2 inline-flex items-center justify-center"
@@ -432,13 +433,13 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
                title={t("folderSelection.links.github")}
                onClick={(event) => {
                  event.preventDefault()
-                  void openExternalUrl(GITHUB_URL, "folder-selection")
+                  openExternalLink("https://github.com/NeuralNomadsAI/CodeNomad")
                }}
              >
                <GitHubMarkIcon class="w-4 h-4" />
              </a>
              <a
-                href={GITHUB_URL}
+                href="https://github.com/NeuralNomadsAI/CodeNomad"
                target="_blank"
                rel="noreferrer"
                class="selector-button selector-button-secondary w-auto px-3 py-1.5 inline-flex items-center justify-center gap-1.5"
@@ -446,7 +447,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
                title={t("folderSelection.links.githubStars")}
                onClick={(event) => {
                  event.preventDefault()
-                  void openExternalUrl(GITHUB_URL, "folder-selection")
+                  openExternalLink("https://github.com/NeuralNomadsAI/CodeNomad")
                }}
              >
                <Star class="w-4 h-4" />
@@ -455,7 +456,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
                </Show>
              </a>
              <a
-                href={DISCORD_URL}
+                href="https://discord.com/channels/1391832426048651334/1458412028325793887/1464701235683917945"
                target="_blank"
                rel="noreferrer"
                class="selector-button selector-button-secondary w-auto p-2 inline-flex items-center justify-center"
@@ -463,7 +464,9 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
                title={t("folderSelection.links.discord")}
                onClick={(event) => {
                  event.preventDefault()
-                  void openExternalUrl(DISCORD_URL, "folder-selection")
+                  openExternalLink(
+                    "https://discord.com/channels/1391832426048651334/1458412028325793887/1464701235683917945",
+                  )
                }}
              >
                <DiscordSymbolIcon class="w-4 h-4" />
--- a/packages/ui/src/components/instance-info.tsx
+++ b/packages/ui/src/components/instance-info.tsx
@@ -82,7 +82,7 @@ const InstanceInfo: Component<InstanceInfoProps> = (props) => {
      <div class="panel-body space-y-3">
        <div>
          <div class="text-xs font-medium text-muted uppercase tracking-wide mb-1">{t("instanceInfo.labels.folder")}</div>
-          <div dir="ltr" class="text-xs text-primary font-mono break-all px-2 py-1.5 rounded border bg-surface-secondary border-base">
+          <div class="text-xs text-primary font-mono break-all px-2 py-1.5 rounded border bg-surface-secondary border-base">
            {currentInstance().folder}
          </div>
        </div>
@@ -94,7 +94,7 @@ const InstanceInfo: Component<InstanceInfoProps> = (props) => {
                <div class="text-xs font-medium text-muted uppercase tracking-wide mb-1">
                  {t("instanceInfo.labels.project")}
                </div>
-                <div dir="ltr" class="text-xs font-mono px-2 py-1.5 rounded border truncate bg-surface-secondary border-base text-primary">
+                <div class="text-xs font-mono px-2 py-1.5 rounded border truncate bg-surface-secondary border-base text-primary">
                  {project().id}
                </div>
              </div>
@@ -137,7 +137,7 @@ const InstanceInfo: Component<InstanceInfoProps> = (props) => {
            <div class="text-xs font-medium text-muted uppercase tracking-wide mb-1">
              {t("instanceInfo.labels.binaryPath")}
            </div>
-            <div dir="ltr" class="text-xs font-mono break-all px-2 py-1.5 rounded border bg-surface-secondary border-base text-primary">
+            <div class="text-xs font-mono break-all px-2 py-1.5 rounded border bg-surface-secondary border-base text-primary">
              {currentInstance().binaryPath}
            </div>
          </div>
@@ -151,7 +151,7 @@ const InstanceInfo: Component<InstanceInfoProps> = (props) => {
            <div class="space-y-1">
              <For each={environmentEntries()}>
                {([key, value]) => (
-                  <div dir="ltr" class="flex items-center gap-2 px-2 py-1.5 rounded border bg-surface-secondary border-base">
+                  <div class="flex items-center gap-2 px-2 py-1.5 rounded border bg-surface-secondary border-base">
                    <span class="text-xs font-mono font-medium flex-1 text-primary" title={key}>
                      {key}
                    </span>
--- a/packages/ui/src/components/instance-welcome-view.tsx
+++ b/packages/ui/src/components/instance-welcome-view.tsx
@@ -404,7 +404,6 @@ const InstanceWelcomeView: Component<InstanceWelcomeViewProps> = (props) => {
                                <div class="flex items-center gap-2">
                                  <span
                                    class="text-sm font-medium text-primary whitespace-normal break-words transition-colors"
-                                    dir="auto"
                                    classList={{
                                      "text-accent": isFocused(),
                                    }}
--- a/packages/ui/src/components/instance/instance-shell2.tsx
+++ b/packages/ui/src/components/instance/instance-shell2.tsx
@@ -81,8 +81,7 @@ interface InstanceShellProps {
 }

 const InstanceShell2: Component<InstanceShellProps> = (props) => {
-  const { t, locale } = useI18n()
-  const isRTL = () => locale() === "he"
+  const { t } = useI18n()

  const [sessionSidebarWidth, setSessionSidebarWidth] = createSignal(DEFAULT_SESSION_SIDEBAR_WIDTH)
  const [rightDrawerWidth, setRightDrawerWidth] = createSignal(
@@ -372,7 +371,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
          sx={{
            width: `${sessionSidebarWidth()}px`,
            flexShrink: 0,
-            borderInlineEnd: "1px solid var(--border-base)",
+            borderRight: "1px solid var(--border-base)",
            backgroundColor: "var(--surface-secondary)",
            height: "100%",
            minHeight: 0,
@@ -414,7 +413,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
    const modalProps = container ? { container: container as Element } : undefined
    return (
      <Drawer
-        anchor={isRTL() ? "right" : "left"}
+        anchor="left"
        variant="temporary"
        open={leftOpen()}
        onClose={closeLeftDrawer}
@@ -423,7 +422,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
          "& .MuiDrawer-paper": {
            width: isPhoneLayout() ? "100vw" : `${sessionSidebarWidth()}px`,
            boxSizing: "border-box",
-            borderInlineEnd: isPhoneLayout() ? "none" : "1px solid var(--border-base)",
+            borderRight: isPhoneLayout() ? "none" : "1px solid var(--border-base)",
            backgroundColor: "var(--surface-secondary)",
            backgroundImage: "none",
            color: "var(--text-primary)",
@@ -481,7 +480,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
          sx={{
            width: `${rightDrawerWidth()}px`,
            flexShrink: 0,
-            borderInlineStart: "1px solid var(--border-base)",
+            borderLeft: "1px solid var(--border-base)",
            backgroundColor: "var(--surface-secondary)",
            height: "100%",
            minHeight: 0,
@@ -524,7 +523,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
    const modalProps = container ? { container: container as Element } : undefined
    return (
      <Drawer
-        anchor={isRTL() ? "left" : "right"}
+        anchor="right"
        variant="temporary"
        open={rightOpen()}
        onClose={closeRightDrawer}
@@ -533,7 +532,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
          "& .MuiDrawer-paper": {
            width: isPhoneLayout() ? "100vw" : `${rightDrawerWidth()}px`,
            boxSizing: "border-box",
-            borderInlineStart: isPhoneLayout() ? "none" : "1px solid var(--border-base)",
+            borderLeft: isPhoneLayout() ? "none" : "1px solid var(--border-base)",
            backgroundColor: "var(--surface-secondary)",
            backgroundImage: "none",
            color: "var(--text-primary)",
@@ -743,7 +742,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                  <Kbd shortcut="cmd+shift+p" />
                </span>

-                <div class="ms-auto flex items-center gap-3">
+                <div class="ml-auto flex items-center gap-3">
                  <div class="connection-status-meta flex items-center gap-3">
                    <Show when={connectionStatus() === "connected"}>
                      <span class="status-indicator connected">
--- a/packages/ui/src/components/instance/shell/right-panel/RightPanel.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/RightPanel.tsx
@@ -1,10 +1,8 @@
 import {
  Show,
-  Suspense,
  createEffect,
  createMemo,
  createSignal,
-  lazy,
  onCleanup,
  type Accessor,
  type Component,
@@ -22,6 +20,11 @@ import type { Session } from "../../../../types/session"
 import type { DrawerViewState } from "../types"
 import type { DiffContextMode, DiffViewMode, DiffWordWrapMode, RightPanelTab } from "./types"

+import ChangesTab from "./tabs/ChangesTab"
+import FilesTab from "./tabs/FilesTab"
+import GitChangesTab from "./tabs/GitChangesTab"
+import StatusTab from "./tabs/StatusTab"
+
 import { getDefaultWorktreeSlug, getOrCreateWorktreeClient, getWorktreeSlugForSession } from "../../../../stores/worktrees"
 import { requestData } from "../../../../lib/opencode-api"
 import { buildUnifiedDiffFromSdkPatch, tryReverseApplyUnifiedDiff } from "../../../../lib/unified-diff-reverse"
@@ -46,15 +49,6 @@ import {
  readStoredRightPanelTab,
 } from "../storage"

-const LazyChangesTab = lazy(() => import("./tabs/ChangesTab"))
-const LazyGitChangesTab = lazy(() => import("./tabs/GitChangesTab"))
-const LazyFilesTab = lazy(() => import("./tabs/FilesTab"))
-const LazyStatusTab = lazy(() => import("./tabs/StatusTab"))
-
-function RightPanelTabFallback() {
-  return <div class="flex-1 min-h-0" />
-}
-
 interface RightPanelProps {
  t: (key: string, vars?: Record<string, any>) => string

@@ -249,8 +243,7 @@ const RightPanel: Component<RightPanelProps> = (props) => {
    const mode = activeSplitResize()
    if (!mode) return
    event.preventDefault()
-    const isRtl = typeof document !== "undefined" && document.documentElement.dir === "rtl"
-    const delta = (event.clientX - splitResizeStartX()) * (isRtl ? -1 : 1)
+    const delta = event.clientX - splitResizeStartX()
    const next = clampSplitWidth(splitResizeStartWidth() + delta)
    if (mode === "changes") setChangesSplitWidth(next)
    else if (mode === "git-changes") setGitChangesSplitWidth(next)
@@ -273,8 +266,7 @@ const RightPanel: Component<RightPanelProps> = (props) => {
    const touch = event.touches[0]
    if (!touch) return
    event.preventDefault()
-    const isRtl = typeof document !== "undefined" && document.documentElement.dir === "rtl"
-    const delta = (touch.clientX - splitResizeStartX()) * (isRtl ? -1 : 1)
+    const delta = touch.clientX - splitResizeStartX()
    const next = clampSplitWidth(splitResizeStartWidth() + delta)
    if (mode === "changes") setChangesSplitWidth(next)
    else if (mode === "git-changes") setGitChangesSplitWidth(next)
@@ -573,13 +565,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
    void loadBrowserEntries(browserPath())
  })

-  createEffect(() => {
-    if (rightPanelTab() === "files") return
-    setBrowserSelectedContent(null)
-    setBrowserSelectedLoading(false)
-    setBrowserSelectedError(null)
-  })
-
  createEffect(() => {
    if (rightPanelTab() !== "git-changes") return
    if (gitStatusLoading()) return
@@ -587,14 +572,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
    void loadGitStatus()
  })

-  createEffect(() => {
-    if (rightPanelTab() === "git-changes") return
-    setGitSelectedBefore(null)
-    setGitSelectedAfter(null)
-    setGitSelectedLoading(false)
-    setGitSelectedError(null)
-  })
-
  const handleSelectChangesFile = (file: string, closeList: boolean) => {
    setSelectedFile(file)
    if (closeList) {
@@ -761,109 +738,101 @@ const RightPanel: Component<RightPanelProps> = (props) => {

      <div class="flex-1 overflow-y-auto">
        <Show when={rightPanelTab() === "changes"}>
-          <Suspense fallback={<RightPanelTabFallback />}>
-            <LazyChangesTab
-              t={props.t}
-              instanceId={props.instanceId}
-              activeSessionId={props.activeSessionId}
-              activeSessionDiffs={props.activeSessionDiffs}
-              selectedFile={selectedFile}
-              onSelectFile={handleSelectChangesFile}
-              diffViewMode={diffViewMode}
-              diffContextMode={diffContextMode}
-              diffWordWrapMode={diffWordWrapMode}
-              onViewModeChange={setDiffViewMode}
-              onContextModeChange={setDiffContextMode}
-              onWordWrapModeChange={setDiffWordWrapMode}
-              listOpen={changesListOpen}
-              onToggleList={toggleChangesList}
-              splitWidth={changesSplitWidth}
-              onResizeMouseDown={handleSplitResizeMouseDown("changes")}
-              onResizeTouchStart={handleSplitResizeTouchStart("changes")}
-              isPhoneLayout={props.isPhoneLayout}
-            />
-          </Suspense>
+          <ChangesTab
+            t={props.t}
+            instanceId={props.instanceId}
+            activeSessionId={props.activeSessionId}
+            activeSessionDiffs={props.activeSessionDiffs}
+            selectedFile={selectedFile}
+            onSelectFile={handleSelectChangesFile}
+            diffViewMode={diffViewMode}
+            diffContextMode={diffContextMode}
+            diffWordWrapMode={diffWordWrapMode}
+            onViewModeChange={setDiffViewMode}
+            onContextModeChange={setDiffContextMode}
+            onWordWrapModeChange={setDiffWordWrapMode}
+            listOpen={changesListOpen}
+            onToggleList={toggleChangesList}
+            splitWidth={changesSplitWidth}
+            onResizeMouseDown={handleSplitResizeMouseDown("changes")}
+            onResizeTouchStart={handleSplitResizeTouchStart("changes")}
+            isPhoneLayout={props.isPhoneLayout}
+          />
        </Show>

        <Show when={rightPanelTab() === "git-changes"}>
-          <Suspense fallback={<RightPanelTabFallback />}>
-            <LazyGitChangesTab
-              t={props.t}
-              activeSessionId={props.activeSessionId}
-              entries={gitStatusEntries}
-              statusLoading={gitStatusLoading}
-              statusError={gitStatusError}
-              selectedPath={gitSelectedPath}
-              selectedLoading={gitSelectedLoading}
-              selectedError={gitSelectedError}
-              selectedBefore={gitSelectedBefore}
-              selectedAfter={gitSelectedAfter}
-              mostChangedPath={gitMostChangedPath}
-              scopeKey={gitScopeKey}
-              diffViewMode={diffViewMode}
-              diffContextMode={diffContextMode}
-              diffWordWrapMode={diffWordWrapMode}
-              onViewModeChange={setDiffViewMode}
-              onContextModeChange={setDiffContextMode}
-              onWordWrapModeChange={setDiffWordWrapMode}
-              onOpenFile={(path: string) => void openGitFile(path)}
-              onRefresh={() => void refreshGitStatus()}
-              listOpen={gitChangesListOpen}
-              onToggleList={toggleGitList}
-              splitWidth={gitChangesSplitWidth}
-              onResizeMouseDown={handleSplitResizeMouseDown("git-changes")}
-              onResizeTouchStart={handleSplitResizeTouchStart("git-changes")}
-              isPhoneLayout={props.isPhoneLayout}
-            />
-          </Suspense>
+          <GitChangesTab
+            t={props.t}
+            activeSessionId={props.activeSessionId}
+            entries={gitStatusEntries}
+            statusLoading={gitStatusLoading}
+            statusError={gitStatusError}
+            selectedPath={gitSelectedPath}
+            selectedLoading={gitSelectedLoading}
+            selectedError={gitSelectedError}
+            selectedBefore={gitSelectedBefore}
+            selectedAfter={gitSelectedAfter}
+            mostChangedPath={gitMostChangedPath}
+            scopeKey={gitScopeKey}
+            diffViewMode={diffViewMode}
+            diffContextMode={diffContextMode}
+            diffWordWrapMode={diffWordWrapMode}
+            onViewModeChange={setDiffViewMode}
+            onContextModeChange={setDiffContextMode}
+            onWordWrapModeChange={setDiffWordWrapMode}
+            onOpenFile={(path) => void openGitFile(path)}
+            onRefresh={() => void refreshGitStatus()}
+            listOpen={gitChangesListOpen}
+            onToggleList={toggleGitList}
+            splitWidth={gitChangesSplitWidth}
+            onResizeMouseDown={handleSplitResizeMouseDown("git-changes")}
+            onResizeTouchStart={handleSplitResizeTouchStart("git-changes")}
+            isPhoneLayout={props.isPhoneLayout}
+          />
        </Show>

        <Show when={rightPanelTab() === "files"}>
-          <Suspense fallback={<RightPanelTabFallback />}>
-            <LazyFilesTab
-              t={props.t}
-              browserPath={browserPath}
-              browserEntries={browserEntries}
-              browserLoading={browserLoading}
-              browserError={browserError}
-              browserSelectedPath={browserSelectedPath}
-              browserSelectedContent={browserSelectedContent}
-              browserSelectedLoading={browserSelectedLoading}
-              browserSelectedError={browserSelectedError}
-              parentPath={browserParentPath}
-              scopeKey={browserScopeKey}
-              onLoadEntries={(path: string) => void loadBrowserEntries(path)}
-              onOpenFile={(path: string) => void openBrowserFile(path)}
-              onRefresh={() => void refreshFilesTab()}
-              listOpen={filesListOpen}
-              onToggleList={toggleFilesList}
-              splitWidth={filesSplitWidth}
-              onResizeMouseDown={handleSplitResizeMouseDown("files")}
-              onResizeTouchStart={handleSplitResizeTouchStart("files")}
-              isPhoneLayout={props.isPhoneLayout}
-            />
-          </Suspense>
+          <FilesTab
+            t={props.t}
+            browserPath={browserPath}
+            browserEntries={browserEntries}
+            browserLoading={browserLoading}
+            browserError={browserError}
+            browserSelectedPath={browserSelectedPath}
+            browserSelectedContent={browserSelectedContent}
+            browserSelectedLoading={browserSelectedLoading}
+            browserSelectedError={browserSelectedError}
+            parentPath={browserParentPath}
+            scopeKey={browserScopeKey}
+            onLoadEntries={(path) => void loadBrowserEntries(path)}
+            onOpenFile={(path) => void openBrowserFile(path)}
+            onRefresh={() => void refreshFilesTab()}
+            listOpen={filesListOpen}
+            onToggleList={toggleFilesList}
+            splitWidth={filesSplitWidth}
+            onResizeMouseDown={handleSplitResizeMouseDown("files")}
+            onResizeTouchStart={handleSplitResizeTouchStart("files")}
+            isPhoneLayout={props.isPhoneLayout}
+          />
        </Show>

        <Show when={rightPanelTab() === "status"}>
-          <Suspense fallback={<RightPanelTabFallback />}>
-            <LazyStatusTab
-              t={props.t}
-              instanceId={props.instanceId}
-              instance={props.instance}
-              activeSessionId={props.activeSessionId}
-              activeSession={props.activeSession}
-              activeSessionDiffs={props.activeSessionDiffs}
-              latestTodoState={props.latestTodoState}
-              backgroundProcessList={props.backgroundProcessList}
-              onOpenBackgroundOutput={props.onOpenBackgroundOutput}
-              onStopBackgroundProcess={props.onStopBackgroundProcess}
-              onTerminateBackgroundProcess={props.onTerminateBackgroundProcess}
-              expandedItems={rightPanelExpandedItems}
-              onExpandedItemsChange={handleAccordionChange}
-              onOpenChangesTab={openChangesTabFromStatus}
-            />
-          </Suspense>
+          <StatusTab
+            t={props.t}
+            instanceId={props.instanceId}
+            instance={props.instance}
+            activeSessionId={props.activeSessionId}
+            activeSession={props.activeSession}
+            activeSessionDiffs={props.activeSessionDiffs}
+            latestTodoState={props.latestTodoState}
+            backgroundProcessList={props.backgroundProcessList}
+            onOpenBackgroundOutput={props.onOpenBackgroundOutput}
+            onStopBackgroundProcess={props.onStopBackgroundProcess}
+            onTerminateBackgroundProcess={props.onTerminateBackgroundProcess}
+            expandedItems={rightPanelExpandedItems}
+            onExpandedItemsChange={handleAccordionChange}
+            onOpenChangesTab={openChangesTabFromStatus}
+          />
        </Show>
      </div>
    </div>
--- a/packages/ui/src/components/instance/shell/right-panel/components/DiffToolbar.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/components/DiffToolbar.tsx
@@ -2,7 +2,6 @@ import type { Component } from "solid-js"

 import { AlignJustify, FoldVertical, Split, UnfoldVertical, WrapText } from "lucide-solid"

-import { useI18n } from "../../../../../lib/i18n"
 import type { DiffContextMode, DiffViewMode, DiffWordWrapMode } from "../types"

 interface DiffToolbarProps {
@@ -15,15 +14,14 @@ interface DiffToolbarProps {
 }

 const DiffToolbar: Component<DiffToolbarProps> = (props) => {
-  const { t } = useI18n()
  const nextViewMode = (): DiffViewMode => (props.viewMode === "split" ? "unified" : "split")
  const nextContextMode = (): DiffContextMode => (props.contextMode === "collapsed" ? "expanded" : "collapsed")
  const nextWordWrapMode = (): DiffWordWrapMode => (props.wordWrapMode === "on" ? "off" : "on")

-  const viewModeTitle = () => (nextViewMode() === "split" ? t("instanceShell.diff.switchToSplit") : t("instanceShell.diff.switchToUnified"))
+  const viewModeTitle = () => (nextViewMode() === "split" ? "Switch to split view" : "Switch to unified view")
  const contextModeTitle = () =>
-    nextContextMode() === "collapsed" ? t("instanceShell.diff.hideUnchanged") : t("instanceShell.diff.showFull")
-  const wordWrapTitle = () => (nextWordWrapMode() === "on" ? t("instanceShell.diff.enableWordWrap") : t("instanceShell.diff.disableWordWrap"))
+    nextContextMode() === "collapsed" ? "Hide unchanged regions" : "Show full file"
+  const wordWrapTitle = () => (nextWordWrapMode() === "on" ? "Enable word wrap" : "Disable word wrap")

  return (
    <div class="file-viewer-toolbar">
--- a/packages/ui/src/components/instance/shell/right-panel/components/SplitFilePanel.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/components/SplitFilePanel.tsx
@@ -1,6 +1,5 @@
 import { Show, type Component, type JSX } from "solid-js"

-import { useI18n } from "../../../../../lib/i18n"
 import OverlayList from "./OverlayList"

 type SplitFilePanelList = {
@@ -25,13 +24,12 @@ interface SplitFilePanelProps {
 }

 const SplitFilePanel: Component<SplitFilePanelProps> = (props) => {
-  const { t } = useI18n()
  return (
    <div class="files-tab-container">
      <div class="files-tab-header">
        <div class="files-tab-header-row">
          <button type="button" class="files-toggle-button" onClick={props.onToggleList}>
-            {props.listOpen ? t("instanceShell.filesShell.hideFiles") : t("instanceShell.filesShell.showFiles")}
+            {props.listOpen ? "Hide files" : "Show files"}
          </button>

          {props.header}
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/ChangesTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/ChangesTab.tsx
@@ -1,13 +1,11 @@
-import { For, Show, Suspense, createMemo, lazy, type Accessor, type Component, type JSX } from "solid-js"
+import { For, Show, createMemo, type Accessor, type Component, type JSX } from "solid-js"
+
+import { MonacoDiffViewer } from "../../../../file-viewer/monaco-diff-viewer"

 import DiffToolbar from "../components/DiffToolbar"
 import SplitFilePanel from "../components/SplitFilePanel"
 import type { DiffContextMode, DiffViewMode, DiffWordWrapMode } from "../types"

-const LazyMonacoDiffViewer = lazy(() =>
-  import("../../../../file-viewer/monaco-diff-viewer").then((module) => ({ default: module.MonacoDiffViewer })),
-)
-
 interface ChangesTabProps {
  t: (key: string, vars?: Record<string, any>) => string

@@ -115,23 +113,15 @@ const ChangesTab: Component<ChangesTabProps> = (props) => {
            }
          >
            {(file) => (
-              <Suspense
-                fallback={
-                  <div class="file-viewer-empty">
-                    <span class="file-viewer-empty-text">{props.t("instanceInfo.loading")}</span>
-                  </div>
-                }
-              >
-                <LazyMonacoDiffViewer
-                  scopeKey={scopeKey()}
-                  path={String(file().file || "")}
-                  before={String((file() as any).before || "")}
-                  after={String((file() as any).after || "")}
-                  viewMode={props.diffViewMode()}
-                  contextMode={props.diffContextMode()}
-                  wordWrap={props.diffWordWrapMode()}
-                />
-              </Suspense>
+              <MonacoDiffViewer
+                scopeKey={scopeKey()}
+                path={String(file().file || "")}
+                before={String((file() as any).before || "")}
+                after={String((file() as any).after || "")}
+                viewMode={props.diffViewMode()}
+                contextMode={props.diffContextMode()}
+                wordWrap={props.diffWordWrapMode()}
+              />
            )}
          </Show>
        </div>
@@ -230,7 +220,7 @@ const ChangesTab: Component<ChangesTabProps> = (props) => {
        onResizeMouseDown={props.onResizeMouseDown}
        onResizeTouchStart={props.onResizeTouchStart}
        isPhoneLayout={props.isPhoneLayout()}
-        overlayAriaLabel={props.t("instanceShell.rightPanel.tabs.changes")}
+        overlayAriaLabel="Changes"
      />
    )
  }
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx
@@ -1,13 +1,11 @@
-import { For, Show, Suspense, lazy, type Accessor, type Component, type JSX } from "solid-js"
+import { For, Show, type Accessor, type Component, type JSX } from "solid-js"
 import type { FileNode } from "@opencode-ai/sdk/v2/client"

 import { RefreshCw } from "lucide-solid"

-import SplitFilePanel from "../components/SplitFilePanel"
+import { MonacoFileViewer } from "../../../../file-viewer/monaco-file-viewer"

-const LazyMonacoFileViewer = lazy(() =>
-  import("../../../../file-viewer/monaco-file-viewer").then((module) => ({ default: module.MonacoFileViewer })),
-)
+import SplitFilePanel from "../components/SplitFilePanel"

 interface FilesTabProps {
  t: (key: string, vars?: Record<string, any>) => string
@@ -53,8 +51,8 @@ const FilesTab: Component<FilesTabProps> = (props) => {
    const headerDisplayedPath = () => props.browserSelectedPath() || props.browserPath()

    const emptyViewerMessage = () => {
-      if (props.browserLoading() && entriesValue === null) return props.t("instanceInfo.loading")
-      return props.t("instanceShell.filesShell.viewerEmpty")
+      if (props.browserLoading() && entriesValue === null) return "Loading files..."
+      return "Select a file to preview"
    }

    const renderViewer = () => (
@@ -79,15 +77,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
                    }
                  >
                    {(payload) => (
-                      <Suspense
-                        fallback={
-                          <div class="file-viewer-empty">
-                            <span class="file-viewer-empty-text">{props.t("instanceInfo.loading")}</span>
-                          </div>
-                        }
-                      >
-                        <LazyMonacoFileViewer scopeKey={props.scopeKey()} path={payload().path} content={payload().content} />
-                      </Suspense>
+                      <MonacoFileViewer scopeKey={props.scopeKey()} path={payload().path} content={payload().content} />
                    )}
                  </Show>
                }
@@ -101,7 +91,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
            }
          >
            <div class="file-viewer-empty">
-              <span class="file-viewer-empty-text">{props.t("instanceInfo.loading")}</span>
+              <span class="file-viewer-empty-text">Loading…</span>
            </div>
          </Show>
        </div>
@@ -123,7 +113,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
        </Show>

        <Show when={props.browserLoading() && entriesValue === null}>
-          <div class="p-3 text-xs text-secondary">{props.t("instanceInfo.loading")}</div>
+          <div class="p-3 text-xs text-secondary">Loading files...</div>
        </Show>

        <For each={sorted}>
@@ -164,7 +154,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
                </span>
              </span>
              <Show when={props.browserLoading()}>
-                <span>{props.t("instanceInfo.loading")}</span>
+                <span>Loading…</span>
              </Show>
              <Show when={props.browserError()}>{(err) => <span class="text-error">{err()}</span>}</Show>
            </div>
@@ -175,7 +165,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
              title={props.t("instanceShell.rightPanel.actions.refresh")}
              aria-label={props.t("instanceShell.rightPanel.actions.refresh")}
              disabled={props.browserLoading()}
-              style={{ "margin-inline-start": "auto" }}
+              style={{ "margin-left": "auto" }}
              onClick={() => props.onRefresh()}
            >
              <RefreshCw class={`h-4 w-4${props.browserLoading() ? " animate-spin" : ""}`} />
@@ -190,7 +180,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
        onResizeMouseDown={props.onResizeMouseDown}
        onResizeTouchStart={props.onResizeTouchStart}
        isPhoneLayout={props.isPhoneLayout()}
-        overlayAriaLabel={props.t("instanceShell.rightPanel.tabs.files")}
+        overlayAriaLabel="Files"
      />
    )
  }
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/GitChangesTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/GitChangesTab.tsx
@@ -1,16 +1,14 @@
-import { For, Show, Suspense, createMemo, lazy, type Accessor, type Component, type JSX } from "solid-js"
+import { For, Show, createMemo, type Accessor, type Component, type JSX } from "solid-js"
 import type { File as GitFileStatus } from "@opencode-ai/sdk/v2/client"

 import { RefreshCw } from "lucide-solid"

+import { MonacoDiffViewer } from "../../../../file-viewer/monaco-diff-viewer"
+
 import DiffToolbar from "../components/DiffToolbar"
 import SplitFilePanel from "../components/SplitFilePanel"
 import type { DiffContextMode, DiffViewMode, DiffWordWrapMode } from "../types"

-const LazyMonacoDiffViewer = lazy(() =>
-  import("../../../../file-viewer/monaco-diff-viewer").then((module) => ({ default: module.MonacoDiffViewer })),
-)
-
 interface GitChangesTabProps {
  t: (key: string, vars?: Record<string, any>) => string

@@ -82,11 +80,11 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
  })

  const emptyViewerMessage = createMemo(() => {
-    if (!hasSession()) return props.t("instanceShell.gitChanges.noSessionSelected")
+    if (!hasSession()) return "Select a session to view changes."
    const currentEntries = entries()
-    if (currentEntries === null) return props.t("instanceShell.gitChanges.loading")
-    if (nonDeleted().length === 0) return props.t("instanceShell.gitChanges.empty")
-    return props.t("instanceShell.filesShell.viewerEmpty")
+    if (currentEntries === null) return "Loading git changes…"
+    if (nonDeleted().length === 0) return "No git changes yet."
+    return "No file selected."
  })

  const renderContent = (): JSX.Element => {
@@ -124,14 +122,7 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
                    }
                  >
                    {(file) => (
-                      <Suspense
-                        fallback={
-                          <div class="file-viewer-empty">
-                            <span class="file-viewer-empty-text">{props.t("instanceInfo.loading")}</span>
-                          </div>
-                        }
-                      >
-                        <LazyMonacoDiffViewer
+                        <MonacoDiffViewer
                          scopeKey={props.scopeKey()}
                          path={String(file().path || "")}
                          before={String((file() as any).before || "")}
@@ -140,8 +131,7 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
                          contextMode={props.diffContextMode()}
                          wordWrap={props.diffWordWrapMode()}
                        />
-                      </Suspense>
-                    )}
+                      )}
                  </Show>
                }
              >
@@ -154,7 +144,7 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
            }
          >
            <div class="file-viewer-empty">
-              <span class="file-viewer-empty-text">{props.t("instanceInfo.loading")}</span>
+              <span class="file-viewer-empty-text">Loading…</span>
            </div>
          </Show>
        </div>
@@ -179,7 +169,7 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
                </div>
                <div class="file-list-item-stats">
                  <Show when={item.status === "deleted"}>
-                    <span class="text-[10px] text-secondary">{props.t("instanceShell.gitChanges.deleted")}</span>
+                    <span class="text-[10px] text-secondary">deleted</span>
                  </Show>
                  <Show when={item.status !== "deleted"}>
                    <>
@@ -210,7 +200,7 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
                </div>
                <div class="file-list-item-stats">
                  <Show when={item.status === "deleted"}>
-                    <span class="text-[10px] text-secondary">{props.t("instanceShell.gitChanges.deleted")}</span>
+                    <span class="text-[10px] text-secondary">deleted</span>
                  </Show>
                  <Show when={item.status !== "deleted"}>
                    <>
@@ -230,8 +220,8 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
          <SplitFilePanel
            header={
              <>
-                <span class="files-tab-selected-path" title={selected?.path || props.t("instanceShell.rightPanel.tabs.gitChanges")}>
-                  <span class="file-path-text">{selected?.path || props.t("instanceShell.rightPanel.tabs.gitChanges")}</span>
+                <span class="files-tab-selected-path" title={selected?.path || "Git Changes"}>
+                  <span class="file-path-text">{selected?.path || "Git Changes"}</span>
                </span>

            <div class="files-tab-stats" style={{ flex: "0 0 auto" }}>
@@ -274,7 +264,7 @@ const GitChangesTab: Component<GitChangesTabProps> = (props) => {
        onResizeMouseDown={props.onResizeMouseDown}
        onResizeTouchStart={props.onResizeTouchStart}
        isPhoneLayout={props.isPhoneLayout()}
-        overlayAriaLabel={props.t("instanceShell.rightPanel.tabs.gitChanges")}
+        overlayAriaLabel="Git Changes"
      />
    )
  }
--- a/packages/ui/src/components/instance/shell/useDrawerResize.ts
+++ b/packages/ui/src/components/instance/shell/useDrawerResize.ts
@@ -46,9 +46,7 @@ export function useDrawerResize(options: DrawerResizeOptions): DrawerResizeApi {
    if (!side) return
    const startWidth = resizeStartWidth()
    const clamp = side === "left" ? options.clampLeft : options.clampRight
-    const isRtl = typeof document !== "undefined" && document.documentElement.dir === "rtl"
-    const rawDelta = side === "left" ? clientX - resizeStartX() : resizeStartX() - clientX
-    const delta = isRtl ? -rawDelta : rawDelta
+    const delta = side === "left" ? clientX - resizeStartX() : resizeStartX() - clientX
    const nextWidth = clamp(startWidth + delta)
    applyDrawerWidth(side, nextWidth)
  }
--- a/packages/ui/src/components/markdown.tsx
+++ b/packages/ui/src/components/markdown.tsx
@@ -1,4 +1,5 @@
 import { createEffect, createMemo, createSignal, onCleanup, onMount } from "solid-js"
+import { renderMarkdown, onLanguagesLoaded, decodeHtmlEntities, setMarkdownTheme } from "../lib/markdown"
 import { useGlobalCache } from "../lib/hooks/use-global-cache"
 import type { TextPart, RenderCache } from "../types/message"
 import { getLogger } from "../lib/logger"
@@ -7,20 +8,6 @@ import { useI18n } from "../lib/i18n"

 const log = getLogger("session")

-type MarkdownModule = typeof import("../lib/markdown")
-
-let markdownModulePromise: Promise<MarkdownModule> | null = null
-
-function loadMarkdownModule(): Promise<MarkdownModule> {
-  if (!markdownModulePromise) {
-    markdownModulePromise = import("../lib/markdown").catch((error) => {
-      markdownModulePromise = null
-      throw error
-    })
-  }
-  return markdownModulePromise
-}
-
 function hashText(value: string): string {
  let hash = 2166136261
  for (let index = 0; index < value.length; index++) {
@@ -37,45 +24,6 @@ function resolvePartVersion(part: TextPart, text: string): string {
  return `text-${hashText(text)}`
 }

-function resolvePartCacheId(part: TextPart, text: string): string {
-  const partId = typeof part.id === "string" && part.id.length > 0 ? part.id : ""
-  if (partId) {
-    return partId
-  }
-
-  return `anonymous:${hashText(text)}`
-}
-
-function decodeHtmlEntitiesLocally(content: string): string {
-  if (!content.includes("&") || typeof document === "undefined") {
-    return content
-  }
-
-  const textarea = document.createElement("textarea")
-  textarea.innerHTML = content
-  return textarea.value
-}
-
-function escapeHtml(content: string): string {
-  const map: Record<string, string> = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': "&quot;",
-    "'": "&#039;",
-  }
-
-  return content.replace(/[&<>"']/g, (match) => map[match] ?? match)
-}
-
-function renderFallbackHtml(content: string): string {
-  if (!content) {
-    return ""
-  }
-
-  return escapeHtml(content).replace(/\n/g, "<br />")
-}
-
 interface MarkdownProps {
  part: TextPart
  instanceId?: string
@@ -90,8 +38,7 @@ export function Markdown(props: MarkdownProps) {
  const { t } = useI18n()
  const [html, setHtml] = createSignal("")
  let containerRef: HTMLDivElement | undefined
-  let latestRequestKey = ""
-  let cleanupLanguageListener: (() => void) | undefined
+  let latestRequestedText = ""

  const notifyRendered = () => {
    Promise.resolve().then(() => props.onRendered?.())
@@ -100,14 +47,15 @@ export function Markdown(props: MarkdownProps) {
  const resolved = createMemo(() => {
    const part = props.part
    const rawText = typeof part.text === "string" ? part.text : ""
-    const text = decodeHtmlEntitiesLocally(rawText)
+    const text = decodeHtmlEntities(rawText)
    const themeKey = Boolean(props.isDark) ? "dark" : "light"
    const highlightEnabled = !props.disableHighlight
-    const partId = typeof part.id === "string" && part.id.length > 0 ? part.id : undefined
-    const cacheId = resolvePartCacheId(part, text)
+    const partId = typeof part.id === "string" && part.id.length > 0 ? part.id : ""
+    if (!partId) {
+      throw new Error("Markdown rendering requires a part id")
+    }
    const version = resolvePartVersion(part, text)
-    const requestKey = `${cacheId}:${themeKey}:${highlightEnabled ? 1 : 0}:${version}`
-    return { part, text, themeKey, highlightEnabled, partId, cacheId, version, requestKey }
+    return { part, text, themeKey, highlightEnabled, partId, version }
  })

  const cacheHandle = useGlobalCache({
@@ -115,46 +63,26 @@ export function Markdown(props: MarkdownProps) {
    sessionId: () => props.sessionId,
    scope: "markdown",
    cacheId: () => {
-      const { cacheId, themeKey, highlightEnabled } = resolved()
-      return `${cacheId}:${themeKey}:${highlightEnabled ? 1 : 0}`
+      const { partId, themeKey, highlightEnabled } = resolved()
+      return `${partId}:${themeKey}:${highlightEnabled ? 1 : 0}`
    },
    version: () => resolved().version,
  })

-  const commitCacheEntry = (snapshot: ReturnType<typeof resolved>, renderedHtml: string) => {
-    const cacheEntry: RenderCache = {
-      text: snapshot.text,
-      html: renderedHtml,
-      theme: snapshot.themeKey,
-      mode: snapshot.version,
-    }
-    setHtml(renderedHtml)
-    cacheHandle.set(cacheEntry)
-    notifyRendered()
-  }
+  createEffect(async () => {
+    const { part, text, themeKey, highlightEnabled, version } = resolved()

-  const renderSnapshot = async (snapshot: ReturnType<typeof resolved>) => {
-    const markdown = await loadMarkdownModule()
-    markdown.setMarkdownTheme(snapshot.themeKey === "dark")
-    const rendered = await markdown.renderMarkdown(snapshot.text, {
-      suppressHighlight: !snapshot.highlightEnabled,
-    })
+    // Ensure the markdown highlighter theme matches the active UI theme.
+    setMarkdownTheme(themeKey === "dark")

-    if (latestRequestKey === snapshot.requestKey) {
-      commitCacheEntry(snapshot, rendered)
-    }
-  }
-
-  createEffect(() => {
-    const snapshot = resolved()
-    latestRequestKey = snapshot.requestKey
+    latestRequestedText = text

    const cacheMatches = (cache: RenderCache | undefined) => {
      if (!cache) return false
-      return cache.theme === snapshot.themeKey && cache.mode === snapshot.version
+      return cache.theme === themeKey && cache.mode === version
    }

-    const localCache = snapshot.part.renderCache
+    const localCache = part.renderCache
    if (localCache && cacheMatches(localCache)) {
      setHtml(localCache.html)
      notifyRendered()
@@ -168,83 +96,111 @@ export function Markdown(props: MarkdownProps) {
      return
    }

-    setHtml(renderFallbackHtml(snapshot.text))
-    notifyRendered()
+    const commitCacheEntry = (renderedHtml: string) => {
+      const cacheEntry: RenderCache = { text, html: renderedHtml, theme: themeKey, mode: version }
+      setHtml(renderedHtml)
+      cacheHandle.set(cacheEntry)
+      notifyRendered()
+    }

-    void renderSnapshot(snapshot).catch((error) => {
-      log.error("Failed to render markdown:", error)
-      if (latestRequestKey === snapshot.requestKey) {
-        commitCacheEntry(snapshot, renderFallbackHtml(snapshot.text))
+    if (!highlightEnabled) {
+      try {
+        const rendered = await renderMarkdown(text, { suppressHighlight: true })
+
+        if (latestRequestedText === text) {
+          commitCacheEntry(rendered)
+        }
+      } catch (error) {
+        log.error("Failed to render markdown:", error)
+        if (latestRequestedText === text) {
+          commitCacheEntry(text)
+        }
      }
-    })
+      return
+    }
+
+    try {
+      const rendered = await renderMarkdown(text)
+      if (latestRequestedText === text) {
+        commitCacheEntry(rendered)
+      }
+    } catch (error) {
+      log.error("Failed to render markdown:", error)
+      if (latestRequestedText === text) {
+        commitCacheEntry(text)
+      }
+    }
  })

  onMount(() => {
-    const handleClick = async (event: Event) => {
-      const target = event.target as HTMLElement
+    const handleClick = async (e: Event) => {
+      const target = e.target as HTMLElement
      const copyButton = target.closest(".code-block-copy") as HTMLButtonElement

-      if (!copyButton) {
-        return
+      if (copyButton) {
+        e.preventDefault()
+        const code = copyButton.getAttribute("data-code")
+        if (code) {
+          const decodedCode = decodeURIComponent(code)
+          const success = await copyToClipboard(decodedCode)
+          const copyText = copyButton.querySelector(".copy-text")
+          if (copyText) {
+            if (success) {
+              copyText.textContent = t("markdown.codeBlock.copy.copied")
+              setTimeout(() => {
+                copyText.textContent = t("markdown.codeBlock.copy.label")
+              }, 2000)
+            } else {
+              copyText.textContent = t("markdown.codeBlock.copy.failed")
+              setTimeout(() => {
+                copyText.textContent = t("markdown.codeBlock.copy.label")
+              }, 2000)
+            }
+          }
+        }
      }
-
-      event.preventDefault()
-      const code = copyButton.getAttribute("data-code")
-      if (!code) {
-        return
-      }
-
-      const decodedCode = decodeURIComponent(code)
-      const success = await copyToClipboard(decodedCode)
-      const copyText = copyButton.querySelector(".copy-text")
-      if (!copyText) {
-        return
-      }
-
-      copyText.textContent = success ? t("markdown.codeBlock.copy.copied") : t("markdown.codeBlock.copy.failed")
-      setTimeout(() => {
-        copyText.textContent = t("markdown.codeBlock.copy.label")
-      }, 2000)
    }

    containerRef?.addEventListener("click", handleClick)

-    let disposed = false
-    void loadMarkdownModule()
-      .then((markdown) => {
-        if (disposed) {
-          return
+    const cleanupLanguageListener = onLanguagesLoaded(async () => {
+      if (props.disableHighlight) {
+        return
+      }
+
+      const { part, text, themeKey, version } = resolved()
+
+      setMarkdownTheme(themeKey === "dark")
+
+      if (latestRequestedText !== text) {
+        return
+      }
+
+      try {
+        const rendered = await renderMarkdown(text)
+        if (latestRequestedText === text) {
+          const cacheEntry: RenderCache = { text, html: rendered, theme: themeKey, mode: version }
+          setHtml(rendered)
+          cacheHandle.set(cacheEntry)
+          notifyRendered()
        }
-
-        cleanupLanguageListener = markdown.onLanguagesLoaded(() => {
-          const snapshot = resolved()
-          if (!snapshot.highlightEnabled) {
-            return
-          }
-
-          latestRequestKey = snapshot.requestKey
-          void renderSnapshot(snapshot).catch((error) => {
-            log.error("Failed to re-render markdown after language load:", error)
-          })
-        })
-      })
-      .catch((error) => {
-        log.error("Failed to load markdown module:", error)
-      })
+      } catch (error) {
+        log.error("Failed to re-render markdown after language load:", error)
+      }
+    })

    onCleanup(() => {
-      disposed = true
      containerRef?.removeEventListener("click", handleClick)
-      cleanupLanguageListener?.()
-      cleanupLanguageListener = undefined
+      cleanupLanguageListener()
    })
  })

+  const proseClass = () => "markdown-body"
+
  return (
    <div
      ref={containerRef}
-      class="markdown-body"
-      dir="auto"
+      class={proseClass()}
      data-view="markdown"
      data-part-id={resolved().partId}
      data-markdown-theme={resolved().themeKey}
--- a/packages/ui/src/components/message-block.tsx
+++ b/packages/ui/src/components/message-block.tsx
@@ -1,6 +1,7 @@
-import { For, Match, Show, Suspense, Switch, createEffect, createMemo, createSignal, lazy, onCleanup, untrack } from "solid-js"
+import { For, Match, Show, Switch, createEffect, createMemo, createSignal, onCleanup, untrack } from "solid-js"
 import { ChevronsDownUp, ChevronsUpDown, ExternalLink, FoldVertical, ListStart, Trash } from "lucide-solid"
 import MessageItem from "./message-item"
+import ToolCall from "./tool-call"
 import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
 import type { ClientPart, MessageInfo } from "../types/message"
 import { partHasRenderableText } from "../types/message"
@@ -14,8 +15,6 @@ import { showAlertDialog } from "../stores/alerts"
 import { deleteMessage } from "../stores/session-actions"
 import { useI18n } from "../lib/i18n"
 import type { DeleteHoverState } from "../types/delete-hover"
-import { useSpeech } from "../lib/hooks/use-speech"
-import SpeechActionButton from "./speech-action-button"

 function DeleteUpToIcon() {
  return (
@@ -30,12 +29,6 @@ const USER_BORDER_COLOR = "var(--message-user-border)"
 const ASSISTANT_BORDER_COLOR = "var(--message-assistant-border)"
 const TOOL_BORDER_COLOR = "var(--message-tool-border)"

-const LazyToolCall = lazy(() => import("./tool-call"))
-
-function ToolCallFallback() {
-  return <div class="tool-call tool-call-loading" />
-}
-
 type ToolCallPart = Extract<ClientPart, { type: "tool" }>


@@ -507,18 +500,16 @@ function ToolCallItem(props: ToolCallItemProps) {
            </div>
          </div>

-          <Suspense fallback={<ToolCallFallback />}>
-            <LazyToolCall
-              toolCall={resolvedToolPart()}
-              toolCallId={props.partId}
-              messageId={props.messageId}
-              messageVersion={messageVersion()}
-              partVersion={partVersion()}
-              instanceId={props.instanceId}
-              sessionId={props.sessionId}
-              onContentRendered={props.onContentRendered}
-            />
-          </Suspense>
+          <ToolCall
+            toolCall={resolvedToolPart()}
+            toolCallId={props.partId}
+            messageId={props.messageId}
+            messageVersion={messageVersion()}
+            partVersion={partVersion()}
+            instanceId={props.instanceId}
+            sessionId={props.sessionId}
+            onContentRendered={props.onContentRendered}
+          />
        </div>
      )}
    </Show>
@@ -911,7 +902,6 @@ export default function MessageBlock(props: MessageBlockProps) {
                    onDeleteMessagesUpTo={props.onDeleteMessagesUpTo}
                    selectedMessageIds={props.selectedMessageIds}
                    onToggleSelectedMessage={props.onToggleSelectedMessage}
-                    onContentRendered={props.onContentRendered}
                  />
                </Match>
              </Switch>
@@ -1290,7 +1280,6 @@ interface ReasoningCardProps {
  onDeleteMessagesUpTo?: (messageId: string) => void | Promise<void>
  selectedMessageIds?: () => Set<string>
  onToggleSelectedMessage?: (messageId: string, selected: boolean) => void
-  onContentRendered?: () => void
 }

 function ReasoningCard(props: ReasoningCardProps) {
@@ -1299,25 +1288,6 @@ function ReasoningCard(props: ReasoningCardProps) {
  const [deletingMessage, setDeletingMessage] = createSignal(false)
  const [deletingUpTo, setDeletingUpTo] = createSignal(false)
  const isSelectedForDeletion = () => Boolean(props.selectedMessageIds?.().has(props.messageId))
-  let pendingRenderNotificationFrame: number | null = null
-
-  const notifyContentRendered = () => {
-    if (!props.onContentRendered || typeof requestAnimationFrame !== "function") return
-    if (pendingRenderNotificationFrame !== null) {
-      cancelAnimationFrame(pendingRenderNotificationFrame)
-    }
-    pendingRenderNotificationFrame = requestAnimationFrame(() => {
-      pendingRenderNotificationFrame = null
-      props.onContentRendered?.()
-    })
-  }
-
-  onCleanup(() => {
-    if (pendingRenderNotificationFrame !== null) {
-      cancelAnimationFrame(pendingRenderNotificationFrame)
-      pendingRenderNotificationFrame = null
-    }
-  })

  createEffect(() => {
    setExpanded(Boolean(props.defaultExpanded))
@@ -1386,19 +1356,6 @@ function ReasoningCard(props: ReasoningCardProps) {
  const viewHideLabel = () =>
    expanded() ? t("messageBlock.reasoning.indicator.hide") : t("messageBlock.reasoning.indicator.view")

-  const speech = useSpeech({
-    id: () => `${props.instanceId}:${props.sessionId}:${props.messageId}:${(props.part as any)?.id ?? "reasoning"}`,
-    text: reasoningText,
-  })
-
-  const canSpeakReasoning = () => reasoningText().trim().length > 0 && speech.canUseSpeech()
-
-  createEffect(() => {
-    if (!expanded()) return
-    reasoningText()
-    notifyContentRendered()
-  })
-
  const canDeleteMessage = () => Boolean(props.showDeleteMessage) && !deletingMessage()

  const handleDeleteMessage = async (event: MouseEvent) => {
@@ -1471,20 +1428,6 @@ function ReasoningCard(props: ReasoningCardProps) {
        </button>

        <div class="message-reasoning-actions">
-          <Show when={canSpeakReasoning()}>
-            <SpeechActionButton
-              class="message-action-button"
-              onClick={(event) => {
-                event.preventDefault()
-                event.stopPropagation()
-                void speech.toggle()
-              }}
-              title={speech.buttonTitle()}
-              isLoading={speech.isLoading()}
-              isPlaying={speech.isPlaying()}
-            />
-          </Show>
-
          <button
            type="button"
            class="message-action-button"
@@ -1554,7 +1497,7 @@ function ReasoningCard(props: ReasoningCardProps) {
        <div class="message-reasoning-expanded">
          <div class="message-reasoning-body">
            <div class="message-reasoning-output" role="region" aria-label={t("messageBlock.reasoning.detailsAriaLabel")}>
-              <pre class="message-reasoning-text" dir="auto">{reasoningText() || ""}</pre>
+              <pre class="message-reasoning-text">{reasoningText() || ""}</pre>
            </div>
          </div>
        </div>
--- a/packages/ui/src/components/message-item.tsx
+++ b/packages/ui/src/components/message-item.tsx
@@ -11,8 +11,6 @@ import { showAlertDialog } from "../stores/alerts"
 import { deleteMessage } from "../stores/session-actions"
 import { isTauriHost } from "../lib/runtime-env"
 import type { DeleteHoverState } from "../types/delete-hover"
-import { useSpeech } from "../lib/hooks/use-speech"
-import SpeechActionButton from "./speech-action-button"

 function DeleteUpToIcon() {
  return (
@@ -296,13 +294,6 @@ export default function MessageItem(props: MessageItemProps) {
      .join("\n\n")
  }

-  const speech = useSpeech({
-    id: () => `${props.instanceId}:${props.sessionId}:${props.record.id}`,
-    text: getRawContent,
-  })
-
-  const canSpeakMessage = () => getRawContent().trim().length > 0 && speech.canUseSpeech()
-
  const handleCopy = async () => {
    const content = getRawContent()
    if (!content) return
@@ -452,16 +443,6 @@ export default function MessageItem(props: MessageItemProps) {
                  <Copy class="w-3.5 h-3.5" aria-hidden="true" />
                </button>

-                <Show when={canSpeakMessage()}>
-                  <SpeechActionButton
-                    class="message-action-button"
-                    onClick={() => void speech.toggle()}
-                    title={speech.buttonTitle()}
-                    isLoading={speech.isLoading()}
-                    isPlaying={speech.isPlaying()}
-                  />
-                </Show>
-
                <Show when={props.onFork}>
                  <button
                    class="message-action-button"
@@ -522,16 +503,6 @@ export default function MessageItem(props: MessageItemProps) {
                  <Copy class="w-3.5 h-3.5" aria-hidden="true" />
                </button>

-                <Show when={canSpeakMessage()}>
-                  <SpeechActionButton
-                    class="message-action-button"
-                    onClick={() => void speech.toggle()}
-                    title={speech.buttonTitle()}
-                    isLoading={speech.isLoading()}
-                    isPlaying={speech.isPlaying()}
-                  />
-                </Show>
-
                <Show when={props.showDeleteMessage}>
                  <button
                    class="message-action-button"
@@ -571,7 +542,7 @@ export default function MessageItem(props: MessageItemProps) {

      </header>

-      <div class="pt-1 whitespace-pre-wrap break-words leading-[1.1]" dir="auto">
+      <div class="pt-1 whitespace-pre-wrap break-words leading-[1.1]">


        <Show when={props.isQueued && isUser()}>
@@ -579,7 +550,7 @@ export default function MessageItem(props: MessageItemProps) {
        </Show>

        <Show when={errorMessage()}>
-          <div class="message-error-block" dir="auto">⚠️ {errorMessage()}</div>
+          <div class="message-error-block">⚠️ {errorMessage()}</div>
        </Show>

        <Show when={isGenerating()}>
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -1,4 +1,5 @@
-import { Match, Show, Suspense, Switch, lazy } from "solid-js"
+import { Show, Match, Switch } from "solid-js"
+import ToolCall from "./tool-call"
 import { isItemExpanded, toggleItemExpanded } from "../stores/tool-call-state"
 import { Markdown } from "./markdown"
 import { useTheme } from "../lib/theme"
@@ -6,8 +7,6 @@ import { partHasRenderableText, SDKPart, TextPart, ClientPart } from "../types/m

 type ToolCallPart = Extract<ClientPart, { type: "tool" }>

-const LazyToolCall = lazy(() => import("./tool-call"))
-
 interface MessagePartProps {
  part: ClientPart
  messageType?: "user" | "assistant"
@@ -134,12 +133,11 @@ export default function MessagePart(props: MessagePartProps) {
        <Show when={!shouldHideTextPart() && partHasRenderableText(props.part)}>
          <div
            class={canRenderMarkdown() ? markdownContainerClass() : textContainerClass()}
-            dir="auto"
            data-role={textContainerRole()}
            data-part-type="text"
            data-part-id={typeof (props.part as any)?.id === "string" ? (props.part as any).id : undefined}
          >
-            <Show when={canRenderMarkdown()} fallback={<span class="text-primary" dir="auto">{plainTextContent()}</span>}>
+            <Show when={canRenderMarkdown()} fallback={<span class="text-primary">{plainTextContent()}</span>}>
              <Markdown
                part={createTextPartForMarkdown()}
                instanceId={props.instanceId}
@@ -154,14 +152,12 @@ export default function MessagePart(props: MessagePartProps) {
      </Match>

      <Match when={partType() === "tool"}>
-        <Suspense fallback={<div class="tool-call tool-call-loading" />}>
-          <LazyToolCall
-            toolCall={props.part as ToolCallPart}
-            toolCallId={props.part?.id}
-            instanceId={props.instanceId}
-            sessionId={props.sessionId}
-          />
-        </Suspense>
+        <ToolCall
+          toolCall={props.part as ToolCallPart}
+          toolCallId={props.part?.id}
+          instanceId={props.instanceId}
+          sessionId={props.sessionId}
+        />
      </Match>


--- a/packages/ui/src/components/message-section.tsx
+++ b/packages/ui/src/components/message-section.tsx
@@ -19,7 +19,7 @@ import type { DeleteHoverState } from "../types/delete-hover"
 import { buildRecordDisplayData } from "../stores/message-v2/record-display-cache"
 import { getPartCharCount } from "../lib/token-utils"

-const SCROLL_SENTINEL_MARGIN_PX = 8
+const SCROLL_SENTINEL_MARGIN_PX = 48
 const MESSAGE_SCROLL_CACHE_SCOPE = "message-stream"
 const QUOTE_SELECTION_MAX_LENGTH = 2000
 const codeNomadLogo = new URL("../images/CodeNomad-Icon.png", import.meta.url).href
--- a/packages/ui/src/components/model-selector.tsx
+++ b/packages/ui/src/components/model-selector.tsx
@@ -295,7 +295,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
                {t("modelSelector.trigger.primary", { model: currentModelValue()?.name ?? t("modelSelector.none") })}
              </span>
          {currentModelValue() && (
-                <span class="selector-trigger-secondary" dir="ltr">
+                <span class="selector-trigger-secondary">
                  {currentModelValue()!.providerId}/{currentModelValue()!.id}
                </span>
              )}
--- a/packages/ui/src/components/permission-approval-modal.tsx
+++ b/packages/ui/src/components/permission-approval-modal.tsx
@@ -1,4 +1,4 @@
-import { For, Show, Suspense, createMemo, createSignal, createEffect, lazy, onCleanup, type Component } from "solid-js"
+import { For, Show, createMemo, createSignal, createEffect, onCleanup, type Component } from "solid-js"
 import type { PermissionRequestLike } from "../types/permission"
 import { getPermissionCallId, getPermissionDisplayTitle, getPermissionKind, getPermissionMessageId, getPermissionSessionId } from "../types/permission"
 import { getQuestionCallId, getQuestionMessageId, getQuestionSessionId, type QuestionRequest } from "../types/question"
@@ -12,8 +12,7 @@ import {
 } from "../stores/instances"
 import { ensureSessionParentExpanded, loadMessages, sessions as sessionStateSessions, setActiveSessionFromList } from "../stores/sessions"
 import { messageStoreBus } from "../stores/message-v2/bus"
-
-const LazyToolCall = lazy(() => import("./tool-call"))
+import ToolCall from "./tool-call"

 interface PermissionApprovalModalProps {
  instanceId: string
@@ -409,17 +408,15 @@ const PermissionApprovalModal: Component<PermissionApprovalModalProps> = (props)
                            }
                          >
                          {(data) => (
-                            <Suspense fallback={<div class="tool-call tool-call-loading" />}>
-                              <LazyToolCall
-                                toolCall={data().toolPart}
-                                toolCallId={data().toolPart.id}
-                                messageId={data().messageId}
-                                messageVersion={data().messageVersion}
-                                partVersion={data().partVersion}
-                                instanceId={props.instanceId}
-                                sessionId={data().sessionId}
-                              />
-                            </Suspense>
+                            <ToolCall
+                              toolCall={data().toolPart}
+                              toolCallId={data().toolPart.id}
+                              messageId={data().messageId}
+                              messageVersion={data().messageVersion}
+                              partVersion={data().partVersion}
+                              instanceId={props.instanceId}
+                              sessionId={data().sessionId}
+                            />
                          )}
                        </Show>
                      </div>
--- a/packages/ui/src/components/prompt-input.tsx
+++ b/packages/ui/src/components/prompt-input.tsx
@@ -1,9 +1,9 @@
-import { Suspense, createEffect, createSignal, lazy, on, onCleanup, Show } from "solid-js"
-import { ArrowBigUp, ArrowBigDown, Loader2, Mic, Volume2, X } from "lucide-solid"
+import { createSignal, Show, onMount, onCleanup, createEffect, on } from "solid-js"
+import { ArrowBigUp, ArrowBigDown } from "lucide-solid"
+import UnifiedPicker from "./unified-picker"
 import ExpandButton from "./expand-button"
 import { clearAttachments, removeAttachment } from "../stores/attachments"
 import { resolvePastedPlaceholders } from "../lib/prompt-placeholders"
-import { createPastedPlaceholderRegex, pastedDisplayCounterRegex } from "./prompt-input/attachmentPlaceholders"
 import Kbd from "./kbd"
 import { getActiveInstance } from "../stores/instances"
 import { agents, executeCustomCommand } from "../stores/sessions"
@@ -13,43 +13,11 @@ import { useI18n } from "../lib/i18n"
 import { getLogger } from "../lib/logger"
 import { preferences } from "../stores/preferences"
 import type { ExpandState, PromptInputApi, PromptInputProps, PromptInsertMode, PromptMode } from "./prompt-input/types"
-import type { Attachment } from "../types/attachment"
 import { usePromptState } from "./prompt-input/usePromptState"
 import { usePromptAttachments } from "./prompt-input/usePromptAttachments"
 import { usePromptPicker } from "./prompt-input/usePromptPicker"
 import { usePromptKeyDown } from "./prompt-input/usePromptKeyDown"
-import { usePromptVoiceInput } from "./prompt-input/usePromptVoiceInput"
-import { canUseConversationMode, isConversationModeEnabled, toggleConversationMode } from "../stores/conversation-speech"
 const log = getLogger("actions")
-const LazyUnifiedPicker = lazy(() => import("./unified-picker"))
-
-function getConsumedPastedTextAttachmentIds(text: string, attachments: Attachment[]): string[] {
-  if (!text || attachments.length === 0) return []
-
-  const usedCounters = new Set<string>()
-  for (const match of text.matchAll(createPastedPlaceholderRegex())) {
-    const counter = match?.[1]
-    if (counter) usedCounters.add(counter)
-  }
-
-  if (usedCounters.size === 0) return []
-
-  const consumed = new Set<string>()
-
-  for (const attachment of attachments) {
-    if (!attachment?.id) continue
-    if (attachment?.source?.type !== "text") continue
-    const display = attachment.display
-    if (typeof display !== "string") continue
-    const match = display.match(pastedDisplayCounterRegex)
-    if (!match?.[1]) continue
-    if (usedCounters.has(match[1])) {
-      consumed.add(attachment.id)
-    }
-  }
-
-  return Array.from(consumed)
-}

 export default function PromptInput(props: PromptInputProps) {
  const { t } = useI18n()
@@ -278,12 +246,7 @@ export default function PromptInput(props: PromptInputProps) {
      commandName.length > 0 &&
      getCommands(props.instanceId).some((cmd) => cmd.name === commandName)

-    const resolvedCommandArgs = isKnownSlashCommand ? resolvePastedPlaceholders(commandArgs, currentAttachments) : ""
-    const resolvedPrompt = isKnownSlashCommand
-      ? resolvedCommandArgs
-        ? `${commandToken} ${resolvedCommandArgs}`
-        : commandToken
-      : resolvePastedPlaceholders(text, currentAttachments)
+    const resolvedPrompt = isKnownSlashCommand ? text : resolvePastedPlaceholders(text, currentAttachments)
    const historyEntry = resolvedPrompt

    const refreshHistory = () => recordHistoryEntry(historyEntry)
@@ -299,10 +262,6 @@ export default function PromptInput(props: PromptInputProps) {
      syncAttachmentCounters("")
      setIgnoredAtPositions(new Set<number>())
    } else {
-      const consumedIds = getConsumedPastedTextAttachmentIds(commandArgs, currentAttachments)
-      for (const attachmentId of consumedIds) {
-        removeAttachment(props.instanceId, props.sessionId, attachmentId)
-      }
      syncAttachmentCounters("")
      setIgnoredAtPositions(new Set<number>())
    }
@@ -322,7 +281,7 @@ export default function PromptInput(props: PromptInputProps) {
          await props.onSend(resolvedPrompt, [])
        }
      } else if (isKnownSlashCommand) {
-        await executeCustomCommand(props.instanceId, props.sessionId, commandName, resolvedCommandArgs)
+        await executeCustomCommand(props.instanceId, props.sessionId, commandName, commandArgs)
      } else {
        await props.onSend(resolvedPrompt, currentAttachments)
      }
@@ -352,19 +311,6 @@ export default function PromptInput(props: PromptInputProps) {
    textareaRef?.focus()
  }

-  function handleClearPrompt() {
-    clearPrompt()
-    clearHistoryDraft()
-    resetHistoryNavigation()
-    setShowPicker(false)
-    setPickerMode("mention")
-    setAtPosition(null)
-    setSearchQuery("")
-    setIgnoredAtPositions(new Set<number>())
-    syncAttachmentCounters("")
-    textareaRef?.focus()
-  }
-
  function insertBlockContent(block: string) {
    const textarea = textareaRef
    const current = prompt()
@@ -436,8 +382,6 @@ export default function PromptInput(props: PromptInputProps) {
    return hasText || attachments().length > 0
  }

-  const canClearPrompt = () => prompt().length > 0
-
  const shellHint = () =>
    mode() === "shell"
      ? { key: "Esc", text: t("promptInput.hints.shell.exit") }
@@ -467,52 +411,9 @@ export default function PromptInput(props: PromptInputProps) {
  })

  const shouldShowOverlay = () => prompt().length === 0
-  const voiceInput = usePromptVoiceInput({
-    prompt,
-    setPrompt,
-    getTextarea: () => textareaRef ?? null,
-    enabled: () => preferences().showPromptVoiceInput,
-    disabled: () => Boolean(props.disabled),
-  })
-  const showVoiceInput = () =>
-    preferences().showPromptVoiceInput &&
-    (voiceInput.canUseVoiceInput() || voiceInput.isRecording() || voiceInput.isTranscribing())
-  const conversationModeEnabled = () => isConversationModeEnabled(props.instanceId)
-  const showConversationToggle = () => showVoiceInput() || conversationModeEnabled()
-  const canToggleConversationMode = () => canUseConversationMode()
-  const conversationModeButtonTitle = () =>
-    conversationModeEnabled()
-      ? t("promptInput.conversationMode.disable.title")
-      : t("promptInput.conversationMode.enable.title")

  const instance = () => getActiveInstance()

-  let voiceButtonPressed = false
-
-  const beginVoicePress = (event?: PointerEvent | KeyboardEvent) => {
-    if (voiceButtonPressed || props.disabled || voiceInput.isTranscribing() || !voiceInput.canUseVoiceInput()) return
-    voiceButtonPressed = true
-
-    if (event instanceof PointerEvent) {
-      const target = event.currentTarget
-      if (target instanceof HTMLElement) {
-        try {
-          target.setPointerCapture(event.pointerId)
-        } catch {
-          // no-op
-        }
-      }
-    }
-
-    void voiceInput.startRecording()
-  }
-
-  const endVoicePress = () => {
-    if (!voiceButtonPressed) return
-    voiceButtonPressed = false
-    voiceInput.stopRecording()
-  }
-
  return (
    <div class="prompt-input-container">
      <div
@@ -527,20 +428,18 @@ export default function PromptInput(props: PromptInputProps) {
        onDrop={handleDrop}
      >
        <Show when={showPicker() && instance()}>
-          <Suspense fallback={null}>
-            <LazyUnifiedPicker
-              open={showPicker()}
-              mode={pickerMode()}
-              onClose={handlePickerClose}
-              onSelect={handlePickerSelect}
-              agents={instanceAgents()}
-              commands={getCommands(props.instanceId)}
-              instanceClient={instance()!.client}
-              searchQuery={searchQuery()}
-              textareaRef={textareaRef}
-              workspaceId={props.instanceId}
-            />
-          </Suspense>
+          <UnifiedPicker
+            open={showPicker()}
+            mode={pickerMode()}
+            onClose={handlePickerClose}
+            onSelect={handlePickerSelect}
+            agents={instanceAgents()}
+            commands={getCommands(props.instanceId)}
+            instanceClient={instance()!.client}
+            searchQuery={searchQuery()}
+            textareaRef={textareaRef}
+            workspaceId={props.instanceId}
+          />
        </Show>

        <div class="flex flex-1 flex-col">
@@ -550,7 +449,6 @@ export default function PromptInput(props: PromptInputProps) {
              <textarea
                ref={textareaRef}
                class={`prompt-input ${mode() === "shell" ? "shell-mode" : ""} ${expandState() === "expanded" ? "is-expanded" : ""}`}
-                dir="auto"
                placeholder={getPlaceholder()}
                value={prompt()}
                onInput={handleInput}
@@ -566,111 +464,42 @@ export default function PromptInput(props: PromptInputProps) {
                autocomplete="off"
              />
              <div class="prompt-nav-buttons">
-                <div class="prompt-nav-column prompt-nav-column-left">
-                  <Show when={showVoiceInput()}>
-                    <button
-                      type="button"
-                      class={`prompt-voice-button prompt-nav-voice-button ${voiceInput.isRecording() ? "is-recording" : ""}`}
-                      onPointerDown={(event) => {
-                        event.preventDefault()
-                        beginVoicePress(event)
-                      }}
-                      onPointerUp={(event) => {
-                        event.preventDefault()
-                        endVoicePress()
-                      }}
-                      onPointerCancel={() => endVoicePress()}
-                      onLostPointerCapture={() => endVoicePress()}
-                      onKeyDown={(event) => {
-                        if (event.repeat) return
-                        if (event.key !== " " && event.key !== "Enter") return
-                        event.preventDefault()
-                        beginVoicePress(event)
-                      }}
-                      onKeyUp={(event) => {
-                        if (event.key !== " " && event.key !== "Enter") return
-                        event.preventDefault()
-                        endVoicePress()
-                      }}
-                      onBlur={() => endVoicePress()}
-                      disabled={!voiceInput.isRecording() && (props.disabled || voiceInput.isTranscribing() || !voiceInput.canUseVoiceInput())}
-                      aria-label={voiceInput.buttonTitle()}
-                      title={voiceInput.buttonTitle()}
-                    >
-                      <Show
-                        when={voiceInput.isRecording()}
-                        fallback={
-                          <Show when={voiceInput.isTranscribing()} fallback={<Mic class="h-4 w-4" aria-hidden="true" />}>
-                            <Loader2 class="h-4 w-4 animate-spin" aria-hidden="true" />
-                          </Show>
-                        }
-                      >
-                        <Mic class="h-4 w-4" aria-hidden="true" />
-                      </Show>
-                    </button>
-                  </Show>
-                  <Show when={showConversationToggle()}>
-                    <button
-                      type="button"
-                      class={`prompt-voice-button prompt-nav-voice-button prompt-conversation-button ${conversationModeEnabled() ? "is-active" : ""}`}
-                      onClick={() => toggleConversationMode(props.instanceId)}
-                      disabled={!conversationModeEnabled() && !canToggleConversationMode()}
-                      aria-pressed={conversationModeEnabled()}
-                      aria-label={conversationModeButtonTitle()}
-                      title={conversationModeButtonTitle()}
-                    >
-                      <Volume2 class="h-4 w-4" aria-hidden="true" />
-                    </button>
-                  </Show>
+                <ExpandButton
+                  expandState={expandState}
+                  onToggleExpand={handleExpandToggle}
+                />
+                <Show when={hasHistory()}>
                  <button
                    type="button"
-                    class="prompt-clear-button"
-                    onClick={handleClearPrompt}
-                    disabled={!canClearPrompt()}
-                    aria-label={t("promptInput.clear.ariaLabel")}
-                    title={t("promptInput.clear.title")}
+                    class="prompt-history-button"
+                    onClick={() =>
+                      selectPreviousHistory({
+                        force: true,
+                        isPickerOpen: showPicker(),
+                        getTextarea: () => textareaRef,
+                      })
+                    }
+                    disabled={!canHistoryGoPrevious()}
+                    aria-label={t("promptInput.history.previousAriaLabel")}
                  >
-                    <X class="h-4 w-4" aria-hidden="true" />
+                    <ArrowBigUp class="h-5 w-5" aria-hidden="true" />
                  </button>
-                </div>
-                <div class="prompt-nav-column prompt-nav-column-right">
-                  <ExpandButton
-                    expandState={expandState}
-                    onToggleExpand={handleExpandToggle}
-                  />
-                  <Show when={hasHistory()}>
-                    <button
-                      type="button"
-                      class="prompt-history-button"
-                      onClick={() =>
-                        selectPreviousHistory({
-                          force: true,
-                          isPickerOpen: showPicker(),
-                          getTextarea: () => textareaRef,
-                        })
-                      }
-                      disabled={!canHistoryGoPrevious()}
-                      aria-label={t("promptInput.history.previousAriaLabel")}
-                    >
-                      <ArrowBigUp class="h-5 w-5" aria-hidden="true" />
-                    </button>
-                    <button
-                      type="button"
-                      class="prompt-history-button"
-                      onClick={() =>
-                        selectNextHistory({
-                          force: true,
-                          isPickerOpen: showPicker(),
-                          getTextarea: () => textareaRef,
-                        })
-                      }
-                      disabled={!canHistoryGoNext()}
-                      aria-label={t("promptInput.history.nextAriaLabel")}
-                    >
-                      <ArrowBigDown class="h-5 w-5" aria-hidden="true" />
-                    </button>
-                  </Show>
-                </div>
+                  <button
+                    type="button"
+                    class="prompt-history-button"
+                    onClick={() =>
+                      selectNextHistory({
+                        force: true,
+                        isPickerOpen: showPicker(),
+                        getTextarea: () => textareaRef,
+                      })
+                    }
+                    disabled={!canHistoryGoNext()}
+                    aria-label={t("promptInput.history.nextAriaLabel")}
+                  >
+                    <ArrowBigDown class="h-5 w-5" aria-hidden="true" />
+                  </button>
+                </Show>
              </div>
              <Show when={shouldShowOverlay()}>
                <div class={`prompt-input-overlay keyboard-hints ${mode() === "shell" ? "shell-mode" : ""}`}>
--- a/packages/ui/src/components/prompt-input/usePromptVoiceInput.ts
+++ b/packages/ui/src/components/prompt-input/usePromptVoiceInput.ts
@@ -1,253 +0,0 @@
-import { createEffect, createSignal, onCleanup, type Accessor } from "solid-js"
-import { showAlertDialog } from "../../stores/alerts"
-import { loadSpeechCapabilities, speechCapabilities } from "../../stores/speech"
-import { serverApi } from "../../lib/api-client"
-import { useI18n } from "../../lib/i18n"
-import { isElectronHost } from "../../lib/runtime-env"
-
-interface UsePromptVoiceInputOptions {
-  prompt: Accessor<string>
-  setPrompt: (value: string) => void
-  getTextarea: () => HTMLTextAreaElement | null
-  enabled: Accessor<boolean>
-  disabled: Accessor<boolean>
-}
-
-type VoiceInputState = "idle" | "recording" | "transcribing"
-
-export function usePromptVoiceInput(options: UsePromptVoiceInputOptions) {
-  const { t } = useI18n()
-  const [state, setState] = createSignal<VoiceInputState>("idle")
-  const [elapsedMs, setElapsedMs] = createSignal(0)
-
-  let mediaRecorder: MediaRecorder | null = null
-  let mediaStream: MediaStream | null = null
-  let timerId: number | undefined
-  let shouldTranscribe = true
-  let recordedChunks: Blob[] = []
-  let recordingStartedAt = 0
-
-  createEffect(() => {
-    void loadSpeechCapabilities()
-  })
-
-  onCleanup(() => {
-    cleanupMedia(false)
-  })
-
-  const isSupported = () => {
-    if (typeof window === "undefined") return false
-    return typeof window.MediaRecorder !== "undefined" && Boolean(navigator.mediaDevices?.getUserMedia)
-  }
-
-  const canUseVoiceInput = () => {
-    const capabilities = speechCapabilities()
-    return Boolean(
-      options.enabled() &&
-        isSupported() &&
-        capabilities?.available &&
-        capabilities?.configured &&
-        capabilities?.supportsStt,
-    )
-  }
-
-  async function toggleRecording(): Promise<void> {
-    if (state() === "recording") {
-      stopRecording()
-      return
-    }
-
-    await startRecording()
-  }
-
-  function stopRecording() {
-    if (!mediaRecorder || state() !== "recording") return
-    shouldTranscribe = true
-    mediaRecorder.stop()
-    setState("transcribing")
-    stopTimer()
-  }
-
-  function cancelRecording() {
-    if (!mediaRecorder || state() !== "recording") return
-    shouldTranscribe = false
-    mediaRecorder.stop()
-    cleanupMedia(false)
-  }
-
-  async function startRecording() {
-    if (!canUseVoiceInput() || options.disabled() || state() === "transcribing" || state() === "recording") return
-
-    if (!isSupported()) {
-      showAlertDialog(t("promptInput.voiceInput.error.unsupported"), {
-        title: t("promptInput.voiceInput.error.title"),
-        variant: "error",
-      })
-      return
-    }
-
-    try {
-      recordedChunks = []
-      shouldTranscribe = true
-
-      if (isElectronHost()) {
-        const granted = await (window as Window & { electronAPI?: ElectronAPI }).electronAPI?.requestMicrophoneAccess?.()
-        if (granted && !granted.granted) {
-          throw new Error(t("promptInput.voiceInput.error.permissionDenied"))
-        }
-      }
-
-      mediaStream = await navigator.mediaDevices.getUserMedia({ audio: true })
-      mediaRecorder = createRecorder(mediaStream)
-
-      mediaRecorder.addEventListener("dataavailable", (event) => {
-        if (event.data.size > 0) {
-          recordedChunks.push(event.data)
-        }
-      })
-
-      mediaRecorder.addEventListener("stop", () => {
-        void finalizeRecording()
-      })
-
-      recordingStartedAt = Date.now()
-      setElapsedMs(0)
-      setState("recording")
-      startTimer()
-      mediaRecorder.start()
-    } catch (error) {
-      cleanupMedia(false)
-      showAlertDialog(t("promptInput.voiceInput.error.permission"), {
-        title: t("promptInput.voiceInput.error.title"),
-        detail: error instanceof Error ? error.message : String(error),
-        variant: "error",
-      })
-    }
-  }
-
-  async function finalizeRecording() {
-    const recorder = mediaRecorder
-    const stream = mediaStream
-    mediaRecorder = null
-    mediaStream = null
-
-    if (!shouldTranscribe || recordedChunks.length === 0) {
-      recordedChunks = []
-      stopTracks(stream)
-      setState("idle")
-      setElapsedMs(0)
-      return
-    }
-
-    const mimeType = recorder?.mimeType || recordedChunks[0]?.type || "audio/webm"
-
-    try {
-      const audioBlob = new Blob(recordedChunks, { type: mimeType })
-      const transcription = await serverApi.transcribeAudio({
-        audioBase64: await blobToBase64(audioBlob),
-        mimeType,
-      })
-      if (transcription.text.trim()) {
-        insertTranscript(transcription.text.trim())
-      }
-    } catch (error) {
-      showAlertDialog(t("promptInput.voiceInput.error.transcribe"), {
-        title: t("promptInput.voiceInput.error.title"),
-        detail: error instanceof Error ? error.message : String(error),
-        variant: "error",
-      })
-    } finally {
-      recordedChunks = []
-      stopTracks(stream)
-      setState("idle")
-      setElapsedMs(0)
-    }
-  }
-
-  function insertTranscript(text: string) {
-    const current = options.prompt()
-    const textarea = options.getTextarea()
-    const start = textarea ? textarea.selectionStart : current.length
-    const end = textarea ? textarea.selectionEnd : current.length
-    const before = current.slice(0, start)
-    const after = current.slice(end)
-    const prefix = before.length > 0 && !/\s$/.test(before) ? " " : ""
-    const suffix = after.length > 0 && !/^\s/.test(after) ? " " : ""
-    const nextValue = `${before}${prefix}${text}${suffix}${after}`
-    const cursor = before.length + prefix.length + text.length
-
-    options.setPrompt(nextValue)
-    if (textarea) {
-      setTimeout(() => {
-        textarea.focus()
-        textarea.setSelectionRange(cursor, cursor)
-      }, 0)
-    }
-  }
-
-  function cleanupMedia(resetState = true) {
-    stopTimer()
-    if (mediaRecorder && mediaRecorder.state !== "inactive") {
-      mediaRecorder.stop()
-    }
-    mediaRecorder = null
-    stopTracks(mediaStream)
-    mediaStream = null
-    recordedChunks = []
-    if (resetState) {
-      setState("idle")
-      setElapsedMs(0)
-    }
-  }
-
-  function startTimer() {
-    stopTimer()
-    timerId = window.setInterval(() => {
-      setElapsedMs(Date.now() - recordingStartedAt)
-    }, 250)
-  }
-
-  function stopTimer() {
-    if (timerId !== undefined) {
-      window.clearInterval(timerId)
-      timerId = undefined
-    }
-  }
-
-  return {
-    state,
-    elapsedMs,
-    canUseVoiceInput,
-    startRecording,
-    stopRecording,
-    toggleRecording,
-    cancelRecording,
-    isRecording: () => state() === "recording",
-    isTranscribing: () => state() === "transcribing",
-    buttonTitle: () => {
-      if (state() === "recording") return t("promptInput.voiceInput.stop.title")
-      if (state() === "transcribing") return t("promptInput.voiceInput.transcribing.title")
-      return t("promptInput.voiceInput.start.title")
-    },
-  }
-}
-
-function createRecorder(stream: MediaStream): MediaRecorder {
-  const candidates = ["audio/webm;codecs=opus", "audio/webm", "audio/mp4", "audio/ogg;codecs=opus"]
-  const supported = candidates.find((candidate) => typeof MediaRecorder.isTypeSupported !== "function" || MediaRecorder.isTypeSupported(candidate))
-  return supported ? new MediaRecorder(stream, { mimeType: supported }) : new MediaRecorder(stream)
-}
-
-function stopTracks(stream: MediaStream | null) {
-  stream?.getTracks().forEach((track) => track.stop())
-}
-
-async function blobToBase64(blob: Blob): Promise<string> {
-  const buffer = await blob.arrayBuffer()
-  const bytes = new Uint8Array(buffer)
-  let binary = ""
-  for (const byte of bytes) {
-    binary += String.fromCharCode(byte)
-  }
-  return btoa(binary)
-}
--- a/packages/ui/src/components/session-list.tsx
+++ b/packages/ui/src/components/session-list.tsx
@@ -444,7 +444,7 @@ const SessionList: Component<SessionListProps> = (props) => {
              </Show>

              {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" dir="auto">{title()}</span>
+              <span class="session-item-title session-item-title--clamp">{title()}</span>
            </div>
          </div>
          <div class="session-item-row session-item-meta">
--- a/packages/ui/src/components/session-rename-dialog.tsx
+++ b/packages/ui/src/components/session-rename-dialog.tsx
@@ -76,7 +76,6 @@ const SessionRenameDialog: Component<SessionRenameDialogProps> = (props) => {
                    inputRef = element
                  }}
                  type="text"
-                  dir="auto"
                  value={title()}
                  onInput={(event) => setTitle(event.currentTarget.value)}
                  placeholder={t("sessionRenameDialog.input.placeholder")}
--- a/packages/ui/src/components/session/session-view.tsx
+++ b/packages/ui/src/components/session/session-view.tsx
@@ -16,7 +16,6 @@ import { getLogger } from "../../lib/logger"
 import { requestData } from "../../lib/opencode-api"
 import { useI18n } from "../../lib/i18n"
 import type { PromptInputApi, PromptInsertMode } from "../prompt-input/types"
-import { clearConversationPlaybackForSession } from "../../stores/conversation-speech"

 const log = getLogger("session")

@@ -89,10 +88,6 @@ export const SessionView: Component<SessionViewProps> = (props) => {
    on(
      () => props.isActive,
      (isActive) => {
-        if (!isActive) {
-          clearConversationPlaybackForSession(props.instanceId, props.sessionId)
-          return
-        }
        if (!isActive) return

        // On phones, focusing the prompt on session switch is disruptive (it raises the OSK).
--- a/packages/ui/src/components/settings-screen.tsx
+++ b/packages/ui/src/components/settings-screen.tsx
@@ -1,5 +1,5 @@
 import { Dialog } from "@kobalte/core/dialog"
-import { Settings, Bell, MonitorUp, Paintbrush, Terminal, Volume2, X } from "lucide-solid"
+import { Settings, Bell, MonitorUp, Paintbrush, Terminal, X } from "lucide-solid"
 import { createMemo, For, type Component } from "solid-js"
 import { useI18n } from "../lib/i18n"
 import {
@@ -13,7 +13,6 @@ import { AppearanceSettingsSection } from "./settings/appearance-settings-sectio
 import { NotificationsSettingsSection } from "./settings/notifications-settings-section"
 import { OpenCodeSettingsSection } from "./settings/opencode-settings-section"
 import { RemoteAccessSettingsSection } from "./settings/remote-access-settings-section"
-import { SpeechSettingsSection } from "./settings/speech-settings-section"

 export const SettingsScreen: Component = () => {
  const { t } = useI18n()
@@ -22,7 +21,6 @@ export const SettingsScreen: Component = () => {
    { id: "appearance" as SettingsSectionId, icon: Paintbrush, label: t("settings.nav.appearance") },
    { id: "notifications" as SettingsSectionId, icon: Bell, label: t("settings.nav.notifications") },
    { id: "remote" as SettingsSectionId, icon: MonitorUp, label: t("settings.nav.remote") },
-    { id: "speech" as SettingsSectionId, icon: Volume2, label: t("settings.nav.speech") },
    { id: "opencode" as SettingsSectionId, icon: Terminal, label: t("settings.nav.opencode") },
  ])

@@ -32,8 +30,6 @@ export const SettingsScreen: Component = () => {
        return <NotificationsSettingsSection />
      case "remote":
        return <RemoteAccessSettingsSection />
-      case "speech":
-        return <SpeechSettingsSection />
      case "opencode":
        return <OpenCodeSettingsSection />
      case "appearance":
--- a/packages/ui/src/components/settings/appearance-settings-section.tsx
+++ b/packages/ui/src/components/settings/appearance-settings-section.tsx
@@ -24,7 +24,6 @@ export const AppearanceSettingsSection: Component = () => {
    toggleUsageMetrics,
    toggleAutoCleanupBlankSessions,
    togglePromptSubmitOnEnter,
-    toggleShowPromptVoiceInput,
    setDiffViewMode,
    setToolOutputExpansion,
    setDiagnosticsExpansion,
@@ -39,11 +38,10 @@ export const AppearanceSettingsSection: Component = () => {
      toggleShowThinkingBlocks,
      toggleKeyboardShortcutHints,
      toggleShowTimelineTools,
-        toggleUsageMetrics,
-        toggleAutoCleanupBlankSessions,
-        togglePromptSubmitOnEnter,
-        toggleShowPromptVoiceInput,
-        setDiffViewMode,
+      toggleUsageMetrics,
+      toggleAutoCleanupBlankSessions,
+      togglePromptSubmitOnEnter,
+      setDiffViewMode,
      setToolOutputExpansion,
      setDiagnosticsExpansion,
      setThinkingBlocksExpansion,
--- a/packages/ui/src/components/settings/speech-settings-card.tsx
+++ b/packages/ui/src/components/settings/speech-settings-card.tsx
@@ -1,373 +0,0 @@
-import { For, Show, createEffect, createMemo, createSignal, type Component } from "solid-js"
-import { Loader2, Mic, Square, Volume2 } from "lucide-solid"
-import { useConfig, type SpeechSettings } from "../../stores/preferences"
-import { useI18n } from "../../lib/i18n"
-import { loadSpeechCapabilities, speechCapabilities, speechCapabilitiesError, speechCapabilitiesLoading } from "../../stores/speech"
-import { getLogger } from "../../lib/logger"
-import { useSpeech } from "../../lib/hooks/use-speech"
-import { getSpeechPlaybackSupport } from "../../lib/speech-playback-support"
-
-const log = getLogger("actions")
-
-type DraftFields = {
-  apiKey: string
-  baseUrl: string
-  sttModel: string
-  ttsModel: string
-  ttsVoice: string
-  playbackMode: SpeechSettings["playbackMode"]
-  ttsFormat: SpeechSettings["ttsFormat"]
-}
-
-function createDraftFields(speech: SpeechSettings): DraftFields {
-  return {
-    apiKey: "",
-    baseUrl: speech.baseUrl ?? "",
-    sttModel: speech.sttModel,
-    ttsModel: speech.ttsModel,
-    ttsVoice: speech.ttsVoice,
-    playbackMode: speech.playbackMode,
-    ttsFormat: speech.ttsFormat,
-  }
-}
-
-function isDraftEqual(a: DraftFields, b: DraftFields): boolean {
-  return (
-    a.apiKey === b.apiKey &&
-    a.baseUrl === b.baseUrl &&
-    a.sttModel === b.sttModel &&
-    a.ttsModel === b.ttsModel &&
-    a.ttsVoice === b.ttsVoice &&
-    a.playbackMode === b.playbackMode &&
-    a.ttsFormat === b.ttsFormat
-  )
-}
-
-export const SpeechSettingsCard: Component = () => {
-  const { t } = useI18n()
-  const { serverSettings, updateSpeechSettings } = useConfig()
-  const initialDrafts = createDraftFields(serverSettings().speech)
-  const [isSaving, setIsSaving] = createSignal(false)
-  const [saveStatus, setSaveStatus] = createSignal<"idle" | "saved" | "error">("saved")
-  const [drafts, setDrafts] = createSignal<DraftFields>(initialDrafts)
-  const [apiKeyTouched, setApiKeyTouched] = createSignal(false)
-  const [clearStoredApiKey, setClearStoredApiKey] = createSignal(false)
-
-  const testSpeech = useSpeech({
-    id: () => "settings-speech-test",
-    text: () => t("settings.speech.testPlayback.sample"),
-    settingsOverride: () => ({
-      playbackMode: drafts().playbackMode,
-      ttsFormat: drafts().ttsFormat,
-    }),
-  })
-
-  createEffect(() => {
-    const speech = serverSettings().speech
-    const nextDrafts = createDraftFields(speech)
-    if (!isSaving() && !isDirty()) {
-      if (!isDraftEqual(drafts(), nextDrafts)) {
-        setDrafts(nextDrafts)
-      }
-      if (apiKeyTouched()) {
-        setApiKeyTouched(false)
-      }
-      if (clearStoredApiKey()) {
-        setClearStoredApiKey(false)
-      }
-    }
-  })
-
-  createEffect(() => {
-    void loadSpeechCapabilities()
-  })
-
-  const capabilityLabel = () => {
-    if (speechCapabilitiesLoading()) return t("settings.speech.status.loading")
-    if (speechCapabilitiesError()) return t("settings.speech.status.error")
-    return speechCapabilities()?.configured ? t("settings.speech.status.configured") : t("settings.speech.status.missing")
-  }
-
-  const updateDraft = (key: keyof DraftFields, value: string) => {
-    setSaveStatus("idle")
-    if (key === "apiKey") {
-      setApiKeyTouched(true)
-      setClearStoredApiKey(false)
-    }
-    setDrafts((current) => ({ ...current, [key]: value }))
-  }
-
-  const apiKeyDirty = createMemo(() => clearStoredApiKey() || drafts().apiKey.trim().length > 0)
-  const playbackSupport = createMemo(() =>
-    getSpeechPlaybackSupport({
-      playbackMode: drafts().playbackMode,
-      ttsFormat: drafts().ttsFormat,
-      capabilities: speechCapabilities(),
-    }),
-  )
-  const compatibilityMessage = createMemo(() => {
-    const capabilities = speechCapabilities()
-    if (!capabilities?.available || !capabilities?.configured || !capabilities?.supportsTts) {
-      return null
-    }
-    if (drafts().playbackMode === "streaming" && !capabilities.supportsStreamingTts) {
-      return t("settings.speech.compatibility.streamingUnavailable")
-    }
-    if (drafts().playbackMode === "streaming" && !playbackSupport().available) {
-      return t("settings.speech.compatibility.browserStreamingUnavailable")
-    }
-    return t("settings.speech.compatibility.runtimeNote")
-  })
-
-  const isDirty = createMemo(() => {
-    const speech = serverSettings().speech
-    const current = drafts()
-    return (
-      apiKeyDirty() ||
-      (current.baseUrl || "") !== (speech.baseUrl || "") ||
-      current.sttModel !== speech.sttModel ||
-      current.ttsModel !== speech.ttsModel ||
-      current.ttsVoice !== speech.ttsVoice ||
-      current.playbackMode !== speech.playbackMode ||
-      current.ttsFormat !== speech.ttsFormat
-    )
-  })
-
-  const saveStatusLabel = () => {
-    if (isSaving()) return t("settings.speech.save.saving")
-    if (saveStatus() === "saved") return t("settings.speech.save.saved")
-    if (saveStatus() === "error") return t("settings.speech.save.error")
-    return t("settings.speech.save.unsaved")
-  }
-
-  async function handleSave() {
-    if (!isDirty() || isSaving()) return
-    const current = drafts()
-    setIsSaving(true)
-    setSaveStatus("idle")
-    try {
-      const trimmedApiKey = current.apiKey.trim()
-      await updateSpeechSettings({
-        ...(clearStoredApiKey() ? { apiKey: null } : trimmedApiKey ? { apiKey: trimmedApiKey } : {}),
-        baseUrl: current.baseUrl.trim() || undefined,
-        sttModel: current.sttModel.trim() || undefined,
-        ttsModel: current.ttsModel.trim() || undefined,
-        ttsVoice: current.ttsVoice.trim() || undefined,
-        playbackMode: current.playbackMode,
-        ttsFormat: current.ttsFormat,
-      })
-      await loadSpeechCapabilities(true)
-      setDrafts({
-        apiKey: "",
-        baseUrl: current.baseUrl.trim(),
-        sttModel: current.sttModel.trim() || serverSettings().speech.sttModel,
-        ttsModel: current.ttsModel.trim() || serverSettings().speech.ttsModel,
-        ttsVoice: current.ttsVoice.trim() || serverSettings().speech.ttsVoice,
-        playbackMode: current.playbackMode,
-        ttsFormat: current.ttsFormat,
-      })
-      setApiKeyTouched(false)
-      setClearStoredApiKey(false)
-      setSaveStatus("saved")
-    } catch (error) {
-      log.error("Failed to save speech settings", error)
-      setSaveStatus("error")
-    } finally {
-      setIsSaving(false)
-    }
-  }
-
-  return (
-    <div class="settings-card">
-      <div class="settings-card-header">
-        <div class="settings-card-heading-with-icon">
-          <Volume2 class="settings-card-heading-icon" />
-          <div>
-            <h3 class="settings-card-title">{t("settings.speech.title")}</h3>
-            <p class="settings-card-subtitle">{t("settings.speech.subtitle")}</p>
-          </div>
-        </div>
-        <span class="settings-scope-badge settings-scope-badge-server">{t("settings.scope.server")}</span>
-      </div>
-
-      <div class="settings-stack">
-        <div class="settings-toggle-row settings-toggle-row-compact">
-          <div>
-            <div class="settings-toggle-title">{t("settings.speech.provider.title")}</div>
-            <div class="settings-toggle-caption">{t("settings.speech.provider.subtitle")}</div>
-          </div>
-          <div class="settings-toolbar-inline">
-            <span class="settings-inline-note">{t("settings.speech.provider.openaiCompatible")}</span>
-            <span class="settings-inline-note">{capabilityLabel()}</span>
-            <span class="settings-inline-note">{saveStatusLabel()}</span>
-            <button
-              type="button"
-              class="selector-button selector-button-secondary w-auto whitespace-nowrap inline-flex items-center gap-2"
-              onClick={() => void testSpeech.toggle()}
-              disabled={isSaving()}
-              title={testSpeech.buttonTitle()}
-              aria-label={testSpeech.buttonTitle()}
-            >
-              <Show
-                when={testSpeech.isLoading()}
-                fallback={
-                  <Show when={testSpeech.isPlaying()} fallback={<Volume2 class="w-3.5 h-3.5" aria-hidden="true" />}>
-                    <Square class="w-3.5 h-3.5" aria-hidden="true" />
-                  </Show>
-                }
-              >
-                <Loader2 class="w-3.5 h-3.5 animate-spin" aria-hidden="true" />
-              </Show>
-              <span>
-                {testSpeech.isPlaying()
-                  ? t("settings.speech.testPlayback.stop")
-                  : testSpeech.isLoading()
-                    ? t("settings.speech.testPlayback.generating")
-                    : t("settings.speech.testPlayback.action")}
-              </span>
-            </button>
-            <button
-              type="button"
-              class="selector-button selector-button-primary w-auto whitespace-nowrap"
-              onClick={() => void handleSave()}
-              disabled={!isDirty() || isSaving()}
-            >
-              {isSaving() ? t("settings.speech.save.saving") : t("settings.speech.save.action")}
-            </button>
-          </div>
-        </div>
-
-        <Field
-          label={t("settings.speech.apiKey.title")}
-          caption={t("settings.speech.apiKey.subtitle")}
-          value={drafts().apiKey}
-          onInput={(value) => updateDraft("apiKey", value)}
-          type="password"
-          placeholder={serverSettings().speech.hasApiKey ? t("settings.speech.apiKey.placeholder") : undefined}
-        />
-        <Show when={serverSettings().speech.hasApiKey && !apiKeyTouched() && drafts().apiKey.length === 0}>
-          <div class="settings-inline-note">
-            {clearStoredApiKey() ? t("settings.speech.apiKey.clearPending") : t("settings.speech.apiKey.storedNote")}{" "}
-            <Show when={!clearStoredApiKey()}>
-              <button
-                type="button"
-                class="selector-button selector-button-secondary w-auto whitespace-nowrap"
-                onClick={() => {
-                  setClearStoredApiKey(true)
-                  setSaveStatus("idle")
-                }}
-              >
-                {t("settings.speech.apiKey.clearAction")}
-              </button>
-            </Show>
-          </div>
-        </Show>
-        <Field
-          label={t("settings.speech.baseUrl.title")}
-          caption={t("settings.speech.baseUrl.subtitle")}
-          value={drafts().baseUrl}
-          onInput={(value) => updateDraft("baseUrl", value)}
-          placeholder={t("settings.speech.baseUrl.placeholder")}
-        />
-        <Field
-          label={t("settings.speech.sttModel.title")}
-          caption={t("settings.speech.sttModel.subtitle")}
-          value={drafts().sttModel}
-          onInput={(value) => updateDraft("sttModel", value)}
-        />
-        <Field
-          label={t("settings.speech.ttsModel.title")}
-          caption={t("settings.speech.ttsModel.subtitle")}
-          value={drafts().ttsModel}
-          onInput={(value) => updateDraft("ttsModel", value)}
-        />
-        <Field
-          label={t("settings.speech.ttsVoice.title")}
-          caption={t("settings.speech.ttsVoice.subtitle")}
-          value={drafts().ttsVoice}
-          onInput={(value) => updateDraft("ttsVoice", value)}
-          icon={<Mic class="w-3.5 h-3.5 icon-muted flex-shrink-0" />}
-        />
-        <SelectField
-          label={t("settings.speech.playbackMode.title")}
-          caption={t("settings.speech.playbackMode.subtitle")}
-          value={drafts().playbackMode}
-          onInput={(value) => updateDraft("playbackMode", value as DraftFields["playbackMode"])}
-          options={[
-            { value: "streaming", label: t("settings.speech.playbackMode.streaming") },
-            { value: "buffered", label: t("settings.speech.playbackMode.buffered") },
-          ]}
-        />
-        <SelectField
-          label={t("settings.speech.ttsFormat.title")}
-          caption={t("settings.speech.ttsFormat.subtitle")}
-          value={drafts().ttsFormat}
-          onInput={(value) => updateDraft("ttsFormat", value as DraftFields["ttsFormat"])}
-          options={[
-            { value: "mp3", label: "MP3" },
-            { value: "wav", label: "WAV" },
-            { value: "opus", label: "Opus" },
-            { value: "aac", label: "AAC" },
-          ]}
-        />
-
-        <div class="settings-inline-note">{t("settings.speech.help")}</div>
-        <Show when={compatibilityMessage()}>{(message) => <div class="settings-inline-note">{message()}</div>}</Show>
-        <div class="settings-inline-note">{t("settings.speech.testPlayback.note")}</div>
-      </div>
-    </div>
-  )
-}
-
-const Field: Component<{
-  label: string
-  caption: string
-  value: string
-  type?: string
-  placeholder?: string
-  onInput: (value: string) => void
-  icon?: any
-}> = (props) => {
-  return (
-    <div class="settings-toggle-row settings-toggle-row-compact">
-      <div>
-        <div class="settings-toggle-title">{props.label}</div>
-        <div class="settings-toggle-caption">{props.caption}</div>
-      </div>
-      <div class="flex items-center gap-2 min-w-[18rem] max-w-[24rem] w-full">
-        {props.icon}
-        <input
-          type={props.type ?? "text"}
-          value={props.value}
-          onInput={(event) => props.onInput(event.currentTarget.value)}
-          class="selector-input w-full"
-          placeholder={props.placeholder}
-        />
-      </div>
-    </div>
-  )
-}
-
-const SelectField: Component<{
-  label: string
-  caption: string
-  value: string
-  onInput: (value: string) => void
-  options: Array<{ value: string; label: string }>
-}> = (props) => {
-  return (
-    <div class="settings-toggle-row settings-toggle-row-compact">
-      <div>
-        <div class="settings-toggle-title">{props.label}</div>
-        <div class="settings-toggle-caption">{props.caption}</div>
-      </div>
-      <div class="min-w-[18rem] max-w-[24rem] w-full">
-        <select value={props.value} onInput={(event) => props.onInput(event.currentTarget.value)} class="selector-input w-full">
-          <For each={props.options}>{(option) => <option value={option.value}>{option.label}</option>}</For>
-        </select>
-      </div>
-    </div>
-  )
-}
-
-export default SpeechSettingsCard
--- a/packages/ui/src/components/settings/speech-settings-section.tsx
+++ b/packages/ui/src/components/settings/speech-settings-section.tsx
@@ -1,10 +0,0 @@
-import type { Component } from "solid-js"
-import SpeechSettingsCard from "./speech-settings-card"
-
-export const SpeechSettingsSection: Component = () => {
-  return (
-    <div class="settings-section-stack">
-      <SpeechSettingsCard />
-    </div>
-  )
-}
--- a/packages/ui/src/components/speech-action-button.tsx
+++ b/packages/ui/src/components/speech-action-button.tsx
@@ -1,34 +0,0 @@
-import { Loader2, Volume2 } from "lucide-solid"
-import type { JSX } from "solid-js"
-
-interface SpeechActionButtonProps {
-  class?: string
-  title: string
-  isLoading: boolean
-  isPlaying: boolean
-  onClick: JSX.EventHandlerUnion<HTMLButtonElement, MouseEvent>
-  type?: "button" | "submit" | "reset"
-}
-
-export default function SpeechActionButton(props: SpeechActionButtonProps) {
-  return (
-    <button
-      type={props.type ?? "button"}
-      class={props.class}
-      onClick={props.onClick}
-      aria-label={props.title}
-      title={props.title}
-    >
-      {props.isLoading ? (
-        <Loader2 class="w-3.5 h-3.5 animate-spin" aria-hidden="true" />
-      ) : props.isPlaying ? (
-        <svg class="w-3.5 h-3.5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
-          <rect x="3" y="3" width="18" height="18" rx="2" />
-          <rect x="9" y="9" width="6" height="6" rx="1" fill="currentColor" stroke="none" />
-        </svg>
-      ) : (
-        <Volume2 class="w-3.5 h-3.5" aria-hidden="true" />
-      )}
-    </button>
-  )
-}
--- a/packages/ui/src/components/tool-call.tsx
+++ b/packages/ui/src/components/tool-call.tsx
@@ -29,7 +29,6 @@ import type {
  ToolScrollHelpers,
 } from "./tool-call/types"
 import {
-  buildToolSpeechText,
  ensureMarkdownContent,
  getRelativePath,
  getToolIcon,
@@ -42,8 +41,6 @@ import {
 } from "./tool-call/utils"
 import { resolveTitleForTool } from "./tool-call/tool-title"
 import { getLogger } from "../lib/logger"
-import { useSpeech } from "../lib/hooks/use-speech"
-import SpeechActionButton from "./speech-action-button"

 const log = getLogger("session")

@@ -517,7 +514,6 @@ function ToolCallDetails(props: {
  })

  const { renderDiffContent } = createDiffContentRenderer({
-    toolState: props.toolState,
    preferences: props.preferences,
    setDiffViewMode: props.setDiffViewMode,
    isDark: props.isDark,
@@ -963,21 +959,6 @@ export default function ToolCall(props: ToolCallProps) {
    return renderToolTitle()
  })

-  const speechText = createMemo(() =>
-    buildToolSpeechText({
-      title: headerText(),
-      state: toolState(),
-      t,
-    }),
-  )
-
-  const speech = useSpeech({
-    id: () => `${props.instanceId}:${props.sessionId}:${props.messageId ?? "message"}:${toolCallIdentifier()}`,
-    text: speechText,
-  })
-
-  const canSpeakToolCall = () => speechText().trim().length > 0 && speech.canUseSpeech()
-
  const handleCopyHeader = async (event: MouseEvent) => {
    event.preventDefault()
    event.stopPropagation()
@@ -1041,16 +1022,6 @@ export default function ToolCall(props: ToolCallProps) {
          <Copy class="w-3.5 h-3.5" />
        </button>

-        <Show when={canSpeakToolCall()}>
-          <SpeechActionButton
-            class="tool-call-header-copy"
-            onClick={() => void speech.toggle()}
-            title={speech.buttonTitle()}
-            isLoading={speech.isLoading()}
-            isPlaying={speech.isPlaying()}
-          />
-        </Show>
-
        <span class="tool-call-header-status" aria-hidden="true">
          {statusIcon()}
        </span>
--- a/packages/ui/src/components/tool-call/ansi-render.tsx
+++ b/packages/ui/src/components/tool-call/ansi-render.tsx
@@ -1,7 +1,7 @@
 import type { Accessor, JSXElement } from "solid-js"
 import type { RenderCache } from "../../types/message"
 import { ansiToHtml, createAnsiStreamRenderer, hasAnsi } from "../../lib/ansi"
-import { escapeHtml } from "../../lib/text-render-utils"
+import { escapeHtml } from "../../lib/markdown"
 import type { AnsiRenderOptions, ToolScrollHelpers } from "./types"

 type AnsiRenderCache = RenderCache & { hasAnsi: boolean }
@@ -20,14 +20,6 @@ export function createAnsiContentRenderer(params: {
  const runningAnsiRenderer = createAnsiStreamRenderer()
  let runningAnsiSource = ""

-  const registerTracked = (element: HTMLDivElement | null) => {
-    params.scrollHelpers.registerContainer(element)
-  }
-
-  const registerUntracked = (element: HTMLDivElement | null) => {
-    params.scrollHelpers.registerContainer(element, { disableTracking: true })
-  }
-
  const getMode = () => {
    const version = params.partVersion?.()
    return typeof version === "number" ? String(version) : undefined
@@ -44,8 +36,6 @@ export function createAnsiContentRenderer(params: {
    const cached = cacheHandle.get<AnsiRenderCache>()
    const mode = getMode()
    const isRunningVariant = options.variant === "running"
-    const disableScrollTracking = !isRunningVariant
-    const registerRef = disableScrollTracking ? registerUntracked : registerTracked

    let nextCache: AnsiRenderCache

@@ -97,9 +87,9 @@ export function createAnsiContentRenderer(params: {
    }

    return (
-      <div class={messageClass} ref={registerRef} onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}>
-        <pre class="tool-call-content tool-call-ansi" dir="auto" innerHTML={nextCache.html} />
-        {params.scrollHelpers.renderSentinel({ disableTracking: disableScrollTracking })}
+      <div class={messageClass} ref={params.scrollHelpers.registerContainer} onScroll={params.scrollHelpers.handleScroll}>
+        <pre class="tool-call-content tool-call-ansi" innerHTML={nextCache.html} />
+        {params.scrollHelpers.renderSentinel()}
      </div>
    )
  }
--- a/packages/ui/src/components/tool-call/diagnostics-section.tsx
+++ b/packages/ui/src/components/tool-call/diagnostics-section.tsx
@@ -42,7 +42,7 @@ export function renderDiagnosticsSection(
                    {entry.displayPath}
                    <span class="tool-call-diagnostic-coords">:L{entry.line || "-"}:C{entry.column || "-"}</span>
                  </span>
-                  <span class="tool-call-diagnostic-message" dir="auto">{entry.message}</span>
+                  <span class="tool-call-diagnostic-message">{entry.message}</span>
                </div>
              )}
            </For>
--- a/packages/ui/src/components/tool-call/diff-render.tsx
+++ b/packages/ui/src/components/tool-call/diff-render.tsx
@@ -1,27 +1,11 @@
-import { Suspense, lazy, onMount, type Accessor, type JSXElement } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk/v2"
+import type { Accessor, JSXElement } from "solid-js"
 import type { RenderCache } from "../../types/message"
 import type { DiffViewMode } from "../../stores/preferences"
+import { ToolCallDiffViewer } from "../diff-viewer"
 import type { DiffPayload, DiffRenderOptions, ToolScrollHelpers } from "./types"
 import { getRelativePath } from "./utils"
 import { getCacheEntry } from "../../lib/global-cache"

-const LazyToolCallDiffViewer = lazy(() =>
-  import("../diff-viewer").then((module) => ({ default: module.ToolCallDiffViewer })),
-)
-
-function CachedDiffMarkup(props: { html: string; onRendered?: () => void }) {
-  onMount(() => {
-    props.onRendered?.()
-  })
-
-  return (
-    <div class="tool-call-diff-viewer">
-      <div innerHTML={props.html} />
-    </div>
-  )
-}
-
 type CacheHandle = {
  get<T>(): T | undefined
  params(): unknown
@@ -32,7 +16,6 @@ type DiffPrefs = {
 }

 export function createDiffContentRenderer(params: {
-  toolState: Accessor<ToolState | undefined>
  preferences: Accessor<DiffPrefs>
  setDiffViewMode: (mode: DiffViewMode) => void
  isDark: Accessor<boolean>
@@ -60,10 +43,7 @@ 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 state = params.toolState()
-    const disableScrollTracking = Boolean(
-      options?.disableScrollTracking || (state?.status !== "running" && state?.status !== "pending"),
-    )
+    const disableScrollTracking = Boolean(options?.disableScrollTracking)
    const registerRef = disableScrollTracking ? registerUntracked : registerTracked

    const baseEntryParams = cacheHandle.params() as any
@@ -121,20 +101,15 @@ export function createDiffContentRenderer(params: {
            </button>
          </div>
        </div>
-        {cachedHtml ? (
-          <CachedDiffMarkup html={cachedHtml} onRendered={handleDiffRendered} />
-        ) : (
-          <Suspense fallback={<pre class="tool-call-diff-fallback">{payload.diffText}</pre>}>
-            <LazyToolCallDiffViewer
-              diffText={payload.diffText}
-              filePath={payload.filePath}
-              theme={themeKey}
-              mode={diffMode()}
-              cacheEntryParams={cacheEntryParams as any}
-              onRendered={handleDiffRendered}
-            />
-          </Suspense>
-        )}
+        <ToolCallDiffViewer
+          diffText={payload.diffText}
+          filePath={payload.filePath}
+          theme={themeKey}
+          mode={diffMode()}
+          cachedHtml={cachedHtml}
+          cacheEntryParams={cacheEntryParams as any}
+          onRendered={handleDiffRendered}
+        />
        {params.scrollHelpers.renderSentinel({ disableTracking: disableScrollTracking })}
      </div>
    )
--- a/packages/ui/src/components/tool-call/markdown-render.tsx
+++ b/packages/ui/src/components/tool-call/markdown-render.tsx
@@ -31,9 +31,10 @@ export function createMarkdownContentRenderer(params: {
    const size = options.size || "default"
    const disableHighlight = options.disableHighlight || false
    const messageClass = `message-text tool-call-markdown${size === "large" ? " tool-call-markdown-large" : ""}`
-    const state = params.toolState()
-    const disableScrollTracking = options.disableScrollTracking || (state?.status !== "running" && state?.status !== "pending")
+    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)
    if (shouldDeferMarkdown) {
      return (
@@ -42,7 +43,7 @@ export function createMarkdownContentRenderer(params: {
          ref={registerRef}
          onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}
        >
-          <pre class="whitespace-pre-wrap break-words text-sm font-mono" dir="auto">{options.content}</pre>
+          <pre class="whitespace-pre-wrap break-words text-sm font-mono">{options.content}</pre>
          {params.scrollHelpers.renderSentinel({ disableTracking: disableScrollTracking })}
        </div>
      )
--- a/packages/ui/src/components/tool-call/utils.ts
+++ b/packages/ui/src/components/tool-call/utils.ts
@@ -1,5 +1,5 @@
 import { isRenderableDiffText } from "../../lib/diff-utils"
-import { getLanguageFromPath } from "../../lib/text-render-utils"
+import { getLanguageFromPath } from "../../lib/markdown"
 import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { DiffPayload } from "./types"
 import { getLogger } from "../../lib/logger"
@@ -231,37 +231,3 @@ export function getDefaultToolAction(toolName: string) {
      return tGlobal("toolCall.renderer.action.working")
  }
 }
-
-export function buildToolSpeechText(options: {
-  title: string
-  state?: ToolState
-  t: (key: string, params?: Record<string, unknown>) => string
-}): string {
-  const sections: string[] = []
-
-  if (options.title.trim()) {
-    sections.push(options.title.trim())
-  }
-
-  const { input, output } = readToolStatePayload(options.state)
-  const formattedInput = formatUnknown(input)
-  const formattedOutput = formatUnknown(output)
-
-  if (formattedInput?.text?.trim()) {
-    sections.push(`${options.t("toolCall.io.input")}:\n${formattedInput.text.trim()}`)
-  }
-
-  if (formattedOutput?.text?.trim()) {
-    sections.push(`${options.t("toolCall.io.output")}:\n${formattedOutput.text.trim()}`)
-  }
-
-  if (options.state?.status === "error" && options.state.error?.trim()) {
-    sections.push(`${options.t("toolCall.error.label")} ${options.state.error.trim()}`)
-  }
-
-  if (sections.length === 1 && options.state?.status === "pending") {
-    sections.push(options.t("toolCall.pending.waitingToRun"))
-  }
-
-  return sections.join("\n\n").trim()
-}
--- a/packages/ui/src/components/virtual-follow-list.tsx
+++ b/packages/ui/src/components/virtual-follow-list.tsx
@@ -1,5 +1,5 @@
-import { Show, createEffect, createMemo, createSignal, onCleanup, type Accessor, type JSX, on } from "solid-js"
-import { Virtualizer, type VirtualizerHandle } from "virtua/solid"
+import { Index, Show, createEffect, createMemo, createSignal, onCleanup, type Accessor, type JSX } from "solid-js"
+import VirtualItem, { type VirtualItemHeightChangeMeta } from "./virtual-item"

 const DEFAULT_SCROLL_SENTINEL_MARGIN_PX = 48
 const USER_SCROLL_INTENT_WINDOW_MS = 600
@@ -122,28 +122,55 @@ export interface VirtualFollowListProps<T> {
 }

 export default function VirtualFollowList<T>(props: VirtualFollowListProps<T>) {
+  const getAnchorId = (key: string) => (props.getAnchorId ? props.getAnchorId(key) : key)
+  const getKeyFromAnchorId = (anchorId: string) => (props.getKeyFromAnchorId ? props.getKeyFromAnchorId(anchorId) : anchorId)
+
  const [scrollElement, setScrollElement] = createSignal<HTMLDivElement | undefined>()
  const [shellElement, setShellElement] = createSignal<HTMLDivElement | undefined>()
-  const [virtuaHandle, setVirtuaHandle] = createSignal<VirtualizerHandle | undefined>()
+  const [topSentinel, setTopSentinel] = createSignal<HTMLDivElement | null>(null)
+  const [bottomSentinelSignal, setBottomSentinelSignal] = createSignal<HTMLDivElement | null>(null)
+  const bottomSentinel = () => bottomSentinelSignal()

  const isActive = () => (props.isActive ? props.isActive() : true)
  const scrollToBottomOnActivate = () => (props.scrollToBottomOnActivate ? props.scrollToBottomOnActivate() : true)
  const initialScrollToBottom = () => (props.initialScrollToBottom ? props.initialScrollToBottom() : true)
  const initialAutoScroll = () => (props.initialAutoScroll ? props.initialAutoScroll() : true)
+  const isLoading = () => Boolean(props.loading?.())
+  const virtualizationEnabled = () => (props.virtualizationEnabled ? props.virtualizationEnabled() : true)
+  const measurementsSuspended = () => Boolean(props.suspendMeasurements?.())

  const [autoScroll, setAutoScroll] = createSignal(Boolean(initialAutoScroll()))
  const [showScrollTopButton, setShowScrollTopButton] = createSignal(false)
  const [showScrollBottomButton, setShowScrollBottomButton] = createSignal(false)
+  const [topSentinelVisible, setTopSentinelVisible] = createSignal(true)
+  const [bottomSentinelVisible, setBottomSentinelVisible] = createSignal(true)
  const [activeKey, setActiveKey] = createSignal<string | null>(null)

+  const [anchorLock, setAnchorLock] = createSignal<{ key: string; block: ScrollLogicalPosition } | null>(null)
+
  const scrollButtonsCount = createMemo(() => (showScrollTopButton() ? 1 : 0) + (showScrollBottomButton() ? 1 : 0))

-  let userScrollIntentUntil = 0
-  let lastUserScrollIntentDirection: "up" | "down" | null = null
-  let detachScrollIntentListeners: (() => void) | undefined
-  let lastResetKey: string | number | undefined
+  let containerRef: HTMLDivElement | undefined
+  let shellRef: HTMLDivElement | undefined
+  let pendingScrollFrame: number | null = null
+  let pendingAnchorScroll: number | null = null
+  let pendingAnchorCorrectionFrame: number | null = null
+  let pendingScrollCompensationScheduled = false
+  let pendingScrollCompensations = new Map<string, number>()
+  let scrollCompensationGen = 0
+  let pendingActiveScroll = false
  let suppressAutoScrollOnce = false
  let pendingInitialScroll = true
+  let scrollToBottomFrame: number | null = null
+  let scrollToBottomDelayedFrame: number | null = null
+
+  let lastKnownScrollTop = 0
+  let lastUserScrollIntentDirection: "up" | "down" | null = null
+
+  let userScrollIntentUntil = 0
+  let detachScrollIntentListeners: (() => void) | undefined
+
+  let lastResetKey: string | number | undefined

  const state: VirtualFollowListState = {
    autoScroll,
@@ -154,7 +181,7 @@ export default function VirtualFollowList<T>(props: VirtualFollowListProps<T>) {
  }

  function markUserScrollIntent(direction?: "up" | "down" | null) {
-    const now = performance.now()
+    const now = typeof performance !== "undefined" ? performance.now() : Date.now()
    userScrollIntentUntil = now + USER_SCROLL_INTENT_WINDOW_MS
    if (direction) {
      lastUserScrollIntentDirection = direction
@@ -162,7 +189,8 @@ export default function VirtualFollowList<T>(props: VirtualFollowListProps<T>) {
  }

  function hasUserScrollIntent() {
-    return performance.now() <= userScrollIntentUntil
+    const now = typeof performance !== "undefined" ? performance.now() : Date.now()
+    return now <= userScrollIntentUntil
  }

  function attachScrollIntentListeners(element: HTMLDivElement | undefined) {
@@ -203,189 +231,670 @@ export default function VirtualFollowList<T>(props: VirtualFollowListProps<T>) {
    }
  }

-  function updateScrollButtons() {
-    const handle = virtuaHandle()
-    const element = scrollElement()
-    if (!handle || !element) return
-
-    const offset = handle.scrollOffset
-    const scrollHeight = handle.scrollSize
-    const clientHeight = element.clientHeight
-    const atBottom = scrollHeight - (offset + clientHeight) <= (props.scrollSentinelMarginPx ?? DEFAULT_SCROLL_SENTINEL_MARGIN_PX)
-    const atTop = offset <= (props.scrollSentinelMarginPx ?? DEFAULT_SCROLL_SENTINEL_MARGIN_PX)
-
+  function updateScrollIndicatorsFromVisibility() {
    const hasItems = props.items().length > 0
-    setShowScrollBottomButton(hasItems && !atBottom)
-    setShowScrollTopButton(hasItems && !atTop)
+    const bottomVisible = bottomSentinelVisible()
+    const topVisible = topSentinelVisible()
+    setShowScrollBottomButton(hasItems && !bottomVisible)
+    setShowScrollTopButton(hasItems && !topVisible)
+  }

-    // Sync autoScroll state based on scroll position if it was a user scroll
-    if (hasUserScrollIntent()) {
-      if (atBottom && !autoScroll()) {
-        setAutoScroll(true)
-      } else if (!atBottom && autoScroll()) {
-        setAutoScroll(false)
-      }
+  function clearScrollToBottomFrames() {
+    if (scrollToBottomFrame !== null) {
+      cancelAnimationFrame(scrollToBottomFrame)
+      scrollToBottomFrame = null
+    }
+    if (scrollToBottomDelayedFrame !== null) {
+      cancelAnimationFrame(scrollToBottomDelayedFrame)
+      scrollToBottomDelayedFrame = null
    }
  }

-  function scrollToBottom(immediate = true, options?: { suppressAutoAnchor?: boolean }) {
-    const handle = virtuaHandle()
-    if (!handle) return
-    if (options?.suppressAutoAnchor ?? !immediate) {
+  function scrollToBottom(immediate = false, options?: { suppressAutoAnchor?: boolean }) {
+    if (!containerRef) return
+    if (anchorLock()) {
+      clearAnchorLock()
+    }
+    const sentinel = bottomSentinel()
+    const behavior: ScrollBehavior = immediate ? "auto" : "smooth"
+    const suppressAutoAnchor = options?.suppressAutoAnchor ?? !immediate
+    if (suppressAutoAnchor) {
      suppressAutoScrollOnce = true
    }
-    handle.scrollToIndex(props.items().length - 1, { align: "end", smooth: !immediate })
+    sentinel?.scrollIntoView({ block: "end", inline: "nearest", behavior })
    setAutoScroll(true)
  }

-  function scrollToTop(immediate = true) {
-    const handle = virtuaHandle()
-    if (!handle) return
-    handle.scrollToIndex(0, { align: "start", smooth: !immediate })
+  function requestScrollToBottom(immediate = true) {
+    if (!isActive()) {
+      pendingActiveScroll = true
+      return
+    }
+    if (!containerRef || !bottomSentinel()) {
+      pendingActiveScroll = true
+      return
+    }
+    pendingActiveScroll = false
+    clearScrollToBottomFrames()
+    scrollToBottomFrame = requestAnimationFrame(() => {
+      scrollToBottomFrame = null
+      scrollToBottomDelayedFrame = requestAnimationFrame(() => {
+        scrollToBottomDelayedFrame = null
+        scrollToBottom(immediate)
+      })
+    })
+  }
+
+  function resolvePendingActiveScroll() {
+    if (!pendingActiveScroll) return
+    if (!isActive()) return
+    requestScrollToBottom(true)
+  }
+
+  function scrollToTop(immediate = false) {
+    if (!containerRef) return
+    const behavior: ScrollBehavior = immediate ? "auto" : "smooth"
+    if (anchorLock()) {
+      clearAnchorLock()
+    }
    setAutoScroll(false)
+    topSentinel()?.scrollIntoView({ block: "start", inline: "nearest", behavior })
+  }
+
+  function scheduleAnchorScroll(immediate = false) {
+    if (!autoScroll()) return
+    if (!isActive()) {
+      pendingActiveScroll = true
+      return
+    }
+    const sentinel = bottomSentinel()
+    if (!sentinel) {
+      pendingActiveScroll = true
+      return
+    }
+    if (pendingAnchorScroll !== null) {
+      cancelAnimationFrame(pendingAnchorScroll)
+      pendingAnchorScroll = null
+    }
+    pendingAnchorScroll = requestAnimationFrame(() => {
+      pendingAnchorScroll = null
+      sentinel.scrollIntoView({ block: "end", inline: "nearest", behavior: immediate ? "auto" : "smooth" })
+    })
+  }
+
+  function clearAnchorLock() {
+    setAnchorLock(null)
+    if (pendingAnchorCorrectionFrame !== null) {
+      cancelAnimationFrame(pendingAnchorCorrectionFrame)
+      pendingAnchorCorrectionFrame = null
+    }
+  }
+
+  function computeDesiredOffset(block: ScrollLogicalPosition, container: HTMLElement, anchorRect: DOMRect) {
+    if (block === "end") {
+      return Math.max(0, container.clientHeight - anchorRect.height)
+    }
+    if (block === "center") {
+      return Math.max(0, container.clientHeight / 2 - anchorRect.height / 2)
+    }
+    // Default to start.
+    return 0
+  }
+
+  function applyAnchorCorrection() {
+    const lock = anchorLock()
+    if (!lock) return
+    if (autoScroll()) return
+    if (!containerRef) return
+    if (typeof document === "undefined") return
+
+    const anchorId = getAnchorId(lock.key)
+    const anchor = document.getElementById(anchorId)
+    if (!anchor) return
+
+    const containerRect = containerRef.getBoundingClientRect()
+    const anchorRect = anchor.getBoundingClientRect()
+    const currentOffset = anchorRect.top - containerRect.top
+    const desiredOffset = computeDesiredOffset(lock.block, containerRef, anchorRect)
+    const delta = currentOffset - desiredOffset
+    if (!Number.isFinite(delta) || Math.abs(delta) < 0.5) {
+      return
+    }
+    const nextTop = containerRef.scrollTop + delta
+    const maxScrollTop = Math.max(containerRef.scrollHeight - containerRef.clientHeight, 0)
+    containerRef.scrollTop = Math.min(maxScrollTop, Math.max(0, nextTop))
+  }
+
+  function scheduleAnchorCorrection() {
+    if (pendingAnchorCorrectionFrame !== null) return
+    pendingAnchorCorrectionFrame = requestAnimationFrame(() => {
+      pendingAnchorCorrectionFrame = null
+      applyAnchorCorrection()
+    })
+  }
+
+  function handleContentRendered() {
+    if (autoScroll() && !anchorLock()) {
+      scheduleAutoPinToBottom()
+      return
+    }
+    if (anchorLock() && !autoScroll()) {
+      scheduleAnchorCorrection()
+      return
+    }
  }

  function handleScroll() {
-    const isUserScroll = hasUserScrollIntent()
-    if (isUserScroll) {
-      if (lastUserScrollIntentDirection === "up" && autoScroll()) {
-        setAutoScroll(false)
-      }
+    if (!containerRef) return
+    if (pendingScrollFrame !== null) {
+      cancelAnimationFrame(pendingScrollFrame)
    }
-    updateScrollButtons()
-    props.onScroll?.()
+    const isUserScroll = hasUserScrollIntent()
+    pendingScrollFrame = requestAnimationFrame(() => {
+      pendingScrollFrame = null
+      if (!containerRef) return
+      const previousScrollTop = lastKnownScrollTop
+      const currentScrollTop = containerRef.scrollTop
+      const deltaScrollTop = currentScrollTop - previousScrollTop
+      if (currentScrollTop !== lastKnownScrollTop) {
+        lastKnownScrollTop = currentScrollTop
+      }
+      const atBottom = bottomSentinelVisible()

-    // Find active key (roughly the first visible item)
-    const handle = virtuaHandle()
-    if (handle) {
-      const start = handle.findItemIndex(handle.scrollOffset)
-      const items = props.items()
-      if (items[start]) {
-        const key = props.getKey(items[start], start)
-        if (key !== activeKey()) {
-          setActiveKey(key)
-          props.onActiveKeyChange?.(key)
+      const beforeAutoScroll = autoScroll()
+
+      const inferredDirection: "up" | "down" | null =
+        lastUserScrollIntentDirection ?? (deltaScrollTop < 0 ? "up" : deltaScrollTop > 0 ? "down" : null)
+
+      // If the user scrolls manually, exit key-anchored mode.
+      if (isUserScroll && anchorLock()) {
+        clearAnchorLock()
+      }
+
+      if (isUserScroll) {
+        // If the user is actively scrolling upward, exit follow-to-bottom mode
+        // immediately. The bottom sentinel can remain "visible" for a short
+        // distance due to its observer margin, which otherwise keeps autoScroll
+        // enabled and makes the list feel stuck.
+        if (inferredDirection === "up" && deltaScrollTop < -0.5 && autoScroll()) {
+          if (pendingAnchorScroll !== null) {
+            cancelAnimationFrame(pendingAnchorScroll)
+            pendingAnchorScroll = null
+          }
+          setAutoScroll(false)
+        }
+
+        // Do not re-enable follow mode while the user's current scroll intent
+        // is upward. This prevents transient anchor/pin scrolls from pulling
+        // the list back into autoScroll(true).
+        if (inferredDirection !== "up") {
+          if (atBottom) {
+            if (!autoScroll()) setAutoScroll(true)
+          } else if (autoScroll()) {
+            setAutoScroll(false)
+          }
+        } else if (!atBottom && autoScroll()) {
+          // If the user is scrolling up and we are no longer at the bottom,
+          // ensure follow mode is disabled.
+          setAutoScroll(false)
        }
      }
+
+      props.onScroll?.()
+    })
+  }
+
+  function setContainerRef(element: HTMLDivElement | null) {
+    containerRef = element || undefined
+    setScrollElement(containerRef)
+    props.onScrollElementChange?.(containerRef)
+    attachScrollIntentListeners(containerRef)
+    lastKnownScrollTop = containerRef?.scrollTop ?? 0
+    lastUserScrollIntentDirection = null
+    if (!containerRef) {
+      return
+    }
+    resolvePendingActiveScroll()
+  }
+
+  function scheduleScrollCompensation(key: string, delta: number) {
+    if (!containerRef) return
+    if (!delta || !Number.isFinite(delta)) return
+    if (typeof document === "undefined") return
+
+    // Only compensate while the user scrolls upward (testing default).
+    if (!hasUserScrollIntent() || lastUserScrollIntentDirection !== "up") return
+    if (autoScroll() || anchorLock()) return
+
+    const anchorId = getAnchorId(key)
+    const anchor = document.getElementById(anchorId)
+    if (!anchor) return
+    const containerRect = containerRef.getBoundingClientRect()
+    const rect = anchor.getBoundingClientRect()
+    // Determine whether the item was fully above the viewport *before* the
+    // height delta applied. Items can expand downward into the viewport; in that
+    // case we still need to compensate to keep existing visible content stable.
+    const bottomAfter = rect.bottom
+    const bottomBefore = bottomAfter - delta
+    const wasAboveViewport = bottomBefore < containerRect.top
+    if (!wasAboveViewport) return
+
+    const next = (pendingScrollCompensations.get(key) ?? 0) + delta
+    pendingScrollCompensations.set(key, next)
+
+    if (pendingScrollCompensationScheduled) return
+    pendingScrollCompensationScheduled = true
+    const gen = scrollCompensationGen
+
+    // Flush in a microtask so compensation lands before the next paint.
+    queueMicrotask(() => {
+      if (gen !== scrollCompensationGen) return
+      pendingScrollCompensationScheduled = false
+      if (!containerRef) return
+      if (!hasUserScrollIntent() || lastUserScrollIntentDirection !== "up") {
+        pendingScrollCompensations = new Map()
+        return
+      }
+      if (autoScroll() || anchorLock()) {
+        pendingScrollCompensations = new Map()
+        return
+      }
+
+      let applied = 0
+      let count = 0
+      for (const pendingDelta of pendingScrollCompensations.values()) {
+        if (!pendingDelta) continue
+        applied += pendingDelta
+        count += 1
+      }
+      pendingScrollCompensations = new Map()
+      if (!applied) return
+
+      const before = containerRef.scrollTop
+      const maxScrollTop = Math.max(containerRef.scrollHeight - containerRef.clientHeight, 0)
+      const nextTop = Math.min(maxScrollTop, Math.max(0, before + applied))
+      if (nextTop !== before) {
+        containerRef.scrollTop = nextTop
+        lastKnownScrollTop = nextTop
+      }
+    })
+  }
+
+  let pendingAutoPin = false
+  let pendingAutoPinFrame: number | null = null
+
+  function clearPendingAutoPinFrame() {
+    if (pendingAutoPinFrame !== null) {
+      cancelAnimationFrame(pendingAutoPinFrame)
+      pendingAutoPinFrame = null
    }
  }

+  function applyAutoPinToBottom() {
+    if (!containerRef) return false
+    if (!autoScroll()) return false
+    if (anchorLock()) return false
+
+    const maxScrollTop = Math.max(containerRef.scrollHeight - containerRef.clientHeight, 0)
+    if (containerRef.scrollTop !== maxScrollTop) {
+      containerRef.scrollTop = maxScrollTop
+      lastKnownScrollTop = maxScrollTop
+    }
+    return true
+  }
+
+  function scheduleAutoPinToBottom() {
+    if (!containerRef) return
+    if (pendingAutoPin) return
+    pendingAutoPin = true
+    clearPendingAutoPinFrame()
+    const gen = scrollCompensationGen
+
+    // Flush in a microtask so adjustments land before the next paint,
+    // then re-apply on the next two frames to catch deferred layout.
+    queueMicrotask(() => {
+      if (gen !== scrollCompensationGen) return
+      pendingAutoPin = false
+      if (!applyAutoPinToBottom()) return
+      pendingAutoPinFrame = requestAnimationFrame(() => {
+        pendingAutoPinFrame = null
+        if (gen !== scrollCompensationGen) return
+        if (!applyAutoPinToBottom()) return
+        pendingAutoPinFrame = requestAnimationFrame(() => {
+          pendingAutoPinFrame = null
+          if (gen !== scrollCompensationGen) return
+          applyAutoPinToBottom()
+        })
+      })
+    })
+  }
+
+  function setShellRef(element: HTMLDivElement | null) {
+    shellRef = element || undefined
+    setShellElement(shellRef)
+    props.onShellElementChange?.(shellRef)
+  }
+
+  function setBottomSentinel(element: HTMLDivElement | null) {
+    setBottomSentinelSignal(element)
+    resolvePendingActiveScroll()
+  }
+
  const api: VirtualFollowListApi = {
-    scrollToTop: (opts) => scrollToTop(opts?.immediate ?? true),
-    scrollToBottom: (opts) => scrollToBottom(opts?.immediate ?? true, { suppressAutoAnchor: opts?.suppressAutoAnchor }),
+    scrollToTop: (opts) => scrollToTop(Boolean(opts?.immediate)),
+    scrollToBottom: (opts) => scrollToBottom(Boolean(opts?.immediate), { suppressAutoAnchor: opts?.suppressAutoAnchor }),
    scrollToKey: (key, opts) => {
-      const index = props.items().findIndex((item, i) => props.getKey(item, i) === key)
-      if (index === -1) return
+      if (typeof document === "undefined") return
+      const anchorId = getAnchorId(key)
+      const behavior = opts?.behavior ?? "smooth"
+      const block = opts?.block ?? "start"
      const nextAutoScroll = opts?.setAutoScroll ?? false
      setAutoScroll(nextAutoScroll)
-      virtuaHandle()?.scrollToIndex(index, { align: opts?.block ?? "start", smooth: opts?.behavior === "smooth" })
-    },
-    notifyContentRendered: () => {
-      if (autoScroll()) {
-        scrollToBottom(true)
+      if (!nextAutoScroll) {
+        if (anchorLock()) {
+          clearAnchorLock()
+        }
+        setAnchorLock({ key, block })
+      } else {
+        if (anchorLock()) {
+          clearAnchorLock()
+        }
      }
+      const first = document.getElementById(anchorId)
+      first?.scrollIntoView({ block, behavior })
+      // When using virtualization, the placeholder height can be stale until the
+      // item mounts/measures. Re-run scrollIntoView() on the next frame to
+      // stabilize the final position.
+      requestAnimationFrame(() => {
+        const second = document.getElementById(anchorId)
+        second?.scrollIntoView({ block, behavior })
+      })
    },
+    notifyContentRendered: () => handleContentRendered(),
    setAutoScroll: (enabled) => setAutoScroll(Boolean(enabled)),
    getAutoScroll: () => autoScroll(),
    getScrollElement: () => scrollElement(),
    getShellElement: () => shellElement(),
  }

-  createEffect(() => props.registerApi?.(api))
-  createEffect(() => props.registerState?.(state))
+  createEffect(() => {
+    props.registerApi?.(api)
+  })

-  // Handle autoScroll (Follow) on items change
-  createEffect(on(() => props.items().length, (len, prevLen) => {
-    if (len > (prevLen ?? 0) && autoScroll() && !suppressAutoScrollOnce) {
-      requestAnimationFrame(() => scrollToBottom(true))
+  createEffect(() => {
+    props.registerState?.(state)
+  })
+
+  createEffect(() => {
+    const nextKey = props.resetKey?.()
+    if (nextKey === undefined) return
+    if (lastResetKey === undefined) {
+      lastResetKey = nextKey
+      return
    }
-    suppressAutoScrollOnce = false
-  }, { defer: true }))
-
-  // Handle followToken change
-  createEffect(on(() => props.followToken?.(), () => {
-    if (autoScroll()) {
-      scrollToBottom(true)
-    }
-  }, { defer: true }))
-
-  // Reset state on resetKey change
-  createEffect(on(() => props.resetKey?.(), (nextKey) => {
    if (nextKey === lastResetKey) return
    lastResetKey = nextKey
-    setAutoScroll(initialAutoScroll())
-    pendingInitialScroll = true
-  }))

-  // Initial scroll and session activation
+    // Reset internal state when consumers swap datasets (e.g. session switch).
+    if (pendingScrollFrame !== null) {
+      cancelAnimationFrame(pendingScrollFrame)
+      pendingScrollFrame = null
+    }
+    if (pendingAnchorScroll !== null) {
+      cancelAnimationFrame(pendingAnchorScroll)
+      pendingAnchorScroll = null
+    }
+    if (pendingAnchorCorrectionFrame !== null) {
+      cancelAnimationFrame(pendingAnchorCorrectionFrame)
+      pendingAnchorCorrectionFrame = null
+    }
+    clearScrollToBottomFrames()
+
+    scrollCompensationGen += 1
+    pendingScrollCompensationScheduled = false
+    pendingScrollCompensations = new Map()
+    pendingAutoPin = false
+    clearPendingAutoPinFrame()
+
+    suppressAutoScrollOnce = false
+    pendingActiveScroll = false
+    pendingInitialScroll = true
+
+    setAnchorLock(null)
+    setActiveKey(null)
+    setShowScrollTopButton(false)
+    setShowScrollBottomButton(false)
+    setTopSentinelVisible(true)
+    setBottomSentinelVisible(true)
+    setAutoScroll(Boolean(initialAutoScroll()))
+
+    lastKnownScrollTop = containerRef?.scrollTop ?? 0
+    lastUserScrollIntentDirection = null
+  })
+
+  let lastActiveState = false
  createEffect(() => {
    const active = isActive()
-    if (!active) return
-    if (pendingInitialScroll && props.items().length > 0) {
-      pendingInitialScroll = false
-      if (initialScrollToBottom()) {
-        scrollToBottom(true)
+    if (active) {
+      resolvePendingActiveScroll()
+      if (!lastActiveState && autoScroll() && scrollToBottomOnActivate()) {
+        requestScrollToBottom(true)
+
+        // When switching back to a cached session pane, items can mount/measure
+        // after the initial scroll jump. Re-pin once layout settles so the
+        // viewport stays at the bottom.
+        requestAnimationFrame(() => {
+          requestAnimationFrame(() => {
+            scheduleAutoPinToBottom()
+          })
+        })
      }
    } else if (autoScroll() && scrollToBottomOnActivate()) {
-      scrollToBottom(true)
+      pendingActiveScroll = true
+    }
+    lastActiveState = active
+  })
+
+  createEffect(() => {
+    const loading = isLoading()
+    if (loading) {
+      // Keep the initial scroll pending while loading so we can
+      // anchor to the bottom as soon as items appear.
+      pendingInitialScroll = true
+    }
+
+    if (!pendingInitialScroll) return
+
+    const container = scrollElement()
+    const sentinel = bottomSentinel()
+    if (!container || !sentinel || props.items().length === 0) return
+
+    if (!initialScrollToBottom()) {
+      // An outer component is responsible for restoring scroll.
+      pendingInitialScroll = false
+      return
+    }
+
+    // Ensure we're in follow-to-bottom mode for the initial position.
+    if (anchorLock()) {
+      clearAnchorLock()
+    }
+    setAutoScroll(true)
+
+    pendingInitialScroll = false
+    // Scroll synchronously so the first paint prefers bottom content.
+    scrollToBottom(true)
+  })
+
+  let previousFollowToken: string | number | undefined
+  createEffect(() => {
+    const token = props.followToken?.()
+    if (token === undefined) {
+      previousFollowToken = token
+      return
+    }
+    if (previousFollowToken === undefined) {
+      previousFollowToken = token
+      return
+    }
+    if (token === previousFollowToken) {
+      return
+    }
+    previousFollowToken = token
+    if (suppressAutoScrollOnce) {
+      suppressAutoScrollOnce = false
+      return
+    }
+    if (autoScroll()) {
+      scheduleAutoPinToBottom()
+      return
+    }
+    if (anchorLock() && !autoScroll()) {
+      scheduleAnchorCorrection()
    }
  })

-  return (
-    <div class="virtual-follow-list-shell" ref={shellElement => {
-      setShellElement(shellElement)
-      props.onShellElementChange?.(shellElement)
-    }}>
-      <div
-        class="message-stream"
-        ref={el => {
-          setScrollElement(el)
-          props.onScrollElementChange?.(el)
-          attachScrollIntentListeners(el)
-        }}
-        onMouseUp={props.onMouseUp}
-        onClick={props.onClick}
-      >
-        <Show when={props.renderBeforeItems}>
-          {props.renderBeforeItems!()}
-        </Show>
-        <Virtualizer
-          ref={setVirtuaHandle}
-          scrollRef={scrollElement()}
-          data={props.items()}
-          bufferSize={props.overscanPx ?? 400}
-          onScroll={handleScroll}
-        >
-          {(item, index) => props.renderItem(item, index())}
-        </Virtualizer>
-      </div>
+  // Drop anchor lock if the anchored key is removed.
+  createEffect(() => {
+    const lock = anchorLock()
+    if (!lock) return
+    const keys = props.items().map((item, idx) => props.getKey(item, idx))
+    if (!keys.includes(lock.key)) {
+      clearAnchorLock()
+    }
+  })

-      <Show when={props.renderOverlay}>
-        <div class="virtual-follow-list-overlay">{props.renderOverlay!()}</div>
-      </Show>
+  createEffect(() => {
+    if (props.items().length === 0) {
+      setShowScrollTopButton(false)
+      setShowScrollBottomButton(false)
+      setAutoScroll(true)
+      return
+    }
+    updateScrollIndicatorsFromVisibility()
+  })

-      <Show when={props.renderControls}>
-        <div class="virtual-follow-list-controls-container">{props.renderControls!(state, api)}</div>
-      </Show>
+  createEffect(() => {
+    const container = scrollElement()
+    const topTarget = topSentinel()
+    const bottomTarget = bottomSentinel()
+    if (!container || !topTarget || !bottomTarget) return
+    if (typeof IntersectionObserver === "undefined") return

-      <Show
-        when={
-          !props.renderControls &&
-          (showScrollTopButton() || showScrollBottomButton()) &&
-          props.scrollToTopAriaLabel &&
-          props.scrollToBottomAriaLabel
+    const margin = props.scrollSentinelMarginPx ?? DEFAULT_SCROLL_SENTINEL_MARGIN_PX
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        let visibilityChanged = false
+        for (const entry of entries) {
+          if (entry.target === topTarget) {
+            setTopSentinelVisible(entry.isIntersecting)
+            visibilityChanged = true
+          } else if (entry.target === bottomTarget) {
+            setBottomSentinelVisible(entry.isIntersecting)
+            visibilityChanged = true
+          }
        }
-      >
+        if (visibilityChanged) {
+          updateScrollIndicatorsFromVisibility()
+        }
+      },
+      { root: container, threshold: 0, rootMargin: `${margin}px 0px ${margin}px 0px` },
+    )
+    observer.observe(topTarget)
+    observer.observe(bottomTarget)
+    onCleanup(() => observer.disconnect())
+  })
+
+  createEffect(() => {
+    const container = scrollElement()
+    const items = props.items()
+    if (!container || items.length === 0) return
+    if (typeof document === "undefined") return
+    if (typeof IntersectionObserver === "undefined") return
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        let best: IntersectionObserverEntry | null = null
+        for (const entry of entries) {
+          if (!entry.isIntersecting) continue
+          if (!best || entry.boundingClientRect.top < best.boundingClientRect.top) {
+            best = entry
+          }
+        }
+        if (best) {
+          const anchorId = (best.target as HTMLElement).id
+          const key = getKeyFromAnchorId(anchorId)
+          setActiveKey((current) => (current === key ? current : key))
+        }
+      },
+      { root: container, rootMargin: "-10% 0px -80% 0px", threshold: 0 },
+    )
+
+    const anchorIds = items.map((item, idx) => getAnchorId(props.getKey(item, idx)))
+    anchorIds.forEach((anchorId) => {
+      const anchor = document.getElementById(anchorId)
+      if (anchor) observer.observe(anchor)
+    })
+
+    onCleanup(() => observer.disconnect())
+  })
+
+  createEffect(() => {
+    const key = activeKey()
+    props.onActiveKeyChange?.(key)
+  })
+
+  onCleanup(() => {
+    if (pendingScrollFrame !== null) {
+      cancelAnimationFrame(pendingScrollFrame)
+    }
+    if (pendingAnchorScroll !== null) {
+      cancelAnimationFrame(pendingAnchorScroll)
+    }
+    if (pendingAnchorCorrectionFrame !== null) {
+      cancelAnimationFrame(pendingAnchorCorrectionFrame)
+    }
+    scrollCompensationGen += 1
+    pendingScrollCompensationScheduled = false
+    pendingScrollCompensations = new Map()
+    clearPendingAutoPinFrame()
+    clearScrollToBottomFrames()
+    if (detachScrollIntentListeners) {
+      detachScrollIntentListeners()
+    }
+  })
+
+  const controls = () => {
+    if (props.renderControls) {
+      return props.renderControls(state, api)
+    }
+
+    // Avoid hardcoded user-visible strings; require consumers to supply
+    // localized aria labels when using the default controls.
+    if (!props.scrollToTopAriaLabel || !props.scrollToBottomAriaLabel) {
+      return null
+    }
+
+    const labelTop = props.scrollToTopAriaLabel()
+    const labelBottom = props.scrollToBottomAriaLabel()
+    return (
+      <Show when={showScrollTopButton() || showScrollBottomButton()}>
        <div class="message-scroll-button-wrapper">
          <Show when={showScrollTopButton()}>
-            <button type="button" class="message-scroll-button" onClick={() => scrollToTop()} aria-label={props.scrollToTopAriaLabel!()}>
+            <button type="button" class="message-scroll-button" onClick={() => scrollToTop()} aria-label={labelTop}>
              <span class="message-scroll-icon" aria-hidden="true">
                ↑
              </span>
            </button>
          </Show>
          <Show when={showScrollBottomButton()}>
-            <button type="button" class="message-scroll-button" onClick={() => scrollToBottom()} aria-label={props.scrollToBottomAriaLabel!()}>
+            <button
+              type="button"
+              class="message-scroll-button"
+              onClick={() => scrollToBottom(false, { suppressAutoAnchor: false })}
+              aria-label={labelBottom}
+            >
              <span class="message-scroll-icon" aria-hidden="true">
                ↓
              </span>
@@ -393,6 +902,71 @@ export default function VirtualFollowList<T>(props: VirtualFollowListProps<T>) {
          </Show>
        </div>
      </Show>
+    )
+  }
+
+  return (
+    <div class="message-stream-shell" ref={setShellRef}>
+      <div
+        class="message-stream"
+        ref={setContainerRef}
+        onScroll={handleScroll}
+        onMouseUp={(event) => props.onMouseUp?.(event)}
+        onClick={(event) => props.onClick?.(event)}
+      >
+        <div ref={setTopSentinel} aria-hidden="true" style={{ height: "1px" }} />
+        {props.renderBeforeItems?.()}
+        <Index each={props.items()}>
+          {(item, index) => {
+            const key = () => props.getKey(item(), index)
+            const anchorId = () => getAnchorId(key())
+            const overscanPx = props.overscanPx ?? 800
+            const suspendMeasurements = () => measurementsSuspended() || !isActive()
+            const itemVirtualizationEnabled = () => virtualizationEnabled() && !autoScroll()
+            return (
+              <VirtualItem
+                id={anchorId()}
+                cacheKey={key()}
+                scrollContainer={scrollElement}
+                threshold={overscanPx}
+                placeholderClass="message-stream-placeholder"
+                virtualizationEnabled={itemVirtualizationEnabled}
+                suspendMeasurements={suspendMeasurements}
+                onHeightChange={(nextHeight, previousHeight, meta: VirtualItemHeightChangeMeta) => {
+                  const delta = nextHeight - previousHeight
+
+                  // Follow mode: keep the viewport pinned to the bottom as
+                  // items mount/measure and change height.
+                  if (delta && autoScroll() && !anchorLock()) {
+                    scheduleAutoPinToBottom()
+                    return
+                  }
+
+                  // Key-anchored mode: keep the target key in view when
+                  // items above it mount/measure and shift layout.
+                  if (anchorLock() && !autoScroll()) {
+                    scheduleAnchorCorrection()
+                    return
+                  }
+
+                  // Free-scroll mode: if items above the viewport change height
+                  // while scrolling upward, compensate scrollTop so visible
+                  // content stays stable.
+                  if (delta) {
+                    if (meta.isStaleCacheCorrection) return
+                    scheduleScrollCompensation(key(), delta)
+                  }
+                }}
+              >{() => props.renderItem(item(), index)}</VirtualItem>
+            )
+          }}
+        </Index>
+        <div ref={setBottomSentinel} aria-hidden="true" style={{ height: "1px" }} />
+      </div>
+
+      {controls()}
+
+      {props.renderOverlay?.()}
    </div>
  )
 }
--- a/packages/ui/src/components/virtual-item.tsx
+++ b/packages/ui/src/components/virtual-item.tsx
@@ -0,0 +1,492 @@
+import { JSX, Accessor, createEffect, createMemo, createSignal, onCleanup } from "solid-js"
+
+const sizeCache = new Map<string, number>()
+const DEFAULT_MARGIN_PX = 600
+const MIN_PLACEHOLDER_HEIGHT = 400
+const VISIBILITY_BUFFER_PX = 0
+
+type ObserverRoot = Element | Document | null
+
+type IntersectionCallback = (entry: IntersectionObserverEntry) => void
+
+interface SharedObserver {
+  observer: IntersectionObserver
+  listeners: Map<Element, Set<IntersectionCallback>>
+}
+
+const NULL_ROOT_KEY = "__null__"
+const rootIds = new WeakMap<Element | Document, number>()
+let sharedRootId = 0
+const sharedObservers = new Map<string, SharedObserver>()
+
+function getRootKey(root: ObserverRoot, margin: number): string {
+  if (!root) {
+    return `${NULL_ROOT_KEY}:${margin}`
+  }
+  let id = rootIds.get(root)
+  if (id === undefined) {
+    id = ++sharedRootId
+    rootIds.set(root, id)
+  }
+  return `${id}:${margin}`
+}
+
+function createSharedObserver(root: ObserverRoot, margin: number): SharedObserver {
+  const listeners = new Map<Element, Set<IntersectionCallback>>()
+  const observer = new IntersectionObserver(
+    (entries) => {
+      entries.forEach((entry) => {
+        const callbacks = listeners.get(entry.target as Element)
+        if (!callbacks) return
+        callbacks.forEach((fn) => fn(entry))
+      })
+    },
+    {
+      root: root ?? undefined,
+      rootMargin: `${margin}px 0px ${margin}px 0px`,
+    },
+  )
+  return { observer, listeners }
+}
+
+function shouldRenderEntry(entry: IntersectionObserverEntry) {
+  const rootBounds = entry.rootBounds
+  if (!rootBounds) {
+    return entry.isIntersecting
+  }
+
+  // Above the root: compare bottom edge to root top.
+  if (entry.boundingClientRect.bottom < rootBounds.top) {
+    const distance = rootBounds.top - entry.boundingClientRect.bottom
+    return distance <= VISIBILITY_BUFFER_PX
+  }
+
+  // Below the root: compare top edge to root bottom.
+  if (entry.boundingClientRect.top > rootBounds.bottom) {
+    const distance = entry.boundingClientRect.top - rootBounds.bottom
+    return distance <= VISIBILITY_BUFFER_PX
+  }
+
+  // Overlapping the root bounds.
+  return true
+}
+
+function getViewportRect(): { top: number; bottom: number } {
+  if (typeof window === "undefined") {
+    return { top: 0, bottom: 0 }
+  }
+  return { top: 0, bottom: window.innerHeight }
+}
+
+function isRenderableRoot(root: ObserverRoot): boolean {
+  if (!root) return true
+  if (root instanceof Document) return true
+  if (typeof window === "undefined") return false
+
+  const element = root as Element
+  const style = window.getComputedStyle(element as Element)
+  if (style.display === "none" || style.visibility === "hidden") {
+    return false
+  }
+  const rect = (element as Element).getBoundingClientRect()
+  return rect.width > 0 && rect.height > 0
+}
+
+function shouldRenderByRects(params: {
+  wrapperRect: DOMRect
+  rootRect: { top: number; bottom: number }
+  margin: number
+}): boolean {
+  const { wrapperRect, rootRect, margin } = params
+  const threshold = margin + VISIBILITY_BUFFER_PX
+
+  // Above the root: compare bottom edge to root top.
+  if (wrapperRect.bottom < rootRect.top) {
+    const distance = rootRect.top - wrapperRect.bottom
+    return distance <= threshold
+  }
+
+  // Below the root: compare top edge to root bottom.
+  if (wrapperRect.top > rootRect.bottom) {
+    const distance = wrapperRect.top - rootRect.bottom
+    return distance <= threshold
+  }
+
+  return true
+}
+
+function subscribeToSharedObserver(
+  target: Element,
+  root: ObserverRoot,
+  margin: number,
+  callback: IntersectionCallback,
+): () => void {
+  if (typeof IntersectionObserver === "undefined") {
+    callback({ isIntersecting: true } as IntersectionObserverEntry)
+    return () => {}
+  }
+  const key = getRootKey(root, margin)
+  let shared = sharedObservers.get(key)
+  if (!shared) {
+    shared = createSharedObserver(root, margin)
+    sharedObservers.set(key, shared)
+  }
+  let targetCallbacks = shared.listeners.get(target)
+  if (!targetCallbacks) {
+    targetCallbacks = new Set()
+    shared.listeners.set(target, targetCallbacks)
+    shared.observer.observe(target)
+  }
+  targetCallbacks.add(callback)
+  return () => {
+    const current = shared?.listeners.get(target)
+    if (current) {
+      current.delete(callback)
+      if (current.size === 0) {
+        shared?.listeners.delete(target)
+        shared?.observer.unobserve(target)
+      }
+    }
+    if (shared && shared.listeners.size === 0) {
+      shared.observer.disconnect()
+      sharedObservers.delete(key)
+    }
+  }
+}
+
+interface VirtualItemProps {
+  cacheKey: string
+  children: JSX.Element | (() => JSX.Element)
+  scrollContainer?: Accessor<HTMLElement | undefined | null>
+  threshold?: number
+  minPlaceholderHeight?: number
+  class?: string
+  contentClass?: string
+  placeholderClass?: string
+  virtualizationEnabled?: Accessor<boolean>
+  forceVisible?: Accessor<boolean>
+  suspendMeasurements?: Accessor<boolean>
+  onMeasured?: () => void
+  onHeightChange?: (nextHeight: number, previousHeight: number, meta: VirtualItemHeightChangeMeta) => void
+  id?: string
+}
+
+export interface VirtualItemHeightChangeMeta {
+  source: "initial-visible-measure" | "resize"
+  previousCachedHeight: number | null
+  isStaleCacheCorrection: boolean
+  wasHidden: boolean
+}
+
+export default function VirtualItem(props: VirtualItemProps) {
+  const resolveContent = () => (typeof props.children === "function" ? (props.children as () => JSX.Element)() : props.children)
+  const cachedHeight = sizeCache.get(props.cacheKey)
+  const fallbackPlaceholderHeight = () => props.minPlaceholderHeight ?? MIN_PLACEHOLDER_HEIGHT
+  // Default to hidden until we can determine visibility.
+  // This avoids keeping heavy DOM alive when IntersectionObserver
+  // doesn't fire (common for hidden/zero-sized scroll roots).
+  const [isIntersecting, setIsIntersecting] = createSignal(false)
+  // Keep measuredHeight aligned with the *effective layout height* while hidden.
+  // When content first mounts, onHeightChange deltas should reflect the DOM's
+  // placeholder height (not 0), otherwise scroll compensation can overshoot.
+  const [measuredHeight, setMeasuredHeight] = createSignal(cachedHeight ?? fallbackPlaceholderHeight())
+  let hasReportedMeasurement = Boolean(cachedHeight && cachedHeight > 0)
+  let pendingVisibility: boolean | null = null
+  let visibilityFrame: number | null = null
+  let awaitingVisibleMeasurement = true
+  let lastMeasurementWhileHidden = true
+  const flushVisibility = () => {
+    if (visibilityFrame !== null) {
+      cancelAnimationFrame(visibilityFrame)
+      visibilityFrame = null
+    }
+    if (pendingVisibility !== null) {
+      setIsIntersecting(pendingVisibility)
+      pendingVisibility = null
+    }
+  }
+  const queueVisibility = (nextValue: boolean) => {
+    pendingVisibility = nextValue
+    if (visibilityFrame !== null) return
+    visibilityFrame = requestAnimationFrame(() => {
+      visibilityFrame = null
+      if (pendingVisibility !== null) {
+        setIsIntersecting(pendingVisibility)
+        pendingVisibility = null
+      }
+    })
+  }
+  const virtualizationEnabled = () => (props.virtualizationEnabled ? props.virtualizationEnabled() : true)
+  const measurementsSuspended = () => Boolean(props.suspendMeasurements?.())
+  const forceVisible = () => Boolean(props.forceVisible?.())
+  const shouldHideContent = createMemo(() => {
+    if (forceVisible()) return false
+    if (!virtualizationEnabled()) return false
+    return !isIntersecting()
+  })
+
+  let wrapperRef: HTMLDivElement | undefined
+  let contentRef: HTMLDivElement | undefined
+
+  let resizeObserver: ResizeObserver | undefined
+  let intersectionCleanup: (() => void) | undefined
+
+  function cleanupResizeObserver() {
+    if (resizeObserver) {
+      resizeObserver.disconnect()
+      resizeObserver = undefined
+    }
+  }
+
+  function scheduleVisibleMeasurements() {
+    if (shouldHideContent() || measurementsSuspended()) return
+    if (!contentRef) return
+    queueMicrotask(() => {
+      if (shouldHideContent() || measurementsSuspended()) return
+      if (!contentRef) return
+      updateMeasuredHeight()
+      setupResizeObserver()
+    })
+  }
+
+  function cleanupIntersectionObserver() {
+    if (intersectionCleanup) {
+      intersectionCleanup()
+      intersectionCleanup = undefined
+    }
+  }
+
+  function persistMeasurement(nextHeight: number, meta?: { source: "initial-visible-measure" | "resize"; wasHidden: boolean }) {
+    if (!Number.isFinite(nextHeight) || nextHeight < 0) {
+      return
+    }
+    const before = measuredHeight()
+    const normalized = nextHeight
+    const previousCachedHeight = sizeCache.get(props.cacheKey) ?? null
+    const previous = previousCachedHeight ?? measuredHeight()
+    const measurementMeta: VirtualItemHeightChangeMeta = {
+      source: meta?.source ?? "resize",
+      previousCachedHeight,
+      isStaleCacheCorrection:
+        (meta?.source ?? "resize") === "initial-visible-measure" &&
+        previousCachedHeight !== null &&
+        normalized > 0 &&
+        Math.abs(normalized - previousCachedHeight) > 1,
+      wasHidden: meta?.wasHidden ?? shouldHideContent(),
+    }
+    // Only keep the previous measurement when the element reports 0 height.
+    // Allow shrinkage so placeholder height matches real content height;
+    // keeping the max height can cause mount/unmount jitter near the
+    // virtualization boundary.
+    const shouldKeepPrevious = previous > 0 && normalized === 0
+    if (shouldKeepPrevious) {
+      if (!hasReportedMeasurement) {
+        hasReportedMeasurement = true
+        props.onMeasured?.()
+      }
+      sizeCache.set(props.cacheKey, previous)
+      setMeasuredHeight(previous)
+      if (previous !== before) props.onHeightChange?.(previous, before, measurementMeta)
+      return
+    }
+    if (normalized > 0) {
+      sizeCache.set(props.cacheKey, normalized)
+      if (!hasReportedMeasurement) {
+        hasReportedMeasurement = true
+        props.onMeasured?.()
+      }
+    }
+    setMeasuredHeight(normalized)
+    if (normalized !== before) props.onHeightChange?.(normalized, before, measurementMeta)
+  }
+
+  function updateMeasuredHeight() {
+    if (!contentRef) return
+    if (measurementsSuspended()) return
+    // Prefer subpixel-accurate height for scroll compensation.
+    // offsetHeight rounds to integers which can accumulate error.
+    const rect = contentRef.getBoundingClientRect()
+    const next = Math.max(0, Math.round(rect.height * 2) / 2)
+    const currentMeasured = measuredHeight()
+    const measurementSource: "initial-visible-measure" | "resize" = awaitingVisibleMeasurement ? "initial-visible-measure" : "resize"
+    const wasHidden = lastMeasurementWhileHidden
+    if (measurementSource === "initial-visible-measure") {
+      awaitingVisibleMeasurement = false
+      lastMeasurementWhileHidden = false
+    }
+    if (next === currentMeasured) return
+    persistMeasurement(next, { source: measurementSource, wasHidden })
+  }
+
+  function setupResizeObserver() {
+    if (!contentRef || measurementsSuspended()) return
+    cleanupResizeObserver()
+    if (typeof ResizeObserver === "undefined") {
+      updateMeasuredHeight()
+      return
+    }
+    resizeObserver = new ResizeObserver(() => {
+      if (measurementsSuspended()) return
+      updateMeasuredHeight()
+    })
+    resizeObserver.observe(contentRef)
+  }
+
+
+  function refreshIntersectionObserver(targetRoot: Element | Document | null) {
+    cleanupIntersectionObserver()
+    if (!wrapperRef) {
+      setIsIntersecting(false)
+      return
+    }
+    if (typeof IntersectionObserver === "undefined") {
+      setIsIntersecting(true)
+      return
+    }
+
+    const margin = props.threshold ?? DEFAULT_MARGIN_PX
+
+    // If the scroll root is hidden / 0x0, IntersectionObserver can report
+    // `isIntersecting` in unexpected ways (often "true" with null rootBounds),
+    // which keeps heavy DOM alive in background tabs.
+    //
+    // In that state, force-hide and skip attaching the observer. When the
+    // pane becomes visible again, VirtualItem will re-run this setup and
+    // re-attach the observer.
+    const renderable = isRenderableRoot(targetRoot)
+    if (!renderable) {
+      setIsIntersecting(false)
+      return
+    }
+
+    // Avoid doing an eager geometry read here.
+    // During large list hydration / initial layout, wrapper rects can be
+    // transiently 0/incorrect and cause many offscreen items to mount.
+    // Rely on the observer callback (which we harden below) to determine
+    // visibility.
+
+    const wrapperEl = wrapperRef
+    intersectionCleanup = subscribeToSharedObserver(wrapperEl, targetRoot, margin, (entry) => {
+      // IntersectionObserver can produce transient false-positives during pane
+      // activation/layout transitions (e.g. `isIntersecting: true` for items far
+      // outside the scroll root). For element roots, prefer explicit rect math.
+      if (targetRoot && !(targetRoot instanceof Document)) {
+        // When rootBounds is null we cannot trust the entry; treat as hidden.
+        if (entry.rootBounds === null) {
+          queueVisibility(false)
+          return
+        }
+        try {
+          const rootRect = (targetRoot as Element).getBoundingClientRect()
+          const visible = shouldRenderByRects({
+            wrapperRect: wrapperEl.getBoundingClientRect(),
+            rootRect: { top: rootRect.top, bottom: rootRect.bottom },
+            margin,
+          })
+          queueVisibility(visible)
+          return
+        } catch {
+          // Fall through to the entry-based heuristic.
+        }
+      }
+
+      const nextVisible = shouldRenderEntry(entry)
+      queueVisibility(nextVisible)
+    })
+  }
+
+  function setWrapperRef(element: HTMLDivElement | null) {
+    wrapperRef = element ?? undefined
+    const root = props.scrollContainer ? props.scrollContainer() : null
+    refreshIntersectionObserver(root ?? null)
+  }
+
+  function setContentRef(element: HTMLDivElement | null) {
+    contentRef = element ?? undefined
+    if (contentRef) {
+      queueMicrotask(() => {
+        if (shouldHideContent() || measurementsSuspended()) return
+        updateMeasuredHeight()
+        setupResizeObserver()
+      })
+    } else {
+      cleanupResizeObserver()
+    }
+  }
+  createEffect(() => {
+    const hidden = shouldHideContent()
+    if (hidden) {
+      awaitingVisibleMeasurement = true
+      lastMeasurementWhileHidden = true
+    }
+    if (hidden || measurementsSuspended()) {
+      cleanupResizeObserver()
+    }
+    if (!hidden && !measurementsSuspended() && contentRef) {
+      scheduleVisibleMeasurements()
+    }
+  })
+
+  
+  createEffect(() => {
+    const key = props.cacheKey
+
+    const cached = sizeCache.get(key)
+    if (cached !== undefined) {
+      setMeasuredHeight(cached)
+    } else {
+      setMeasuredHeight(fallbackPlaceholderHeight())
+    }
+  })
+
+  createEffect(() => {
+    measurementsSuspended()
+    const root = props.scrollContainer ? props.scrollContainer() : null
+    refreshIntersectionObserver(root ?? null)
+  })
+
+  const placeholderHeight = createMemo(() => {
+
+    const seenHeight = measuredHeight()
+    if (seenHeight > 0) {
+      return seenHeight
+    }
+    return props.minPlaceholderHeight ?? MIN_PLACEHOLDER_HEIGHT
+  })
+
+  onCleanup(() => {
+    cleanupResizeObserver()
+    cleanupIntersectionObserver()
+    flushVisibility()
+  })
+ 
+  const wrapperClass = () => ["virtual-item-wrapper", props.class].filter(Boolean).join(" ")
+  const contentClass = () => {
+    const classes = ["virtual-item-content", props.contentClass]
+    if (shouldHideContent()) {
+      classes.push("virtual-item-content-hidden")
+    }
+    return classes.filter(Boolean).join(" ")
+  }
+  const placeholderClass = () => ["virtual-item-placeholder", props.placeholderClass].filter(Boolean).join(" ")
+  const lazyContent = createMemo<JSX.Element | null>(() => {
+    if (shouldHideContent()) return null
+    return resolveContent()
+  })
+
+  return (
+    <div ref={setWrapperRef} id={props.id} class={wrapperClass()} style={{ width: "100%" }}>
+      <div
+        class={placeholderClass()}
+        style={{
+          width: "100%",
+          height: shouldHideContent() ? `${placeholderHeight()}px` : undefined,
+        }}
+      >
+        <div ref={setContentRef} class={contentClass()}>
+          {lazyContent()}
+        </div>
+      </div>
+    </div>
+  )
+}
--- a/packages/ui/src/components/worktree-selector.tsx
+++ b/packages/ui/src/components/worktree-selector.tsx
@@ -18,7 +18,6 @@ import {
  setWorktreeSlugForParentSession,
 } from "../stores/worktrees"
 import { sessions } from "../stores/sessions"
-import { useI18n } from "../lib/i18n"

 const log = getLogger("session")

@@ -26,6 +25,8 @@ 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.
@@ -70,7 +71,6 @@ interface WorktreeSelectorProps {
 }

 export default function WorktreeSelector(props: WorktreeSelectorProps) {
-  const { t } = useI18n()
  const [isOpen, setIsOpen] = createSignal(false)
  const [createOpen, setCreateOpen] = createSignal(false)
  const [createSlug, setCreateSlug] = createSignal("")
@@ -99,8 +99,7 @@ export default function WorktreeSelector(props: WorktreeSelectorProps) {
      directory: wt.directory,
      raw: wt,
    }))
-    const createOption: WorktreeOption = { kind: "action", key: "__create__", label: t("instanceShell.worktree.create") }
-    return [createOption, ...mapped]
+    return [CREATE_OPTION, ...mapped]
  })

  const selectedOption = createMemo<WorktreeOption | undefined>(() => {
--- a/packages/ui/src/lib/api-client.ts
+++ b/packages/ui/src/lib/api-client.ts
@@ -7,9 +7,6 @@ import type {
  FileSystemCreateFolderResponse,
  FileSystemListResponse,
  InstanceData,
-  SpeechCapabilitiesResponse,
-  SpeechSynthesisResponse,
-  SpeechTranscriptionResponse,
  ServerMeta,
  WorkspaceCreateRequest,
  WorkspaceDescriptor,
@@ -123,28 +120,6 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
  }
 }

-async function requestRaw(path: string, init?: RequestInit): Promise<Response> {
-  const url = API_BASE ? new URL(path, API_BASE).toString() : path
-  const headers = normalizeHeaders(init?.headers)
-  if (init?.body !== undefined && !headers["Content-Type"]) {
-    headers["Content-Type"] = "application/json"
-  }
-
-  const method = (init?.method ?? "GET").toUpperCase()
-  const startedAt = Date.now()
-  logHttp(`${method} ${path}`)
-
-  const response = await fetch(url, { ...init, headers, credentials: init?.credentials ?? "include" })
-  if (!response.ok) {
-    const message = await response.text()
-    logHttp(`${method} ${path} -> ${response.status}`, { durationMs: Date.now() - startedAt, error: message })
-    throw new Error(message || `Request failed with ${response.status}`)
-  }
-
-  logHttp(`${method} ${path} -> ${response.status}`, { durationMs: Date.now() - startedAt })
-  return response
-}
-

 export const serverApi = {
  fetchWorkspaces(): Promise<WorkspaceDescriptor[]> {
@@ -260,37 +235,6 @@ export const serverApi = {
      body: JSON.stringify({ path }),
    })
  },
-  fetchSpeechCapabilities(): Promise<SpeechCapabilitiesResponse> {
-    return request<SpeechCapabilitiesResponse>("/api/speech/capabilities")
-  },
-  transcribeAudio(payload: {
-    audioBase64: string
-    mimeType: string
-    filename?: string
-    language?: string
-    prompt?: string
-  }): Promise<SpeechTranscriptionResponse> {
-    return request<SpeechTranscriptionResponse>("/api/speech/transcribe", {
-      method: "POST",
-      body: JSON.stringify(payload),
-    })
-  },
-  synthesizeSpeech(payload: { text: string; format?: "mp3" | "wav" | "opus" | "aac" }): Promise<SpeechSynthesisResponse> {
-    return request<SpeechSynthesisResponse>("/api/speech/synthesize", {
-      method: "POST",
-      body: JSON.stringify(payload),
-    })
-  },
-  synthesizeSpeechStream(
-    payload: { text: string; format?: "mp3" | "wav" | "opus" | "aac" },
-    signal?: AbortSignal,
-  ): Promise<Response> {
-    return requestRaw("/api/speech/synthesize/stream", {
-      method: "POST",
-      body: JSON.stringify(payload),
-      signal,
-    })
-  },
  listFileSystem(path?: string, options?: { includeFiles?: boolean }): Promise<FileSystemListResponse> {
    const params = new URLSearchParams()
    if (path && path !== ".") {
--- a/packages/ui/src/lib/external-url.ts
+++ b/packages/ui/src/lib/external-url.ts
@@ -1,23 +0,0 @@
-import { isTauriHost } from "./runtime-env"
-
-export async function openExternalUrl(url: string, context = "ui"): Promise<void> {
-  if (typeof window === "undefined") {
-    return
-  }
-
-  if (isTauriHost()) {
-    try {
-      const { openUrl } = await import("@tauri-apps/plugin-opener")
-      await openUrl(url)
-      return
-    } catch (error) {
-      console.warn(`[${context}] unable to open via system opener`, error)
-    }
-  }
-
-  try {
-    window.open(url, "_blank", "noopener,noreferrer")
-  } catch (error) {
-    console.warn(`[${context}] unable to open external url`, error)
-  }
-}
--- a/packages/ui/src/lib/hooks/use-commands.ts
+++ b/packages/ui/src/lib/hooks/use-commands.ts
@@ -34,7 +34,6 @@ export interface UseCommandsOptions {
  toggleUsageMetrics: () => void
  toggleAutoCleanupBlankSessions: () => void
  togglePromptSubmitOnEnter: () => void
-  toggleShowPromptVoiceInput: () => void
  setDiffViewMode: (mode: "split" | "unified") => void
  setToolOutputExpansion: (mode: ExpansionPreference) => void
  setDiagnosticsExpansion: (mode: ExpansionPreference) => void
@@ -436,7 +435,6 @@ export function useCommands(options: UseCommandsOptions) {
      toggleUsageMetrics: options.toggleUsageMetrics,
      toggleAutoCleanupBlankSessions: options.toggleAutoCleanupBlankSessions,
      togglePromptSubmitOnEnter: options.togglePromptSubmitOnEnter,
-      toggleShowPromptVoiceInput: options.toggleShowPromptVoiceInput,
      setDiffViewMode: options.setDiffViewMode,
      setToolOutputExpansion: options.setToolOutputExpansion,
      setDiagnosticsExpansion: options.setDiagnosticsExpansion,
--- a/packages/ui/src/lib/hooks/use-speech.ts
+++ b/packages/ui/src/lib/hooks/use-speech.ts
@@ -1,416 +0,0 @@
-import { createEffect, createSignal, onCleanup, type Accessor } from "solid-js"
-import { showAlertDialog } from "../../stores/alerts"
-import { serverApi } from "../api-client"
-import { useI18n } from "../i18n"
-import { loadSpeechCapabilities, speechCapabilities } from "../../stores/speech"
-import { useConfig, type SpeechSettings } from "../../stores/preferences"
-import { formatToMimeType, getSpeechPlaybackSupport } from "../speech-playback-support"
-
-type SpeechPlaybackState = "idle" | "loading" | "playing"
-
-interface UseSpeechOptions {
-  id: Accessor<string>
-  text: Accessor<string>
-  settingsOverride?: Accessor<Partial<Pick<SpeechSettings, "playbackMode" | "ttsFormat">>>
-}
-
-interface ActivePlaybackEntry {
-  ownerId: string
-  stop: () => void
-}
-
-const stateResetters = new Map<string, () => void>()
-
-let activePlayback: ActivePlaybackEntry | null = null
-
-function resetOwnerState(ownerId: string) {
-  stateResetters.get(ownerId)?.()
-}
-
-function stopActivePlayback(ownerId?: string) {
-  if (!activePlayback) return
-  if (ownerId && activePlayback.ownerId !== ownerId) return
-  const current = activePlayback
-  activePlayback = null
-  current.stop()
-}
-
-function setActivePlayback(ownerId: string, stop: () => void) {
-  if (activePlayback?.ownerId === ownerId) {
-    activePlayback = { ownerId, stop }
-    return
-  }
-
-  stopActivePlayback()
-  activePlayback = { ownerId, stop }
-}
-
-export function useSpeech(options: UseSpeechOptions) {
-  const { t } = useI18n()
-  const { serverSettings } = useConfig()
-  const [state, setState] = createSignal<SpeechPlaybackState>("idle")
-
-  let requestVersion = 0
-  let audio: HTMLAudioElement | null = null
-  let objectUrl: string | null = null
-  let mediaSource: MediaSource | null = null
-  let abortController: AbortController | null = null
-
-  createEffect(() => {
-    void loadSpeechCapabilities()
-  })
-
-  const cleanupAudio = () => {
-    if (abortController) {
-      abortController.abort()
-      abortController = null
-    }
-
-    if (audio) {
-      audio.pause()
-      audio.currentTime = 0
-      audio.src = ""
-      audio.load()
-      audio = null
-    }
-
-    mediaSource = null
-
-    if (objectUrl) {
-      URL.revokeObjectURL(objectUrl)
-      objectUrl = null
-    }
-  }
-
-  const resetState = () => {
-    requestVersion += 1
-    cleanupAudio()
-    setState("idle")
-  }
-
-  stateResetters.set(options.id(), resetState)
-
-  onCleanup(() => {
-    stateResetters.delete(options.id())
-    stopActivePlayback(options.id())
-    resetState()
-  })
-
-  const isSupported = () => typeof window !== "undefined" && typeof window.Audio !== "undefined"
-
-  const resolvedSettings = () => ({
-    ...serverSettings().speech,
-    ...(options.settingsOverride?.() ?? {}),
-  })
-
-  const canUseSpeech = () => {
-    const capabilities = speechCapabilities()
-    if (!isSupported() || !capabilities?.available || !capabilities?.configured || !capabilities?.supportsTts) {
-      return false
-    }
-    return getSpeechPlaybackSupport({
-      playbackMode: resolvedSettings().playbackMode,
-      ttsFormat: resolvedSettings().ttsFormat,
-      capabilities,
-    }).available
-  }
-
-  const stop = () => {
-    if (activePlayback?.ownerId === options.id()) {
-      activePlayback = null
-    }
-    resetState()
-  }
-
-  const start = async () => {
-    const ownerId = options.id()
-    const text = options.text().trim()
-    if (!text || state() === "loading" || state() === "playing") return
-
-    if (!isSupported()) {
-      showAlertDialog(t("messageItem.actions.speak.error.unsupported"), {
-        title: t("messageItem.actions.speak.error.title"),
-        variant: "error",
-      })
-      return
-    }
-
-    const capabilities = (await loadSpeechCapabilities()) ?? speechCapabilities()
-    if (!capabilities?.available || !capabilities?.configured || !capabilities?.supportsTts) {
-      showAlertDialog(t("messageItem.actions.speak.error.unavailable"), {
-        title: t("messageItem.actions.speak.error.title"),
-        variant: "error",
-      })
-      return
-    }
-
-    const support = getSpeechPlaybackSupport({
-      playbackMode: resolvedSettings().playbackMode,
-      ttsFormat: resolvedSettings().ttsFormat,
-      capabilities,
-    })
-    if (!support.available) {
-      const detailKey =
-        support.reason === "provider-streaming-unavailable"
-          ? "settings.speech.compatibility.streamingUnavailable"
-          : support.reason === "browser-streaming-unavailable"
-            ? "settings.speech.compatibility.browserStreamingUnavailable"
-            : "messageItem.actions.speak.error.unsupported"
-
-      showAlertDialog(t("messageItem.actions.speak.error.unavailable"), {
-        title: t("messageItem.actions.speak.error.title"),
-        detail: t(detailKey),
-        variant: "error",
-      })
-      return
-    }
-
-    requestVersion += 1
-    const currentRequest = requestVersion
-    stopActivePlayback()
-    cleanupAudio()
-    setState("loading")
-
-    const settings = resolvedSettings()
-    const format = settings.ttsFormat
-
-    try {
-      if (settings.playbackMode === "streaming") {
-        await startStreamingPlayback(ownerId, currentRequest, text, format)
-      } else {
-        await startBufferedPlayback(ownerId, currentRequest, text, format)
-      }
-    } catch (error) {
-      if (currentRequest !== requestVersion) {
-        return
-      }
-      resetState()
-      showAlertDialog(t("messageItem.actions.speak.error.generate"), {
-        title: t("messageItem.actions.speak.error.title"),
-        detail: error instanceof Error ? error.message : String(error),
-        variant: "error",
-      })
-    }
-  }
-
-  async function startBufferedPlayback(
-    ownerId: string,
-    currentRequest: number,
-    text: string,
-    format: "mp3" | "wav" | "opus" | "aac",
-  ) {
-    const response = await serverApi.synthesizeSpeech({ text, format })
-
-    if (currentRequest !== requestVersion) {
-      return
-    }
-
-    const nextUrl = createObjectUrlFromBase64(response.audioBase64, response.mimeType)
-    const nextAudio = new Audio(nextUrl)
-    objectUrl = nextUrl
-    audio = nextAudio
-
-    attachPlaybackLifecycle(ownerId, nextAudio)
-    setActivePlayback(ownerId, () => {
-      cleanupAudio()
-      setState("idle")
-    })
-    setState("playing")
-    await nextAudio.play()
-  }
-
-  async function startStreamingPlayback(
-    ownerId: string,
-    currentRequest: number,
-    text: string,
-    format: "mp3" | "wav" | "opus" | "aac",
-  ) {
-    if (typeof MediaSource === "undefined") {
-      throw new Error("MediaSource is not available in this browser.")
-    }
-
-    const controller = new AbortController()
-    abortController = controller
-    const response = await serverApi.synthesizeSpeechStream({ text, format }, controller.signal)
-    const mimeType = response.headers.get("content-type") || formatToMimeType(format)
-
-    if (!MediaSource.isTypeSupported(mimeType)) {
-      throw new Error(`Streaming playback is not supported for ${mimeType}.`)
-    }
-
-    const stream = response.body
-    if (!stream) {
-      throw new Error("Speech stream did not include a response body.")
-    }
-
-    const nextMediaSource = new MediaSource()
-    const nextObjectUrl = URL.createObjectURL(nextMediaSource)
-    const nextAudio = new Audio(nextObjectUrl)
-    mediaSource = nextMediaSource
-    objectUrl = nextObjectUrl
-    audio = nextAudio
-
-    attachPlaybackLifecycle(ownerId, nextAudio)
-    setActivePlayback(ownerId, () => {
-      cleanupAudio()
-      setState("idle")
-    })
-
-    await new Promise<void>((resolve, reject) => {
-      const handleSourceOpen = () => {
-        nextMediaSource.removeEventListener("sourceopen", handleSourceOpen)
-        void streamToMediaSource({
-          mediaSource: nextMediaSource,
-          stream,
-          mimeType,
-          audioElement: nextAudio,
-          onPlayable: async () => {
-            if (currentRequest !== requestVersion) return
-            if (state() !== "playing") {
-              setState("playing")
-            }
-            try {
-              await nextAudio.play()
-            } catch (error) {
-              reject(error)
-            }
-          },
-          onComplete: resolve,
-          onError: reject,
-        })
-      }
-
-      nextMediaSource.addEventListener("sourceopen", handleSourceOpen, { once: true })
-      nextAudio.addEventListener(
-        "error",
-        () => reject(new Error("Unable to play streamed speech.")),
-        { once: true },
-      )
-    })
-  }
-
-  const toggle = async () => {
-    if (state() === "idle") {
-      await start()
-      return
-    }
-    stop()
-  }
-
-  return {
-    state,
-    canUseSpeech,
-    isLoading: () => state() === "loading",
-    isPlaying: () => state() === "playing",
-    toggle,
-    stop,
-    buttonTitle: () => {
-      if (state() === "loading") return t("messageItem.actions.generatingSpeech")
-      if (state() === "playing") return t("messageItem.actions.stopSpeech")
-      return t("messageItem.actions.speak")
-    },
-  }
-}
-
-function attachPlaybackLifecycle(ownerId: string, audio: HTMLAudioElement) {
-  const finish = () => {
-    if (activePlayback?.ownerId === ownerId) {
-      activePlayback = null
-    }
-    resetOwnerState(ownerId)
-  }
-
-  audio.addEventListener("ended", finish, { once: true })
-  audio.addEventListener("error", finish, { once: true })
-}
-
-async function streamToMediaSource(options: {
-  mediaSource: MediaSource
-  stream: ReadableStream<Uint8Array>
-  mimeType: string
-  audioElement: HTMLAudioElement
-  onPlayable: () => Promise<void>
-  onComplete: () => void
-  onError: (error: unknown) => void
-}) {
-  try {
-    const sourceBuffer = options.mediaSource.addSourceBuffer(options.mimeType)
-    const reader = options.stream.getReader()
-    let startedPlayback = false
-    let queue: Uint8Array[] = []
-    let processing = false
-
-    const flushQueue = async () => {
-      if (processing || sourceBuffer.updating || queue.length === 0) return
-      processing = true
-      const chunk = queue.shift()!
-      await appendChunk(sourceBuffer, chunk)
-      if (!startedPlayback) {
-        startedPlayback = true
-        await options.onPlayable()
-      }
-      processing = false
-      await flushQueue()
-    }
-
-    while (true) {
-      const { done, value } = await reader.read()
-      if (done) break
-      if (value && value.byteLength > 0) {
-        queue.push(value)
-        await flushQueue()
-      }
-    }
-
-    while (queue.length > 0 || sourceBuffer.updating) {
-      if (queue.length > 0) {
-        await flushQueue()
-      } else {
-        await waitForUpdateEnd(sourceBuffer)
-      }
-    }
-
-    if (options.mediaSource.readyState === "open") {
-      options.mediaSource.endOfStream()
-    }
-    options.onComplete()
-  } catch (error) {
-    options.onError(error)
-  }
-}
-
-function appendChunk(sourceBuffer: SourceBuffer, chunk: Uint8Array): Promise<void> {
-  return new Promise((resolve, reject) => {
-    const handleUpdateEnd = () => {
-      cleanup()
-      resolve()
-    }
-    const handleError = () => {
-      cleanup()
-      reject(new Error("Failed to append audio stream chunk."))
-    }
-    const cleanup = () => {
-      sourceBuffer.removeEventListener("updateend", handleUpdateEnd)
-      sourceBuffer.removeEventListener("error", handleError)
-    }
-
-    sourceBuffer.addEventListener("updateend", handleUpdateEnd, { once: true })
-    sourceBuffer.addEventListener("error", handleError, { once: true })
-    sourceBuffer.appendBuffer(new Uint8Array(chunk).buffer)
-  })
-}
-
-function waitForUpdateEnd(sourceBuffer: SourceBuffer): Promise<void> {
-  return new Promise((resolve) => {
-    sourceBuffer.addEventListener("updateend", () => resolve(), { once: true })
-  })
-}
-
-function createObjectUrlFromBase64(audioBase64: string, mimeType: string): string {
-  const binary = atob(audioBase64)
-  const bytes = new Uint8Array(binary.length)
-  for (let index = 0; index < binary.length; index += 1) {
-    bytes[index] = binary.charCodeAt(index)
-  }
-  return URL.createObjectURL(new Blob([bytes], { type: mimeType || "audio/mpeg" }))
-}
--- a/packages/ui/src/lib/i18n/index.tsx
+++ b/packages/ui/src/lib/i18n/index.tsx
@@ -7,11 +7,10 @@ type Messages = Record<string, string>

 export type TranslateParams = Record<string, unknown>

-export type Locale = "en" | "es" | "fr" | "ru" | "ja" | "zh-Hans" | "he"
+export type Locale = "en" | "es" | "fr" | "ru" | "ja" | "zh-Hans"

-const SUPPORTED_LOCALES: readonly Locale[] = ["en", "es", "fr", "ru", "ja", "zh-Hans", "he"] as const
+const SUPPORTED_LOCALES: readonly Locale[] = ["en", "es", "fr", "ru", "ja", "zh-Hans"] as const
 const SUPPORTED_LOCALES_BY_LOWER = new Map(SUPPORTED_LOCALES.map((locale) => [locale.toLowerCase(), locale]))
-const RTL_LOCALES = new Set<Locale>(["he"])

 const localeMessagesCache = new Map<Locale, Messages>([["en", enMessages]])
 const localeMessagesPromises = new Map<Locale, Promise<Messages>>()
@@ -23,11 +22,6 @@ const localeLoaders: Record<Locale, () => Promise<Messages>> = {
  ru: async () => (await import("./messages/ru")).ruMessages,
  ja: async () => (await import("./messages/ja")).jaMessages,
  "zh-Hans": async () => (await import("./messages/zh-Hans")).zhHansMessages,
-  he: async () => (await import("./messages/he")).heMessages,
-}
-
-function getLocaleDirection(locale: Locale): "ltr" | "rtl" {
-  return RTL_LOCALES.has(locale) ? "rtl" : "ltr"
 }

 function normalizeLocaleTag(value: string): string {
@@ -155,8 +149,6 @@ export const I18nProvider: ParentComponent = (props) => {
  const [resolvedLocale, setResolvedLocale] = createSignal<Locale>(globalLocale)
  const previousGlobalMessages = globalMessages
  const previousGlobalLocale = globalLocale
-  const previousDocumentLanguage = typeof document !== "undefined" ? document.documentElement.lang : ""
-  const previousDocumentDirection = typeof document !== "undefined" ? document.documentElement.dir : ""

  onMount(() => {
    const detected = detectNavigatorLocale()
@@ -203,21 +195,10 @@ export const I18nProvider: ParentComponent = (props) => {
    })
  })

-  createEffect(() => {
-    if (typeof document === "undefined") return
-    const activeLocale = locale()
-    document.documentElement.dir = getLocaleDirection(activeLocale)
-    document.documentElement.lang = activeLocale
-  })
-
  onCleanup(() => {
    globalMessages = previousGlobalMessages
    globalLocale = previousGlobalLocale
    setGlobalRevision((value) => value + 1)
-    if (typeof document !== "undefined") {
-      document.documentElement.lang = previousDocumentLanguage
-      document.documentElement.dir = previousDocumentDirection
-    }
  })

  const value: I18nContextValue = {
--- a/packages/ui/src/lib/i18n/messages/en/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/en/instance.ts
@@ -114,26 +114,12 @@ export const instanceMessages = {
  "instanceShell.sessionChanges.filesChanged": "{count} files changed",
  "instanceShell.sessionChanges.actions.show": "Show changes",

-  "instanceShell.gitChanges.noSessionSelected": "Select a session to view git changes.",
-  "instanceShell.gitChanges.loading": "Loading git changes...",
-  "instanceShell.gitChanges.empty": "No git changes yet.",
-  "instanceShell.gitChanges.deleted": "Deleted",
-
  "instanceShell.filesShell.fileListTitle": "File list",
  "instanceShell.filesShell.mobileSelectorLabel": "Select file",
  "instanceShell.filesShell.mobileSelectorEmpty": "Select a file",
  "instanceShell.filesShell.viewerTitle": "Change viewer",
  "instanceShell.filesShell.viewerPlaceholder": "Detailed change rendering will be added in the next step.",
  "instanceShell.filesShell.viewerEmpty": "No file selected.",
-  "instanceShell.filesShell.hideFiles": "Hide files",
-  "instanceShell.filesShell.showFiles": "Show files",
-  "instanceShell.diff.hideUnchanged": "Hide unchanged regions",
-  "instanceShell.diff.showFull": "Show full file",
-  "instanceShell.diff.switchToSplit": "Switch to split view",
-  "instanceShell.diff.switchToUnified": "Switch to unified view",
-  "instanceShell.diff.enableWordWrap": "Enable word wrap",
-  "instanceShell.diff.disableWordWrap": "Disable word wrap",
-  "instanceShell.worktree.create": "+ Create worktree",

  "instanceShell.plan.noSessionSelected": "Select a session to view plan.",
  "instanceShell.plan.empty": "Nothing planned yet.",
--- a/packages/ui/src/lib/i18n/messages/en/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/en/messaging.ts
@@ -75,13 +75,6 @@ export const messagingMessages = {
  "messageItem.actions.copy": "Copy",
  "messageItem.actions.copyTitle": "Copy message",
  "messageItem.actions.copied": "Copied!",
-  "messageItem.actions.speak": "Speak message",
-  "messageItem.actions.generatingSpeech": "Generating speech",
-  "messageItem.actions.stopSpeech": "Stop playback",
-  "messageItem.actions.speak.error.title": "Speech playback failed",
-  "messageItem.actions.speak.error.unsupported": "Speech playback is not supported in this browser.",
-  "messageItem.actions.speak.error.unavailable": "Speech playback is unavailable until speech settings are configured.",
-  "messageItem.actions.speak.error.generate": "Unable to generate speech for this message.",
  "messageItem.actions.deleteMessage": "Delete message (doesn't undo changes)",
  "messageItem.actions.deleteMessagesUpTo": "Delete messages up to here (doesn't undo changes)",
  "messageItem.actions.deletingMessage": "Deleting...",
@@ -142,21 +135,7 @@ export const messagingMessages = {
  "promptInput.overlay.againToAbort": "again to abort session",
  "promptInput.stopSession.ariaLabel": "Stop session",
  "promptInput.stopSession.title": "Stop session",
-  "promptInput.clear.ariaLabel": "Clear prompt text",
-  "promptInput.clear.title": "Clear prompt text",
  "promptInput.send.ariaLabel": "Send message",
  "promptInput.send.errorFallback": "Failed to send message",
  "promptInput.send.errorTitle": "Send failed",
-  "promptInput.conversationMode.enable.title": "Enable conversation mode",
-  "promptInput.conversationMode.disable.title": "Disable conversation mode",
-  "promptInput.conversationMode.error.title": "Conversation playback failed",
-  "promptInput.conversationMode.error.message": "Unable to continue speaking assistant replies.",
-  "promptInput.voiceInput.start.title": "Start voice input",
-  "promptInput.voiceInput.stop.title": "Stop recording and transcribe",
-  "promptInput.voiceInput.transcribing.title": "Transcribing audio",
-  "promptInput.voiceInput.error.title": "Voice input failed",
-  "promptInput.voiceInput.error.permission": "Microphone access is required to record voice input.",
-  "promptInput.voiceInput.error.permissionDenied": "Microphone access was denied by macOS.",
-  "promptInput.voiceInput.error.unsupported": "Voice input is not supported in this browser.",
-  "promptInput.voiceInput.error.transcribe": "Unable to transcribe the recorded audio.",
 } as const
--- a/packages/ui/src/lib/i18n/messages/en/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/en/settings.ts
@@ -65,7 +65,6 @@ export const settingsMessages = {
  "settings.nav.appearance": "Appearance",
  "settings.nav.notifications": "Notifications",
  "settings.nav.remote": "Remote Access",
-  "settings.nav.speech": "Speech",
  "settings.nav.opencode": "OpenCode",
  "settings.scope.device": "This device",
  "settings.scope.server": "Server setting",
@@ -138,52 +137,6 @@ export const settingsMessages = {
  "settings.behavior.usageMetrics.subtitle": "Show or hide token and cost stats for assistant messages.",
  "settings.behavior.autoCleanup.title": "Auto-cleanup blank sessions",
  "settings.behavior.autoCleanup.subtitle": "Automatically clean up blank sessions when creating new ones.",
-  "settings.behavior.promptVoiceInput.title": "Prompt voice input",
-  "settings.behavior.promptVoiceInput.subtitle": "Show the microphone control for speech-to-text prompt input when speech is configured.",
  "settings.behavior.promptSubmit.title": "Enter to submit",
  "settings.behavior.promptSubmit.subtitle": "Use Enter to submit prompts; Cmd/Ctrl+Enter inserts a new line.",
-  "settings.speech.title": "Speech",
-  "settings.speech.subtitle": "Configure speech-to-text now and text-to-speech groundwork for later features.",
-  "settings.speech.provider.title": "Provider",
-  "settings.speech.provider.subtitle": "Speech requests use the server-side speech adapter.",
-  "settings.speech.provider.openaiCompatible": "OpenAI-compatible",
-  "settings.speech.status.loading": "Checking configuration...",
-  "settings.speech.status.configured": "Configured",
-  "settings.speech.status.missing": "Missing API key",
-  "settings.speech.status.error": "Speech service unavailable",
-  "settings.speech.apiKey.title": "API key",
-  "settings.speech.apiKey.subtitle": "Used for CodeNomad-managed speech requests.",
-  "settings.speech.apiKey.placeholder": "Enter a new API key",
-  "settings.speech.apiKey.storedNote": "A saved API key is hidden. Enter a new value to replace it, or leave the field blank to keep it.",
-  "settings.speech.apiKey.clearAction": "Clear saved key",
-  "settings.speech.apiKey.clearPending": "The saved API key will be removed when you save.",
-  "settings.speech.baseUrl.title": "Base URL",
-  "settings.speech.baseUrl.subtitle": "Optional override for OpenAI-compatible speech endpoints.",
-  "settings.speech.baseUrl.placeholder": "https://api.openai.com/v1",
-  "settings.speech.sttModel.title": "Transcription model",
-  "settings.speech.sttModel.subtitle": "Model used for prompt speech-to-text requests.",
-  "settings.speech.ttsModel.title": "Speech model",
-  "settings.speech.ttsModel.subtitle": "Default text-to-speech model reserved for future playback features.",
-  "settings.speech.ttsVoice.title": "Default voice",
-  "settings.speech.ttsVoice.subtitle": "Default text-to-speech voice reserved for future playback features.",
-  "settings.speech.playbackMode.title": "Playback mode",
-  "settings.speech.playbackMode.subtitle": "Choose whether TTS starts playing as audio streams in or after the full file is generated.",
-  "settings.speech.playbackMode.streaming": "Streaming",
-  "settings.speech.playbackMode.buffered": "Buffered",
-  "settings.speech.ttsFormat.title": "Output format",
-  "settings.speech.ttsFormat.subtitle": "Choose the audio format for synthesized speech. Streaming support depends on your provider and browser.",
-  "settings.speech.help": "Prompt voice input appears when speech transcription is configured and supported. Message playback uses the TTS mode and format selected here.",
-  "settings.speech.compatibility.streamingUnavailable": "Your current speech provider configuration does not advertise streaming TTS. Switch playback mode to buffered if you want playback to work now.",
-  "settings.speech.compatibility.browserStreamingUnavailable": "Your current browser cannot stream the selected TTS format. Choose buffered playback or switch to a different format.",
-  "settings.speech.compatibility.runtimeNote": "All formats stay selectable in streaming mode. Some browser and provider combinations may still fail at playback time.",
-  "settings.speech.testPlayback.action": "Test playback",
-  "settings.speech.testPlayback.generating": "Generating sample",
-  "settings.speech.testPlayback.stop": "Stop sample",
-  "settings.speech.testPlayback.sample": "Thank you for using CodeNomad, your speech settings are working fine.",
-  "settings.speech.testPlayback.note": "The test uses your current playback mode and format immediately. Save API key, base URL, model, or voice changes first if you want those reflected too.",
-  "settings.speech.save.action": "Save",
-  "settings.speech.save.saving": "Saving...",
-  "settings.speech.save.saved": "Saved",
-  "settings.speech.save.unsaved": "Unsaved changes",
-  "settings.speech.save.error": "Save failed",
 } as const
--- a/packages/ui/src/lib/i18n/messages/es/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/es/instance.ts
@@ -90,7 +90,6 @@ export const instanceMessages = {

  "instanceShell.rightPanel.title": "Panel de estado",
  "instanceShell.rightPanel.tabs.changes": "Cambios",
-  "instanceShell.rightPanel.tabs.gitChanges": "Cambios de Git",
  "instanceShell.rightPanel.tabs.files": "Archivos",
  "instanceShell.rightPanel.tabs.status": "Estado",
  "instanceShell.rightPanel.tabs.ariaLabel": "Pestañas del panel derecho",
@@ -113,10 +112,6 @@ export const instanceMessages = {
  "instanceShell.sessionChanges.filesChanged": "{count} archivos cambiados",
  "instanceShell.sessionChanges.actions.show": "Mostrar cambios",

-  "instanceShell.gitChanges.loading": "Cargando cambios de Git...",
-  "instanceShell.gitChanges.empty": "Aún no hay cambios de Git.",
-  "instanceShell.gitChanges.deleted": "Eliminado",
-
  "instanceShell.filesShell.fileListTitle": "Lista de archivos",
  "instanceShell.filesShell.mobileSelectorLabel": "Seleccionar archivo",
  "instanceShell.filesShell.mobileSelectorEmpty": "Selecciona un archivo",
--- a/packages/ui/src/lib/i18n/messages/es/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/es/messaging.ts
@@ -77,13 +77,6 @@ export const messagingMessages = {
  "messageItem.actions.copy": "Copiar",
  "messageItem.actions.copyTitle": "Copiar mensaje",
  "messageItem.actions.copied": "¡Copiado!",
-  "messageItem.actions.speak": "Reproducir mensaje",
-  "messageItem.actions.generatingSpeech": "Generando audio",
-  "messageItem.actions.stopSpeech": "Detener reproduccion",
-  "messageItem.actions.speak.error.title": "La reproduccion de voz fallo",
-  "messageItem.actions.speak.error.unsupported": "La reproduccion de voz no es compatible con este navegador.",
-  "messageItem.actions.speak.error.unavailable": "La reproduccion de voz no estara disponible hasta que la configuracion de voz este lista.",
-  "messageItem.actions.speak.error.generate": "No se pudo generar audio para este mensaje.",
  "messageItem.actions.deleteMessage": "Eliminar mensaje (no deshace cambios)",
  "messageItem.actions.deleteMessagesUpTo": "Eliminar mensajes hasta aqui (no deshace cambios)",
  "messageItem.actions.deletingMessage": "Eliminando...",
@@ -144,21 +137,7 @@ export const messagingMessages = {
  "promptInput.overlay.againToAbort": "otra vez para abortar la sesión",
  "promptInput.stopSession.ariaLabel": "Detener sesión",
  "promptInput.stopSession.title": "Detener sesión",
-  "promptInput.clear.ariaLabel": "Borrar el texto del prompt",
-  "promptInput.clear.title": "Borrar el texto del prompt",
  "promptInput.send.ariaLabel": "Enviar mensaje",
  "promptInput.send.errorFallback": "No se pudo enviar el mensaje",
  "promptInput.send.errorTitle": "Error al enviar",
-  "promptInput.conversationMode.enable.title": "Activar modo conversacion",
-  "promptInput.conversationMode.disable.title": "Desactivar modo conversacion",
-  "promptInput.conversationMode.error.title": "Fallo la reproduccion de la conversacion",
-  "promptInput.conversationMode.error.message": "No se pudieron seguir reproduciendo las respuestas del asistente.",
-  "promptInput.voiceInput.start.title": "Iniciar entrada de voz",
-  "promptInput.voiceInput.stop.title": "Detener grabación y transcribir",
-  "promptInput.voiceInput.transcribing.title": "Transcribiendo audio",
-  "promptInput.voiceInput.error.title": "La entrada de voz falló",
-  "promptInput.voiceInput.error.permission": "Se requiere acceso al micrófono para grabar la entrada de voz.",
-  "promptInput.voiceInput.error.permissionDenied": "macOS denegó el acceso al micrófono.",
-  "promptInput.voiceInput.error.unsupported": "La entrada de voz no es compatible con este navegador.",
-  "promptInput.voiceInput.error.transcribe": "No se pudo transcribir el audio grabado.",
 } as const
--- a/packages/ui/src/lib/i18n/messages/es/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/es/settings.ts
@@ -65,7 +65,6 @@ export const settingsMessages = {
  "settings.nav.appearance": "Appearance",
  "settings.nav.notifications": "Notifications",
  "settings.nav.remote": "Remote Access",
-  "settings.nav.speech": "Speech",
  "settings.nav.opencode": "OpenCode",
  "settings.scope.device": "This device",
  "settings.scope.server": "Server setting",
@@ -138,52 +137,6 @@ export const settingsMessages = {
  "settings.behavior.usageMetrics.subtitle": "Muestra u oculta estadisticas de tokens y costo en mensajes del asistente.",
  "settings.behavior.autoCleanup.title": "Limpieza automatica de sesiones en blanco",
  "settings.behavior.autoCleanup.subtitle": "Limpia automaticamente las sesiones en blanco al crear nuevas.",
-  "settings.behavior.promptVoiceInput.title": "Prompt voice input",
-  "settings.behavior.promptVoiceInput.subtitle": "Show the microphone control for speech-to-text prompt input when speech is configured.",
  "settings.behavior.promptSubmit.title": "Enter para enviar",
  "settings.behavior.promptSubmit.subtitle": "Usa Enter para enviar; Cmd/Ctrl+Enter inserta una nueva linea.",
-  "settings.speech.title": "Voz",
-  "settings.speech.subtitle": "Configura ahora el reconocimiento de voz y prepara la base de texto a voz para funciones futuras.",
-  "settings.speech.provider.title": "Proveedor",
-  "settings.speech.provider.subtitle": "Las solicitudes de voz usan el adaptador de voz del servidor.",
-  "settings.speech.provider.openaiCompatible": "OpenAI-compatible",
-  "settings.speech.status.loading": "Comprobando configuración...",
-  "settings.speech.status.configured": "Configurado",
-  "settings.speech.status.missing": "Falta la clave API",
-  "settings.speech.status.error": "Servicio de voz no disponible",
-  "settings.speech.apiKey.title": "API key",
-  "settings.speech.apiKey.subtitle": "Se usa para las solicitudes de voz gestionadas por CodeNomad.",
-  "settings.speech.apiKey.placeholder": "Introduce una nueva clave API",
-  "settings.speech.apiKey.storedNote": "Hay una clave API guardada y oculta. Introduce un nuevo valor para reemplazarla o deja el campo vacío para conservarla.",
-  "settings.speech.apiKey.clearAction": "Borrar clave guardada",
-  "settings.speech.apiKey.clearPending": "La clave API guardada se eliminará al guardar.",
-  "settings.speech.baseUrl.title": "Base URL",
-  "settings.speech.baseUrl.subtitle": "Anulación opcional para endpoints de voz compatibles con OpenAI.",
-  "settings.speech.baseUrl.placeholder": "https://api.openai.com/v1",
-  "settings.speech.sttModel.title": "Modelo de transcripción",
-  "settings.speech.sttModel.subtitle": "Modelo usado para las solicitudes de voz a texto en el prompt.",
-  "settings.speech.ttsModel.title": "Modelo de voz",
-  "settings.speech.ttsModel.subtitle": "Modelo predeterminado de texto a voz reservado para futuras funciones de reproducción.",
-  "settings.speech.ttsVoice.title": "Voz predeterminada",
-  "settings.speech.ttsVoice.subtitle": "Voz predeterminada de texto a voz reservada para futuras funciones de reproducción.",
-  "settings.speech.playbackMode.title": "Modo de reproduccion",
-  "settings.speech.playbackMode.subtitle": "Elige si TTS empieza a reproducirse mientras llega el audio o despues de generar el archivo completo.",
-  "settings.speech.playbackMode.streaming": "Streaming",
-  "settings.speech.playbackMode.buffered": "Buffered",
-  "settings.speech.ttsFormat.title": "Formato de salida",
-  "settings.speech.ttsFormat.subtitle": "Elige el formato de audio para la voz sintetizada. La compatibilidad de streaming depende de tu proveedor y navegador.",
-  "settings.speech.help": "La entrada de voz del prompt aparece cuando la transcripcion de voz esta configurada y es compatible. La reproduccion de mensajes usa el modo y formato TTS seleccionados aqui.",
-  "settings.speech.compatibility.streamingUnavailable": "Tu configuracion actual del proveedor de voz no anuncia TTS por streaming. Cambia el modo de reproduccion a buffered si quieres que la reproduccion funcione ahora.",
-  "settings.speech.compatibility.browserStreamingUnavailable": "Tu navegador actual no puede reproducir por streaming el formato TTS seleccionado. Elige reproduccion buffered o cambia a otro formato.",
-  "settings.speech.compatibility.runtimeNote": "Todos los formatos siguen disponibles en modo streaming. Algunas combinaciones de navegador y proveedor aun pueden fallar al reproducir.",
-  "settings.speech.testPlayback.action": "Probar reproduccion",
-  "settings.speech.testPlayback.generating": "Generando muestra",
-  "settings.speech.testPlayback.stop": "Detener muestra",
-  "settings.speech.testPlayback.sample": "Gracias por usar CodeNomad, tu configuracion de voz funciona correctamente.",
-  "settings.speech.testPlayback.note": "La prueba usa de inmediato el modo y formato actuales. Guarda primero los cambios de API key, base URL, modelo o voz si tambien quieres probarlos.",
-  "settings.speech.save.action": "Guardar",
-  "settings.speech.save.saving": "Guardando...",
-  "settings.speech.save.saved": "Guardado",
-  "settings.speech.save.unsaved": "Cambios sin guardar",
-  "settings.speech.save.error": "Error al guardar",
 } as const
--- a/packages/ui/src/lib/i18n/messages/fr/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/instance.ts
@@ -90,7 +90,6 @@ export const instanceMessages = {

  "instanceShell.rightPanel.title": "Panneau d'état",
  "instanceShell.rightPanel.tabs.changes": "Modifications",
-  "instanceShell.rightPanel.tabs.gitChanges": "Changements Git",
  "instanceShell.rightPanel.tabs.files": "Fichiers",
  "instanceShell.rightPanel.tabs.status": "Statut",
  "instanceShell.rightPanel.tabs.ariaLabel": "Onglets du panneau droit",
@@ -113,10 +112,6 @@ export const instanceMessages = {
  "instanceShell.sessionChanges.filesChanged": "{count} fichiers modifiés",
  "instanceShell.sessionChanges.actions.show": "Afficher les changements",

-  "instanceShell.gitChanges.loading": "Chargement des changements Git...",
-  "instanceShell.gitChanges.empty": "Aucun changement Git pour l'instant.",
-  "instanceShell.gitChanges.deleted": "Supprimé",
-
  "instanceShell.filesShell.fileListTitle": "Liste des fichiers",
  "instanceShell.filesShell.mobileSelectorLabel": "Sélectionner un fichier",
  "instanceShell.filesShell.mobileSelectorEmpty": "Sélectionnez un fichier",
--- a/packages/ui/src/lib/i18n/messages/fr/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/messaging.ts
@@ -77,13 +77,6 @@ export const messagingMessages = {
  "messageItem.actions.copy": "Copier",
  "messageItem.actions.copyTitle": "Copier le message",
  "messageItem.actions.copied": "Copié !",
-  "messageItem.actions.speak": "Lire le message",
-  "messageItem.actions.generatingSpeech": "Generation de l'audio",
-  "messageItem.actions.stopSpeech": "Arreter la lecture",
-  "messageItem.actions.speak.error.title": "La lecture vocale a echoue",
-  "messageItem.actions.speak.error.unsupported": "La lecture vocale n'est pas prise en charge dans ce navigateur.",
-  "messageItem.actions.speak.error.unavailable": "La lecture vocale n'est pas disponible tant que les parametres vocaux ne sont pas configures.",
-  "messageItem.actions.speak.error.generate": "Impossible de generer l'audio pour ce message.",
  "messageItem.actions.deleteMessage": "Supprimer le message (sans annuler les changements)",
  "messageItem.actions.deleteMessagesUpTo": "Supprimer les messages jusqu'ici (sans annuler les changements)",
  "messageItem.actions.deletingMessage": "Suppression...",
@@ -144,21 +137,7 @@ export const messagingMessages = {
  "promptInput.overlay.againToAbort": "à nouveau pour interrompre la session",
  "promptInput.stopSession.ariaLabel": "Arrêter la session",
  "promptInput.stopSession.title": "Arrêter la session",
-  "promptInput.clear.ariaLabel": "Effacer le texte du prompt",
-  "promptInput.clear.title": "Effacer le texte du prompt",
  "promptInput.send.ariaLabel": "Envoyer le message",
  "promptInput.send.errorFallback": "Impossible d'envoyer le message",
  "promptInput.send.errorTitle": "Échec de l'envoi",
-  "promptInput.conversationMode.enable.title": "Activer le mode conversation",
-  "promptInput.conversationMode.disable.title": "Desactiver le mode conversation",
-  "promptInput.conversationMode.error.title": "La lecture de la conversation a echoue",
-  "promptInput.conversationMode.error.message": "Impossible de continuer a lire les reponses de l'assistant.",
-  "promptInput.voiceInput.start.title": "Démarrer la saisie vocale",
-  "promptInput.voiceInput.stop.title": "Arrêter l'enregistrement et transcrire",
-  "promptInput.voiceInput.transcribing.title": "Transcription de l'audio",
-  "promptInput.voiceInput.error.title": "Échec de la saisie vocale",
-  "promptInput.voiceInput.error.permission": "L'accès au microphone est requis pour enregistrer la saisie vocale.",
-  "promptInput.voiceInput.error.permissionDenied": "macOS a refusé l'accès au microphone.",
-  "promptInput.voiceInput.error.unsupported": "La saisie vocale n'est pas prise en charge dans ce navigateur.",
-  "promptInput.voiceInput.error.transcribe": "Impossible de transcrire l'audio enregistré.",
 } as const
--- a/packages/ui/src/lib/i18n/messages/fr/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/settings.ts
@@ -65,7 +65,6 @@ export const settingsMessages = {
  "settings.nav.appearance": "Appearance",
  "settings.nav.notifications": "Notifications",
  "settings.nav.remote": "Remote Access",
-  "settings.nav.speech": "Speech",
  "settings.nav.opencode": "OpenCode",
  "settings.scope.device": "This device",
  "settings.scope.server": "Server setting",
@@ -138,52 +137,6 @@ export const settingsMessages = {
  "settings.behavior.usageMetrics.subtitle": "Afficher ou masquer les stats de tokens et de cout pour les messages de l'assistant.",
  "settings.behavior.autoCleanup.title": "Nettoyage auto des sessions vides",
  "settings.behavior.autoCleanup.subtitle": "Nettoyer automatiquement les sessions vides lors de la creation de nouvelles.",
-  "settings.behavior.promptVoiceInput.title": "Prompt voice input",
-  "settings.behavior.promptVoiceInput.subtitle": "Show the microphone control for speech-to-text prompt input when speech is configured.",
  "settings.behavior.promptSubmit.title": "Entrer pour envoyer",
  "settings.behavior.promptSubmit.subtitle": "Utiliser Entrer pour envoyer; Cmd/Ctrl+Entrer insere une nouvelle ligne.",
-  "settings.speech.title": "Voix",
-  "settings.speech.subtitle": "Configurez dès maintenant la reconnaissance vocale et préparez la synthèse vocale pour de futures fonctionnalités.",
-  "settings.speech.provider.title": "Fournisseur",
-  "settings.speech.provider.subtitle": "Les requêtes vocales utilisent l'adaptateur vocal côté serveur.",
-  "settings.speech.provider.openaiCompatible": "OpenAI-compatible",
-  "settings.speech.status.loading": "Vérification de la configuration...",
-  "settings.speech.status.configured": "Configuré",
-  "settings.speech.status.missing": "Clé API manquante",
-  "settings.speech.status.error": "Service vocal indisponible",
-  "settings.speech.apiKey.title": "API key",
-  "settings.speech.apiKey.subtitle": "Utilisée pour les requêtes vocales gérées par CodeNomad.",
-  "settings.speech.apiKey.placeholder": "Saisissez une nouvelle clé API",
-  "settings.speech.apiKey.storedNote": "Une clé API enregistrée est masquée. Saisissez une nouvelle valeur pour la remplacer ou laissez le champ vide pour la conserver.",
-  "settings.speech.apiKey.clearAction": "Effacer la clé enregistrée",
-  "settings.speech.apiKey.clearPending": "La clé API enregistrée sera supprimée lors de l'enregistrement.",
-  "settings.speech.baseUrl.title": "Base URL",
-  "settings.speech.baseUrl.subtitle": "Remplacement facultatif des points d'accès vocaux compatibles OpenAI.",
-  "settings.speech.baseUrl.placeholder": "https://api.openai.com/v1",
-  "settings.speech.sttModel.title": "Modèle de transcription",
-  "settings.speech.sttModel.subtitle": "Modèle utilisé pour les requêtes vocales vers texte du prompt.",
-  "settings.speech.ttsModel.title": "Modèle vocal",
-  "settings.speech.ttsModel.subtitle": "Modèle de synthèse vocale par défaut réservé aux futures fonctions de lecture.",
-  "settings.speech.ttsVoice.title": "Voix par défaut",
-  "settings.speech.ttsVoice.subtitle": "Voix de synthèse vocale par défaut réservée aux futures fonctions de lecture.",
-  "settings.speech.playbackMode.title": "Mode de lecture",
-  "settings.speech.playbackMode.subtitle": "Choisissez si le TTS commence a jouer pendant le flux audio ou apres la generation complete du fichier.",
-  "settings.speech.playbackMode.streaming": "Streaming",
-  "settings.speech.playbackMode.buffered": "Buffered",
-  "settings.speech.ttsFormat.title": "Format de sortie",
-  "settings.speech.ttsFormat.subtitle": "Choisissez le format audio pour la voix synthetisee. La prise en charge du streaming depend du fournisseur et du navigateur.",
-  "settings.speech.help": "La saisie vocale du prompt apparait lorsque la transcription vocale est configuree et prise en charge. La lecture des messages utilise le mode et le format TTS selectionnes ici.",
-  "settings.speech.compatibility.streamingUnavailable": "Votre configuration actuelle du fournisseur vocal n'annonce pas le TTS en streaming. Passez le mode de lecture sur buffered si vous voulez que la lecture fonctionne maintenant.",
-  "settings.speech.compatibility.browserStreamingUnavailable": "Votre navigateur actuel ne peut pas lire en streaming le format TTS selectionne. Choisissez la lecture buffered ou passez a un autre format.",
-  "settings.speech.compatibility.runtimeNote": "Tous les formats restent selectionnables en mode streaming. Certaines combinaisons navigateur/fournisseur peuvent quand meme echouer au moment de la lecture.",
-  "settings.speech.testPlayback.action": "Tester la lecture",
-  "settings.speech.testPlayback.generating": "Generation de l'extrait",
-  "settings.speech.testPlayback.stop": "Arreter l'extrait",
-  "settings.speech.testPlayback.sample": "Merci d'utiliser CodeNomad, vos parametres vocaux fonctionnent correctement.",
-  "settings.speech.testPlayback.note": "Le test utilise immediatement le mode et le format actuels. Enregistrez d'abord les changements d'API key, d'URL de base, de modele ou de voix si vous voulez aussi les tester.",
-  "settings.speech.save.action": "Enregistrer",
-  "settings.speech.save.saving": "Enregistrement...",
-  "settings.speech.save.saved": "Enregistré",
-  "settings.speech.save.unsaved": "Modifications non enregistrées",
-  "settings.speech.save.error": "Échec de l'enregistrement",
 } as const
--- a/packages/ui/src/lib/i18n/messages/he/advancedSettings.ts
+++ b/packages/ui/src/lib/i18n/messages/he/advancedSettings.ts
@@ -1,6 +0,0 @@
-export const advancedSettingsMessages = {
-  "advancedSettings.title": "הגדרות מתקדמות",
-  "advancedSettings.environmentVariables.title": "משתני סביבה",
-  "advancedSettings.environmentVariables.subtitle": "מוחלים בכל פעם שמופע OpenCode חדש מופעל",
-  "advancedSettings.actions.close": "סגור",
-} as const
--- a/packages/ui/src/lib/i18n/messages/he/app.ts
+++ b/packages/ui/src/lib/i18n/messages/he/app.ts
@@ -1,42 +0,0 @@
-export const appMessages = {
-  "app.launchError.title": "לא ניתן להפעיל את OpenCode",
-  "app.launchError.description": "לא הצלחנו להפעיל את קובץ ה-OpenCode שנבחר. בדוק את פלט השגיאה למטה או בחר קובץ בינארי אחר מהגדרות OpenCode.",
-  "app.launchError.binaryPathLabel": "נתיב הקובץ הבינארי",
-  "app.launchError.errorOutputLabel": "פלט שגיאה",
-  "app.launchError.openAdvancedSettings": "פתח הגדרות OpenCode",
-  "app.launchError.close": "סגור",
-  "app.launchError.closeTitle": "סגור (Esc)",
-  "app.launchError.fallbackMessage": "הפעלת סביבת העבודה נכשלה",
-
-  "app.stopInstance.confirmMessage": "לעצור את מופע OpenCode? פעולה זו תעצור את השרת.",
-  "app.stopInstance.title": "עצור מופע",
-  "app.stopInstance.confirmLabel": "עצור",
-  "app.stopInstance.cancelLabel": "המשך להריץ",
-
-  "emptyState.logoAlt": "לוגו CodeNomad",
-  "emptyState.brandTitle": "CodeNomad",
-  "emptyState.tagline": "בחר תיקייה כדי להתחיל לתכנת עם AI",
-  "emptyState.actions.selectFolder": "בחר תיקייה",
-  "emptyState.actions.selecting": "בוחר...",
-  "emptyState.keyboardShortcut": "קיצור מקלדת: {shortcut}",
-  "emptyState.examples": "דוגמאות: {example}",
-  "emptyState.multipleInstances": "ניתן לפתוח מספר מופעים של אותה תיקייה",
-
-  "releases.upgradeRequired.title": "נדרש שדרוג",
-  "releases.upgradeRequired.message.withVersion": "שדרג ל-CodeNomad {version} כדי להשתמש בממשק המעודכן.",
-  "releases.upgradeRequired.message.noVersion": "שדרג את CodeNomad כדי להשתמש בממשק המעודכן.",
-  "releases.upgradeRequired.action.getUpdate": "קבל עדכון",
-
-  "releases.uiUpdated.title": "הממשק עודכן",
-  "releases.uiUpdated.message": "הממשק עודכן לגרסה {version}.",
-
-  "releases.devUpdateAvailable.title": "גרסת פיתוח זמינה",
-  "releases.devUpdateAvailable.message": "גרסת פיתוח חדשה זמינה: {version}.",
-  "releases.devUpdateAvailable.action": "צפה בגרסה",
-
-  "theme.mode.system": "מערכת",
-  "theme.mode.light": "בהיר",
-  "theme.mode.dark": "כהה",
-  "theme.toggle.title": "ערכת נושא: {mode}",
-  "theme.toggle.ariaLabel": "ערכת נושא: {mode}",
-} as const
--- a/packages/ui/src/lib/i18n/messages/he/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/he/commands.ts
@@ -1,176 +0,0 @@
-export const commandMessages = {
-  "commandPalette.title": "לוח פקודות",
-  "commandPalette.description": "חיפוש והפעלה של פקודות",
-  "commandPalette.searchPlaceholder": "הקלד פקודה או חיפוש...",
-  "commandPalette.empty": "לא נמצאו פקודות עבור \"{query}\"",
-  "commandPalette.category.customCommands": "פקודות מותאמות אישית",
-  "commandPalette.category.instance": "מופע",
-  "commandPalette.category.session": "סשן",
-  "commandPalette.category.agentModel": "סוכן ומודל",
-  "commandPalette.category.inputFocus": "קלט ופוקוס",
-  "commandPalette.category.system": "מערכת",
-  "commandPalette.category.other": "אחר",
-
-  "commands.newInstance.label": "מופע חדש",
-  "commands.newInstance.description": "פתח בורר תיקיות ליצירת מופע חדש",
-  "commands.newInstance.keywords": "תיקייה, פרויקט, סביבת עבודה",
-
-  "commands.closeInstance.label": "סגור מופע",
-  "commands.closeInstance.description": "עצור את השרת של המופע הנוכחי",
-  "commands.closeInstance.keywords": "עצור, סגור",
-
-  "commands.nextInstance.label": "מופע הבא",
-  "commands.nextInstance.description": "עבור למופע הבא",
-  "commands.nextInstance.keywords": "החלף, נווט",
-
-  "commands.previousInstance.label": "מופע קודם",
-  "commands.previousInstance.description": "עבור למופע הקודם",
-  "commands.previousInstance.keywords": "החלף, נווט",
-
-  "commands.newSession.label": "סשן חדש",
-  "commands.newSession.description": "צור סשן הורה חדש",
-  "commands.newSession.keywords": "צור, התחל",
-
-  "commands.closeSession.label": "סגור סשן",
-  "commands.closeSession.description": "סגור את סשן ההורה הנוכחי",
-  "commands.closeSession.keywords": "סגור, עצור",
-
-  "commands.scrubSessions.label": "נקה סשנים",
-  "commands.scrubSessions.description": "הסר סשנים ריקים, סשני תת-סוכן שסיימו את משימתם הראשית, וסשני פיצול מיותרים.",
-  "commands.scrubSessions.keywords": "ניקוי, ריק, סשנים, הסר, מחק",
-
-  "commands.instanceInfo.label": "מידע על מופע",
-  "commands.instanceInfo.description": "פתח את סקירת המופע ללוגים וסטטוס",
-  "commands.instanceInfo.keywords": "מידע, לוגים, קונסולה, פלט",
-
-  "commands.nextSession.label": "סשן הבא",
-  "commands.nextSession.description": "עבור לסשן הבא",
-  "commands.nextSession.keywords": "החלף, נווט",
-
-  "commands.previousSession.label": "סשן קודם",
-  "commands.previousSession.description": "עבור לסשן הקודם",
-  "commands.previousSession.keywords": "החלף, נווט",
-
-  "commands.compactSession.label": "סכם סשן",
-  "commands.compactSession.description": "סכם ודחוס את הסשן הנוכחי",
-  "commands.compactSession.keywords": "סיכום, דחיסה",
-  "commands.compactSession.errorFallback": "סיכום הסשן נכשל",
-  "commands.compactSession.alert.title": "הסיכום נכשל",
-  "commands.compactSession.alert.message": "הסיכום נכשל: {message}",
-
-  "commands.undoLastMessage.label": "בטל הודעה אחרונה",
-  "commands.undoLastMessage.description": "בטל את ההודעה האחרונה",
-  "commands.undoLastMessage.keywords": "חזרה, ביטול",
-  "commands.undoLastMessage.none.title": "אין פעולות לביטול",
-  "commands.undoLastMessage.none.message": "אין מה לבטל",
-  "commands.undoLastMessage.failed.title": "הביטול נכשל",
-  "commands.undoLastMessage.failed.message": "ביטול ההודעה נכשל",
-
-  "commands.openModelSelector.label": "פתח בורר מודלים",
-  "commands.openModelSelector.description": "בחר מודל אחר",
-  "commands.openModelSelector.keywords": "מודל, llm, ai",
-
-  "commands.selectModelVariant.label": "בחר גרסת מודל",
-  "commands.selectModelVariant.description": "בחר רמת מאמץ חשיבה למודל הנוכחי",
-  "commands.selectModelVariant.keywords": "גרסה, חשיבה, מאמץ",
-
-  "commands.openAgentSelector.label": "פתח בורר סוכנים",
-  "commands.openAgentSelector.description": "בחר סוכן אחר",
-  "commands.openAgentSelector.keywords": "סוכן, מצב",
-
-  "commands.clearInput.label": "נקה קלט",
-  "commands.clearInput.description": "נקה את תיבת הטקסט של הפקודה",
-  "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": "הצג או הסתר קטעי חשיבה של ה-AI",
-  "commands.thinkingBlocks.keywords": "חשיבה, הצג, הסתר",
-
-  "commands.timelineToolCalls.label.show": "הצג קריאות כלי בציר הזמן",
-  "commands.timelineToolCalls.label.hide": "הסתר קריאות כלי בציר הזמן",
-  "commands.timelineToolCalls.description": "הצג/הסתר קריאות כלי בציר הודעות",
-  "commands.timelineToolCalls.keywords": "ציר זמן, כלי, הצג, הסתר",
-
-  "commands.keyboardShortcutHints.label.show": "הצג רמזי קיצורי מקלדת",
-  "commands.keyboardShortcutHints.label.hide": "הסתר רמזי קיצורי מקלדת",
-  "commands.keyboardShortcutHints.description": "הצג או הסתר רמזי קיצורי מקלדת בכל הממשק",
-  "commands.keyboardShortcutHints.description.disabledWeb": "מושבת בממשק Web (רמזי קיצורים תמיד מוסתרים)",
-  "commands.keyboardShortcutHints.keywords": "קיצור, מקלדת, רמזים",
-
-  "commands.common.expanded": "פרוס",
-  "commands.common.collapsed": "מכווץ",
-  "commands.common.visible": "גלוי",
-  "commands.common.hidden": "מוסתר",
-  "commands.common.enabled": "מופעל",
-  "commands.common.disabled": "מושבת",
-
-  "commands.thinkingBlocksDefault.label": "תצוגת חשיבה: {state}",
-  "commands.thinkingBlocksDefault.description": "כווץ / פרוס קטעי חשיבה של ה-AI",
-  "commands.thinkingBlocksDefault.keywords": "חשיבה, פרוס, כווץ, ברירת מחדל",
-
-  "commands.diffViewSplit.label": "השתמש בתצוגת diff מפוצלת",
-  "commands.diffViewSplit.description": "הצג diff של קריאות כלי זה לצד זה",
-  "commands.diffViewSplit.keywords": "diff, מפוצל, תצוגה",
-
-  "commands.diffViewUnified.label": "השתמש בתצוגת diff מאוחדת",
-  "commands.diffViewUnified.description": "הצג diff של קריאות כלי בשורה אחת",
-  "commands.diffViewUnified.keywords": "diff, מאוחד, תצוגה",
-
-  "commands.toolOutputsDefault.label": "ברירת מחדל לפלטי כלים · {state}",
-  "commands.toolOutputsDefault.description": "החלף ברירת מחדל לפריסת פלטי כלים",
-  "commands.toolOutputsDefault.keywords": "כלי, פלט, פרוס, כווץ",
-
-  "commands.diagnosticsDefault.label": "ברירת מחדל לאבחון · {state}",
-  "commands.diagnosticsDefault.description": "החלף ברירת מחדל לפריסת פלט אבחון",
-  "commands.diagnosticsDefault.keywords": "אבחון, פרוס, כווץ",
-
-  "commands.toolInputsVisibility.label": "נראות קלטי כלים · {state}",
-  "commands.toolInputsVisibility.description": "הגדר נראות ברירת מחדל לארגומנטים של קריאות כלי",
-  "commands.toolInputsVisibility.keywords": "כלי, קלטים, ארגומנטים, נראות, הסתר, הצג",
-
-  "commands.tokenUsageDisplay.label": "תצוגת שימוש בטוקנים · {state}",
-  "commands.tokenUsageDisplay.description": "הצג או הסתר נתוני טוקנים ועלות להודעות הסוכן",
-  "commands.tokenUsageDisplay.keywords": "טוקן, שימוש, עלות, נתונים",
-
-  "commands.autoCleanupBlankSessions.label": "ניקוי אוטומטי של סשנים ריקים · {state}",
-  "commands.autoCleanupBlankSessions.description": "נקה אוטומטית סשנים ריקים בעת יצירת סשנים חדשים",
-  "commands.autoCleanupBlankSessions.keywords": "אוטומטי, ניקוי, ריק, סשנים",
-
-  "commands.showHelp.label": "הצג עזרה",
-  "commands.showHelp.description": "הצג קיצורי מקלדת ועזרה",
-  "commands.showHelp.keywords": "קיצורים, עזרה",
-
-  "commands.custom.argumentsPrompt.message": "ארגומנטים עבור /{name}",
-  "commands.custom.argumentsPrompt.title": "פקודה מותאמת אישית",
-  "commands.custom.argumentsPrompt.inputLabel": "ארגומנטים",
-  "commands.custom.argumentsPrompt.inputPlaceholder": "למשל: foo bar",
-  "commands.custom.argumentsPrompt.confirmLabel": "הפעל",
-  "commands.custom.argumentsPrompt.cancelLabel": "ביטול",
-  "commands.custom.argumentsPrompt.openFailed.message": "פתיחת תיבת ארגומנטים נכשלה.",
-  "commands.custom.argumentsPrompt.openFailed.title": "ארגומנטים לפקודה",
-  "commands.custom.entries.descriptionFallback": "פקודה מותאמת אישית",
-  "commands.custom.sessionRequired.message": "בחר סשן לפני הפעלת פקודה מותאמת אישית.",
-  "commands.custom.sessionRequired.title": "נדרש סשן",
-  "commands.custom.runFailed.message": "הפעלת הפקודה המותאמת אישית נכשלה. בדוק את הקונסולה לפרטים.",
-  "commands.custom.runFailed.title": "הפקודה נכשלה",
-
-  "unifiedPicker.loading.searching": "מחפש...",
-  "unifiedPicker.loading.loadingWorkspace": "טוען סביבת עבודה...",
-  "unifiedPicker.title.command": "בחר פקודה",
-  "unifiedPicker.title.mention": "בחר סוכן או קובץ",
-  "unifiedPicker.empty": "לא נמצאו תוצאות",
-  "unifiedPicker.sections.commands": "פקודות",
-  "unifiedPicker.sections.agents": "סוכנים",
-  "unifiedPicker.sections.files": "קבצים",
-  "unifiedPicker.sections.workspaceRoot": "שורש סביבת העבודה",
-  "unifiedPicker.badge.subagent": "תת-סוכן",
-  "unifiedPicker.footer.navigate": "ניווט",
-  "unifiedPicker.footer.select": "בחירה",
-  "unifiedPicker.footer.close": "סגירה",
-} as const
--- a/packages/ui/src/lib/i18n/messages/he/dialogs.ts
+++ b/packages/ui/src/lib/i18n/messages/he/dialogs.ts
@@ -1,16 +0,0 @@
-export const dialogMessages = {
-  "alertDialog.fallbackTitle.info": "לתשומת לבך",
-  "alertDialog.fallbackTitle.warning": "נא לבדוק",
-  "alertDialog.fallbackTitle.error": "משהו השתבש",
-  "alertDialog.actions.confirm": "אישור",
-  "alertDialog.actions.run": "הפעל",
-  "alertDialog.actions.ok": "אישור",
-  "alertDialog.actions.cancel": "ביטול",
-  "alertDialog.prompt.inputLabel": "קלט",
-
-  "backgroundProcessOutputDialog.title": "פלט תהליך רקע",
-  "backgroundProcessOutputDialog.actions.close": "סגור",
-  "backgroundProcessOutputDialog.loading": "טוען פלט...",
-  "backgroundProcessOutputDialog.truncatedNotice": "הפלט קוצר לצורך התצוגה.",
-  "backgroundProcessOutputDialog.loadErrorFallback": "טעינת הפלט נכשלה.",
-} as const
--- a/packages/ui/src/lib/i18n/messages/he/filesystem.ts
+++ b/packages/ui/src/lib/i18n/messages/he/filesystem.ts
@@ -1,43 +0,0 @@
-export const filesystemMessages = {
-  "directoryBrowser.defaultDescription": "עיון בתיקיות תחת שורש סביבת העבודה המוגדר.",
-  "directoryBrowser.close": "סגור",
-  "directoryBrowser.currentFolder": "תיקייה נוכחית",
-  "directoryBrowser.selectCurrent": "בחר נוכחית",
-  "directoryBrowser.newFolder": "תיקייה חדשה",
-  "directoryBrowser.creating": "יוצר…",
-  "directoryBrowser.loadingFolders": "טוען תיקיות…",
-  "directoryBrowser.noFolders": "אין תיקיות זמינות.",
-  "directoryBrowser.upOneLevel": "עלה רמה אחת",
-  "directoryBrowser.select": "בחר",
-  "directoryBrowser.load.errorFallback": "לא ניתן לטעון את מערכת הקבצים",
-  "directoryBrowser.createFolder.promptMessage": "צור תיקייה חדשה בספרייה הנוכחית.",
-  "directoryBrowser.createFolder.title": "תיקייה חדשה",
-  "directoryBrowser.createFolder.inputLabel": "שם תיקייה",
-  "directoryBrowser.createFolder.inputPlaceholder": "למשל: my-new-project",
-  "directoryBrowser.createFolder.confirmLabel": "צור",
-  "directoryBrowser.createFolder.cancelLabel": "ביטול",
-  "directoryBrowser.createFolder.invalidNameMessage": "נא להזין שם תיקייה יחיד.",
-  "directoryBrowser.createFolder.invalidNameDetail": "שמות תיקיות אינם יכולים לכלול נטויות, '..', או '~'.",
-  "directoryBrowser.createFolder.errorFallback": "יצירת התיקייה נכשלה",
-
-  "filesystemBrowser.descriptionFallback": "חפש נתיב תחת שורש סביבת העבודה המוגדר.",
-  "filesystemBrowser.rootLabel": "שורש: {root}",
-  "filesystemBrowser.actions.close": "סגור",
-  "filesystemBrowser.actions.retry": "נסה שוב",
-  "filesystemBrowser.actions.select": "בחר",
-  "filesystemBrowser.filterLabel": "סינון",
-  "filesystemBrowser.search.placeholder.directories": "חפש תיקיות",
-  "filesystemBrowser.search.placeholder.files": "חפש קבצים",
-  "filesystemBrowser.currentFolder.label": "תיקייה נוכחית",
-  "filesystemBrowser.currentFolder.selectCurrent": "בחר נוכחית",
-  "filesystemBrowser.loading.filesystem": "מערכת קבצים",
-  "filesystemBrowser.loading.workspaceRoot": "שורש סביבת עבודה",
-  "filesystemBrowser.loading.loadingWithPath": "טוען {path}…",
-  "filesystemBrowser.empty.noEntries": "לא נמצאו רשומות.",
-  "filesystemBrowser.navigation.upOneLevel": "עלה רמה אחת",
-  "filesystemBrowser.hints.navigate": "ניווט",
-  "filesystemBrowser.hints.select": "בחירה",
-  "filesystemBrowser.hints.close": "סגירה",
-  "filesystemBrowser.errors.loadFilesystemFallback": "לא ניתן לטעון את מערכת הקבצים",
-  "filesystemBrowser.errors.openDirectoryFallback": "לא ניתן לפתוח את הספרייה",
-} as const
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shantur Rathore	50ccae8b27	fix(i18n): preserve global locale state across provider updates	2026-03-23 14:40:51 +00:00
Pascal André	f1ba699f9f	refactor(ui): drop bootstrap config cache layer	2026-03-23 11:10:33 +01:00
Pascal André	0cb1c05903	refactor(ui): keep bootstrap config in global cache	2026-03-23 10:37:57 +01:00
Pascal André	b7ed232688	refactor(ui): reuse storage cache for bootstrap config	2026-03-23 10:11:13 +01:00
Pascal André	a442d53efa	refactor(ui): move bootstrap cache sync out of preferences	2026-03-23 09:29:29 +01:00
Pascal André	8c0a82d3a8	refactor(ui): keep locale bootstrap branch focused	2026-03-19 21:21:00 +01:00
Pascal André	57efe5def3	fix(i18n): seed locale state from bootstrap preload	2026-03-19 21:17:46 +01:00
Pascal André	3710df916f	fix(ui): harden bootstrap locale fallback	2026-03-19 21:17:46 +01:00
Pascal André	6f15ba2051	perf(ui): trim hidden session and bootstrap work	2026-03-19 21:17:46 +01:00
Pascal André	695c3fa954	perf(ui): defer locale and overlay bundles	2026-03-19 21:16:30 +01:00