feat(speech): make prompt input push to talk

This reverts commit f9b5e2b529.

.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

.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}`);

.github/workflows/pr-build.yml

@@ -1,57 +0,0 @@
-name: PR Build Validation
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-
-permissions:
-  contents: read
-  actions: write
-
-concurrency:
-  group: pr-build-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  authorize:
-    runs-on: ubuntu-latest
-    outputs:
-      allowed: ${{ steps.auth.outputs.allowed }}
-    env:
-      ALLOWED_ACTORS: ${{ vars.ALLOWED_NON_DEV_PR_ACTORS }}
-      ACTOR: ${{ github.actor }}
-      BASE_REF: ${{ github.event.pull_request.base.ref }}
-    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"
-            echo "Skipping builds for unauthorized PR targeting $BASE_REF" >&2
-          fi
-
-  build:
-    needs: authorize
-    if: ${{ needs.authorize.outputs.allowed == 'true' && !github.event.pull_request.draft }}
-    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

.github/workflows/restrict-non-dev-prs.yml

@@ -1,54 +0,0 @@
-name: Restrict Non-Dev PRs
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - reopened
-      - synchronize
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  restrict-non-dev-prs:
-    if: ${{ github.event.pull_request.base.ref != 'dev' }}
-    runs-on: ubuntu-latest
-    env:
-      ALLOWED_ACTORS: ${{ vars.ALLOWED_NON_DEV_PR_ACTORS }}
-      ACTOR: ${{ github.actor }}
-      PR_NUMBER: ${{ github.event.pull_request.number }}
-      BASE_REF: ${{ github.event.pull_request.base.ref }}
-    steps:
-      - name: Check allowed actor
-        id: auth
-        shell: bash
-        run: |
-          set -euo pipefail
-          normalized=",${ALLOWED_ACTORS},"
-          if [[ "$normalized" == *",${ACTOR},"* ]]; then
-            echo "authorized=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "authorized=false" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Comment on unauthorized PR
-        if: ${{ steps.auth.outputs.authorized != 'true' }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr comment "$PR_NUMBER" --body "Thanks for the contribution. PRs need to target \`dev\` branch. Please retarget this PR to the dev branch"
-
-      - name: Close unauthorized PR
-        if: ${{ steps.auth.outputs.authorized != 'true' }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr close "$PR_NUMBER"
-
-      - name: Fail unauthorized PR
-        if: ${{ steps.auth.outputs.authorized != 'true' }}
-        run: |
-          echo "Actor $ACTOR is not allowed to open PRs targeting $BASE_REF" >&2
-          exit 1

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "codenomad-workspace",
-  "version": "0.13.1",
+  "version": "0.12.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codenomad-workspace",
-      "version": "0.13.1",
+      "version": "0.12.2",
       "license": "MIT",
       "dependencies": {
         "7zip-bin": "^5.2.0",
@@ -3253,9 +3253,9 @@
       }
     },
     "node_modules/@tauri-apps/api": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.10.1.tgz",
-      "integrity": "sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.9.1.tgz",
+      "integrity": "sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw==",
       "license": "Apache-2.0 OR MIT",
       "funding": {
         "type": "opencollective",
@@ -3322,15 +3322,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@tauri-apps/plugin-dialog": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.6.0.tgz",
-      "integrity": "sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg==",
-      "license": "MIT OR Apache-2.0",
-      "dependencies": {
-        "@tauri-apps/api": "^2.8.0"
-      }
-    },
     "node_modules/@tauri-apps/plugin-notification": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-notification/-/plugin-notification-2.3.3.tgz",
@@ -10265,6 +10256,14 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/tauri-plugin-keepawake-api": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/tauri-plugin-keepawake-api/-/tauri-plugin-keepawake-api-0.1.0.tgz",
+      "integrity": "sha512-XPUl66zUYiB7kCRxsTdmCoNjFM/++NWCJ4kdTo2NUOgBUa8UVYfayDWnnTzGIQbhT7qNAHs+jgKSjhqSKs/QHA==",
+      "dependencies": {
+        "@tauri-apps/api": ">=2.0.0-beta.6"
+      }
+    },
     "node_modules/temp-dir": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
@@ -11005,36 +11004,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,
@@ -12055,7 +12024,7 @@
     },
     "packages/electron-app": {
       "name": "@neuralnomads/codenomad-electron-app",
-      "version": "0.13.1",
+      "version": "0.12.2",
       "license": "MIT",
       "dependencies": {
         "@codenomad/ui": "file:../ui",
@@ -12092,7 +12061,7 @@
     },
     "packages/server": {
       "name": "@neuralnomads/codenomad",
-      "version": "0.13.1",
+      "version": "0.12.2",
       "license": "MIT",
       "dependencies": {
         "@fastify/cors": "^8.5.0",
@@ -12134,7 +12103,7 @@
     },
     "packages/tauri-app": {
       "name": "@codenomad/tauri-app",
-      "version": "0.13.1",
+      "version": "0.12.2",
       "license": "MIT",
       "devDependencies": {
         "@tauri-apps/cli": "^2.9.4"
@@ -12142,7 +12111,7 @@
     },
     "packages/ui": {
       "name": "@codenomad/ui",
-      "version": "0.13.1",
+      "version": "0.12.2",
       "license": "MIT",
       "dependencies": {
         "@git-diff-view/solid": "^0.0.8",
@@ -12152,8 +12121,6 @@
         "@suid/icons-material": "^0.9.0",
         "@suid/material": "^0.19.0",
         "@suid/system": "^0.14.0",
-        "@tauri-apps/api": "^2.10.1",
-        "@tauri-apps/plugin-dialog": "^2.6.0",
         "@tauri-apps/plugin-notification": "^2.3.3",
         "@tauri-apps/plugin-opener": "^2.5.3",
         "ansi-sequence-parser": "^1.1.3",
@@ -12166,7 +12133,7 @@
         "shiki": "^3.13.0",
         "solid-js": "^1.8.0",
         "solid-toast": "^0.5.0",
-        "virtua": "^0.48.8",
+        "tauri-plugin-keepawake-api": "^0.1.0",
         "yaml": "^2.4.2"
       },
       "devDependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codenomad-workspace",
-  "version": "0.13.1",
+  "version": "0.12.2",
   "private": true,
   "description": "CodeNomad monorepo workspace",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "build:mac-x64": "npm run build:mac-x64 --workspace @neuralnomads/codenomad-electron-app",
     "build:binaries": "npm run build:binaries --workspace @neuralnomads/codenomad-electron-app",
     "typecheck": "npm run typecheck --workspace @codenomad/ui && npm run typecheck --workspace @neuralnomads/codenomad-electron-app",
-    "bumpVersion": "npm version --workspaces --include-workspace-root --no-git-tag-version && npm run sync:version --workspace @codenomad/tauri-app"
+    "bumpVersion": "npm version --workspaces --include-workspace-root --no-git-tag-version"
   },
   "dependencies": {
     "7zip-bin": "^5.2.0",

packages/cloudflare/release-config.json

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

packages/electron-app/.gitignore

@@ -2,4 +2,3 @@ node_modules/
 dist/
 release/
 .vite/
-electron/resources/server/

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 }> => {

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)
     })

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")
-}

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)
-  }
 }

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),
 }

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()

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>

packages/electron-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neuralnomads/codenomad-electron-app",
-  "version": "0.13.1",
+  "version": "0.12.2",
   "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": [
         {

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"])
 

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)
-})

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"]
 }

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.14"
   }
 }

packages/opencode-config/plugin/codenomad.ts

@@ -2,8 +2,6 @@ import type { PluginInput } from "@opencode-ai/plugin"
 import { createCodeNomadClient, getCodeNomadConfig } from "./lib/client"
 import { createBackgroundProcessTools } from "./lib/background-process"
 
-let voiceModeEnabled = false
-
 export async function CodeNomadPlugin(input: PluginInput) {
   const config = getCodeNomadConfig()
   const client = createCodeNomadClient(config)
@@ -18,11 +16,6 @@ export async function CodeNomadPlugin(input: PluginInput) {
           pingTs: (event.properties as any)?.ts,
         },
       }).catch(() => {})
-      return
-    }
-
-    if (event.type === "codenomad.voiceMode") {
-      voiceModeEnabled = Boolean((event.properties as { enabled?: unknown } | undefined)?.enabled)
     }
   })
 
@@ -30,13 +23,6 @@ export async function CodeNomadPlugin(input: PluginInput) {
     tool: {
       ...backgroundProcessTools,
     },
-    async "chat.message"(_input: { sessionID: string }, output: { message: { system?: string } }) {
-      if (!voiceModeEnabled) {
-        return
-      }
-
-      output.message.system = [output.message.system, buildVoiceModePrompt()].filter(Boolean).join("\n\n")
-    },
     async event(input: { event: any }) {
       const opencodeEvent = input?.event
       if (!opencodeEvent || typeof opencodeEvent !== "object") return
@@ -44,19 +30,3 @@ export async function CodeNomadPlugin(input: PluginInput) {
     },
   }
 }
-
-function buildVoiceModePrompt(): string {
-  return [
-    "Voice conversation mode is enabled.",
-    "Prepend your reply with a fenced code block using language `spoken`.",
-    "The `spoken` block should be the natural conversational reply you would say out loud to the user. It should be a concise spoken gist of the full response in 2 to 4 natural sentences.",
-    "In the spoken block, summarize the main outcome, recommendation, or next step. Sound conversational and natural, not like a document summary.",
-    "Do not include code, bullet lists, markdown formatting, or long technical detail in the spoken block.",
-    "Do not add generic phrases about whether the user should read more.",
-    "Only mention additional written detail when there is something specific that may matter for the user's next response, such as a tradeoff, caveat, risk, open question, exact diff, or test result.",
-    "When referring to that written detail, say `below` or `in the message` rather than `detailed section`.",
-    "After the `spoken` block, continue with your normal detailed response.",
-    "Example:",
-    "```spoken\nI implemented the relay-based voice-mode flow and it works with the current plugin bridge. The reconnect caveat is explained below.\n```",
-  ].join("\n\n")
-}

packages/server/package-lock.json

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

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neuralnomads/codenomad",
-  "version": "0.13.1",
+  "version": "0.12.2",
   "description": "CodeNomad Server",
   "license": "MIT",
   "author": {

packages/server/src/api-types.ts

@@ -219,13 +219,10 @@ export interface SpeechCapabilitiesResponse {
   provider: string
   supportsStt: boolean
   supportsTts: boolean
-  supportsStreamingTts: boolean
   baseUrl?: string
   sttModel: string
   ttsModel: string
   ttsVoice: string
-  ttsFormats: string[]
-  streamingTtsFormats: string[]
 }
 
 export interface SpeechTranscriptionResponse {
@@ -240,10 +237,6 @@ export interface SpeechSynthesisResponse {
   mimeType: string
 }
 
-export interface VoiceModeStateResponse {
-  enabled: boolean
-}
-
 export type WorkspaceEventType =
   | "workspace.created"
   | "workspace.started"

packages/server/src/clients/connection-manager.ts

@@ -1,128 +0,0 @@
-import type { Logger } from "../logger"
-
-const STALE_CONNECTION_TIMEOUT_MS = 45000
-const STALE_SWEEP_INTERVAL_MS = 5000
-
-export interface ClientConnectionRef {
-  clientId: string
-  connectionId: string
-}
-
-export interface ClientConnectionRecord extends ClientConnectionRef {
-  key: string
-  connectedAt: number
-  lastSeenAt: number
-}
-
-type ConnectionChangeEvent = {
-  type: "connected" | "disconnected"
-  connection: ClientConnectionRecord
-  reason?: string
-}
-
-interface RegisteredConnection extends ClientConnectionRecord {
-  close: () => void
-}
-
-export class ClientConnectionManager {
-  private readonly connections = new Map<string, RegisteredConnection>()
-  private readonly subscribers = new Set<(event: ConnectionChangeEvent) => void>()
-  private readonly sweepTimer: NodeJS.Timeout
-
-  constructor(private readonly logger: Logger) {
-    this.sweepTimer = setInterval(() => this.sweepStaleConnections(), STALE_SWEEP_INTERVAL_MS)
-    this.sweepTimer.unref?.()
-  }
-
-  shutdown(): void {
-    clearInterval(this.sweepTimer)
-    for (const connection of Array.from(this.connections.values())) {
-      this.disconnect(connection.key, "shutdown", false)
-    }
-  }
-
-  subscribe(listener: (event: ConnectionChangeEvent) => void): () => void {
-    this.subscribers.add(listener)
-    return () => this.subscribers.delete(listener)
-  }
-
-  register(input: ClientConnectionRef & { close: () => void }): () => void {
-    const key = getConnectionKey(input)
-    const now = Date.now()
-    const existing = this.connections.get(key)
-
-    if (existing) {
-      this.logger.debug({ clientId: input.clientId, connectionId: input.connectionId }, "Replacing existing client connection")
-      this.disconnect(key, "replaced")
-    }
-
-    const connection: RegisteredConnection = {
-      key,
-      clientId: input.clientId,
-      connectionId: input.connectionId,
-      connectedAt: now,
-      lastSeenAt: now,
-      close: input.close,
-    }
-    this.connections.set(key, connection)
-    this.logger.debug({ clientId: input.clientId, connectionId: input.connectionId }, "Client connected")
-    this.notify({ type: "connected", connection })
-    return () => this.disconnect(key, "closed")
-  }
-
-  pong(input: ClientConnectionRef): boolean {
-    const key = getConnectionKey(input)
-    const connection = this.connections.get(key)
-    if (!connection) {
-      this.logger.debug({ clientId: input.clientId, connectionId: input.connectionId }, "Ignoring pong for unknown client connection")
-      return false
-    }
-
-    connection.lastSeenAt = Date.now()
-    return true
-  }
-
-  isConnected(input: ClientConnectionRef): boolean {
-    return this.connections.has(getConnectionKey(input))
-  }
-
-  private sweepStaleConnections(): void {
-    const cutoff = Date.now() - STALE_CONNECTION_TIMEOUT_MS
-    for (const connection of Array.from(this.connections.values())) {
-      if (connection.lastSeenAt > cutoff) continue
-      this.logger.debug({ clientId: connection.clientId, connectionId: connection.connectionId }, "Client connection timed out")
-      this.disconnect(connection.key, "timeout")
-    }
-  }
-
-  private disconnect(key: string, reason: string, invokeClose = true): void {
-    const connection = this.connections.get(key)
-    if (!connection) return
-    this.connections.delete(key)
-    this.logger.debug({ clientId: connection.clientId, connectionId: connection.connectionId, reason }, "Client disconnected")
-
-    if (invokeClose) {
-      try {
-        connection.close()
-      } catch (error) {
-        this.logger.warn({ err: error, clientId: connection.clientId, connectionId: connection.connectionId }, "Failed to close stale client connection")
-      }
-    }
-
-    this.notify({ type: "disconnected", connection, reason })
-  }
-
-  private notify(event: ConnectionChangeEvent): void {
-    for (const subscriber of this.subscribers) {
-      try {
-        subscriber(event)
-      } catch (error) {
-        this.logger.warn({ err: error, eventType: event.type }, "Client connection subscriber failed")
-      }
-    }
-  }
-}
-
-function getConnectionKey(input: ClientConnectionRef): string {
-  return `${input.clientId}:${input.connectionId}`
-}

packages/server/src/filesystem/browser.ts

@@ -81,14 +81,6 @@ export class FileSystemBrowser {
     return { path: relativePath, absolutePath }
   }
 
-  writeFile(relativePath: string, contents: string): void {
-    if (this.unrestricted) {
-      throw new Error("writeFile is not available in unrestricted mode")
-    }
-    const resolved = this.toRestrictedAbsolute(relativePath)
-    fs.writeFileSync(resolved, contents, "utf-8")
-  }
-
   readFile(relativePath: string): string {
     if (this.unrestricted) {
       throw new Error("readFile is not available in unrestricted mode")

packages/server/src/plugins/voice-mode.ts

@@ -1,96 +0,0 @@
-import type { Logger } from "../logger"
-import type { ClientConnectionManager, ClientConnectionRef } from "../clients/connection-manager"
-import type { PluginChannelManager } from "./channel"
-
-interface VoiceModeManagerOptions {
-  connections: ClientConnectionManager
-  channel: PluginChannelManager
-  logger: Logger
-}
-
-export class VoiceModeManager {
-  private readonly enabledConnectionsByInstance = new Map<string, Set<string>>()
-  private readonly aggregateByInstance = new Map<string, boolean>()
-
-  constructor(private readonly options: VoiceModeManagerOptions) {
-    this.options.connections.subscribe((event) => {
-      if (event.type !== "disconnected") return
-      this.clearConnection(event.connection)
-    })
-  }
-
-  setEnabled(instanceId: string, connection: ClientConnectionRef, enabled: boolean): void {
-    if (enabled && !this.options.connections.isConnected(connection)) {
-      this.options.logger.debug(
-        { instanceId, clientId: connection.clientId, connectionId: connection.connectionId },
-        "Ignoring voice mode enable for disconnected client connection",
-      )
-      return
-    }
-
-    const key = getConnectionKey(connection)
-    const current = this.enabledConnectionsByInstance.get(instanceId) ?? new Set<string>()
-
-    if (enabled) {
-      current.add(key)
-      this.enabledConnectionsByInstance.set(instanceId, current)
-    } else if (current.delete(key)) {
-      if (current.size === 0) {
-        this.enabledConnectionsByInstance.delete(instanceId)
-      } else {
-        this.enabledConnectionsByInstance.set(instanceId, current)
-      }
-    }
-
-    this.options.logger.debug({ instanceId, clientId: connection.clientId, connectionId: connection.connectionId, enabled }, "Voice mode updated for client connection")
-    this.publishIfChanged(instanceId)
-  }
-
-  syncInstance(instanceId: string): void {
-    this.options.channel.send(instanceId, buildVoiceModeEvent(this.isEnabled(instanceId)))
-  }
-
-  isEnabled(instanceId: string): boolean {
-    return this.aggregateByInstance.get(instanceId) === true
-  }
-
-  private clearConnection(connection: ClientConnectionRef): void {
-    const key = getConnectionKey(connection)
-    for (const [instanceId, enabledConnections] of Array.from(this.enabledConnectionsByInstance.entries())) {
-      if (!enabledConnections.delete(key)) continue
-      if (enabledConnections.size === 0) {
-        this.enabledConnectionsByInstance.delete(instanceId)
-      }
-      this.publishIfChanged(instanceId)
-    }
-  }
-
-  private publishIfChanged(instanceId: string): void {
-    const enabled = (this.enabledConnectionsByInstance.get(instanceId)?.size ?? 0) > 0
-    const previous = this.aggregateByInstance.get(instanceId) === true
-    if (enabled === previous) return
-
-    if (enabled) {
-      this.aggregateByInstance.set(instanceId, true)
-    } else {
-      this.aggregateByInstance.delete(instanceId)
-    }
-
-    this.options.logger.debug({ instanceId, enabled }, "Broadcasting aggregate voice mode")
-    this.options.channel.send(instanceId, buildVoiceModeEvent(enabled))
-  }
-}
-
-function buildVoiceModeEvent(enabled: boolean) {
-  return {
-    type: "codenomad.voiceMode",
-    properties: {
-      enabled,
-      formatVersion: "v1",
-    },
-  }
-}
-
-function getConnectionKey(connection: ClientConnectionRef): string {
-  return `${connection.clientId}:${connection.connectionId}`
-}

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

@@ -29,9 +29,6 @@ import type { AuthManager } from "../auth/manager"
 import { registerAuthRoutes } from "./routes/auth"
 import { sendUnauthorized, wantsHtml } from "../auth/http-auth"
 import type { SpeechService } from "../speech/service"
-import { ClientConnectionManager } from "../clients/connection-manager"
-import { PluginChannelManager } from "../plugins/channel"
-import { VoiceModeManager } from "../plugins/voice-mode"
 
 interface HttpServerDeps {
   bindHost: string
@@ -176,13 +173,6 @@ export function createHttpServer(deps: HttpServerDeps) {
     eventBus: deps.eventBus,
     logger: deps.logger.child({ component: "background-processes" }),
   })
-  const clientConnectionManager = new ClientConnectionManager(deps.logger.child({ component: "client-connections" }))
-  const pluginChannel = new PluginChannelManager(deps.logger.child({ component: "plugin-channel" }))
-  const voiceModeManager = new VoiceModeManager({
-    connections: clientConnectionManager,
-    channel: pluginChannel,
-    logger: deps.logger.child({ component: "voice-mode" }),
-  })
 
   registerAuthRoutes(app, { authManager: deps.authManager })
 
@@ -258,12 +248,7 @@ export function createHttpServer(deps: HttpServerDeps) {
   registerSettingsRoutes(app, { settings: deps.settings, logger: apiLogger })
   registerFilesystemRoutes(app, { fileSystemBrowser: deps.fileSystemBrowser })
   registerMetaRoutes(app, { serverMeta: deps.serverMeta })
-  registerEventRoutes(app, {
-    eventBus: deps.eventBus,
-    registerClient: registerSseClient,
-    logger: sseLogger,
-    connectionManager: clientConnectionManager,
-  })
+  registerEventRoutes(app, { eventBus: deps.eventBus, registerClient: registerSseClient, logger: sseLogger })
   registerWorktreeRoutes(app, { workspaceManager: deps.workspaceManager })
   registerStorageRoutes(app, {
     instanceStore: deps.instanceStore,
@@ -271,13 +256,7 @@ export function createHttpServer(deps: HttpServerDeps) {
     workspaceManager: deps.workspaceManager,
   })
   registerSpeechRoutes(app, { speechService: deps.speechService })
-  registerPluginRoutes(app, {
-    workspaceManager: deps.workspaceManager,
-    eventBus: deps.eventBus,
-    logger: proxyLogger,
-    channel: pluginChannel,
-    voiceModeManager,
-  })
+  registerPluginRoutes(app, { workspaceManager: deps.workspaceManager, eventBus: deps.eventBus, logger: proxyLogger })
   registerBackgroundProcessRoutes(app, { backgroundProcessManager })
   registerInstanceProxyRoutes(app, { workspaceManager: deps.workspaceManager, logger: proxyLogger })
 
@@ -342,7 +321,6 @@ export function createHttpServer(deps: HttpServerDeps) {
     },
     stop: () => {
       closeSseClients()
-      clientConnectionManager.shutdown()
       return app.close()
     },
   }

packages/server/src/server/routes/events.ts

@@ -1,32 +1,19 @@
 import { FastifyInstance } from "fastify"
-import { z } from "zod"
 import { EventBus } from "../../events/bus"
 import { WorkspaceEventPayload } from "../../api-types"
-import type { ClientConnectionManager } from "../../clients/connection-manager"
 import { Logger } from "../../logger"
 
 interface RouteDeps {
   eventBus: EventBus
   registerClient: (cleanup: () => void) => () => void
   logger: Logger
-  connectionManager: ClientConnectionManager
 }
 
 let nextClientId = 0
 
-const ConnectionQuerySchema = z.object({
-  clientId: z.string().trim().min(1),
-  connectionId: z.string().trim().min(1),
-})
-
-const PongBodySchema = ConnectionQuerySchema.extend({
-  pingTs: z.number().optional(),
-})
-
 export function registerEventRoutes(app: FastifyInstance, deps: RouteDeps) {
   app.get("/api/events", (request, reply) => {
     const clientId = ++nextClientId
-    const connection = ConnectionQuerySchema.parse(request.query ?? {})
     deps.logger.debug({ clientId }, "SSE client connected")
 
     const origin = request.headers.origin ?? "*"
@@ -48,8 +35,7 @@ export function registerEventRoutes(app: FastifyInstance, deps: RouteDeps) {
 
     const unsubscribe = deps.eventBus.onEvent(send)
     const heartbeat = setInterval(() => {
-      const ping = { ts: Date.now() }
-      reply.raw.write(`event: codenomad.client.ping\ndata: ${JSON.stringify(ping)}\n\n`)
+      reply.raw.write(`:hb ${Date.now()}\n\n`)
     }, 15000)
 
     let closed = false
@@ -63,27 +49,13 @@ export function registerEventRoutes(app: FastifyInstance, deps: RouteDeps) {
     }
 
     const unregister = deps.registerClient(close)
-    const unregisterConnection = deps.connectionManager.register({
-      ...connection,
-      close,
-    })
 
     const handleClose = () => {
       close()
       unregister()
-      unregisterConnection()
     }
 
     request.raw.on("close", handleClose)
     request.raw.on("error", handleClose)
   })
-
-  app.post("/api/client-connections/pong", (request, reply) => {
-    const body = PongBodySchema.parse(request.body ?? {})
-    if (!deps.connectionManager.pong(body)) {
-      reply.code(404).send({ error: "Client connection not found" })
-      return
-    }
-    reply.code(204).send()
-  })
 }

packages/server/src/server/routes/plugin.ts

@@ -1,19 +1,15 @@
 import { FastifyInstance } from "fastify"
 import { z } from "zod"
-import type { VoiceModeStateResponse } from "../../api-types"
 import type { WorkspaceManager } from "../../workspaces/manager"
 import type { EventBus } from "../../events/bus"
 import type { Logger } from "../../logger"
 import { PluginChannelManager } from "../../plugins/channel"
 import { buildPingEvent, handlePluginEvent } from "../../plugins/handlers"
-import { VoiceModeManager } from "../../plugins/voice-mode"
 
 interface RouteDeps {
   workspaceManager: WorkspaceManager
   eventBus: EventBus
   logger: Logger
-  channel: PluginChannelManager
-  voiceModeManager: VoiceModeManager
 }
 
 const PluginEventSchema = z.object({
@@ -21,13 +17,9 @@ const PluginEventSchema = z.object({
   properties: z.record(z.unknown()).optional(),
 })
 
-const VoiceModeStateSchema = z.object({
-  enabled: z.boolean(),
-  clientId: z.string().trim().min(1),
-  connectionId: z.string().trim().min(1),
-})
-
 export function registerPluginRoutes(app: FastifyInstance, deps: RouteDeps) {
+  const channel = new PluginChannelManager(deps.logger.child({ component: "plugin-channel" }))
+
   app.get<{ Params: { id: string } }>("/workspaces/:id/plugin/events", (request, reply) => {
     const workspace = deps.workspaceManager.get(request.params.id)
     if (!workspace) {
@@ -41,11 +33,10 @@ export function registerPluginRoutes(app: FastifyInstance, deps: RouteDeps) {
     reply.raw.flushHeaders?.()
     reply.hijack()
 
-    const registration = deps.channel.register(request.params.id, reply)
-    deps.voiceModeManager.syncInstance(request.params.id)
+    const registration = channel.register(request.params.id, reply)
 
     const heartbeat = setInterval(() => {
-      deps.channel.send(request.params.id, buildPingEvent())
+      channel.send(request.params.id, buildPingEvent())
     }, 15000)
 
     const close = () => {
@@ -58,22 +49,6 @@ export function registerPluginRoutes(app: FastifyInstance, deps: RouteDeps) {
     request.raw.on("error", close)
   })
 
-  app.post<{ Params: { id: string }; Body: VoiceModeStateResponse }>("/workspaces/:id/plugin/voice-mode", (request, reply) => {
-    const workspace = deps.workspaceManager.get(request.params.id)
-    if (!workspace) {
-      reply.code(404).send({ error: "Workspace not found" })
-      return
-    }
-
-    const payload = VoiceModeStateSchema.parse(request.body ?? {})
-    deps.voiceModeManager.setEnabled(
-      request.params.id,
-      { clientId: payload.clientId, connectionId: payload.connectionId },
-      payload.enabled,
-    )
-    return { enabled: payload.enabled }
-  })
-
   const handleWildcard = async (request: any, reply: any) => {
     const workspaceId = request.params.id as string
     const workspace = deps.workspaceManager.get(workspaceId)

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" }

packages/server/src/server/routes/speech.ts

@@ -16,23 +16,9 @@ const TranscribeBodySchema = z.object({
 
 const SynthesizeBodySchema = z.object({
   text: z.string().trim().min(1, "Text is required"),
-  format: z.enum(["mp3", "wav", "opus", "aac"]).optional(),
+  format: z.enum(["mp3", "wav", "opus"]).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())
 
@@ -42,8 +28,8 @@ export function registerSpeechRoutes(app: FastifyInstance, deps: RouteDeps) {
       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") }
+      reply.code(400)
+      return { error: error instanceof Error ? error.message : "Failed to transcribe audio" }
     }
   })
 
@@ -53,22 +39,8 @@ export function registerSpeechRoutes(app: FastifyInstance, deps: RouteDeps) {
       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") }
+      reply.code(400)
+      return { error: error instanceof Error ? error.message : "Failed to synthesize audio" }
     }
   })
 }

packages/server/src/server/routes/workspaces.ts

@@ -19,10 +19,6 @@ const WorkspaceFileContentQuerySchema = z.object({
   path: z.string(),
 })
 
-const WorkspaceFileContentBodySchema = z.object({
-  contents: z.string(),
-})
-
 const WorkspaceFileSearchQuerySchema = z.object({
   q: z.string().trim().min(1, "Query is required"),
   limit: z.coerce.number().int().positive().max(200).optional(),
@@ -104,20 +100,6 @@ export function registerWorkspaceRoutes(app: FastifyInstance, deps: RouteDeps) {
       return handleWorkspaceError(error, reply)
     }
   })
-
-  app.put<{
-    Params: { id: string }
-    Querystring: { path?: string }
-  }>("/api/workspaces/:id/files/content", async (request, reply) => {
-    try {
-      const query = WorkspaceFileContentQuerySchema.parse(request.query ?? {})
-      const body = WorkspaceFileContentBodySchema.parse(request.body ?? {})
-      deps.workspaceManager.writeFile(request.params.id, query.path, body.contents)
-      reply.code(204)
-    } catch (error) {
-      return handleWorkspaceError(error, reply)
-    }
-  })
 }
 
 

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
-}

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)
   }

packages/server/src/speech/providers/openai-compatible.ts

@@ -1,9 +1,8 @@
-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"
+import type { NormalizedSpeechSettings, SynthesizeSpeechInput, TranscribeAudioInput } from "../service"
 
 interface OpenAICompatibleSpeechProviderOptions {
   settings: NormalizedSpeechSettings
@@ -21,13 +20,10 @@ export class OpenAICompatibleSpeechProvider {
       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"],
     }
   }
 
@@ -96,7 +92,8 @@ export class OpenAICompatibleSpeechProvider {
   }
 
   async synthesize(input: SynthesizeSpeechInput): Promise<SpeechSynthesisResponse> {
-    const format = input.format ?? this.options.settings.ttsFormat
+    const client = this.createClient()
+    const format = input.format ?? "mp3"
 
     this.options.logger.info(
       {
@@ -107,98 +104,20 @@ export class OpenAICompatibleSpeechProvider {
       "speech.synthesize",
     )
 
-    const response = await this.requestSpeechAudio(input.text, format)
-    const mimeType = response.headers.get("content-type") || mimeTypeForFormat(format)
+    const response = await client.audio.speech.create({
+      model: this.options.settings.ttsModel,
+      voice: this.options.settings.ttsVoice as any,
+      input: input.text,
+      response_format: format as any,
+    })
 
     const audioBuffer = Buffer.from(await response.arrayBuffer())
     return {
       audioBase64: audioBuffer.toString("base64"),
-      mimeType,
+      mimeType: mimeTypeForFormat(format),
     }
   }
 
-  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) {
@@ -222,13 +141,8 @@ function extensionForMime(mimeType: string): string {
   return "webm"
 }
 
-function mimeTypeForFormat(format: "mp3" | "wav" | "opus" | "aac"): string {
+function mimeTypeForFormat(format: "mp3" | "wav" | "opus"): string {
   if (format === "wav") return "audio/wav"
-  if (format === "opus") return 'audio/ogg; codecs="opus"'
-  if (format === "aac") return "audio/aac"
+  if (format === "opus") return "audio/opus"
   return "audio/mpeg"
 }
-
-function ensureTrailingSlash(value: string): string {
-  return value.endsWith("/") ? value : `${value}/`
-}

packages/server/src/speech/service.ts

@@ -1,5 +1,4 @@
 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"
@@ -14,7 +13,6 @@ const ServerSpeechSettingsSchema = z.object({
       sttModel: z.string().optional(),
       ttsModel: z.string().optional(),
       ttsVoice: z.string().optional(),
-      ttsFormat: z.enum(["mp3", "wav", "opus", "aac"]).optional(),
     })
     .optional(),
 })
@@ -29,19 +27,13 @@ export interface TranscribeAudioInput {
 
 export interface SynthesizeSpeechInput {
   text: string
-  format?: "mp3" | "wav" | "opus" | "aac"
-}
-
-export interface SpeechSynthesisStreamResponse {
-  stream: Readable
-  mimeType: string
+  format?: "mp3" | "wav" | "opus"
 }
 
 export interface SpeechProvider {
   getCapabilities(): SpeechCapabilitiesResponse
   transcribe(input: TranscribeAudioInput): Promise<SpeechTranscriptionResponse>
   synthesize(input: SynthesizeSpeechInput): Promise<SpeechSynthesisResponse>
-  synthesizeStream(input: SynthesizeSpeechInput): Promise<SpeechSynthesisStreamResponse>
 }
 
 export interface NormalizedSpeechSettings {
@@ -51,14 +43,12 @@ export interface NormalizedSpeechSettings {
   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,
@@ -77,10 +67,6 @@ export class SpeechService {
     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({
@@ -100,7 +86,6 @@ export class SpeechService {
       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,
     }
   }
 }

packages/server/src/ui/__tests__/remote-ui.test.ts

@@ -55,31 +55,4 @@ describe("resolveUi local version preference", () => {
     assert.equal(result.uiStaticDir, bundledDir)
     assert.equal(result.uiVersion, "0.8.1")
   })
-
-  it("prefers bundled when bundled and downloaded versions are equal", async () => {
-    const bundledDir = path.join(tempRoot, "bundled")
-    const configDir = path.join(tempRoot, "config")
-    const currentDir = path.join(configDir, "ui", "current")
-
-    await mkdir(bundledDir, { recursive: true })
-    await mkdir(currentDir, { recursive: true })
-
-    writeFileSync(path.join(bundledDir, "index.html"), "<html>bundled</html>")
-    writeFileSync(path.join(bundledDir, "ui-version.json"), JSON.stringify({ uiVersion: "0.8.1" }))
-
-    writeFileSync(path.join(currentDir, "index.html"), "<html>current</html>")
-    writeFileSync(path.join(currentDir, "ui-version.json"), JSON.stringify({ uiVersion: "0.8.1" }))
-
-    const result = await resolveUi({
-      serverVersion: "0.8.1",
-      bundledUiDir: bundledDir,
-      autoUpdate: false,
-      configDir,
-      logger: noopLogger,
-    })
-
-    assert.equal(result.source, "bundled")
-    assert.equal(result.uiStaticDir, bundledDir)
-    assert.equal(result.uiVersion, "0.8.1")
-  })
 })

packages/server/src/ui/remote-ui.ts

@@ -250,7 +250,7 @@ async function pickBestLocalUi(args: {
       uiStaticDir: currentResolved,
       source: "downloaded",
       uiVersion: await readUiVersion(currentResolved),
-      priority: 1,
+      priority: 2,
     })
   }
 
@@ -260,7 +260,7 @@ async function pickBestLocalUi(args: {
       uiStaticDir: bundledResolved,
       source: "bundled",
       uiVersion: await readUiVersion(bundledResolved),
-      priority: 2,
+      priority: 1,
     })
   }
 

packages/server/src/workspaces/manager.ts

@@ -83,12 +83,6 @@ export class WorkspaceManager {
     }
   }
 
-  writeFile(workspaceId: string, relativePath: string, contents: string): void {
-    const workspace = this.requireWorkspace(workspaceId)
-    const browser = new FileSystemBrowser({ rootDir: workspace.path })
-    browser.writeFile(relativePath, contents)
-  }
-
   async create(folder: string, name?: string): Promise<WorkspaceDescriptor> {
  
     const id = `${Date.now().toString(36)}`

packages/tauri-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codenomad/tauri-app",
-  "version": "0.13.1",
+  "version": "0.12.2",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -8,7 +8,6 @@
     "dev:ui": "npm run dev --workspace @codenomad/ui",
     "dev:prep": "node ./scripts/dev-prep.js",
     "dev:bootstrap": "npm run dev:prep && npm run dev:ui",
-    "sync:version": "node ./scripts/sync-tauri-version.js",
     "prebuild": "node ./scripts/prebuild.js",
     "bundle:server": "npm run prebuild",
     "build": "tauri build"

packages/tauri-app/scripts/prebuild.js

@@ -20,7 +20,6 @@ const serverDevInstallCommand =
   "npm install --workspace @neuralnomads/codenomad --include-workspace-root=false --install-strategy=nested --fund=false --audit=false"
 const uiDevInstallCommand =
   "npm install --workspace @codenomad/ui --include-workspace-root=false --install-strategy=nested --fund=false --audit=false"
-const serverPrepareUiCommand = "npm run prepare-ui --workspace @neuralnomads/codenomad"
 
 const envWithRootBin = {
   ...process.env,
@@ -56,7 +55,11 @@ async function ensureMonacoAssets() {
 function ensureServerBuild() {
   const distPath = path.join(serverRoot, "dist")
   const publicPath = path.join(serverRoot, "public")
-  console.log("[prebuild] rebuilding server workspace for desktop packaging...")
+  if (fs.existsSync(distPath) && fs.existsSync(publicPath)) {
+    return
+  }
+
+  console.log("[prebuild] server build missing; running workspace build...")
   execSync("npm --workspace @neuralnomads/codenomad run build", {
     cwd: workspaceRoot,
     stdio: "inherit",
@@ -88,15 +91,6 @@ function ensureUiBuild() {
   }
 }
 
-function syncServerUiBundle() {
-  console.log("[prebuild] syncing server public UI bundle...")
-  execSync(serverPrepareUiCommand, {
-    cwd: workspaceRoot,
-    stdio: "inherit",
-    env: envWithRootBin,
-  })
-}
-
 function ensureServerDevDependencies() {
   if (fs.existsSync(braceExpansionPath)) {
     return
@@ -252,7 +246,6 @@ function copyUiLoadingAssets() {
   ensureServerDependencies()
   ensureServerBuild()
   ensureUiBuild()
-  syncServerUiBundle()
   copyServerArtifacts()
   stripNodeModuleBins()
   copyUiLoadingAssets()

packages/tauri-app/scripts/sync-tauri-version.js

@@ -1,102 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require("fs")
-const path = require("path")
-
-const root = path.resolve(__dirname, "..")
-const packageJsonPath = path.join(root, "package.json")
-const cargoTomlPath = path.join(root, "src-tauri", "Cargo.toml")
-const cargoLockPath = path.join(root, "Cargo.lock")
-const tauriConfigPath = path.join(root, "src-tauri", "tauri.conf.json")
-
-function readPackageVersion() {
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"))
-  if (typeof packageJson.version !== "string" || packageJson.version.length === 0) {
-    throw new Error("Missing version in packages/tauri-app/package.json")
-  }
-  return packageJson.version
-}
-
-function syncCargoToml(version) {
-  const current = fs.readFileSync(cargoTomlPath, "utf8")
-  const packageVersionPattern = /(\[package\][\s\S]*?^version\s*=\s*")([^"]+)(")/m
-  const match = current.match(packageVersionPattern)
-
-  if (!match) {
-    throw new Error("Unable to find [package] version in packages/tauri-app/src-tauri/Cargo.toml")
-  }
-
-  if (match[2] === version) {
-    return false
-  }
-
-  const updated = current.replace(packageVersionPattern, (_, prefix, __, suffix) => `${prefix}${version}${suffix}`)
-  fs.writeFileSync(cargoTomlPath, updated)
-  return true
-}
-
-function syncCargoLock(version) {
-  if (!fs.existsSync(cargoLockPath)) {
-    return false
-  }
-
-  const current = fs.readFileSync(cargoLockPath, "utf8")
-  const packageVersionPattern = /(\[\[package\]\]\r?\nname = "codenomad-tauri"\r?\nversion = ")([^"]+)(")/
-  const match = current.match(packageVersionPattern)
-
-  if (!match) {
-    throw new Error("Unable to find codenomad-tauri version in packages/tauri-app/Cargo.lock")
-  }
-
-  if (match[2] === version) {
-    return false
-  }
-
-  const updated = current.replace(packageVersionPattern, (_, prefix, __, suffix) => `${prefix}${version}${suffix}`)
-  fs.writeFileSync(cargoLockPath, updated)
-  return true
-}
-
-function syncTauriConfig(version) {
-  const current = fs.readFileSync(tauriConfigPath, "utf8")
-  const config = JSON.parse(current)
-  if (config.version === version) {
-    return false
-  }
-
-  config.version = version
-  fs.writeFileSync(tauriConfigPath, `${JSON.stringify(config, null, 2)}\n`)
-  return true
-}
-
-function main() {
-  const version = readPackageVersion()
-  const changed = []
-
-  if (syncCargoToml(version)) {
-    changed.push(path.relative(root, cargoTomlPath))
-  }
-
-  if (syncCargoLock(version)) {
-    changed.push(path.relative(root, cargoLockPath))
-  }
-
-  if (syncTauriConfig(version)) {
-    changed.push(path.relative(root, tauriConfigPath))
-  }
-
-  if (changed.length === 0) {
-    console.log(`[sync-tauri-version] already aligned to ${version}`)
-    return
-  }
-
-  console.log(`[sync-tauri-version] synced ${version} -> ${changed.join(", ")}`)
-}
-
-try {
-  main()
-} catch (error) {
-  const message = error instanceof Error ? error.message : String(error)
-  console.error(`[sync-tauri-version] failed: ${message}`)
-  process.exit(1)
-}

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

@@ -1,6 +1,6 @@
 [package]
 name = "codenomad-tauri"
-version = "0.12.3"
+version = "0.1.0"
 edition = "2021"
 license = "MIT"
 
@@ -19,13 +19,9 @@ thiserror = "1"
 anyhow = "1"
 which = "4"
 libc = "0.2"
-keepawake = "0.6"
 tauri-plugin-dialog = "2"
 dirs = "5"
 tauri-plugin-opener = "2"
-tauri-plugin-global-shortcut = "2"
 url = "2"
+tauri-plugin-keepawake = "0.1.1"
 tauri-plugin-notification = "2"
-
-[target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.59", features = ["Win32_UI_Shell"] }

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>

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",

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"]}}

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

@@ -2379,70 +2379,34 @@
           "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",
+          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`",
           "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"
+          "const": "keepawake:default",
+          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`"
         },
         {
-          "description": "Enables the is_registered command without any pre-configured scope.",
+          "description": "Enables the start 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."
+          "const": "keepawake:allow-start",
+          "markdownDescription": "Enables the start command without any pre-configured scope."
         },
         {
-          "description": "Enables the register command without any pre-configured scope.",
+          "description": "Enables the stop command without any pre-configured scope.",
           "type": "string",
-          "const": "global-shortcut:allow-register",
-          "markdownDescription": "Enables the register command without any pre-configured scope."
+          "const": "keepawake:allow-stop",
+          "markdownDescription": "Enables the stop command without any pre-configured scope."
         },
         {
-          "description": "Enables the register_all command without any pre-configured scope.",
+          "description": "Denies the start 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."
+          "const": "keepawake:deny-start",
+          "markdownDescription": "Denies the start command without any pre-configured scope."
         },
         {
-          "description": "Enables the unregister command without any pre-configured scope.",
+          "description": "Denies the stop 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."
+          "const": "keepawake:deny-stop",
+          "markdownDescription": "Denies the stop command without any pre-configured scope."
         },
         {
           "description": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`",

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

@@ -2378,6 +2378,36 @@
           "const": "dialog:deny-save",
           "markdownDescription": "Denies the save command without any pre-configured scope."
         },
+        {
+          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`",
+          "type": "string",
+          "const": "keepawake:default",
+          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-start`\n- `allow-stop`"
+        },
+        {
+          "description": "Enables the start command without any pre-configured scope.",
+          "type": "string",
+          "const": "keepawake:allow-start",
+          "markdownDescription": "Enables the start command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the stop command without any pre-configured scope.",
+          "type": "string",
+          "const": "keepawake:allow-stop",
+          "markdownDescription": "Enables the stop command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the start command without any pre-configured scope.",
+          "type": "string",
+          "const": "keepawake:deny-start",
+          "markdownDescription": "Denies the start command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the stop command without any pre-configured scope.",
+          "type": "string",
+          "const": "keepawake:deny-stop",
+          "markdownDescription": "Denies the stop command without any pre-configured scope."
+        },
         {
           "description": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`",
           "type": "string",

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

@@ -9,8 +9,6 @@ use std::ffi::OsStr;
 use std::fs;
 use std::io::{BufRead, BufReader, Read, Write};
 use std::net::TcpStream;
-#[cfg(unix)]
-use std::os::unix::process::CommandExt;
 use std::path::PathBuf;
 use std::process::{Child, Command, Stdio};
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -19,24 +17,10 @@ use std::thread;
 use std::time::{Duration, Instant};
 use tauri::{webview::cookie::Cookie, AppHandle, Emitter, Manager, Url};
 
-#[cfg(windows)]
-use std::os::windows::process::CommandExt;
-
-#[cfg(windows)]
-const CREATE_NO_WINDOW: u32 = 0x08000000;
-
 fn log_line(message: &str) {
     println!("[tauri-cli] {message}");
 }
 
-#[cfg(windows)]
-fn configure_spawn(command: &mut Command) {
-    command.creation_flags(CREATE_NO_WINDOW);
-}
-
-#[cfg(not(windows))]
-fn configure_spawn(_command: &mut Command) {}
-
 fn workspace_root() -> Option<PathBuf> {
     std::env::current_dir().ok().and_then(|mut dir| {
         for _ in 0..3 {
@@ -51,49 +35,7 @@ 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) {
-    // Ensure the CLI runs in its own process group so we can terminate wrapper
-    // processes (login shell/tsx) without leaving the server orphaned.
-    unsafe {
-        command.pre_exec(|| {
-            if libc::setpgid(0, 0) != 0 {
-                return Err(std::io::Error::last_os_error());
-            }
-            Ok(())
-        });
-    }
-}
-
-#[cfg(windows)]
-fn kill_process_tree_windows(pid: u32, force: bool) -> bool {
-    let mut args = vec!["/PID".to_string(), pid.to_string(), "/T".to_string()];
-    if force {
-        args.push("/F".to_string());
-    }
-
-    let mut command = Command::new("taskkill");
-    command.args(&args);
-    configure_spawn(&mut command);
-
-    match command.output() {
-        Ok(output) => {
-            if output.status.success() {
-                return true;
-            }
-
-            // If the PID is already gone, treat it as success.
-            let stdout = String::from_utf8_lossy(&output.stdout).to_lowercase();
-            let stderr = String::from_utf8_lossy(&output.stderr).to_lowercase();
-            let combined = format!("{stdout}\n{stderr}");
-            combined.contains("not found") || combined.contains("no running instance")
-        }
-        Err(_) => false,
-    }
-}
 fn navigate_main(app: &AppHandle, url: &str) {
     if let Some(win) = app.webview_windows().get("main") {
         let mut display = url.to_string();
@@ -404,21 +346,13 @@ 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;
-                // Prefer signaling the process group to avoid orphaning children
-                // when the CLI was launched via a wrapper shell.
-                let group_res = libc::kill(-pid, libc::SIGTERM);
-                if group_res != 0 {
-                    let _ = libc::kill(pid, libc::SIGTERM);
-                }
+                libc::kill(child.id() as i32, libc::SIGTERM);
             }
             #[cfg(windows)]
             {
-                let _ = kill_process_tree_windows(child.id(), false);
+                let _ = child.kill();
             }
 
             let start = Instant::now();
@@ -426,21 +360,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={}",
@@ -449,21 +368,11 @@ impl CliProcessManager {
                             ));
                             #[cfg(unix)]
                             unsafe {
-                                let pid = child.id() as i32;
-                                let group_res = libc::kill(-pid, libc::SIGKILL);
-                                if group_res != 0 {
-                                    let _ = libc::kill(pid, libc::SIGKILL);
-                                }
+                                libc::kill(child.id() as i32, libc::SIGKILL);
                             }
                             #[cfg(windows)]
                             {
-                                if !forced_tree_shutdown
-                                    && !kill_process_tree_windows(child.id(), true)
-                                {
-                                    let _ = child.kill();
-                                } else if forced_tree_shutdown {
-                                    let _ = child.kill();
-                                }
+                                let _ = child.kill();
                             }
                             break;
                         }
@@ -541,12 +450,9 @@ impl CliProcessManager {
                     .env("ELECTRON_RUN_AS_NODE", "1")
                     .stdout(Stdio::piped())
                     .stderr(Stdio::piped());
-                configure_spawn(&mut c);
                 if let Some(ref cwd) = cwd {
                     c.current_dir(cwd);
                 }
-                #[cfg(unix)]
-                configure_posix_process_group(&mut c);
                 c.spawn()?
             }
             ShellCommandType::Direct(cmd) => {
@@ -556,12 +462,9 @@ impl CliProcessManager {
                     .env("ELECTRON_RUN_AS_NODE", "1")
                     .stdout(Stdio::piped())
                     .stderr(Stdio::piped());
-                configure_spawn(&mut c);
                 if let Some(ref cwd) = cwd {
                     c.current_dir(cwd);
                 }
-                #[cfg(unix)]
-                configure_posix_process_group(&mut c);
                 c.spawn()?
             }
         };
@@ -634,24 +537,7 @@ impl CliProcessManager {
             locked.error = Some("CLI did not start in time".to_string());
             log_line("timeout waiting for CLI readiness");
             if let Some(child) = child_holder_clone.lock().as_mut() {
-                #[cfg(unix)]
-                unsafe {
-                    let pid = child.id() as i32;
-                    let group_res = libc::kill(-pid, libc::SIGKILL);
-                    if group_res != 0 {
-                        let _ = libc::kill(pid, libc::SIGKILL);
-                    }
-                }
-                #[cfg(windows)]
-                {
-                    if !kill_process_tree_windows(child.id(), true) {
-                        let _ = child.kill();
-                    }
-                }
-                #[cfg(not(any(unix, windows)))]
-                {
-                    let _ = child.kill();
-                }
+                let _ = child.kill();
             }
             let _ = app_clone.emit("cli:error", json!({"message": "CLI did not start in time"}));
             Self::emit_status(&app_clone, &locked);

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

@@ -3,52 +3,20 @@
 mod cli_manager;
 
 use cli_manager::{CliProcessManager, CliStatus};
-use keepawake::KeepAwake;
-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;
 
-#[cfg(windows)]
-use std::ffi::OsStr;
-#[cfg(windows)]
-use std::iter;
-#[cfg(windows)]
-use std::os::windows::ffi::OsStrExt;
-#[cfg(windows)]
-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";
 
+#[derive(Clone)]
 pub struct AppState {
     pub manager: CliProcessManager,
-    pub wake_lock: Mutex<Option<KeepAwake>>,
-    pub zoom_level: Mutex<f64>,
-}
-
-#[derive(Debug, Default, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-struct WakeLockConfig {
-    display: bool,
-    idle: bool,
-    sleep: bool,
 }
 
 #[tauri::command]
@@ -67,39 +35,6 @@ fn cli_restart(app: AppHandle, state: tauri::State<AppState>) -> Result<CliStatu
     Ok(state.manager.status())
 }
 
-#[tauri::command]
-fn wake_lock_start(
-    state: tauri::State<AppState>,
-    config: Option<WakeLockConfig>,
-) -> Result<(), String> {
-    let config = config.unwrap_or(WakeLockConfig {
-        display: true,
-        idle: false,
-        sleep: false,
-    });
-
-    let mut builder = keepawake::Builder::default();
-    builder
-        .display(config.display)
-        .idle(config.idle)
-        .sleep(config.sleep)
-        .reason("CodeNomad active session")
-        .app_name("CodeNomad")
-        .app_reverse_domain("ai.neuralnomads.codenomad.client");
-
-    let wake_lock = builder.create().map_err(|err| err.to_string())?;
-    let mut state_lock = state.wake_lock.lock().map_err(|err| err.to_string())?;
-    *state_lock = Some(wake_lock);
-    Ok(())
-}
-
-#[tauri::command]
-fn wake_lock_stop(state: tauri::State<AppState>) -> Result<(), String> {
-    let mut state_lock = state.wake_lock.lock().map_err(|err| err.to_string())?;
-    state_lock.take();
-    Ok(())
-}
-
 fn is_dev_mode() -> bool {
     cfg!(debug_assertions) || std::env::var("TAURI_DEV").is_ok()
 }
@@ -166,99 +101,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)
-        .encode_wide()
-        .chain(iter::once(0))
-        .collect();
-
-    let result = unsafe { SetCurrentProcessExplicitAppUserModelID(app_id.as_ptr()) };
-    if result < 0 {
-        eprintln!("[tauri] failed to set AppUserModelID: {result}");
-    }
-}
-
-#[cfg(not(windows))]
-fn set_windows_app_user_model_id() {}
-
 fn main() {
     let navigation_guard: TauriPlugin<Wry, ()> = PluginBuilder::new("external-link-guard")
         .on_navigation(|webview, url| intercept_navigation(webview, url))
@@ -267,48 +109,14 @@ 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_keepawake::init())
         .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();
@@ -319,12 +127,7 @@ fn main() {
             });
             Ok(())
         })
-        .invoke_handler(tauri::generate_handler![
-            cli_get_status,
-            cli_restart,
-            wake_lock_start,
-            wake_lock_stop
-        ])
+        .invoke_handler(tauri::generate_handler![cli_get_status, cli_restart])
         .on_menu_event(|app_handle, event| {
             match event.id().0.as_str() {
                 // File menu
@@ -333,42 +136,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 +179,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 +266,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 +293,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 +318,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

packages/tauri-app/src-tauri/tauri.conf.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "CodeNomad",
-  "version": "0.12.3",
-  "identifier": "ai.neuralnomads.codenomad.client",
+  "version": "0.1.0",
+  "identifier": "ai.opencode.client",
   "build": {
     "beforeDevCommand": "npm run dev:bootstrap",
     "beforeBuildCommand": "npm run bundle:server",

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codenomad/ui",
-  "version": "0.13.1",
+  "version": "0.12.2",
   "private": true,
   "license": "MIT",
   "type": "module",
@@ -18,10 +18,8 @@
     "@suid/icons-material": "^0.9.0",
     "@suid/material": "^0.19.0",
     "@suid/system": "^0.14.0",
-    "@tauri-apps/api": "^2.10.1",
-    "@tauri-apps/plugin-dialog": "^2.6.0",
-    "@tauri-apps/plugin-notification": "^2.3.3",
     "@tauri-apps/plugin-opener": "^2.5.3",
+    "@tauri-apps/plugin-notification": "^2.3.3",
     "ansi-sequence-parser": "^1.1.3",
     "debug": "^4.4.3",
     "github-markdown-css": "^5.8.1",
@@ -32,7 +30,7 @@
     "shiki": "^3.13.0",
     "solid-js": "^1.8.0",
     "solid-toast": "^0.5.0",
-    "virtua": "^0.48.8",
+    "tauri-plugin-keepawake-api": "^0.1.0",
     "yaml": "^2.4.2"
   },
   "devDependencies": {

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,
@@ -181,6 +184,10 @@ const App: Component = () => {
     }
   })
 
+  createEffect(() => {
+    void initMarkdown(isDark()).catch((error) => log.error("Failed to initialize markdown", error))
+  })
+
   createEffect(() => {
     initReleaseNotifications()
   })

packages/ui/src/components/alert-dialog.tsx

@@ -108,15 +108,15 @@ const AlertDialog: Component = () => {
             open
             modal
             onOpenChange={(open) => {
-              // Only handle dismiss if dialog is dismissible (default: true)
-              if (!open && payload.dismissible !== false) {
+              if (!open) {
                 dismiss(false, payload)
               }
             }}
           >
             <Dialog.Portal>
-              <Dialog.Overlay class="modal-overlay z-[60]" />
-              <Dialog.Content class="modal-surface fixed left-1/2 top-1/2 z-[1310] w-full max-w-sm -translate-x-1/2 -translate-y-1/2 p-6 border border-base shadow-2xl" tabIndex={-1}>
+              <Dialog.Overlay class="modal-overlay" />
+               <div class="fixed inset-0 z-50 flex items-center justify-center p-4">
+                 <Dialog.Content class="modal-surface w-full max-w-sm p-6 border border-base shadow-2xl" tabIndex={-1}>
                    <div class="flex items-start gap-3">
                      <div
                        class="flex h-12 w-12 shrink-0 items-center justify-center rounded-xl border text-base font-semibold"
@@ -140,11 +140,10 @@ const AlertDialog: Component = () => {
 
                     <Show when={isPrompt}>
                       <div class="mt-4">
-                        <label for="prompt-input" class="text-sm font-medium text-secondary">
+                        <label class="text-sm font-medium text-secondary">
                           {payload.inputLabel || t("alertDialog.prompt.inputLabel")}
                         </label>
                         <input
-                          id="prompt-input"
                           ref={(el) => {
                             promptInputRef = el
                           }}
@@ -185,10 +184,11 @@ const AlertDialog: Component = () => {
                      >
                        {confirmLabel}
                      </button>
-                    </div>
-                  </Dialog.Content>
-                </Dialog.Portal>
-              </Dialog>
+                   </div>
+                 </Dialog.Content>
+               </div>
+             </Dialog.Portal>
+           </Dialog>
          )
        }}
      </Show>

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"
 

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>
   )
-}
+}

packages/ui/src/components/file-viewer/monaco-file-viewer.tsx

@@ -9,8 +9,6 @@ interface MonacoFileViewerProps {
   scopeKey: string
   path: string
   content: string
-  onSave?: (content: string) => void
-  onContentChange?: (content: string) => void
 }
 
 export function MonacoFileViewer(props: MonacoFileViewerProps) {
@@ -35,11 +33,6 @@ export function MonacoFileViewer(props: MonacoFileViewerProps) {
     editor = null
   }
 
-  const saveContent = () => {
-    if (!editor || !props.onSave) return
-    props.onSave(editor.getValue())
-  }
-
   onMount(() => {
     let cancelled = false
     void (async () => {
@@ -51,7 +44,7 @@ export function MonacoFileViewer(props: MonacoFileViewerProps) {
       editor = monaco.editor.create(host, {
         value: "",
         language: "plaintext",
-        readOnly: false,
+        readOnly: true,
         automaticLayout: true,
         lineNumbers: "on",
         minimap: { enabled: false },
@@ -61,14 +54,6 @@ export function MonacoFileViewer(props: MonacoFileViewerProps) {
         fontSize: 13,
       })
 
-      editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, saveContent)
-
-      editor.onDidChangeModelContent(() => {
-        if (props.onContentChange) {
-          props.onContentChange(editor.getValue())
-        }
-      })
-
       setReady(true)
     })()
 

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,21 +433,21 @@ 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"
                 aria-label={t("folderSelection.links.githubStars")}
-                title={githubStars() !== null ? `${t("folderSelection.links.githubStars")}: ${githubStars()!.toLocaleString()}` : t("folderSelection.links.githubStars")}
+                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" />

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

@@ -44,7 +44,6 @@ const InstanceInfo: Component<InstanceInfoProps> = (props) => {
       variant: "warning",
       confirmLabel: t("infoView.dispose.confirm.confirmLabel"),
       cancelLabel: t("infoView.dispose.confirm.cancelLabel"),
-      dismissible: false,
     })
 
     if (!confirmed) return
@@ -83,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>
@@ -95,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>
@@ -138,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>
@@ -152,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>

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(),
                                     }}

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

@@ -36,12 +36,12 @@ import { serverApi } from "../../lib/api-client"
 import { loadBackgroundProcesses } from "../../stores/background-processes"
 import { BackgroundProcessOutputDialog } from "../background-process-output-dialog"
 import { useI18n } from "../../lib/i18n"
-import { getPermissionQueue, getPermissionQueueLength, getQuestionQueueLength, sendPermissionResponse } from "../../stores/instances"
+import { getPermissionQueueLength, getQuestionQueueLength } from "../../stores/instances"
 import SessionSidebar from "./shell/SessionSidebar"
 import { useSessionSidebarRequests } from "./shell/useSessionSidebarRequests"
 import RightPanel from "./shell/right-panel/RightPanel"
 import { useDrawerChrome } from "./shell/useDrawerChrome"
-import { getRetrySeconds, getSessionRetry, getSessionStatus } from "../../stores/session-status"
+import { getSessionStatus } from "../../stores/session-status"
 import { Maximize2, ShieldAlert } from "lucide-solid"
 
 import type { LayoutMode } from "./shell/types"
@@ -57,13 +57,6 @@ import { useDrawerHostMeasure } from "./shell/useDrawerHostMeasure"
 import { useDrawerResize } from "./shell/useDrawerResize"
 import { useSessionCache } from "./shell/useSessionCache"
 import { useInstanceSessionContext } from "./shell/useInstanceSessionContext"
-import { getPermissionSessionId } from "../../types/permission"
-import {
-  canAutoRespondPermission,
-  finishAutoRespondPermission,
-  getPermissionAutoAcceptInFlightVersion,
-  isPermissionAutoAcceptEnabled,
-} from "../../stores/permission-auto-accept"
 
 const log = getLogger("session")
 
@@ -88,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(
@@ -104,7 +96,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
   const [selectedBackgroundProcess, setSelectedBackgroundProcess] = createSignal<BackgroundProcess | null>(null)
   const [showBackgroundOutput, setShowBackgroundOutput] = createSignal(false)
   const [permissionModalOpen, setPermissionModalOpen] = createSignal(false)
-  const [now, setNow] = createSignal(Date.now())
 
   // Worktree selector manages its own dialogs.
   const [showSessionSearch, setShowSessionSearch] = createSignal(false)
@@ -238,12 +229,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     window.localStorage.setItem(RIGHT_DRAWER_STORAGE_KEY, rightDrawerWidth().toString())
   })
 
-  createEffect(() => {
-    if (typeof window === "undefined") return
-    const timer = window.setInterval(() => setNow(Date.now()), 1000)
-    onCleanup(() => window.clearInterval(timer))
-  })
-
   const connectionStatus = () => sseManager.getStatus(props.instance.id)
   const connectionStatusClass = () => {
     const status = connectionStatus()
@@ -266,33 +251,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     return permissions + questions > 0
   })
 
-  const permissionQueue = createMemo(() => getPermissionQueue(props.instance.id))
-
-  createEffect(() => {
-    getPermissionAutoAcceptInFlightVersion()
-
-    for (const permission of permissionQueue()) {
-      const sessionId = getPermissionSessionId(permission)
-      if (!sessionId) continue
-      if (!permission?.id) continue
-      if (!canAutoRespondPermission(props.instance.id, sessionId, permission.id)) continue
-
-      void sendPermissionResponse(props.instance.id, sessionId, permission.id, "once")
-        .catch((error) => {
-          log.error("Failed to auto-accept permission", error)
-        })
-        .finally(() => {
-          finishAutoRespondPermission(props.instance.id, sessionId, permission.id)
-        })
-    }
-  })
-
-  const yoloModeEnabled = createMemo(() => {
-    const session = activeSessionForInstance()
-    if (!session) return false
-    return isPermissionAutoAcceptEnabled(props.instance.id, session.id)
-  })
-
   const activeSessionStatusPill = createMemo(() => {
     const activeSessionId = activeSessionIdForInstance()
     if (!activeSessionId || activeSessionId === "info") return null
@@ -313,28 +271,17 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     }
 
     const status = getSessionStatus(props.instance.id, activeSessionId)
-    const retry = getSessionRetry(props.instance.id, activeSessionId)
-    const text = retry
-      ? (() => {
-          const seconds = getRetrySeconds(retry.next, now())
-          return seconds > 0 ? t("sessionList.status.retryingIn", { seconds: String(seconds) }) : t("sessionList.status.retrying")
-        })()
-      : status === "working"
+    const text =
+      status === "working"
         ? t("sessionList.status.working")
         : status === "compacting"
           ? t("sessionList.status.compacting")
           : t("sessionList.status.idle")
 
     return {
-      className: `session-${retry ? "retrying" : status}`,
+      className: `session-${status}`,
       text,
       showAlertIcon: false,
-      title: retry
-        ? t("sessionList.status.retryTooltip", {
-            message: retry.message,
-            attempt: String(retry.attempt),
-          })
-        : undefined,
     }
   })
 
@@ -342,39 +289,13 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     const pill = activeSessionStatusPill()
     if (!pill) return null
     return (
-      <span class={`status-indicator session-status session-status-list ${pill.className}`} title={pill.title}>
+      <span class={`status-indicator session-status session-status-list ${pill.className}`}>
         {pill.showAlertIcon ? <ShieldAlert class="w-3.5 h-3.5" aria-hidden="true" /> : <span class="status-dot" />}
         {pill.text}
       </span>
     )
   }
 
-  const renderYoloModePill = () => {
-    if (!yoloModeEnabled()) return null
-    return (
-      <span
-        class="status-indicator session-status session-status-list session-yolo-mode"
-        aria-label={t("instanceShell.yoloMode.badgeAriaLabel")}
-        title={t("instanceShell.yoloMode.badgeAriaLabel")}
-      >
-        <span class="status-dot" />
-        {t("instanceShell.yoloMode.badge")}
-      </span>
-    )
-  }
-
-  const renderSessionHeaderIndicators = () => (
-    <div class="flex items-center flex-wrap justify-center gap-2">
-      {renderYoloModePill()}
-      <Show when={hasPendingRequests()} fallback={renderActiveSessionStatusPill()}>
-        <PermissionNotificationBanner
-          instanceId={props.instance.id}
-          onClick={() => setPermissionModalOpen(true)}
-        />
-      </Show>
-    </div>
-  )
-
   const handleCommandPaletteClick = () => {
     showCommandPalette(props.instance.id)
   }
@@ -450,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,
@@ -492,17 +413,16 @@ 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}
         ModalProps={modalProps}
         sx={{
-          zIndex: 60,
           "& .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)",
@@ -560,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,
@@ -603,17 +523,16 @@ 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}
         ModalProps={modalProps}
         sx={{
-          zIndex: 60,
           "& .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)",
@@ -700,7 +619,12 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                     </Show>
 
                     <div class="flex-1 flex items-center justify-center min-w-0">
-                      {renderSessionHeaderIndicators()}
+                      <Show when={hasPendingRequests()} fallback={renderActiveSessionStatusPill()}>
+                        <PermissionNotificationBanner
+                          instanceId={props.instance.id}
+                          onClick={() => setPermissionModalOpen(true)}
+                        />
+                      </Show>
                     </div>
 
                     <div class="flex flex-wrap items-center justify-center gap-1">
@@ -792,7 +716,12 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                 </Show>
 
                 <div class="ml-auto flex items-center session-header-hints">
-                  {renderSessionHeaderIndicators()}
+                  <Show when={hasPendingRequests()} fallback={renderActiveSessionStatusPill()}>
+                    <PermissionNotificationBanner
+                      instanceId={props.instance.id}
+                      onClick={() => setPermissionModalOpen(true)}
+                    />
+                  </Show>
                 </div>
               </div>
 
@@ -813,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">

packages/ui/src/components/instance/shell/SessionSidebar.tsx

@@ -48,103 +48,104 @@ interface SessionSidebarProps {
 }
 
 const SessionSidebar: Component<SessionSidebarProps> = (props) => (
-    <div class="flex flex-col h-full min-h-0" ref={props.setContentEl}>
-      <div class="flex flex-col gap-2 px-4 py-3 border-b border-base">
-        <div class="flex items-center justify-between gap-2">
-          <span class="session-sidebar-title text-sm font-semibold uppercase text-primary">
-            {props.t("instanceShell.leftPanel.sessionsTitle")}
-          </span>
-          <div class="flex items-center gap-2 text-primary">
+  <div class="flex flex-col h-full min-h-0" ref={props.setContentEl}>
+    <div class="flex flex-col gap-2 px-4 py-3 border-b border-base">
+      <div class="flex items-center justify-between gap-2">
+        <span class="session-sidebar-title text-sm font-semibold uppercase text-primary">
+          {props.t("instanceShell.leftPanel.sessionsTitle")}
+        </span>
+        <div class="flex items-center gap-2 text-primary">
+          <IconButton
+            size="small"
+            color="inherit"
+            aria-label={props.t("sessionList.actions.newSession.ariaLabel")}
+            title={props.t("sessionList.actions.newSession.title")}
+            onClick={() => {
+              const result = props.onNewSession()
+              if (result instanceof Promise) {
+                void result.catch((error) => log.error("Failed to create session:", error))
+              }
+            }}
+          >
+            <PlusSquare class="w-5 h-5" />
+          </IconButton>
+          <IconButton
+            size="small"
+            color="inherit"
+            aria-label={props.t("sessionList.filter.ariaLabel")}
+            title={props.t("sessionList.filter.ariaLabel")}
+            aria-pressed={props.showSearch()}
+            onClick={props.onToggleSearch}
+            sx={{
+              color: props.showSearch() ? "var(--text-primary)" : "inherit",
+              backgroundColor: props.showSearch() ? "var(--surface-hover)" : "transparent",
+              "&:hover": {
+                backgroundColor: "var(--surface-hover)",
+              },
+            }}
+          >
+            <Search class="w-5 h-5" />
+          </IconButton>
+          <IconButton
+            size="small"
+            color="inherit"
+            aria-label={props.t("instanceShell.leftPanel.instanceInfo")}
+            title={props.t("instanceShell.leftPanel.instanceInfo")}
+            onClick={() => props.onSelectSession("info")}
+          >
+            <InfoOutlinedIcon fontSize="small" />
+          </IconButton>
+          <Show when={!props.isPhoneLayout()}>
             <IconButton
               size="small"
               color="inherit"
-              aria-label={props.t("sessionList.actions.newSession.ariaLabel")}
-              title={props.t("sessionList.actions.newSession.title")}
-              onClick={() => {
-                const result = props.onNewSession()
-                if (result instanceof Promise) {
-                  void result.catch((error) => log.error("Failed to create session:", error))
-                }
-              }}
+              aria-label={props.leftPinned() ? props.t("instanceShell.leftDrawer.unpin") : props.t("instanceShell.leftDrawer.pin")}
+              onClick={() => (props.leftPinned() ? props.onUnpinLeftDrawer() : props.onPinLeftDrawer())}
             >
-              <PlusSquare class="w-5 h-5" />
+              {props.leftPinned() ? <PushPinIcon fontSize="small" /> : <PushPinOutlinedIcon fontSize="small" />}
             </IconButton>
+          </Show>
+          <Show when={props.drawerState() === "floating-open"}>
             <IconButton
               size="small"
               color="inherit"
-              aria-label={props.t("sessionList.filter.ariaLabel")}
-              title={props.t("sessionList.filter.ariaLabel")}
-              aria-pressed={props.showSearch()}
-              onClick={props.onToggleSearch}
-              sx={{
-                color: props.showSearch() ? "var(--text-primary)" : "inherit",
-                backgroundColor: props.showSearch() ? "var(--surface-hover)" : "transparent",
-                "&:hover": {
-                  backgroundColor: "var(--surface-hover)",
-                },
-              }}
+              aria-label={props.t("instanceShell.leftDrawer.toggle.close")}
+              title={props.t("instanceShell.leftDrawer.toggle.close")}
+              onClick={props.onCloseLeftDrawer}
             >
-              <Search class="w-5 h-5" />
+              <MenuOpenIcon fontSize="small" />
             </IconButton>
-            <IconButton
-              size="small"
-              color="inherit"
-              aria-label={props.t("instanceShell.leftPanel.instanceInfo")}
-              title={props.t("instanceShell.leftPanel.instanceInfo")}
-              onClick={() => props.onSelectSession("info")}
-            >
-              <InfoOutlinedIcon fontSize="small" />
-            </IconButton>
-            <Show when={!props.isPhoneLayout()}>
-              <IconButton
-                size="small"
-                color="inherit"
-                aria-label={props.leftPinned() ? props.t("instanceShell.leftDrawer.unpin") : props.t("instanceShell.leftDrawer.pin")}
-                onClick={() => (props.leftPinned() ? props.onUnpinLeftDrawer() : props.onPinLeftDrawer())}
-              >
-                {props.leftPinned() ? <PushPinIcon fontSize="small" /> : <PushPinOutlinedIcon fontSize="small" />}
-              </IconButton>
-            </Show>
-            <Show when={props.drawerState() === "floating-open"}>
-              <IconButton
-                size="small"
-                color="inherit"
-                aria-label={props.t("instanceShell.leftDrawer.toggle.close")}
-                title={props.t("instanceShell.leftDrawer.toggle.close")}
-                onClick={props.onCloseLeftDrawer}
-              >
-                <MenuOpenIcon fontSize="small" />
-              </IconButton>
-            </Show>
-          </div>
-        </div>
-        <div class="session-sidebar-shortcuts">
-          <Show when={props.keyboardShortcuts().length}>
-            <KeyboardHint shortcuts={props.keyboardShortcuts()} separator=" " showDescription={false} />
           </Show>
         </div>
       </div>
+      <div class="session-sidebar-shortcuts">
+        <Show when={props.keyboardShortcuts().length}>
+          <KeyboardHint shortcuts={props.keyboardShortcuts()} separator=" " showDescription={false} />
+        </Show>
+      </div>
+    </div>
 
-      <div class="session-sidebar flex flex-col flex-1 min-h-0">
-        <SessionList
-          instanceId={props.instanceId}
-          threads={props.threads()}
-          activeSessionId={props.activeSessionId()}
-          onSelect={props.onSelectSession}
-          onNew={() => {
-            const result = props.onNewSession()
-            if (result instanceof Promise) {
-              void result.catch((error) => log.error("Failed to create session:", error))
-            }
-          }}
-          enableFilterBar={props.showSearch()}
-          showHeader={false}
-          showFooter={false}
-        />
+    <div class="session-sidebar flex flex-col flex-1 min-h-0">
+      <SessionList
+        instanceId={props.instanceId}
+        threads={props.threads()}
+        activeSessionId={props.activeSessionId()}
+        onSelect={props.onSelectSession}
+        onNew={() => {
+          const result = props.onNewSession()
+          if (result instanceof Promise) {
+            void result.catch((error) => log.error("Failed to create session:", error))
+          }
+        }}
+        enableFilterBar={props.showSearch()}
+        showHeader={false}
+        showFooter={false}
+      />
 
-        <div class="session-sidebar-separator" />
-        <Show when={props.activeSession()}>
-          {(activeSession) => (
+      <div class="session-sidebar-separator" />
+      <Show when={props.activeSession()}>
+        {(activeSession) => (
+          <>
             <div class="session-sidebar-controls px-4 py-4 border-t border-base flex flex-col gap-3">
               <WorktreeSelector instanceId={props.instanceId} sessionId={activeSession().id} />
 
@@ -176,10 +177,11 @@ const SessionSidebar: Component<SessionSidebarProps> = (props) => (
                 showDescription={false}
               />
             </div>
-          )}
-        </Show>
-      </div>
+          </>
+        )}
+      </Show>
     </div>
-  )
+  </div>
+)
 
 export default SessionSidebar

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,11 +20,13 @@ 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 { serverApi } from "../../../../lib/api-client"
-import { showConfirmDialog } from "../../../../stores/alerts"
-import { showToastNotification } from "../../../../lib/notifications"
 import { buildUnifiedDiffFromSdkPatch, tryReverseApplyUnifiedDiff } from "../../../../lib/unified-diff-reverse"
 import { useGlobalPointerDrag } from "../useGlobalPointerDrag"
 import {
@@ -49,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
 
@@ -89,7 +80,6 @@ interface RightPanelProps {
 const RightPanel: Component<RightPanelProps> = (props) => {
   const [rightPanelTab, setRightPanelTab] = createSignal<RightPanelTab>(readStoredRightPanelTab("changes"))
   const [rightPanelExpandedItems, setRightPanelExpandedItems] = createSignal<string[]>([
-    "yolo-mode",
     "plan",
     "background-processes",
     "mcp",
@@ -106,9 +96,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
   const [browserSelectedContent, setBrowserSelectedContent] = createSignal<string | null>(null)
   const [browserSelectedLoading, setBrowserSelectedLoading] = createSignal(false)
   const [browserSelectedError, setBrowserSelectedError] = createSignal<string | null>(null)
-  const [browserSelectedDirty, setBrowserSelectedDirty] = createSignal(false)
-  const [browserSelectedSaving, setBrowserSelectedSaving] = createSignal(false)
-  const [browserSelectedOriginalContent, setBrowserSelectedOriginalContent] = createSignal<string | null>(null)
 
   const [diffViewMode, setDiffViewMode] = createSignal<DiffViewMode>(
     readStoredEnum(RIGHT_PANEL_CHANGES_DIFF_VIEW_MODE_KEY, ["split", "unified"] as const) ?? "unified",
@@ -256,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)
@@ -280,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)
@@ -546,8 +531,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
     setBrowserSelectedLoading(true)
     setBrowserSelectedError(null)
     setBrowserSelectedContent(null)
-    setBrowserSelectedDirty(false)
-    setBrowserSelectedOriginalContent(null)
 
     // Phone: treat file selection as a commit action and close the overlay.
     if (props.isPhoneLayout()) {
@@ -568,7 +551,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
         throw new Error("Unsupported file type")
       }
       setBrowserSelectedContent(text)
-      setBrowserSelectedOriginalContent(text) // Track original content for conflict detection
     } catch (error) {
       setBrowserSelectedError(error instanceof Error ? error.message : "Failed to read file")
     } finally {
@@ -576,95 +558,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
     }
   }
 
-  const saveBrowserFile = async (content: string): Promise<boolean> => {
-    const path = browserSelectedPath()
-    if (!path) return false
-
-    // Check for conflict: agent edited file while user was editing
-    const originalContent = browserSelectedOriginalContent()
-    if (originalContent !== null) {
-      try {
-        const currentDiskContent = await requestData<FileContent>(
-          browserClient().file.read({ path }),
-          "file.read",
-        )
-        const diskContent = (currentDiskContent as any)?.content
-
-        // If disk content differs from what we originally loaded (agent edit)
-        // AND differs from user's current edits, we have a conflict
-        if (diskContent !== originalContent && diskContent !== content) {
-          const confirmed = await showConfirmDialog(
-            props.t("instanceShell.rightPanel.actions.conflict.message", { path }),
-            {
-              variant: "warning",
-              confirmLabel: props.t("instanceShell.rightPanel.actions.conflict.confirmLabel"),
-              cancelLabel: props.t("instanceShell.rightPanel.actions.conflict.cancelLabel"),
-              dismissible: false,
-            },
-          )
-          if (!confirmed) {
-            return false
-          }
-          // User chose to overwrite, proceed with save
-        }
-      } catch {
-        // If we can't check for conflict, proceed with save
-      }
-    }
-
-    setBrowserSelectedSaving(true)
-    try {
-      await serverApi.writeWorkspaceFile(props.instanceId, path, content)
-      setBrowserSelectedContent(content)
-      setBrowserSelectedOriginalContent(content) // Update original to match saved
-      setBrowserSelectedDirty(false)
-      showToastNotification({
-        message: props.t("instanceShell.rightPanel.toast.saveSuccess"),
-        variant: "success",
-      })
-      return true
-    } catch (error) {
-      setBrowserSelectedError(error instanceof Error ? error.message : "Failed to save file")
-      showToastNotification({
-        message: props.t("instanceShell.rightPanel.toast.saveError"),
-        variant: "error",
-      })
-      return false
-    } finally {
-      setBrowserSelectedSaving(false)
-    }
-  }
-
-  const handleBrowserFileChange = (content: string) => {
-    setBrowserSelectedContent(content)
-    setBrowserSelectedDirty(true)
-  }
-
-  const handleOpenBrowserFileRequest = async (path: string) => {
-    if (browserSelectedDirty()) {
-      const confirmed = await showConfirmDialog(
-        props.t("instanceShell.rightPanel.actions.saveConfirm.message", { path: browserSelectedPath() || "" }),
-        {
-          variant: "warning",
-          confirmLabel: props.t("instanceShell.rightPanel.actions.saveConfirm.confirmLabel"),
-          cancelLabel: props.t("instanceShell.rightPanel.actions.saveConfirm.cancelLabel"),
-          dismissible: false,
-        },
-      )
-      if (confirmed) {
-        const saveSuccess = await saveBrowserFile(browserSelectedContent() || "")
-        if (!saveSuccess) {
-          // Save failed - stay on current file, error toast already shown
-          return
-        }
-      } else {
-        // User chose not to save - clear dirty state and discard edits
-        setBrowserSelectedDirty(false)
-      }
-    }
-    await openBrowserFile(path)
-  }
-
   createEffect(() => {
     if (rightPanelTab() !== "files") return
     if (browserLoading()) return
@@ -672,14 +565,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
     void loadBrowserEntries(browserPath())
   })
 
-  createEffect(() => {
-    if (rightPanelTab() === "files") return
-    setBrowserSelectedContent(null)
-    setBrowserSelectedLoading(false)
-    setBrowserSelectedError(null)
-    setBrowserSelectedDirty(false)
-  })
-
   createEffect(() => {
     if (rightPanelTab() !== "git-changes") return
     if (gitStatusLoading()) return
@@ -687,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) {
@@ -730,22 +607,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
   }
 
   const refreshFilesTab = async () => {
-    // Prompt for confirmation if file has unsaved changes
-    if (browserSelectedDirty()) {
-      const confirmed = await showConfirmDialog(
-        props.t("instanceShell.rightPanel.actions.refreshDirty.message"),
-        {
-          variant: "warning",
-          confirmLabel: props.t("instanceShell.rightPanel.actions.refreshDirty.confirmLabel"),
-          cancelLabel: props.t("instanceShell.rightPanel.actions.refreshDirty.cancelLabel"),
-          dismissible: false,
-        },
-      )
-      if (!confirmed) {
-        return
-      }
-    }
-
     void loadBrowserEntries(browserPath())
     const selected = browserSelectedPath()
     if (selected) {
@@ -767,8 +628,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
           throw new Error("Unsupported file type")
         }
         setBrowserSelectedContent(text)
-        setBrowserSelectedOriginalContent(text) // Update original content after refresh
-        setBrowserSelectedDirty(false) // Clear dirty after refresh
       } catch (error) {
         setBrowserSelectedError(error instanceof Error ? error.message : "Failed to read file")
       } finally {
@@ -788,7 +647,7 @@ const RightPanel: Component<RightPanelProps> = (props) => {
     setRightPanelTab("changes")
   }
 
-  const statusSectionIds = ["yolo-mode", "session-changes", "plan", "background-processes", "mcp", "lsp", "plugins"]
+  const statusSectionIds = ["session-changes", "plan", "background-processes", "mcp", "lsp", "plugins"]
 
   createEffect(() => {
     const currentExpanded = new Set(rightPanelExpandedItems())
@@ -879,113 +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}
-              browserSelectedDirty={browserSelectedDirty}
-              browserSelectedSaving={browserSelectedSaving}
-              parentPath={browserParentPath}
-              scopeKey={browserScopeKey}
-              onLoadEntries={(path: string) => void loadBrowserEntries(path)}
-              onRequestOpenFile={(path: string) => void handleOpenBrowserFileRequest(path)}
-              onRefresh={() => void refreshFilesTab()}
-              onSave={(content: string) => void saveBrowserFile(content)}
-              onContentChange={(content: string) => handleBrowserFileChange(content)}
-              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>

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">

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}

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"
       />
     )
   }

packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx

@@ -1,14 +1,12 @@
-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, Save } from "lucide-solid"
+import { RefreshCw } from "lucide-solid"
+
+import { MonacoFileViewer } from "../../../../file-viewer/monaco-file-viewer"
 
 import SplitFilePanel from "../components/SplitFilePanel"
 
-const LazyMonacoFileViewer = lazy(() =>
-  import("../../../../file-viewer/monaco-file-viewer").then((module) => ({ default: module.MonacoFileViewer })),
-)
-
 interface FilesTabProps {
   t: (key: string, vars?: Record<string, any>) => string
 
@@ -21,17 +19,13 @@ interface FilesTabProps {
   browserSelectedContent: Accessor<string | null>
   browserSelectedLoading: Accessor<boolean>
   browserSelectedError: Accessor<string | null>
-  browserSelectedDirty: Accessor<boolean>
-  browserSelectedSaving: Accessor<boolean>
 
   parentPath: Accessor<string | null>
   scopeKey: Accessor<string>
 
   onLoadEntries: (path: string) => void
-  onRequestOpenFile: (path: string) => void
+  onOpenFile: (path: string) => void
   onRefresh: () => void
-  onSave: (content: string) => void
-  onContentChange: (content: string) => void
 
   listOpen: Accessor<boolean>
   onToggleList: () => void
@@ -42,13 +36,6 @@ interface FilesTabProps {
 }
 
 const FilesTab: Component<FilesTabProps> = (props) => {
-  const handleSave = () => {
-    const content = props.browserSelectedContent()
-    if (content !== undefined && content !== null) {
-      props.onSave(content)
-    }
-  }
-
   const renderContent = (): JSX.Element => {
     const entriesValue = props.browserEntries()
     const entries = entriesValue || []
@@ -64,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 = () => (
@@ -90,21 +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}
-                          onSave={props.onSave}
-                          onContentChange={props.onContentChange}
-                        />
-                      </Suspense>
+                      <MonacoFileViewer scopeKey={props.scopeKey()} path={payload().path} content={payload().content} />
                     )}
                   </Show>
                 }
@@ -118,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>
@@ -140,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}>
@@ -152,7 +125,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
                   props.onLoadEntries(item.path)
                   return
                 }
-                props.onRequestOpenFile(item.path)
+                props.onOpenFile(item.path)
               }}
               title={item.path}
             >
@@ -181,29 +154,18 @@ 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>
-            <button
-              type="button"
-              class="files-header-icon-button"
-              title={props.t("instanceShell.rightPanel.actions.save") || "Save (Ctrl+S)"}
-              aria-label={props.t("instanceShell.rightPanel.actions.save") || "Save"}
-              disabled={props.browserSelectedSaving() || !props.browserSelectedDirty()}
-              style={{ "margin-inline-start": "auto" }}
-              onClick={handleSave}
-            >
-              <Show when={props.browserSelectedSaving()} fallback={<Save class="h-4 w-4" />}>
-                <RefreshCw class="h-4 w-4 animate-spin" />
-              </Show>
-            </button>
+
             <button
               type="button"
               class="files-header-icon-button"
               title={props.t("instanceShell.rightPanel.actions.refresh")}
               aria-label={props.t("instanceShell.rightPanel.actions.refresh")}
               disabled={props.browserLoading()}
+              style={{ "margin-left": "auto" }}
               onClick={() => props.onRefresh()}
             >
               <RefreshCw class={`h-4 w-4${props.browserLoading() ? " animate-spin" : ""}`} />
@@ -218,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"
       />
     )
   }
@@ -226,4 +188,4 @@ const FilesTab: Component<FilesTabProps> = (props) => {
   return <>{renderContent()}</>
 }
 
-export default FilesTab
+export default FilesTab

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"
       />
     )
   }

packages/ui/src/components/instance/shell/right-panel/tabs/StatusTab.tsx

@@ -2,7 +2,6 @@ import { For, Show, type Accessor, type Component } from "solid-js"
 import type { ToolState } from "@opencode-ai/sdk/v2"
 import { Accordion } from "@kobalte/core"
 import { Tooltip } from "@kobalte/core/tooltip"
-import Switch from "@suid/material/Switch"
 
 import { ChevronDown, Info, TerminalSquare, Trash2, XOctagon } from "lucide-solid"
 
@@ -13,7 +12,6 @@ import type { Session } from "../../../../../types/session"
 import ContextUsagePanel from "../../../../session/context-usage-panel"
 import { TodoListView } from "../../../../tool-call/renderers/todo"
 import InstanceServiceStatus from "../../../../instance-service-status"
-import { isPermissionAutoAcceptEnabled, togglePermissionAutoAccept } from "../../../../../stores/permission-auto-accept"
 
 interface StatusTabProps {
   t: (key: string, vars?: Record<string, any>) => string
@@ -41,35 +39,6 @@ interface StatusTabProps {
 const StatusTab: Component<StatusTabProps> = (props) => {
   const isSectionExpanded = (id: string) => props.expandedItems().includes(id)
 
-  const renderYoloModeSection = () => {
-    const session = props.activeSession()
-    if (!session) {
-      return (
-        <div class="right-panel-empty right-panel-empty--left">
-          <span class="text-xs">{props.t("instanceShell.yoloMode.noSessionSelected")}</span>
-        </div>
-      )
-    }
-
-    return (
-      <div class="rounded-md border border-base bg-surface-secondary px-3 py-2">
-        <div class="flex items-start justify-between gap-3">
-          <div class="min-w-0">
-            <div class="text-sm font-medium text-primary">{props.t("instanceShell.yoloMode.title")}</div>
-            <p class="mt-1 text-xs text-secondary">{props.t("instanceShell.yoloMode.description")}</p>
-          </div>
-          <Switch
-            checked={isPermissionAutoAcceptEnabled(props.instanceId, session.id)}
-            color="warning"
-            size="small"
-            inputProps={{ "aria-label": props.t("instanceShell.yoloMode.title") }}
-            onChange={() => togglePermissionAutoAccept(props.instanceId, session.id)}
-          />
-        </div>
-      </div>
-    )
-  }
-
   const renderStatusSessionChanges = () => {
     const sessionId = props.activeSessionId()
     if (!sessionId || sessionId === "info") {
@@ -235,12 +204,6 @@ const StatusTab: Component<StatusTabProps> = (props) => {
   }
 
   const statusSections = [
-    {
-      id: "yolo-mode",
-      labelKey: "instanceShell.rightPanel.sections.yoloMode",
-      tooltipKey: "instanceShell.rightPanel.sections.yoloMode.tooltip",
-      render: renderYoloModeSection,
-    },
     {
       id: "session-changes",
       labelKey: "instanceShell.rightPanel.sections.sessionChanges",
@@ -318,23 +281,29 @@ const StatusTab: Component<StatusTabProps> = (props) => {
         <For each={statusSections}>
           {(section) => (
             <Accordion.Item value={section.id} class="right-panel-accordion-item">
-              <Accordion.Header class="right-panel-accordion-header-row">
+              <Accordion.Header>
                 <Accordion.Trigger class="right-panel-accordion-trigger">
                   <span class="section-left">
+                    <Tooltip openDelay={200} gutter={4} placement="top">
+                      <Tooltip.Trigger
+                        class="section-info-trigger"
+                        aria-label={props.t(section.tooltipKey)}
+                        onClick={(e) => e.stopPropagation()}
+                      >
+                        <Info class="section-info-icon" />
+                      </Tooltip.Trigger>
+                      <Tooltip.Portal>
+                        <Tooltip.Content class="section-info-tooltip">
+                          {props.t(section.tooltipKey)}
+                        </Tooltip.Content>
+                      </Tooltip.Portal>
+                    </Tooltip>
                     <span class="section-label">{props.t(section.labelKey)}</span>
                   </span>
                   <ChevronDown
                     class={`right-panel-accordion-chevron ${isSectionExpanded(section.id) ? "right-panel-accordion-chevron-expanded" : ""}`}
                   />
                 </Accordion.Trigger>
-                <Tooltip openDelay={200} gutter={4} placement="top">
-                  <Tooltip.Trigger as="button" type="button" class="section-info-trigger" aria-label={props.t(section.tooltipKey)}>
-                    <Info class="section-info-icon" />
-                  </Tooltip.Trigger>
-                  <Tooltip.Portal>
-                    <Tooltip.Content class="section-info-tooltip">{props.t(section.tooltipKey)}</Tooltip.Content>
-                  </Tooltip.Portal>
-                </Tooltip>
               </Accordion.Header>
               <Accordion.Content class="right-panel-accordion-content">{section.render()}</Accordion.Content>
             </Accordion.Item>

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)
   }

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
@@ -83,7 +31,6 @@ interface MarkdownProps {
   isDark?: boolean
   size?: "base" | "sm" | "tight"
   disableHighlight?: boolean
-  escapeRawHtml?: boolean
   onRendered?: () => void
 }
 
@@ -91,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?.())
@@ -101,15 +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 escapeRawHtml = Boolean(props.escapeRawHtml)
-    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}:${escapeRawHtml ? 1 : 0}:${version}`
-    return { part, text, themeKey, highlightEnabled, escapeRawHtml, partId, cacheId, version, requestKey }
+    return { part, text, themeKey, highlightEnabled, partId, version }
   })
 
   const cacheHandle = useGlobalCache({
@@ -117,55 +63,26 @@ export function Markdown(props: MarkdownProps) {
     sessionId: () => props.sessionId,
     scope: "markdown",
     cacheId: () => {
-      const { cacheId, themeKey, highlightEnabled } = resolved()
-      return `${cacheId}:${themeKey}:${highlightEnabled ? 1 : 0}:${resolved().escapeRawHtml ? 1 : 0}`
+      const { partId, themeKey, highlightEnabled } = resolved()
+      return `${partId}:${themeKey}:${highlightEnabled ? 1 : 0}`
     },
     version: () => resolved().version,
   })
 
-  const commitCacheEntry = (
-    snapshot: ReturnType<typeof resolved>,
-    renderedHtml: string,
-    options?: { cache?: boolean },
-  ) => {
-    const cacheEntry: RenderCache = {
-      text: snapshot.text,
-      html: renderedHtml,
-      theme: snapshot.themeKey,
-      mode: `${snapshot.version}:${snapshot.escapeRawHtml ? "escaped" : "raw"}`,
-    }
-    setHtml(renderedHtml)
-    if (options?.cache ?? true) {
-      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,
-      escapeRawHtml: snapshot.escapeRawHtml,
-    })
-    const shouldCache = !snapshot.highlightEnabled || !markdown.hasPendingCodeHighlight(snapshot.text)
+    // Ensure the markdown highlighter theme matches the active UI theme.
+    setMarkdownTheme(themeKey === "dark")
 
-    if (latestRequestKey === snapshot.requestKey) {
-      commitCacheEntry(snapshot, rendered, { cache: shouldCache })
-    }
-  }
-
-  createEffect(() => {
-    const snapshot = resolved()
-    latestRequestKey = snapshot.requestKey
-    const cacheMode = `${snapshot.version}:${snapshot.escapeRawHtml ? "escaped" : "raw"}`
+    latestRequestedText = text
 
     const cacheMatches = (cache: RenderCache | undefined) => {
       if (!cache) return false
-      return cache.theme === snapshot.themeKey && cache.mode === cacheMode
+      return cache.theme === themeKey && cache.mode === version
     }
 
-    const localCache = snapshot.part.renderCache
+    const localCache = part.renderCache
     if (localCache && cacheMatches(localCache)) {
       setHtml(localCache.html)
       notifyRendered()
@@ -179,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}

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>

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()}>

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,19 +133,17 @@ 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}
                 sessionId={props.sessionId}
                 isDark={isDark()}
                 size={isAssistantMessage() ? "tight" : "base"}
-                escapeRawHtml={props.messageType === "user"}
                 onRendered={props.onRendered}
               />
             </Show>
@@ -155,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>
 
 

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

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>
               )}

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>

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, Loader2, Mic } 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,48 +13,12 @@ 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,
-  clearConversationPlaybackForInstance,
-  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()
@@ -283,12 +247,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)
@@ -304,10 +263,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>())
     }
@@ -327,7 +282,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)
       }
@@ -357,19 +312,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()
@@ -441,8 +383,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") }
@@ -482,13 +422,6 @@ export default function PromptInput(props: PromptInputProps) {
   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()
 
@@ -497,8 +430,6 @@ export default function PromptInput(props: PromptInputProps) {
   const beginVoicePress = (event?: PointerEvent | KeyboardEvent) => {
     if (voiceButtonPressed || props.disabled || voiceInput.isTranscribing() || !voiceInput.canUseVoiceInput()) return
     voiceButtonPressed = true
-    // Treat a mic press as barge-in: stop any active assistant speech before listening.
-    clearConversationPlaybackForInstance(props.instanceId)
 
     if (event instanceof PointerEvent) {
       const target = event.currentTarget
@@ -534,20 +465,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">
@@ -557,7 +486,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}
@@ -573,111 +501,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" : ""}`}>
@@ -733,6 +592,48 @@ export default function PromptInput(props: PromptInputProps) {
         </div>
 
         <div class="prompt-input-actions">
+          <Show when={showVoiceInput()}>
+            <button
+              type="button"
+              class={`prompt-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>
+                }
+              >
+                <span class="prompt-voice-timer">{formatVoiceTimer(voiceInput.elapsedMs())}</span>
+              </Show>
+            </button>
+          </Show>
           <button
             type="button"
             class="stop-button"
@@ -767,3 +668,10 @@ export default function PromptInput(props: PromptInputProps) {
     </div>
   )
 }
+
+function formatVoiceTimer(elapsedMs: number): string {
+  const totalSeconds = Math.max(0, Math.floor(elapsedMs / 1000))
+  const minutes = Math.floor(totalSeconds / 60)
+  const seconds = totalSeconds % 60
+  return `${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`
+}

packages/ui/src/components/prompt-input/usePromptVoiceInput.ts

@@ -3,7 +3,6 @@ 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>
@@ -89,14 +88,6 @@ export function usePromptVoiceInput(options: UsePromptVoiceInputOptions) {
     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)
 

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

@@ -98,7 +98,6 @@ export function RemoteAccessOverlay(props: RemoteAccessOverlayProps) {
       variant: "warning",
       confirmLabel: t("remoteAccess.listeningMode.restartConfirm.confirmLabel"),
       cancelLabel: t("remoteAccess.listeningMode.restartConfirm.cancelLabel"),
-      dismissible: false,
     })
 
     if (!confirmed) {

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

@@ -1,8 +1,8 @@
 import { Component, For, Show, createSignal, createMemo, createEffect, JSX, onCleanup } from "solid-js"
 import type { SessionStatus } from "../types/session"
 import type { SessionThread } from "../stores/session-state"
-import { getRetrySeconds, getSessionRetry, getSessionStatus } from "../stores/session-status"
-import { Bot, User, Copy, Trash2, Pencil, ShieldAlert, ChevronDown, Search, Square, CheckSquare, MinusSquare, Split, RotateCw } from "lucide-solid"
+import { getSessionStatus } from "../stores/session-status"
+import { Bot, User, Copy, Trash2, Pencil, ShieldAlert, ChevronDown, Search, Square, CheckSquare, MinusSquare, Split } from "lucide-solid"
 import KeyboardHint from "./keyboard-hint"
 import SessionRenameDialog from "./session-rename-dialog"
 import { keyboardRegistry } from "../lib/keyboard-registry"
@@ -14,7 +14,6 @@ import {
   ensureSessionParentExpanded,
   getVisibleSessionIds,
   isSessionParentExpanded,
-  loadMessages,
   loading,
   renameSession,
   sessions as sessionStateSessions,
@@ -54,14 +53,6 @@ const SessionList: Component<SessionListProps> = (props) => {
   const normalizedQuery = createMemo(() => (props.enableFilterBar ? filterQuery().trim().toLowerCase() : ""))
 
   const [selectedSessionIds, setSelectedSessionIds] = createSignal<Set<string>>(new Set())
-  const [reloadingSessionIds, setReloadingSessionIds] = createSignal<Set<string>>(new Set())
-  const [now, setNow] = createSignal(Date.now())
-
-  createEffect(() => {
-    if (typeof window === "undefined") return
-    const timer = window.setInterval(() => setNow(Date.now()), 1000)
-    onCleanup(() => window.clearInterval(timer))
-  })
 
   const normalizeSessionLabel = (sessionId: string) => {
     const session = sessionStateSessions().get(props.instanceId)?.get(sessionId)
@@ -166,7 +157,6 @@ const SessionList: Component<SessionListProps> = (props) => {
         variant: "warning",
         confirmLabel: t("sessionList.delete.confirmLabel"),
         cancelLabel: t("sessionList.delete.cancelLabel"),
-        dismissible: false,
       },
     )
     if (!confirmed) return
@@ -222,32 +212,6 @@ const SessionList: Component<SessionListProps> = (props) => {
     setRenameTarget({ id: sessionId, title: session.title ?? "", label })
   }
 
-  const isSessionReloading = (sessionId: string) => reloadingSessionIds().has(sessionId)
-
-  const handleReloadSession = async (event: MouseEvent, sessionId: string) => {
-    event.stopPropagation()
-    if (isSessionReloading(sessionId)) return
-
-    setReloadingSessionIds((prev) => {
-      const next = new Set(prev)
-      next.add(sessionId)
-      return next
-    })
-
-    try {
-      await loadMessages(props.instanceId, sessionId, true)
-    } catch (error) {
-      log.error(`Failed to reload session ${sessionId}:`, error)
-      showToastNotification({ message: t("sessionList.reload.error"), variant: "error" })
-    } finally {
-      setReloadingSessionIds((prev) => {
-        const next = new Set(prev)
-        next.delete(sessionId)
-        return next
-      })
-    }
-  }
-
   const closeRenameDialog = () => {
     setRenameTarget(null)
   }
@@ -321,7 +285,6 @@ const SessionList: Component<SessionListProps> = (props) => {
         variant: "warning",
         confirmLabel: t("sessionList.bulkDelete.confirmLabel"),
         cancelLabel: t("sessionList.bulkDelete.cancelLabel"),
-        dismissible: false,
       },
     )
 
@@ -407,13 +370,7 @@ const SessionList: Component<SessionListProps> = (props) => {
     const isActive = () => props.activeSessionId === rowProps.sessionId
     const title = () => session()?.title || t("sessionList.session.untitled")
     const status = () => getSessionStatus(props.instanceId, rowProps.sessionId)
-    const retry = () => getSessionRetry(props.instanceId, rowProps.sessionId)
     const statusLabel = () => {
-      const retryState = retry()
-      if (retryState) {
-        const seconds = getRetrySeconds(retryState.next, now())
-        return seconds > 0 ? t("sessionList.status.retryingIn", { seconds: String(seconds) }) : t("sessionList.status.retrying")
-      }
       switch (formatSessionStatus(status())) {
         case "working":
           return t("sessionList.status.working")
@@ -426,21 +383,13 @@ const SessionList: Component<SessionListProps> = (props) => {
     const needsPermission = () => Boolean(session()?.pendingPermission)
     const needsQuestion = () => Boolean((session() as any)?.pendingQuestion)
     const needsInput = () => needsPermission() || needsQuestion()
-    const statusClassName = () => (needsInput() ? "session-permission" : `session-${retry() ? "retrying" : status()}`)
+    const statusClassName = () => (needsInput() ? "session-permission" : `session-${status()}`)
     const statusText = () =>
       needsPermission()
         ? t("sessionList.status.needsPermission")
         : needsQuestion()
           ? t("sessionList.status.needsInput")
           : statusLabel()
-    const statusTooltip = () => {
-      const retryState = retry()
-      if (!retryState) return undefined
-      return t("sessionList.status.retryTooltip", {
-        message: retryState.message,
-        attempt: String(retryState.attempt),
-      })
-    }
  
     const isSelected = () => selectedSessionIds().has(rowProps.sessionId)
 
@@ -495,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">
@@ -520,7 +469,7 @@ const SessionList: Component<SessionListProps> = (props) => {
                   <ChevronDown class={`w-3.5 h-3.5 transition-transform ${rowProps.expanded ? "" : "-rotate-90"}`} />
                 </span>
               </Show>
-              <span class={`status-indicator session-status session-status-list ${statusClassName()}`} title={statusTooltip()}>
+              <span class={`status-indicator session-status session-status-list ${statusClassName()}`}>
                 {needsInput() ? <ShieldAlert class="w-3.5 h-3.5" aria-hidden="true" /> : <span class="status-dot" />}
                 {statusText()}
               </span>
@@ -542,21 +491,6 @@ const SessionList: Component<SessionListProps> = (props) => {
               >
                 <Copy class="w-3 h-3" />
               </span>
-              <span
-                class={`session-item-close opacity-80 hover:opacity-100 ${isActive() ? "hover:bg-white/20" : "hover:bg-surface-hover"}`}
-                onClick={(event) => handleReloadSession(event, rowProps.sessionId)}
-                role="button"
-                tabIndex={0}
-                aria-label={t("sessionList.actions.reload.ariaLabel")}
-                title={t("sessionList.actions.reload.title")}
-              >
-                <Show
-                  when={!isSessionReloading(rowProps.sessionId)}
-                  fallback={<RotateCw class="w-3 h-3 animate-spin" />}
-                >
-                  <RotateCw class="w-3 h-3" />
-                </Show>
-              </span>
               <span
                 class={`session-item-close opacity-80 hover:opacity-100 ${isActive() ? "hover:bg-white/20" : "hover:bg-surface-hover"}`}
                 onClick={(event) => {

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")}

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).

packages/ui/src/components/settings/remote-access-settings-section.tsx

@@ -86,7 +86,6 @@ export const RemoteAccessSettingsSection: Component = () => {
       variant: "warning",
       confirmLabel: t("remoteAccess.listeningMode.restartConfirm.confirmLabel"),
       cancelLabel: t("remoteAccess.listeningMode.restartConfirm.cancelLabel"),
-      dismissible: false,
     })
 
     if (!confirmed) return

packages/ui/src/components/settings/speech-settings-card.tsx

@@ -1,11 +1,9 @@
-import { For, Show, createEffect, createMemo, createSignal, type Component } from "solid-js"
-import { Loader2, Mic, Square, Volume2 } from "lucide-solid"
+import { createEffect, createMemo, createSignal, type Component } from "solid-js"
+import { Mic, 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")
 
@@ -15,32 +13,20 @@ type DraftFields = {
   sttModel: string
   ttsModel: string
   ttsVoice: string
-  playbackMode: SpeechSettings["playbackMode"]
-  ttsFormat: SpeechSettings["ttsFormat"]
 }
 
 function createDraftFields(speech: SpeechSettings): DraftFields {
   return {
-    apiKey: "",
+    apiKey: speech.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
-  )
+  return a.apiKey === b.apiKey && a.baseUrl === b.baseUrl && a.sttModel === b.sttModel && a.ttsModel === b.ttsModel && a.ttsVoice === b.ttsVoice
 }
 
 export const SpeechSettingsCard: Component = () => {
@@ -50,17 +36,6 @@ export const SpeechSettingsCard: Component = () => {
   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
@@ -69,12 +44,6 @@ export const SpeechSettingsCard: Component = () => {
       if (!isDraftEqual(drafts(), nextDrafts)) {
         setDrafts(nextDrafts)
       }
-      if (apiKeyTouched()) {
-        setApiKeyTouched(false)
-      }
-      if (clearStoredApiKey()) {
-        setClearStoredApiKey(false)
-      }
     }
   })
 
@@ -90,46 +59,18 @@ export const SpeechSettingsCard: Component = () => {
 
   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.apiKey || "") !== (speech.apiKey || "") ||
       (current.baseUrl || "") !== (speech.baseUrl || "") ||
       current.sttModel !== speech.sttModel ||
       current.ttsModel !== speech.ttsModel ||
-      current.ttsVoice !== speech.ttsVoice ||
-      current.playbackMode !== speech.playbackMode ||
-      current.ttsFormat !== speech.ttsFormat
+      current.ttsVoice !== speech.ttsVoice
     )
   })
 
@@ -146,28 +87,21 @@ export const SpeechSettingsCard: Component = () => {
     setIsSaving(true)
     setSaveStatus("idle")
     try {
-      const trimmedApiKey = current.apiKey.trim()
       await updateSpeechSettings({
-        ...(clearStoredApiKey() ? { apiKey: null } : trimmedApiKey ? { apiKey: trimmedApiKey } : {}),
+        apiKey: current.apiKey.trim() || undefined,
         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: "",
+        apiKey: current.apiKey.trim(),
         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)
@@ -200,32 +134,6 @@ export const SpeechSettingsCard: Component = () => {
             <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"
@@ -243,25 +151,7 @@ export const SpeechSettingsCard: Component = () => {
           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")}
@@ -288,32 +178,8 @@ export const SpeechSettingsCard: Component = () => {
           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>
   )
@@ -348,26 +214,4 @@ const Field: Component<{
   )
 }
 
-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

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>
-  )
-}

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>

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>
     )
   }

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>

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>
     )

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>
       )

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()
-}

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>
   )
 }

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>
+  )
+}

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>(() => {

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

@@ -11,7 +11,6 @@ import type {
   SpeechSynthesisResponse,
   SpeechTranscriptionResponse,
   ServerMeta,
-  VoiceModeStateResponse,
   WorkspaceCreateRequest,
   WorkspaceDescriptor,
   WorkspaceFileResponse,
@@ -24,7 +23,6 @@ import type {
   WorktreeMap,
   WorktreeCreateRequest,
 } from "../../../server/src/api-types"
-import { getClientIdentity } from "./client-identity"
 import { getLogger } from "./logger"
 
 const RUNTIME_BASE = typeof window !== "undefined" ? window.location?.origin : undefined
@@ -125,28 +123,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[]> {
@@ -236,16 +212,6 @@ export const serverApi = {
       `/api/workspaces/${encodeURIComponent(id)}/files/content?${params.toString()}`,
     )
   },
-  writeWorkspaceFile(id: string, relativePath: string, contents: string): Promise<void> {
-    const params = new URLSearchParams({ path: relativePath })
-    return request(
-      `/api/workspaces/${encodeURIComponent(id)}/files/content?${params.toString()}`,
-      {
-        method: "PUT",
-        body: JSON.stringify({ contents }),
-      },
-    )
-  },
 
   fetchConfigOwner<T extends Record<string, any> = Record<string, any>>(owner: string): Promise<T> {
     return request<T>(`/api/storage/config/${encodeURIComponent(owner)}`)
@@ -287,22 +253,12 @@ export const serverApi = {
       body: JSON.stringify(payload),
     })
   },
-  synthesizeSpeech(payload: { text: string; format?: "mp3" | "wav" | "opus" | "aac" }): Promise<SpeechSynthesisResponse> {
+  synthesizeSpeech(payload: { text: string; format?: "mp3" | "wav" | "opus" }): 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 !== ".") {
@@ -350,19 +306,6 @@ export const serverApi = {
       { method: "POST" },
     )
   },
-  updateVoiceMode(instanceId: string, enabled: boolean): Promise<VoiceModeStateResponse> {
-    const identity = getClientIdentity()
-    return request<VoiceModeStateResponse>(`/workspaces/${encodeURIComponent(instanceId)}/plugin/voice-mode`, {
-      method: "POST",
-      body: JSON.stringify({ ...identity, enabled }),
-    })
-  },
-  sendClientConnectionPong(payload: { clientId: string; connectionId: string; pingTs?: number }): Promise<void> {
-    return request<void>("/api/client-connections/pong", {
-      method: "POST",
-      body: JSON.stringify(payload),
-    })
-  },
   fetchBackgroundProcessOutput(
     instanceId: string,
     processId: string,
@@ -387,15 +330,9 @@ export const serverApi = {
       `/workspaces/${encodeURIComponent(instanceId)}/plugin/background-processes/${encodeURIComponent(processId)}/output${suffix}`,
     )
   },
-  connectEvents(
-    onEvent: (event: WorkspaceEventPayload) => void,
-    onError?: () => void,
-    onPing?: (payload: { ts?: number }) => void,
-  ) {
-    const identity = getClientIdentity()
-    const url = buildClientEventsUrl(identity)
-    sseLogger.info(`Connecting to ${url}`)
-    const source = new EventSource(url, { withCredentials: true } as any)
+  connectEvents(onEvent: (event: WorkspaceEventPayload) => void, onError?: () => void) {
+    sseLogger.info(`Connecting to ${EVENTS_URL}`)
+    const source = new EventSource(EVENTS_URL, { withCredentials: true } as any)
     source.onmessage = (event) => {
       try {
         const payload = JSON.parse(event.data) as WorkspaceEventPayload
@@ -408,26 +345,8 @@ export const serverApi = {
       sseLogger.warn("EventSource error, closing stream")
       onError?.()
     }
-    source.addEventListener("codenomad.client.ping", (event: MessageEvent) => {
-      try {
-        const payload = event.data ? (JSON.parse(event.data) as { ts?: number }) : {}
-        onPing?.(payload)
-      } catch (error) {
-        sseLogger.error("Failed to parse ping event", error)
-      }
-    })
     return source
   },
 }
 
-function buildClientEventsUrl(identity: { clientId: string; connectionId: string }): string {
-  const url = new URL(EVENTS_URL, typeof window !== "undefined" ? window.location.origin : "http://localhost")
-  url.searchParams.set("clientId", identity.clientId)
-  url.searchParams.set("connectionId", identity.connectionId)
-  if (EVENTS_URL.startsWith("http://") || EVENTS_URL.startsWith("https://")) {
-    return url.toString()
-  }
-  return `${url.pathname}${url.search}`
-}
-
 export type { WorkspaceDescriptor, WorkspaceLogEntry, WorkspaceEventPayload, WorkspaceEventType }

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

@@ -1,58 +0,0 @@
-const CLIENT_ID_STORAGE_KEY = "codenomad.client-id"
-const CONNECTION_ID_STORAGE_KEY = "codenomad.connection-id"
-
-let cachedClientId: string | null = null
-let cachedConnectionId: string | null = null
-
-export function getClientIdentity(): { clientId: string; connectionId: string } {
-  return {
-    clientId: getOrCreateClientId(),
-    connectionId: getOrCreateConnectionId(),
-  }
-}
-
-function getOrCreateClientId(): string {
-  if (cachedClientId) return cachedClientId
-  cachedClientId = getOrCreateStoredValue(CLIENT_ID_STORAGE_KEY, window.localStorage)
-  return cachedClientId
-}
-
-function getOrCreateConnectionId(): string {
-  if (cachedConnectionId) return cachedConnectionId
-  cachedConnectionId = getOrCreateStoredValue(CONNECTION_ID_STORAGE_KEY, window.sessionStorage)
-  return cachedConnectionId
-}
-
-function getOrCreateStoredValue(key: string, storage: Storage): string {
-  if (typeof window === "undefined") {
-    return generateUUID()
-  }
-
-  try {
-    const existing = storage.getItem(key)
-    if (existing && existing.trim()) {
-      return existing.trim()
-    }
-  } catch {
-    return generateUUID()
-  }
-
-  const next = generateUUID()
-  try {
-    storage.setItem(key, next)
-  } catch {
-    // Ignore storage failures and fall back to the in-memory value.
-  }
-  return next
-}
-
-function generateUUID(): string {
-  if (typeof crypto !== "undefined" && crypto.randomUUID) {
-    return crypto.randomUUID()
-  }
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (char) => {
-    const random = (Math.random() * 16) | 0
-    const value = char === "x" ? random : (random & 0x3) | 0x8
-    return value.toString(16)
-  })
-}