fix(server): prefer LAN remote addresses over public IPs

refactor(ui): align password action with status summary
Keep the Change password control on the same row as the username and password-status copy in the settings card, so the summary reads as one horizontal unit instead of stacked text followed by a separate action row.
2026-04-01 22:09:23 +01:00 · 2026-04-01 17:32:27 +03:00 · 2026-04-01 17:17:42 +03:00 · 2026-04-01 17:04:20 +03:00 · 2026-04-01 17:03:41 +03:00 · 2026-03-31 02:58:42 +03:00
189 changed files with 1385 additions and 7979 deletions
--- a/.github/workflows/comment-pr-artifacts.yml
+++ b/.github/workflows/comment-pr-artifacts.yml
@@ -4,7 +4,6 @@ on:
  pull_request_target:
    types:
      - opened
-      - edited
      - synchronize
      - reopened
      - ready_for_review
@@ -20,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    env:
      ALLOWED_ACTORS: ${{ vars.ALLOWED_NON_DEV_PR_ACTORS }}
-      PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+      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 }}
@@ -38,7 +37,7 @@ jobs:
          fi

          normalized=",${ALLOWED_ACTORS},"
-          if [[ "$normalized" == *",${PR_AUTHOR},"* ]]; then
+          if [[ "$normalized" == *",${ACTOR},"* ]]; then
            echo "allowed=true" >> "$GITHUB_OUTPUT"
          else
            echo "allowed=false" >> "$GITHUB_OUTPUT"
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -4,7 +4,6 @@ on:
  pull_request:
    types:
      - opened
-      - edited
      - synchronize
      - reopened
      - ready_for_review
@@ -24,7 +23,7 @@ jobs:
      allowed: ${{ steps.auth.outputs.allowed }}
    env:
      ALLOWED_ACTORS: ${{ vars.ALLOWED_NON_DEV_PR_ACTORS }}
-      PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+      ACTOR: ${{ github.actor }}
      BASE_REF: ${{ github.event.pull_request.base.ref }}
    steps:
      - name: Check PR authorization
@@ -38,11 +37,11 @@ jobs:
          fi

          normalized=",${ALLOWED_ACTORS},"
-          if [[ "$normalized" == *",${PR_AUTHOR},"* ]]; then
+          if [[ "$normalized" == *",${ACTOR},"* ]]; then
            echo "allowed=true" >> "$GITHUB_OUTPUT"
          else
            echo "allowed=false" >> "$GITHUB_OUTPUT"
-            echo "Skipping builds for PR by unauthorized author targeting $BASE_REF" >&2
+            echo "Skipping builds for unauthorized PR targeting $BASE_REF" >&2
          fi

  build:
--- a/.github/workflows/restrict-non-dev-prs.yml
+++ b/.github/workflows/restrict-non-dev-prs.yml
@@ -4,7 +4,6 @@ on:
  pull_request_target:
    types:
      - opened
-      - edited
      - reopened
      - synchronize

@@ -18,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    env:
      ALLOWED_ACTORS: ${{ vars.ALLOWED_NON_DEV_PR_ACTORS }}
-      PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+      ACTOR: ${{ github.actor }}
      PR_NUMBER: ${{ github.event.pull_request.number }}
      BASE_REF: ${{ github.event.pull_request.base.ref }}
    steps:
@@ -28,7 +27,7 @@ jobs:
        run: |
          set -euo pipefail
          normalized=",${ALLOWED_ACTORS},"
-          if [[ "$normalized" == *",${PR_AUTHOR},"* ]]; then
+          if [[ "$normalized" == *",${ACTOR},"* ]]; then
            echo "authorized=true" >> "$GITHUB_OUTPUT"
          else
            echo "authorized=false" >> "$GITHUB_OUTPUT"
@@ -51,5 +50,5 @@ jobs:
      - name: Fail unauthorized PR
        if: ${{ steps.auth.outputs.authorized != 'true' }}
        run: |
-          echo "PR author $PR_AUTHOR is not allowed to open PRs targeting $BASE_REF" >&2
+          echo "Actor $ACTOR is not allowed to open PRs targeting $BASE_REF" >&2
          exit 1
--- a/README.md
+++ b/README.md
@@ -1,127 +1,128 @@
 # CodeNomad

-## The AI Coding Cockpit for OpenCode
+## A fast, multi-instance workspace for running OpenCode sessions.

-CodeNomad transforms OpenCode from a terminal tool into a **premium desktop workspace** — built for developers who live inside AI coding sessions for hours and need control, speed, and clarity.
-
-> OpenCode gives you the engine. CodeNomad gives you the cockpit.
+CodeNomad is built for people who live inside OpenCode for hours on end and need a cockpit, not a kiosk. It delivers a premium, low-latency workspace that favors speed, clarity, and direct control.

 ![Multi-instance workspace](docs/screenshots/newSession.png)
+_Manage multiple OpenCode sessions side-by-side._

---
+<details>
+<summary>📸 More Screenshots</summary>

-## Features
+![Command palette overlay](docs/screenshots/command-palette.png)
+_Global command palette for keyboard-first control._

- **🚀 Multi-Instance Workspace**
- **🌐 Remote Access**
- **🧠 Session Management**
- **🎙️ Voice Input & Speech**
- **🌳 Git Worktrees**
- **💬 Rich Message Experience**
- **⌨️ Command Palette**
- **📁 File System Browser**
- **🔐 Authentication & Security**
- **🔔 Notifications**
- **🎨 Theming**
- **🌍 Internationalization**
+![Image Previews](docs/screenshots/image-previews.png)
+_Rich media previews for images and assets._

---
+![Browser Support](docs/screenshots/browser-support.png)
+_Browser support via CodeNomad Server._
+
+</details>

 ## Getting Started

-### 🖥️ Desktop App
+Choose the way that fits your workflow:

-Available as both Electron and Tauri builds — choose based on your preference.
+### 🖥️ Desktop App (Recommended)
+The best experience. A native application (Electron-based) with global shortcuts, deeper system integration, and a dedicated window.

-Download the latest installer for your platform from [Releases](https://github.com/shantur/CodeNomad/releases).
+- **Download**: Grab the latest installer for macOS, Windows, or Linux from the [Releases Page](https://github.com/shantur/CodeNomad/releases).
+- **Run**: Install and launch like any other app.

-| Platform | Formats |
-|----------|---------|
-| macOS | DMG, ZIP (Universal: Intel + Apple Silicon) |
-| Windows | NSIS Installer, ZIP (x64, ARM64) |
-| Linux | AppImage, deb, tar.gz (x64, ARM64) |
+### 🦀 Tauri App (Experimental)
+We are also working on a lightweight, high-performance version built with [Tauri](https://tauri.app). It is currently in active development.
+
+- **Download**: Experimental builds are available on the [Releases Page](https://github.com/shantur/CodeNomad/releases).
+- **Source**: Check out `packages/tauri-app` if you're interested in contributing.

 ### 💻 CodeNomad Server
-
-Run as a local server and access via browser. Perfect for remote development.
+Run CodeNomad as a local server and access it via your web browser. Perfect for remote development (SSH/VPN) or running as a service.

 ```bash
 npx @neuralnomads/codenomad --launch
 ```

-See [Server Documentation](packages/server/README.md) for flags, TLS, auth, and remote access.
+Full server/CLI documentation (flags + env vars, TLS, auth, remote access):
+- [packages/server/README.md](packages/server/README.md)
+
+To see all available options:
+
+```bash
+npx @neuralnomads/codenomad --help
+```

 ### 🧪 Dev Releases
-
-Bleeding-edge builds from the `dev` branch:
+Bleeding-edge builds are published as GitHub pre-releases and are generated automatically from the `dev` branch.

 ```bash
 npx @neuralnomads/codenomad-dev --launch
 ```

---
+## Highlights
+
+- **Multi-Instance**: Juggle several OpenCode sessions side-by-side with tabs.
+- **Long-Session Native**: Scroll through massive transcripts without hitches.
+- **Command Palette**: A single global palette to jump tabs, launch tools, and control everything.
+- **Deep Task Awareness**: Monitor background tasks and child sessions without losing flow.

 ## Requirements

- **[OpenCode CLI](https://opencode.ai)** — must be installed and in your `PATH`
- **Node.js 18+** — for server mode or building from source
-
---
-
-## Development
-
-CodeNomad is a monorepo built with:
-
-| Package | Description |
-|---------|-------------|
-| **[packages/server](packages/server/README.md)** | Core logic & CLI — workspaces, OpenCode proxy, API, auth, speech |
-| **[packages/ui](packages/ui/README.md)** | SolidJS frontend — reactive, fast, beautiful |
-| **[packages/electron-app](packages/electron-app/README.md)** | Desktop shell — process management, IPC, native dialogs |
-| **[packages/tauri-app](packages/tauri-app)** | Tauri desktop shell (experimental) |
-
-### Quick Start
-
-```bash
-git clone https://github.com/NeuralNomadsAI/CodeNomad.git
-cd CodeNomad
-npm install
-npm run dev
-```
-
---
+- **[OpenCode CLI](https://opencode.ai)**: Must be installed and available in your `PATH`.
+- **Node.js 18+**: Required if running the CLI server or building from source.

 ## Troubleshooting

-<details>
-<summary><strong>macOS: "CodeNomad.app is damaged and can't be opened"</strong></summary>
-
-Gatekeeper flag due to missing notarization. Clear the quarantine attribute:
+### macOS says the app is damaged
+If macOS reports that "CodeNomad.app is damaged and can't be opened," Gatekeeper flagged the download because the app is not yet notarized. You can clear the quarantine flag after moving CodeNomad into `/Applications`:

 ```bash
+xattr -l /Applications/CodeNomad.app
 xattr -dr com.apple.quarantine /Applications/CodeNomad.app
 ```

-On Intel Macs, also check **System Settings → Privacy & Security** on first launch.
-</details>
+After removing the quarantine attribute, launch the app normally. On Intel Macs you may also need to approve CodeNomad from **System Settings → Privacy & Security** the first time you run it.

-<details>
-<summary><strong>Linux (Wayland + NVIDIA): Tauri App closes immediately</strong></summary>
+### Linux (Wayland + NVIDIA): Tauri AppImage closes immediately
+On some Wayland compositor + NVIDIA driver setups, WebKitGTK can fail to initialize its DMA-BUF/GBM path and the Tauri build may exit right away.

-WebKitGTK DMA-BUF/GBM issue. Run with:
+Try running with one of these environment variables:

 ```bash
+# Most reliable workaround (can reduce rendering performance)
 WEBKIT_DISABLE_DMABUF_RENDERER=1 codenomad
+
+# Alternative for some Wayland setups
+__NV_DISABLE_EXPLICIT_SYNC=1 codenomad
 ```

-See full workaround in the original README.
-</details>
+If you're running the Tauri AppImage and want the workaround applied every time, create a tiny wrapper script on your `PATH`:

---
+```bash
+#!/bin/bash
+export WEBKIT_DISABLE_DMABUF_RENDERER=1
+exec ~/.local/share/bauh/appimage/installed/codenomad/CodeNomad-Tauri-0.4.0-linux-x64.AppImage "$@"
+```

-## Community
+Upstream tracking: https://github.com/tauri-apps/tauri/issues/10702

-[![Star History](https://api.star-history.com/svg?repos=NeuralNomadsAI/CodeNomad&type=Date)](https://star-history.com/#NeuralNomadsAI/CodeNomad&Date)
+## Architecture & Development

---
+CodeNomad is a monorepo split into specialized packages. If you want to contribute or build from source, check out the individual package documentation:
+
+| Package | Description |
+|---------|-------------|
+| **[packages/electron-app](packages/electron-app/README.md)** | The native desktop application shell. Wraps the UI and Server. |
+| **[packages/server](packages/server/README.md)** | The core logic and CLI. Manages workspaces, proxies OpenCode, and serves the API. |
+| **[packages/ui](packages/ui/README.md)** | The SolidJS-based frontend. Fast, reactive, and beautiful. |
+
+### Quick Build
+To build the Desktop App from source:
+
+1.  Clone the repo.
+2.  Run `npm install` (requires pnpm or npm 7+ for workspaces).
+3.  Run `npm run build --workspace @neuralnomads/codenomad-electron-app`.
+
+[![Star History Chart](https://api.star-history.com/svg?repos=NeuralNomadsAI/CodeNomad&type=Date)](https://star-history.com/#NeuralNomadsAI/CodeNomad&Date)

-**Built with ♥ by [Neural Nomads](https://github.com/NeuralNomadsAI)** · [MIT License](LICENSE)
--- a/docs/screenshots/browser-support.png
+++ b/docs/screenshots/browser-support.png
--- a/docs/screenshots/command-palette.png
+++ b/docs/screenshots/command-palette.png
--- a/docs/screenshots/image-previews.png
+++ b/docs/screenshots/image-previews.png
--- a/docs/screenshots/newSession.png
+++ b/docs/screenshots/newSession.png
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "codenomad-workspace",
-  "version": "0.13.3",
+  "version": "0.13.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "codenomad-workspace",
-      "version": "0.13.3",
+      "version": "0.13.1",
      "license": "MIT",
      "dependencies": {
        "7zip-bin": "^5.2.0",
@@ -64,6 +64,7 @@
      "version": "7.28.5",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.27.1",
        "@babel/generator": "^7.28.5",
@@ -3380,6 +3381,7 @@
      "version": "7.20.5",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/parser": "^7.20.7",
        "@babel/types": "^7.20.7",
@@ -3481,6 +3483,7 @@
      "version": "22.19.0",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "undici-types": "~6.21.0"
      }
@@ -3555,6 +3558,7 @@
      "integrity": "sha512-MCbrb508JZHqe7bUibmZj/lyojdhLRnfkmyXnkrCM2zVrjTgL89U8UEfInpKTvPeTnxsw2hmyZxnhsdNR6yhwg==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "cac": "^6.7.14",
        "colorette": "^2.0.20",
@@ -3637,6 +3641,7 @@
      "version": "6.12.6",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
@@ -3839,7 +3844,6 @@
      "version": "5.3.2",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "archiver-utils": "^2.1.0",
        "async": "^3.2.4",
@@ -3857,7 +3861,6 @@
      "version": "2.1.0",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "glob": "^7.1.4",
        "graceful-fs": "^4.2.0",
@@ -3878,7 +3881,6 @@
      "version": "2.3.8",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "core-util-is": "~1.0.0",
        "inherits": "~2.0.3",
@@ -3892,14 +3894,12 @@
    "node_modules/archiver-utils/node_modules/safe-buffer": {
      "version": "5.1.2",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/archiver-utils/node_modules/string_decoder": {
      "version": "1.1.1",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "safe-buffer": "~5.1.0"
      }
@@ -4213,7 +4213,6 @@
      "version": "4.1.0",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "buffer": "^5.5.0",
        "inherits": "^2.0.4",
@@ -4277,6 +4276,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "baseline-browser-mapping": "^2.9.0",
        "caniuse-lite": "^1.0.30001759",
@@ -4767,7 +4767,6 @@
      "version": "4.1.2",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "buffer-crc32": "^0.2.13",
        "crc32-stream": "^4.0.2",
@@ -4897,7 +4896,6 @@
      "version": "1.2.2",
      "dev": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "crc32": "bin/crc32.njs"
      },
@@ -4909,7 +4907,6 @@
      "version": "4.0.3",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "crc-32": "^1.2.0",
        "readable-stream": "^3.4.0"
@@ -5275,6 +5272,7 @@
      "version": "24.13.3",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "app-builder-lib": "24.13.3",
        "builder-util": "24.13.1",
@@ -5441,7 +5439,6 @@
      "version": "24.13.3",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "app-builder-lib": "24.13.3",
        "archiver": "^5.3.1",
@@ -5453,7 +5450,6 @@
      "version": "10.1.0",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "graceful-fs": "^4.2.0",
        "jsonfile": "^6.0.1",
@@ -5467,7 +5463,6 @@
      "version": "6.2.0",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "universalify": "^2.0.0"
      },
@@ -5479,7 +5474,6 @@
      "version": "2.0.1",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      }
@@ -6197,8 +6191,7 @@
    "node_modules/fs-constants": {
      "version": "1.0.0",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/fs-extra": {
      "version": "8.1.0",
@@ -7415,8 +7408,7 @@
    "node_modules/isarray": {
      "version": "1.0.0",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/isbinaryfile": {
      "version": "5.0.6",
@@ -7466,6 +7458,7 @@
      "version": "1.21.7",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "bin": {
        "jiti": "bin/jiti.js"
      }
@@ -7597,7 +7590,6 @@
      "version": "1.0.1",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "readable-stream": "^2.0.5"
      },
@@ -7609,7 +7601,6 @@
      "version": "2.3.8",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "core-util-is": "~1.0.0",
        "inherits": "~2.0.3",
@@ -7623,14 +7614,12 @@
    "node_modules/lazystream/node_modules/safe-buffer": {
      "version": "5.1.2",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lazystream/node_modules/string_decoder": {
      "version": "1.1.1",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "safe-buffer": "~5.1.0"
      }
@@ -7695,26 +7684,22 @@
    "node_modules/lodash.defaults": {
      "version": "4.2.0",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lodash.difference": {
      "version": "4.5.0",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lodash.flatten": {
      "version": "4.4.0",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lodash.isplainobject": {
      "version": "4.0.6",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lodash.sortby": {
      "version": "4.7.0",
@@ -7726,8 +7711,7 @@
    "node_modules/lodash.union": {
      "version": "4.6.0",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lowercase-keys": {
      "version": "2.0.0",
@@ -8531,6 +8515,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "nanoid": "^3.3.11",
        "picocolors": "^1.1.1",
@@ -8678,8 +8663,7 @@
    "node_modules/process-nextick-args": {
      "version": "2.0.1",
      "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/process-warning": {
      "version": "3.0.0",
@@ -8928,7 +8912,6 @@
      "version": "3.6.2",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "inherits": "^2.0.3",
        "string_decoder": "^1.1.1",
@@ -8942,7 +8925,6 @@
      "version": "1.1.3",
      "dev": true,
      "license": "Apache-2.0",
-      "peer": true,
      "dependencies": {
        "minimatch": "^5.1.0"
      }
@@ -9245,6 +9227,7 @@
      "version": "4.52.5",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@types/estree": "1.0.8"
      },
@@ -9468,6 +9451,7 @@
    "node_modules/seroval": {
      "version": "1.3.2",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=10"
      }
@@ -9791,6 +9775,7 @@
    "node_modules/solid-js": {
      "version": "1.9.10",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "csstype": "^3.1.0",
        "seroval": "~1.3.0",
@@ -9931,7 +9916,6 @@
      "version": "1.3.0",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "safe-buffer": "~5.2.0"
      }
@@ -10265,7 +10249,6 @@
      "version": "2.2.0",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "bl": "^4.0.3",
        "end-of-stream": "^1.4.1",
@@ -10458,6 +10441,7 @@
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -10707,6 +10691,7 @@
      "version": "5.9.3",
      "dev": true,
      "license": "Apache-2.0",
+      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -11054,6 +11039,7 @@
      "version": "5.4.21",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "esbuild": "^0.21.3",
        "postcss": "^8.4.43",
@@ -11538,6 +11524,7 @@
      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.3",
        "fast-uri": "^3.0.1",
@@ -11732,6 +11719,7 @@
      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "bin": {
        "rollup": "dist/bin/rollup"
      },
@@ -12020,7 +12008,6 @@
      "version": "4.1.1",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "archiver-utils": "^3.0.4",
        "compress-commons": "^4.1.2",
@@ -12034,7 +12021,6 @@
      "version": "3.0.4",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "glob": "^7.2.3",
        "graceful-fs": "^4.2.0",
@@ -12054,6 +12040,7 @@
    "node_modules/zod": {
      "version": "3.25.76",
      "license": "MIT",
+      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
@@ -12068,7 +12055,7 @@
    },
    "packages/electron-app": {
      "name": "@neuralnomads/codenomad-electron-app",
-      "version": "0.13.3",
+      "version": "0.13.1",
      "license": "MIT",
      "dependencies": {
        "@codenomad/ui": "file:../ui",
@@ -12105,7 +12092,7 @@
    },
    "packages/server": {
      "name": "@neuralnomads/codenomad",
-      "version": "0.13.3",
+      "version": "0.13.1",
      "license": "MIT",
      "dependencies": {
        "@fastify/cors": "^8.5.0",
@@ -12147,7 +12134,7 @@
    },
    "packages/tauri-app": {
      "name": "@codenomad/tauri-app",
-      "version": "0.13.3",
+      "version": "0.13.1",
      "license": "MIT",
      "devDependencies": {
        "@tauri-apps/cli": "^2.9.4"
@@ -12155,7 +12142,7 @@
    },
    "packages/ui": {
      "name": "@codenomad/ui",
-      "version": "0.13.3",
+      "version": "0.13.1",
      "license": "MIT",
      "dependencies": {
        "@git-diff-view/solid": "^0.0.8",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "codenomad-workspace",
-  "version": "0.13.3",
+  "version": "0.13.1",
  "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": "node ./scripts/bump-version.js"
+    "bumpVersion": "npm version --workspaces --include-workspace-root --no-git-tag-version"
  },
  "dependencies": {
    "7zip-bin": "^5.2.0",
--- a/packages/cloudflare/release-config.json
+++ b/packages/cloudflare/release-config.json
@@ -1,4 +1,4 @@
 {
-  "minServerVersion": "0.13.3",
+  "minServerVersion": "0.13.1",
  "latestServerUrl": "https://github.com/NeuralNomadsAI/CodeNomad/releases/latest"
 }
--- a/packages/cloudflare/src/index.ts
+++ b/packages/cloudflare/src/index.ts
@@ -4,23 +4,6 @@ export interface Env {

 export default {
  async fetch(request: Request, env: Env): Promise<Response> {
-    const url = new URL(request.url)
-
-    if (url.pathname === "/version.json") {
-      const response = await env.ASSETS.fetch(request)
-
-      const newHeaders = new Headers(response.headers)
-      newHeaders.set("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate")
-      newHeaders.set("Pragma", "no-cache")
-      newHeaders.set("Expires", "0")
-
-      return new Response(response.body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: newHeaders,
-      })
-    }
-
    return env.ASSETS.fetch(request)
  },
 }
--- a/packages/electron-app/.gitignore
+++ b/packages/electron-app/.gitignore
@@ -2,4 +2,3 @@ node_modules/
 dist/
 release/
 .vite/
-electron/resources/server/
--- a/packages/electron-app/electron/main/ipc.ts
+++ b/packages/electron-app/electron/main/ipc.ts
@@ -1,6 +1,5 @@
 import { BrowserWindow, Notification, dialog, ipcMain, powerSaveBlocker, type OpenDialogOptions } from "electron"
 import fs from "fs"
-import { requestMicrophoneAccess } from "./permissions"
 import type { CliProcessManager, CliStatus } from "./process-manager"

 let wakeLockId: number | null = null
@@ -112,33 +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(
-    "remote:openWindow",
-    async (
-      _event,
-      payload: { id: string; name: string; baseUrl: string; skipTlsVerify: boolean },
-    ): Promise<{ ok: boolean }> => {
-      const opener = (mainWindow as BrowserWindow & {
-        __codenomadOpenRemoteWindow?: (payload: {
-          id: string
-          name: string
-          baseUrl: string
-          skipTlsVerify: boolean
-        }) => Promise<void>
-      }).__codenomadOpenRemoteWindow
-      if (!opener) {
-        throw new Error("Remote window opening is not available")
-      }
-      await opener(payload)
-      return { ok: true }
-    },
-  )
-
  ipcMain.handle(
    "notifications:show",
    async (_event, payload: { title?: unknown; body?: unknown }): Promise<{ ok: boolean; reason?: string }> => {
--- a/packages/electron-app/electron/main/main.ts
+++ b/packages/electron-app/electron/main/main.ts
@@ -1,12 +1,11 @@
 import { app, BrowserView, BrowserWindow, nativeImage, session, shell } from "electron"
 import http from "node:http"
 import https from "node:https"
-import { existsSync, mkdirSync } from "fs"
+import { existsSync } from "fs"
 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)
@@ -14,31 +13,6 @@ const mainDirname = dirname(mainFilename)

 const isMac = process.platform === "darwin"

-function configureDevStoragePaths() {
-  if (app.isPackaged) {
-    return
-  }
-
-  const appName = "CodeNomad"
-
-  try {
-    app.setName(appName)
-
-    const userDataPath = join(app.getPath("appData"), appName)
-    const sessionDataPath = join(userDataPath, "session-data")
-
-    mkdirSync(userDataPath, { recursive: true })
-    mkdirSync(sessionDataPath, { recursive: true })
-
-    app.setPath("userData", userDataPath)
-    app.setPath("sessionData", sessionDataPath)
-  } catch (error) {
-    console.warn("[cli] failed to configure dev storage paths", error)
-  }
-}
-
-configureDevStoragePaths()
-
 const cliManager = new CliProcessManager()
 let mainWindow: BrowserWindow | null = null
 let currentCliUrl: string | null = null
@@ -46,8 +20,6 @@ let pendingCliUrl: string | null = null
 let pendingBootstrapToken: string | null = null
 let showingLoadingScreen = false
 let preloadingView: BrowserView | null = null
-const remoteWindowOrigins = new Map<number, Set<string>>()
-const insecureWindowOrigins = new Map<number, Set<string>>()

 if (isMac) {
  app.commandLine.appendSwitch("disable-spell-checking")
@@ -120,13 +92,8 @@ function loadLoadingScreen(window: BrowserWindow) {
  })
 }

-function getAllowedRendererOrigins(window?: BrowserWindow | null): string[] {
+function getAllowedRendererOrigins(): string[] {
  const origins = new Set<string>()
-  if (window) {
-    for (const origin of remoteWindowOrigins.get(window.id) ?? []) {
-      origins.add(origin)
-    }
-  }
  const rendererCandidates = [currentCliUrl, process.env.VITE_DEV_SERVER_URL, process.env.ELECTRON_RENDERER_URL]
  for (const candidate of rendererCandidates) {
    if (!candidate) {
@@ -141,13 +108,13 @@ function getAllowedRendererOrigins(window?: BrowserWindow | null): string[] {
  return Array.from(origins)
 }

-function shouldOpenExternally(url: string, window?: BrowserWindow | null): boolean {
+function shouldOpenExternally(url: string): boolean {
  try {
    const parsed = new URL(url)
    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
      return true
    }
-    const allowedOrigins = getAllowedRendererOrigins(window)
+    const allowedOrigins = getAllowedRendererOrigins()
    return !allowedOrigins.includes(parsed.origin)
  } catch {
    return false
@@ -160,7 +127,7 @@ function setupNavigationGuards(window: BrowserWindow) {
  }

  window.webContents.setWindowOpenHandler(({ url }) => {
-    if (shouldOpenExternally(url, window)) {
+    if (shouldOpenExternally(url)) {
      handleExternal(url)
      return { action: "deny" }
    }
@@ -168,54 +135,13 @@ function setupNavigationGuards(window: BrowserWindow) {
  })

  window.webContents.on("will-navigate", (event, url) => {
-    if (shouldOpenExternally(url, window)) {
+    if (shouldOpenExternally(url)) {
      event.preventDefault()
      handleExternal(url)
    }
  })
 }

-function setWindowAllowedOrigin(window: BrowserWindow, url: string) {
-  try {
-    const origin = new URL(url).origin
-    remoteWindowOrigins.set(window.id, new Set([origin]))
-  } catch (error) {
-    console.warn("[cli] failed to store allowed origin", url, error)
-  }
-}
-
-function clearWindowAllowedOrigin(window: BrowserWindow) {
-  remoteWindowOrigins.delete(window.id)
-}
-
-function addWindowInsecureOrigin(window: BrowserWindow, url: string) {
-  try {
-    const origin = new URL(url).origin
-    insecureWindowOrigins.set(window.id, new Set([origin]))
-  } catch (error) {
-    console.warn("[cli] failed to store insecure origin", url, error)
-  }
-}
-
-function clearWindowInsecureOrigin(window: BrowserWindow) {
-  insecureWindowOrigins.delete(window.id)
-}
-
-function isInsecureOriginAllowed(url: string) {
-  try {
-    const targetOrigin = new URL(url).origin
-    for (const origins of insecureWindowOrigins.values()) {
-      if (origins.has(targetOrigin)) {
-        return true
-      }
-    }
-  } catch {
-    return false
-  }
-
-  return false
-}
-
 let cachedPreloadPath: string | null = null
 function getPreloadPath() {
  if (cachedPreloadPath && existsSync(cachedPreloadPath)) {
@@ -280,30 +206,25 @@ function createWindow() {
    },
  })

-  const window = mainWindow
-
-  setupNavigationGuards(window)
+  setupNavigationGuards(mainWindow)

  if (isMac) {
-    window.webContents.session.setSpellCheckerEnabled(false)
+    mainWindow.webContents.session.setSpellCheckerEnabled(false)
  }

  showingLoadingScreen = true
  currentCliUrl = null
-  clearWindowAllowedOrigin(window)
-  loadLoadingScreen(window)
+  loadLoadingScreen(mainWindow)

  if (process.env.NODE_ENV === "development") {
-    window.webContents.openDevTools({ mode: "detach" })
+    mainWindow.webContents.openDevTools({ mode: "detach" })
  }

-  createApplicationMenu(window)
-  setupCliIPC(window, cliManager)
+  createApplicationMenu(mainWindow)
+  setupCliIPC(mainWindow, cliManager)

-  window.on("closed", () => {
+  mainWindow.on("closed", () => {
    destroyPreloadingView()
-    clearWindowAllowedOrigin(window)
-    clearWindowInsecureOrigin(window)
    mainWindow = null
    currentCliUrl = null
    pendingCliUrl = null
@@ -400,66 +321,10 @@ function finalizeCliSwap(url: string) {
    return
  }

-  const window = mainWindow
  showingLoadingScreen = false
  currentCliUrl = url
-  setWindowAllowedOrigin(window, url)
  pendingCliUrl = null
-  window.loadURL(url).catch((error) => console.error("[cli] failed to load CLI view:", error))
-}
-
-function buildRemoteWindowTitle(name: string, baseUrl: string) {
-  try {
-    const parsed = new URL(baseUrl)
-    return `${name} - ${parsed.host}`
-  } catch {
-    return `${name} - ${baseUrl}`
-  }
-}
-
-function buildRemoteErrorHtml(name: string, baseUrl: string, message: string) {
-  const escapedName = name.replace(/[&<>"]/g, (char) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" }[char] ?? char))
-  const escapedUrl = baseUrl.replace(/[&<>"]/g, (char) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" }[char] ?? char))
-  const escapedMessage = message.replace(/[&<>"]/g, (char) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" }[char] ?? char))
-  return `<!doctype html><html><head><meta charset="utf-8" /><title>${escapedName}</title><style>body{margin:0;background:#111827;color:#f9fafb;font-family:Inter,system-ui,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;padding:24px}main{max-width:560px;width:100%;background:rgba(17,24,39,.88);border:1px solid rgba(255,255,255,.08);border-radius:20px;padding:28px;box-shadow:0 25px 60px rgba(0,0,0,.45)}h1{margin:0 0 10px;font-size:1.5rem}p{margin:0 0 10px;color:#cbd5e1;line-height:1.5}code{display:block;margin-top:16px;padding:12px 14px;border-radius:12px;background:#0f172a;color:#bfdbfe;overflow:auto}</style></head><body><main><h1>${escapedName}</h1><p>Could not connect to the remote server.</p><p>${escapedMessage}</p><code>${escapedUrl}</code></main></body></html>`
-}
-
-async function openRemoteWindow(payload: { id: string; name: string; baseUrl: string; skipTlsVerify: boolean }) {
-  const targetUrl = new URL(payload.baseUrl)
-  const title = buildRemoteWindowTitle(payload.name, payload.baseUrl)
-  const window = new BrowserWindow({
-    width: 1400,
-    height: 900,
-    minWidth: 800,
-    minHeight: 600,
-    backgroundColor: "#1a1a1a",
-    icon: getIconPath(),
-    title,
-    webPreferences: {
-      preload: getPreloadPath(),
-      contextIsolation: true,
-      nodeIntegration: false,
-      spellcheck: !isMac,
-    },
-  })
-
-  setWindowAllowedOrigin(window, targetUrl.toString())
-  if (payload.skipTlsVerify) {
-    addWindowInsecureOrigin(window, targetUrl.toString())
-  }
-
-  setupNavigationGuards(window)
-  window.on("closed", () => {
-    clearWindowAllowedOrigin(window)
-    clearWindowInsecureOrigin(window)
-  })
-
-  try {
-    await window.loadURL(targetUrl.toString())
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error)
-    await window.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(buildRemoteErrorHtml(payload.name, payload.baseUrl, message))}`)
-  }
+  mainWindow.loadURL(url).catch((error) => console.error("[cli] failed to load CLI view:", error))
 }

 let bootstrapExchangeInFlight = false
@@ -624,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)
    })
@@ -638,17 +502,6 @@ app.whenReady().then(() => {
  }

  createWindow()
-  ;(mainWindow as BrowserWindow & { __codenomadOpenRemoteWindow?: typeof openRemoteWindow }).__codenomadOpenRemoteWindow = openRemoteWindow
-
-  app.on("certificate-error", (event, _webContents, url, error, _certificate, callback) => {
-    if (isInsecureOriginAllowed(url)) {
-      event.preventDefault()
-      console.warn("[cli] allowing insecure remote certificate for", url, error)
-      callback(true)
-      return
-    }
-    callback(false)
-  })

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

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

 const BOOTSTRAP_TOKEN_PREFIX = "CODENOMAD_BOOTSTRAP_TOKEN:"
 const SESSION_COOKIE_NAME_PREFIX = "codenomad_session"
@@ -42,9 +39,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 {
@@ -124,8 +118,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 = ""
@@ -145,63 +138,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")
    }

@@ -216,48 +179,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(() => {
@@ -284,22 +222,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 {
@@ -375,7 +307,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")
@@ -395,46 +327,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 }
  }
@@ -450,22 +342,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
    }
@@ -539,7 +423,7 @@ export class CliProcessManager extends EventEmitter {
  }

  private buildCliArgs(options: StartOptions, host: string): string[] {
-    const args = ["serve", "--host", host, "--generate-token", "--auth-cookie-name", this.authCookieName, "--unrestricted-root"]
+    const args = ["serve", "--host", host, "--generate-token", "--auth-cookie-name", this.authCookieName]

    if (options.dev) {
      // Dev: run plain HTTP + Vite dev server proxy.
@@ -572,10 +456,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] }
@@ -646,58 +526,4 @@ export class CliProcessManager extends EventEmitter {
    }
    throw new Error("Unable to locate CodeNomad CLI build (dist/bin.js). Run npm run build --workspace @neuralnomads/codenomad.")
  }
-
-  private shouldUsePackagedShellSupervisor(options: StartOptions): boolean {
-    return !options.dev && app.isPackaged && process.platform === "darwin"
-  }
-
-  private resolveCliSupervisorPath(): string {
-    const candidates = [
-      path.join(process.resourcesPath, "cli-supervisor.cjs"),
-      path.join(mainDirname, "../resources/cli-supervisor.cjs"),
-    ]
-
-    for (const candidate of candidates) {
-      if (existsSync(candidate)) {
-        return candidate
-      }
-    }
-
-    throw new Error("Unable to locate CodeNomad CLI supervisor script.")
-  }
-
-  private resolveShellNodeCommand(): string {
-    const configured = process.env.NODE_BINARY?.trim()
-    return configured && configured.length > 0 ? configured : "node"
-  }
-
-  private resolveBundledProdEntry(): string {
-    const candidates = [
-      path.join(process.resourcesPath, "server", "dist", "bin.js"),
-      path.join(mainDirname, "../resources/server/dist/bin.js"),
-    ]
-
-    for (const candidate of candidates) {
-      if (existsSync(candidate)) {
-        return candidate
-      }
-    }
-
-    throw new Error("Unable to locate bundled CodeNomad CLI build in app resources.")
-  }
-
-  private describeUtilityProcessError(error: unknown): string {
-    if (error instanceof Error && error.message) {
-      return error.message
-    }
-
-    if (error && typeof error === "object") {
-      const typed = error as { type?: unknown; location?: unknown }
-      if (typeof typed.type === "string") {
-        return typeof typed.location === "string" ? `${typed.type} at ${typed.location}` : typed.type
-      }
-    }
-
-    return String(error)
-  }
 }
--- a/packages/electron-app/electron/preload/index.cjs
+++ b/packages/electron-app/electron/preload/index.cjs
@@ -20,10 +20,8 @@ const electronAPI = {
      return null
    }
  },
-  requestMicrophoneAccess: () => ipcRenderer.invoke("media:requestMicrophoneAccess"),
  setWakeLock: (enabled) => ipcRenderer.invoke("power:setWakeLock", Boolean(enabled)),
  showNotification: (payload) => ipcRenderer.invoke("notifications:show", payload),
-  openRemoteWindow: (payload) => ipcRenderer.invoke("remote:openWindow", payload),
 }

 contextBridge.exposeInMainWorld("electronAPI", electronAPI)
--- a/packages/electron-app/electron/resources/cli-supervisor.cjs
+++ b/packages/electron-app/electron/resources/cli-supervisor.cjs
@@ -1,131 +0,0 @@
-#!/usr/bin/env node
-
-const { spawn } = require("child_process")
-
-const SHUTDOWN_GRACE_MS = 30_000
-
-let child = null
-let shutdownTimer = null
-
-function log(message, error) {
-  if (error) {
-    console.error(`[cli-supervisor] ${message}`, error)
-    return
-  }
-  console.log(`[cli-supervisor] ${message}`)
-}
-
-function clearShutdownTimer() {
-  if (shutdownTimer) {
-    clearTimeout(shutdownTimer)
-    shutdownTimer = null
-  }
-}
-
-function forwardStream(stream, target) {
-  if (!stream) return
-  stream.on("data", (chunk) => {
-    target.write(chunk)
-  })
-}
-
-function terminateChild(force) {
-  if (!child || child.exitCode !== null || child.signalCode !== null) {
-    return
-  }
-
-  try {
-    child.kill(force ? "SIGKILL" : "SIGTERM")
-  } catch {
-    // no-op
-  }
-}
-
-function requestShutdown(force = false) {
-  if (!child) {
-    process.exit(force ? 1 : 0)
-    return
-  }
-
-  terminateChild(force)
-  if (force) {
-    process.exit(1)
-    return
-  }
-
-  clearShutdownTimer()
-  shutdownTimer = setTimeout(() => {
-    log(`shutdown timed out after ${SHUTDOWN_GRACE_MS}ms; forcing child termination`)
-    terminateChild(true)
-  }, SHUTDOWN_GRACE_MS)
-  shutdownTimer.unref()
-}
-
-function installShutdownHandlers() {
-  process.on("SIGTERM", () => requestShutdown(false))
-  process.on("SIGINT", () => requestShutdown(false))
-  process.on("disconnect", () => requestShutdown(false))
-  process.on("uncaughtException", (error) => {
-    log("uncaught exception", error)
-    requestShutdown(true)
-  })
-  process.on("unhandledRejection", (error) => {
-    log("unhandled rejection", error)
-    requestShutdown(true)
-  })
-}
-
-function parsePayload() {
-  const raw = process.argv[2]
-  if (!raw) {
-    throw new Error("Supervisor payload is required")
-  }
-
-  const parsed = JSON.parse(raw)
-  if (!parsed || typeof parsed !== "object") {
-    throw new Error("Supervisor payload must be an object")
-  }
-  if (typeof parsed.command !== "string" || parsed.command.trim().length === 0) {
-    throw new Error("Supervisor payload command is required")
-  }
-  if (!Array.isArray(parsed.args) || !parsed.args.every((value) => typeof value === "string")) {
-    throw new Error("Supervisor payload args must be a string array")
-  }
-
-  return {
-    command: parsed.command,
-    args: parsed.args,
-    cwd: typeof parsed.cwd === "string" && parsed.cwd.trim().length > 0 ? parsed.cwd : process.cwd(),
-  }
-}
-
-function main() {
-  installShutdownHandlers()
-
-  const payload = parsePayload()
-  log(`launching shell command: ${payload.command} ${payload.args.join(" ")}`)
-
-  child = spawn(payload.command, payload.args, {
-    cwd: payload.cwd,
-    env: process.env,
-    shell: false,
-    stdio: ["ignore", "pipe", "pipe"],
-  })
-
-  forwardStream(child.stdout, process.stdout)
-  forwardStream(child.stderr, process.stderr)
-
-  child.on("error", (error) => {
-    log("failed to spawn shell command", error)
-    process.exit(1)
-  })
-
-  child.on("exit", (code, signal) => {
-    clearShutdownTimer()
-    log(`child exited code=${code ?? ""} signal=${signal ?? ""}`)
-    process.exitCode = typeof code === "number" ? code : signal ? 1 : 0
-    process.exit()
-  })
-}
-
-main()
--- a/packages/electron-app/electron/resources/entitlements.mac.plist
+++ b/packages/electron-app/electron/resources/entitlements.mac.plist
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>com.apple.security.cs.allow-jit</key>
-  <true/>
-  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-  <true/>
-  <key>com.apple.security.cs.disable-library-validation</key>
-  <true/>
-  <key>com.apple.security.device.audio-input</key>
-  <true/>
-</dict>
-</plist>
--- a/packages/electron-app/package.json
+++ b/packages/electron-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@neuralnomads/codenomad-electron-app",
-  "version": "0.13.3",
+  "version": "0.13.1",
  "description": "CodeNomad - AI coding assistant",
  "license": "MIT",
  "author": {
@@ -20,8 +20,6 @@
    "dev:debug": "cross-env CLI_LOG_LEVEL=debug electron-vite dev",
    "dev:trace": "cross-env CLI_LOG_LEVEL=trace electron-vite dev",
    "dev:electron": "NODE_ENV=development ELECTRON_ENABLE_LOGGING=1 NODE_OPTIONS=\"--import tsx\" electron electron/main/main.ts",
-    "prepare:resources": "node scripts/prepare-resources.js",
-    "prebuild": "npm run prepare:resources",
    "build": "electron-vite build",
    "typecheck": "tsc --noEmit -p tsconfig.json",
    "preview": "electron-vite preview",
@@ -35,11 +33,8 @@
    "build:linux-arm64": "node scripts/build.js linux-arm64",
    "build:linux-rpm": "node scripts/build.js linux-rpm",
    "build:all": "node scripts/build.js all",
-    "prepackage:mac": "npm run prepare:resources",
    "package:mac": "electron-builder --mac",
-    "prepackage:win": "npm run prepare:resources",
    "package:win": "electron-builder --win",
-    "prepackage:linux": "npm run prepare:resources",
    "package:linux": "electron-builder --linux"
  },
  "dependencies": {
@@ -87,12 +82,6 @@
      }
    ],
    "mac": {
-      "entitlements": "electron/resources/entitlements.mac.plist",
-      "entitlementsInherit": "electron/resources/entitlements.mac.plist",
-      "extendInfo": {
-        "NSMicrophoneUsageDescription": "CodeNomad needs microphone access for speech-to-text prompt input.",
-        "NSLocalNetworkUsageDescription": "CodeNomad needs local network access to connect to locally hosted AI and speech services."
-      },
      "category": "public.app-category.developer-tools",
      "target": [
        {
--- a/packages/electron-app/scripts/build.js
+++ b/packages/electron-app/scripts/build.js
@@ -111,12 +111,6 @@ async function build(platform) {
      env: { NODE_PATH: workspaceNodeModulesPath },
    })

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

--- a/packages/electron-app/scripts/prepare-resources.js
+++ b/packages/electron-app/scripts/prepare-resources.js
@@ -1,132 +0,0 @@
-#!/usr/bin/env node
-
-import fs from "fs"
-import path, { join } from "path"
-import { spawnSync } from "child_process"
-import { fileURLToPath } from "url"
-
-const __dirname = fileURLToPath(new URL(".", import.meta.url))
-const appDir = join(__dirname, "..")
-const workspaceRoot = join(appDir, "..", "..")
-const serverRoot = join(appDir, "..", "server")
-const resourcesRoot = join(appDir, "electron", "resources")
-const serverDest = join(resourcesRoot, "server")
-const npmExecPath = process.env.npm_execpath
-const npmNodeExecPath = process.env.npm_node_execpath
-
-const serverSources = ["dist", "public", "node_modules", "package.json"]
-const serverDepsMarker = join(serverRoot, "node_modules", "fastify", "package.json")
-
-function log(message) {
-  console.log(`[prepare-resources] ${message}`)
-}
-
-function ensureServerBuild() {
-  const distPath = join(serverRoot, "dist")
-  const publicPath = join(serverRoot, "public")
-  if (!fs.existsSync(distPath) || !fs.existsSync(publicPath)) {
-    throw new Error("Server build artifacts are missing. Run the server build before packaging Electron.")
-  }
-}
-
-function ensureServerDependencies() {
-  if (fs.existsSync(serverDepsMarker)) {
-    return
-  }
-
-  log("installing production server dependencies")
-  const npmArgs = [
-    "install",
-    "--omit=dev",
-    "--ignore-scripts",
-    "--workspaces=false",
-    "--package-lock=false",
-    "--install-strategy=shallow",
-    "--fund=false",
-    "--audit=false",
-  ]
-
-  const env = {
-    ...process.env,
-    PATH: `${join(workspaceRoot, "node_modules", ".bin")}${path.delimiter}${process.env.PATH ?? ""}`,
-    npm_config_workspaces: "false",
-  }
-
-  const npmCli = npmExecPath && npmNodeExecPath ? [npmNodeExecPath, [npmExecPath, ...npmArgs]] : null
-  const result = npmCli
-    ? spawnSync(npmCli[0], npmCli[1], { cwd: serverRoot, stdio: "inherit", env })
-    : spawnSync("npm", npmArgs, { cwd: serverRoot, stdio: "inherit", env, shell: process.platform === "win32" })
-
-  if (result.status !== 0) {
-    if (result.error) {
-      throw result.error
-    }
-    throw new Error(`npm install exited with code ${result.status ?? 1}`)
-  }
-}
-
-function copyServerArtifacts() {
-  fs.rmSync(serverDest, { recursive: true, force: true })
-  fs.mkdirSync(serverDest, { recursive: true })
-
-  for (const name of serverSources) {
-    const from = join(serverRoot, name)
-    const to = join(serverDest, name)
-    if (!fs.existsSync(from)) {
-      throw new Error(`Missing required server artifact: ${from}`)
-    }
-    fs.cpSync(from, to, { recursive: true, dereference: true })
-    log(`copied ${name} to Electron resources`) 
-  }
-}
-
-function stripNodeModuleBins() {
-  const root = join(serverDest, "node_modules")
-  if (!fs.existsSync(root)) {
-    return
-  }
-
-  const stack = [root]
-  let removed = 0
-
-  while (stack.length > 0) {
-    const current = stack.pop()
-    if (!current) break
-
-    let entries
-    try {
-      entries = fs.readdirSync(current, { withFileTypes: true })
-    } catch {
-      continue
-    }
-
-    for (const entry of entries) {
-      const full = join(current, entry.name)
-      if (entry.name === ".bin") {
-        fs.rmSync(full, { recursive: true, force: true })
-        removed += 1
-        continue
-      }
-
-      if (entry.isDirectory()) {
-        stack.push(full)
-      }
-    }
-  }
-
-  if (removed > 0) {
-    log(`removed ${removed} node_modules/.bin directories`)
-  }
-}
-
-async function main() {
-  ensureServerBuild()
-  ensureServerDependencies()
-  copyServerArtifacts()
-  stripNodeModuleBins()
-}
-
-main().catch((error) => {
-  console.error("[prepare-resources] failed:", error)
-  process.exit(1)
-})
--- a/packages/electron-app/tsconfig.json
+++ b/packages/electron-app/tsconfig.json
@@ -14,5 +14,5 @@
    "noEmit": true
  },
  "include": ["electron/**/*.ts", "electron.vite.config.ts"],
-  "exclude": ["node_modules", "dist", "electron/resources/server"]
+  "exclude": ["node_modules", "dist"]
 }
--- a/packages/opencode-config/package.json
+++ b/packages/opencode-config/package.json
@@ -4,6 +4,6 @@
  "private": true,
  "license": "MIT",
  "dependencies": {
-    "@opencode-ai/plugin": "1.3.7"
+    "@opencode-ai/plugin": "1.3.2"
  }
 }
--- a/packages/opencode-config/plugin/codenomad.ts
+++ b/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")
-}
--- a/packages/opencode-config/plugin/lib/background-process.ts
+++ b/packages/opencode-config/plugin/lib/background-process.ts
@@ -13,11 +13,6 @@ type BackgroundProcess = {
  outputSizeBytes?: number
 }

-type BackgroundProcessNotificationRequest = {
-  sessionID: string
-  directory: string
-}
-
 type BackgroundProcessOptions = {
  baseDir: string
 }
@@ -41,19 +36,12 @@ export function createBackgroundProcessTools(config: CodeNomadConfig, options: B
      args: {
        title: tool.schema.string().describe("Short label for the process (e.g. Dev server, DB server)"),
        command: tool.schema.string().describe("Shell command to run in the workspace"),
-        notify: tool.schema.boolean().optional().describe("Notify the current session when the process ends"),
      },
-      async execute(args, context) {
+      async execute(args) {
        assertCommandWithinBase(args.command, options.baseDir)
-        const notification: BackgroundProcessNotificationRequest | undefined = args.notify
-          ? {
-              sessionID: context.sessionID,
-              directory: context.directory,
-            }
-          : undefined
        const process = await request<BackgroundProcess>("", {
          method: "POST",
-          body: JSON.stringify({ title: args.title, command: args.command, notify: args.notify, notification }),
+          body: JSON.stringify({ title: args.title, command: args.command }),
        })

        return `Started background process ${process.id} (${process.title})\nStatus: ${process.status}\nCommand: ${process.command}`
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@neuralnomads/codenomad",
-  "version": "0.13.3",
+  "version": "0.13.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@neuralnomads/codenomad",
-      "version": "0.13.3",
+      "version": "0.13.1",
      "dependencies": {
        "@fastify/cors": "^8.5.0",
        "@fastify/reply-from": "^9.8.0",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@neuralnomads/codenomad",
-  "version": "0.13.3",
+  "version": "0.13.1",
  "description": "CodeNomad Server",
  "license": "MIT",
  "author": {
--- a/packages/server/src/api-types.ts
+++ b/packages/server/src/api-types.ts
@@ -170,24 +170,6 @@ export interface InstanceStreamEvent {
  [key: string]: unknown
 }

-export type SideCarKind = "port"
-
-export type SideCarPrefixMode = "strip" | "preserve"
-
-export type SideCarStatus = "running" | "stopped"
-
-export interface SideCar {
-  id: string
-  kind: SideCarKind
-  name: string
-  port: number
-  insecure: boolean
-  prefixMode: SideCarPrefixMode
-  status: SideCarStatus
-  createdAt: string
-  updatedAt: string
-}
-
 export interface BinaryRecord {
  id: string
  path: string
@@ -258,44 +240,12 @@ export interface SpeechSynthesisResponse {
  mimeType: string
 }

-export interface VoiceModeStateResponse {
-  enabled: boolean
-}
-
-export interface RemoteServerProfile {
-  id: string
-  name: string
-  baseUrl: string
-  skipTlsVerify: boolean
-  createdAt: string
-  updatedAt: string
-  lastConnectedAt?: string
-}
-
-export interface RemoteServerProbeRequest {
-  baseUrl: string
-  skipTlsVerify?: boolean
-}
-
-export interface RemoteServerProbeResponse {
-  ok: boolean
-  reachable: boolean
-  normalizedUrl: string
-  skipTlsVerify: boolean
-  requiresAuth: boolean
-  authenticated: boolean
-  error?: string
-  errorCode?: string
-}
-
 export type WorkspaceEventType =
  | "workspace.created"
  | "workspace.started"
  | "workspace.error"
  | "workspace.stopped"
  | "workspace.log"
-  | "sidecar.updated"
-  | "sidecar.removed"
  | "storage.configChanged"
  | "storage.stateChanged"
  | "instance.dataChanged"
@@ -308,8 +258,6 @@ export type WorkspaceEventPayload =
  | { type: "workspace.error"; workspace: WorkspaceDescriptor }
  | { type: "workspace.stopped"; workspaceId: string }
  | { type: "workspace.log"; entry: WorkspaceLogEntry }
-  | { type: "sidecar.updated"; sidecar: SideCar }
-  | { type: "sidecar.removed"; sidecarId: string }
  | { type: "storage.configChanged"; owner: SettingsOwner; value: SettingsBucket }
  | { type: "storage.stateChanged"; owner: SettingsOwner; value: SettingsBucket }
  | { type: "instance.dataChanged"; instanceId: string; data: InstanceData }
@@ -376,8 +324,6 @@ export interface ServerMeta {

 export type BackgroundProcessStatus = "running" | "stopped" | "error"

-export type BackgroundProcessTerminalReason = "finished" | "failed" | "user_stopped" | "user_terminated"
-
 export interface BackgroundProcess {
  id: string
  workspaceId: string
@@ -390,8 +336,6 @@ export interface BackgroundProcess {
  stoppedAt?: string
  exitCode?: number
  outputSizeBytes?: number
-  terminalReason?: BackgroundProcessTerminalReason
-  notifyEnabled?: boolean
 }

 export interface BackgroundProcessListResponse {
--- a/packages/server/src/auth/manager.ts
+++ b/packages/server/src/auth/manager.ts
@@ -104,18 +104,13 @@ export class AuthManager {
  }

  getSessionFromRequest(request: FastifyRequest): { username: string; sessionId: string } | null {
-    return this.getSessionFromHeaders(request.headers)
-  }
-
-  getSessionFromHeaders(headers: { cookie?: string | string[] | undefined }): { username: string; sessionId: string } | null {
    if (!this.authEnabled) {
      // When auth is disabled, treat all requests as authenticated.
      // We still return a stable username so callers can display it.
      return { username: this.init.username, sessionId: "auth-disabled" }
    }

-    const cookieHeader = Array.isArray(headers.cookie) ? headers.cookie.join("; ") : headers.cookie
-    const cookies = parseCookies(cookieHeader)
+    const cookies = parseCookies(request.headers.cookie)
    const sessionId = cookies[this.cookieName]
    const session = this.sessionManager.getSession(sessionId)
    if (!session) return null
--- a/packages/server/src/background-processes/manager.ts
+++ b/packages/server/src/background-processes/manager.ts
@@ -5,7 +5,7 @@ import { randomBytes } from "crypto"
 import type { EventBus } from "../events/bus"
 import type { WorkspaceManager } from "../workspaces/manager"
 import type { Logger } from "../logger"
-import type { BackgroundProcess, BackgroundProcessStatus, BackgroundProcessTerminalReason } from "../api-types"
+import type { BackgroundProcess, BackgroundProcessStatus } from "../api-types"

 const ROOT_DIR = ".codenomad/background_processes"
 const INDEX_FILE = "index.json"
@@ -27,31 +27,6 @@ interface RunningProcess {
  outputPath: string
  exitPromise: Promise<void>
  workspaceId: string
-  completion?: ProcessCompletion
-}
-
-interface ProcessCompletion {
-  reason: BackgroundProcessTerminalReason
-  endContext: "normal" | "workspace_cleanup"
-  removeAfterFinalize?: boolean
-}
-
-interface BackgroundProcessNotificationState {
-  sessionID: string
-  directory: string
-  sentAt?: string
-}
-
-interface PersistedBackgroundProcess extends BackgroundProcess {
-  notify?: BackgroundProcessNotificationState
-}
-
-interface StartOptions {
-  notify?: boolean
-  notification?: {
-    sessionID: string
-    directory: string
-  }
 }

 export class BackgroundProcessManager {
@@ -66,14 +41,14 @@ export class BackgroundProcessManager {
    const records = await this.readIndex(workspaceId)
    const enriched = await Promise.all(
      records.map(async (record) => ({
-        ...this.toPublicProcess(record),
+        ...record,
        outputSizeBytes: await this.getOutputSize(workspaceId, record.id),
      })),
    )
    return enriched
  }

-  async start(workspaceId: string, title: string, command: string, options: StartOptions = {}): Promise<BackgroundProcess> {
+  async start(workspaceId: string, title: string, command: string): Promise<BackgroundProcess> {
    const workspace = this.deps.workspaceManager.get(workspaceId)
    if (!workspace) {
      throw new Error("Workspace not found")
@@ -98,7 +73,8 @@ export class BackgroundProcessManager {
      this.killProcessTree(child, "SIGTERM")
    })

-    const record: PersistedBackgroundProcess = {
+    const record: BackgroundProcess = {
+
      id,
      workspaceId,
      title,
@@ -108,20 +84,6 @@ export class BackgroundProcessManager {
      pid: child.pid,
      startedAt: new Date().toISOString(),
      outputSizeBytes: 0,
-      notify: options.notify && options.notification
-        ? {
-            sessionID: options.notification.sessionID,
-            directory: options.notification.directory,
-          }
-        : undefined,
-    }
-
-    const runningState: RunningProcess = {
-      id,
-      child,
-      outputPath,
-      exitPromise: Promise.resolve(),
-      workspaceId,
    }

    const exitPromise = new Promise<void>((resolve) => {
@@ -129,21 +91,18 @@ export class BackgroundProcessManager {
        await new Promise<void>((resolve) => outputStream.end(resolve))
        this.running.delete(id)

-        const completion = runningState.completion ?? this.completionFromExit(code)
-
-        record.terminalReason = completion.reason
-        record.status = this.statusFromReason(completion.reason)
+        record.status = this.statusFromExit(code)
        record.exitCode = code === null ? undefined : code
        record.stoppedAt = new Date().toISOString()

-        await this.finalizeRecord(workspaceId, record, completion)
+        await this.upsertIndex(workspaceId, record)
+        record.outputSizeBytes = await this.getOutputSize(workspaceId, record.id)
+        this.publishUpdate(workspaceId, record)
        resolve()
      })
    })

-    runningState.exitPromise = exitPromise
-
-    this.running.set(id, runningState)
+    this.running.set(id, { id, child, outputPath, exitPromise, workspaceId })

    let lastPublishAt = 0
    const maybePublishSize = () => {
@@ -169,7 +128,7 @@ export class BackgroundProcessManager {
    await this.upsertIndex(workspaceId, record)
    record.outputSizeBytes = await this.getOutputSize(workspaceId, record.id)
    this.publishUpdate(workspaceId, record)
-    return this.toPublicProcess(record)
+    return record
  }

  async stop(workspaceId: string, processId: string): Promise<BackgroundProcess | null> {
@@ -180,21 +139,19 @@ export class BackgroundProcessManager {

    const running = this.running.get(processId)
    if (running?.child && !running.child.killed) {
-      running.completion = { reason: "user_stopped", endContext: "normal" }
      this.killProcessTree(running.child, "SIGTERM")
      await this.waitForExit(running)
-      const updated = await this.findProcess(workspaceId, processId)
-      return updated ? this.toPublicProcess(updated) : this.toPublicProcess(record)
    }

    if (record.status === "running") {
      record.status = "stopped"
-      record.terminalReason = "user_stopped"
      record.stoppedAt = new Date().toISOString()
-      await this.finalizeRecord(workspaceId, record, { reason: "user_stopped", endContext: "normal" })
+      await this.upsertIndex(workspaceId, record)
+      record.outputSizeBytes = await this.getOutputSize(workspaceId, record.id)
+      this.publishUpdate(workspaceId, record)
    }

-    return this.toPublicProcess(record)
+    return record
  }

  async terminate(workspaceId: string, processId: string): Promise<void> {
@@ -203,19 +160,17 @@ export class BackgroundProcessManager {

    const running = this.running.get(processId)
    if (running?.child && !running.child.killed) {
-      running.completion = { reason: "user_terminated", endContext: "normal", removeAfterFinalize: true }
      this.killProcessTree(running.child, "SIGTERM")
      await this.waitForExit(running)
-      return
    }

-    record.status = "stopped"
-    record.terminalReason = "user_terminated"
-    record.stoppedAt = new Date().toISOString()
-    await this.finalizeRecord(workspaceId, record, {
-      reason: "user_terminated",
-      endContext: "normal",
-      removeAfterFinalize: true,
+    await this.removeFromIndex(workspaceId, processId)
+    await this.removeProcessDir(workspaceId, processId)
+
+    this.deps.eventBus.publish({
+      type: "instance.event",
+      instanceId: workspaceId,
+      event: { type: "background.process.removed", properties: { processId } },
    })
  }

@@ -311,11 +266,6 @@ export class BackgroundProcessManager {
  private async cleanupWorkspace(workspaceId: string) {
    for (const [, running] of this.running.entries()) {
      if (running.workspaceId !== workspaceId) continue
-      running.completion = {
-        reason: "user_terminated",
-        endContext: "workspace_cleanup",
-        removeAfterFinalize: true,
-      }
      this.killProcessTree(running.child, "SIGTERM")
      await this.waitForExit(running)
    }
@@ -406,17 +356,10 @@ export class BackgroundProcessManager {
    return args
  }

-  private completionFromExit(code: number | null): ProcessCompletion {
-    if (code === 0) {
-      return { reason: "finished", endContext: "normal" }
-    }
-
-    return { reason: "failed", endContext: "normal" }
-  }
-
-  private statusFromReason(reason: BackgroundProcessTerminalReason): BackgroundProcessStatus {
-    if (reason === "failed") return "error"
-    return "stopped"
+  private statusFromExit(code: number | null): BackgroundProcessStatus {
+    if (code === null) return "stopped"
+    if (code === 0) return "stopped"
+    return "error"
  }

  private async readOutputBytes(outputPath: string, sizeBytes: number, maxBytes?: number): Promise<string> {
@@ -480,25 +423,25 @@ export class BackgroundProcessManager {
    return path.join(workspace.path, ROOT_DIR, workspaceId, processId, OUTPUT_FILE)
  }

-  private async findProcess(workspaceId: string, processId: string): Promise<PersistedBackgroundProcess | null> {
+  private async findProcess(workspaceId: string, processId: string): Promise<BackgroundProcess | null> {
    const records = await this.readIndex(workspaceId)
    return records.find((entry) => entry.id === processId) ?? null
  }

-  private async readIndex(workspaceId: string): Promise<PersistedBackgroundProcess[]> {
+  private async readIndex(workspaceId: string): Promise<BackgroundProcess[]> {
    const indexPath = await this.getIndexPath(workspaceId)
    if (!existsSync(indexPath)) return []

    try {
      const raw = await fs.readFile(indexPath, "utf-8")
      const parsed = JSON.parse(raw)
-      return Array.isArray(parsed) ? (parsed as PersistedBackgroundProcess[]) : []
+      return Array.isArray(parsed) ? (parsed as BackgroundProcess[]) : []
    } catch {
      return []
    }
  }

-  private async upsertIndex(workspaceId: string, record: PersistedBackgroundProcess) {
+  private async upsertIndex(workspaceId: string, record: BackgroundProcess) {
    const records = await this.readIndex(workspaceId)
    const index = records.findIndex((entry) => entry.id === record.id)
    if (index >= 0) {
@@ -515,7 +458,7 @@ export class BackgroundProcessManager {
    await this.writeIndex(workspaceId, next)
  }

-  private async writeIndex(workspaceId: string, records: PersistedBackgroundProcess[]) {
+  private async writeIndex(workspaceId: string, records: BackgroundProcess[]) {
    const indexPath = await this.getIndexPath(workspaceId)
    await fs.mkdir(path.dirname(indexPath), { recursive: true })
    await fs.writeFile(indexPath, JSON.stringify(records, null, 2))
@@ -560,139 +503,14 @@ export class BackgroundProcessManager {
    }
  }

-  private publishUpdate(workspaceId: string, record: PersistedBackgroundProcess) {
+  private publishUpdate(workspaceId: string, record: BackgroundProcess) {
    this.deps.eventBus.publish({
      type: "instance.event",
      instanceId: workspaceId,
-      event: { type: "background.process.updated", properties: { process: this.toPublicProcess(record) } },
+      event: { type: "background.process.updated", properties: { process: record } },
    })
  }

-  private toPublicProcess(record: PersistedBackgroundProcess): BackgroundProcess {
-    return {
-      id: record.id,
-      workspaceId: record.workspaceId,
-      title: record.title,
-      command: record.command,
-      cwd: record.cwd,
-      status: record.status,
-      pid: record.pid,
-      startedAt: record.startedAt,
-      stoppedAt: record.stoppedAt,
-      exitCode: record.exitCode,
-      outputSizeBytes: record.outputSizeBytes,
-      terminalReason: record.terminalReason,
-      notifyEnabled: Boolean(record.notify),
-    }
-  }
-
-  private async finalizeRecord(workspaceId: string, record: PersistedBackgroundProcess, completion: ProcessCompletion) {
-    if (this.shouldSendCompletionPrompt(record, completion)) {
-      try {
-        await this.sendCompletionPrompt(workspaceId, record)
-        if (record.notify) {
-          record.notify.sentAt = new Date().toISOString()
-        }
-      } catch (error) {
-        this.deps.logger.warn({ err: error, workspaceId, processId: record.id }, "Failed to send background process completion prompt")
-      }
-    }
-
-    if (completion.removeAfterFinalize) {
-      await this.removeFromIndex(workspaceId, record.id)
-      await this.removeProcessDir(workspaceId, record.id)
-
-      this.deps.eventBus.publish({
-        type: "instance.event",
-        instanceId: workspaceId,
-        event: { type: "background.process.removed", properties: { processId: record.id } },
-      })
-      return
-    }
-
-    await this.upsertIndex(workspaceId, record)
-    record.outputSizeBytes = await this.getOutputSize(workspaceId, record.id)
-    this.publishUpdate(workspaceId, record)
-  }
-
-  private shouldSendCompletionPrompt(record: PersistedBackgroundProcess, completion: ProcessCompletion) {
-    if (completion.endContext === "workspace_cleanup") return false
-    if (!record.notify) return false
-    return !record.notify.sentAt
-  }
-
-  private async sendCompletionPrompt(workspaceId: string, record: PersistedBackgroundProcess) {
-    const notify = record.notify
-    if (!notify || !record.terminalReason) return
-
-    if (!this.deps.workspaceManager.get(workspaceId)) {
-      throw new Error("Workspace not found")
-    }
-
-    const port = this.deps.workspaceManager.getInstancePort(workspaceId)
-    if (!port) {
-      throw new Error("Workspace instance is not ready")
-    }
-
-    const targetUrl = `http://127.0.0.1:${port}/session/${encodeURIComponent(notify.sessionID)}/prompt_async`
-    const headers: Record<string, string> = {
-      "content-type": "application/json",
-      "x-opencode-directory": /[^\x00-\x7F]/.test(notify.directory) ? encodeURIComponent(notify.directory) : notify.directory,
-    }
-
-    const authorization = this.deps.workspaceManager.getInstanceAuthorizationHeader(workspaceId)
-    if (authorization) {
-      headers.authorization = authorization
-    }
-
-    const response = await fetch(targetUrl, {
-      method: "POST",
-      headers,
-      body: JSON.stringify({
-        parts: [
-          {
-            type: "text",
-            text: this.buildSyntheticCompletionPrompt(record),
-            synthetic: true,
-          },
-        ],
-      }),
-    })
-
-    if (!response.ok) {
-      const message = await response.text().catch(() => "")
-      throw new Error(message || `Prompt request failed with ${response.status}`)
-    }
-  }
-
-  private buildCompletionPrompt(record: PersistedBackgroundProcess): string {
-    const ref = `Background process "${record.title}" (${record.id})`
-
-    switch (record.terminalReason) {
-      case "finished":
-        return `${ref} finished successfully.`
-      case "failed":
-        return record.exitCode === undefined ? `${ref} failed.` : `${ref} failed with exit code ${record.exitCode}.`
-      case "user_stopped":
-        return `${ref} was stopped by user.`
-      case "user_terminated":
-        return `${ref} was terminated by user.`
-    }
-
-    return `${ref} ended.`
-  }
-
-  private buildSyntheticCompletionPrompt(record: PersistedBackgroundProcess): string {
-    return `<system-message>${this.escapeTaggedText(this.buildCompletionPrompt(record))}</system-message>`
-  }
-
-  private escapeTaggedText(input: string): string {
-    return input
-      .replace(/&/g, "&amp;")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;")
-  }
-
  private generateId(): string {
    const timestamp = new Date().toISOString().replace(/[:.]/g, "").slice(0, 15)
    const random = randomBytes(3).toString("hex")
--- a/packages/server/src/clients/connection-manager.ts
+++ b/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}`
-}
--- a/packages/server/src/config/schema.ts
+++ b/packages/server/src/config/schema.ts
@@ -26,7 +26,6 @@ const PreferencesSchema = z
  showUsageMetrics: z.boolean().default(true),
  autoCleanupBlankSessions: z.boolean().default(true),
  listeningMode: z.enum(["local", "all"]).default("local"),
-  logLevel: z.enum(["DEBUG", "INFO", "WARN", "ERROR"]).default("DEBUG"),

  // OS notifications
  osNotificationsEnabled: z.boolean().default(false),
--- a/packages/server/src/events/bus.ts
+++ b/packages/server/src/events/bus.ts
@@ -24,8 +24,6 @@ export class EventBus extends EventEmitter {
    this.on("workspace.error", handler)
    this.on("workspace.stopped", handler)
    this.on("workspace.log", handler)
-    this.on("sidecar.updated", handler)
-    this.on("sidecar.removed", handler)
    this.on("storage.configChanged", handler)
    this.on("storage.stateChanged", handler)
    this.on("instance.dataChanged", handler)
@@ -37,8 +35,6 @@ export class EventBus extends EventEmitter {
      this.off("workspace.error", handler)
      this.off("workspace.stopped", handler)
      this.off("workspace.log", handler)
-      this.off("sidecar.updated", handler)
-      this.off("sidecar.removed", handler)
      this.off("storage.configChanged", handler)
      this.off("storage.stateChanged", handler)
      this.off("instance.dataChanged", handler)
--- a/packages/server/src/filesystem/browser.ts
+++ b/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")
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -24,7 +24,6 @@ import { resolveHttpsOptions } from "./server/tls"
 import { resolveNetworkAddresses, resolveRemoteAddresses } from "./server/network-addresses"
 import { startDevReleaseMonitor } from "./releases/dev-release-monitor"
 import { SpeechService } from "./speech/service"
-import { SideCarManager } from "./sidecars/manager"

 const require = createRequire(import.meta.url)

@@ -316,11 +315,6 @@ async function main() {
  const fileSystemBrowser = new FileSystemBrowser({ rootDir: options.rootDir, unrestricted: options.unrestrictedRoot })
  const instanceStore = new InstanceStore(configLocation.instancesDir)
  const speechService = new SpeechService(settings, logger.child({ component: "speech" }))
-  const sidecarManager = new SideCarManager({
-    settings,
-    eventBus,
-    logger: logger.child({ component: "sidecars" }),
-  })
  const instanceEventBridge = new InstanceEventBridge({
    workspaceManager,
    eventBus,
@@ -406,7 +400,6 @@ async function main() {
        serverMeta,
        instanceStore,
        speechService,
-        sidecarManager,
        authManager,
        uiStaticDir: uiResolution.uiStaticDir ?? DEFAULT_UI_STATIC_DIR,
        uiDevServerUrl: uiResolution.uiDevServerUrl,
@@ -428,7 +421,6 @@ async function main() {
        serverMeta,
        instanceStore,
        speechService,
-        sidecarManager,
        authManager,
        uiStaticDir: uiResolution.uiStaticDir ?? DEFAULT_UI_STATIC_DIR,
        uiDevServerUrl: undefined,
@@ -528,12 +520,6 @@ async function main() {
        logger.warn({ err: error }, "Instance event bridge shutdown failed")
      }

-      try {
-        await sidecarManager.shutdown()
-      } catch (error) {
-        logger.error({ err: error }, "SideCar manager shutdown failed")
-      }
-
      try {
        await workspaceManager.shutdown()
        logger.info("Workspace manager shutdown complete")
--- a/packages/server/src/plugins/voice-mode.ts
+++ b/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}`
-}
--- a/packages/server/src/server/http-server.ts
+++ b/packages/server/src/server/http-server.ts
@@ -3,9 +3,7 @@ import cors from "@fastify/cors"
 import fastifyStatic from "@fastify/static"
 import replyFrom from "@fastify/reply-from"
 import fs from "fs"
-import { connect as connectTcp, type Socket } from "net"
 import path from "path"
-import { connect as connectTls, type TLSSocket } from "tls"
 import { fetch } from "undici"
 import type { Logger } from "../logger"
 import { WorkspaceManager } from "../workspaces/manager"
@@ -24,8 +22,6 @@ import { registerPluginRoutes } from "./routes/plugin"
 import { registerBackgroundProcessRoutes } from "./routes/background-processes"
 import { registerWorktreeRoutes } from "./routes/worktrees"
 import { registerSpeechRoutes } from "./routes/speech"
-import { registerRemoteServerRoutes } from "./routes/remote-servers"
-import { registerSideCarRoutes } from "./routes/sidecars"
 import { ServerMeta } from "../api-types"
 import { InstanceStore } from "../storage/instance-store"
 import { BackgroundProcessManager } from "../background-processes/manager"
@@ -33,10 +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"
-import type { SideCarManager } from "../sidecars/manager"

 interface HttpServerDeps {
  bindHost: string
@@ -52,7 +44,6 @@ interface HttpServerDeps {
  serverMeta: ServerMeta
  instanceStore: InstanceStore
  speechService: SpeechService
-  sidecarManager: SideCarManager
  authManager: AuthManager
  uiStaticDir: string
  uiDevServerUrl?: string
@@ -182,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 })

@@ -209,7 +193,7 @@ export function createHttpServer(deps: HttpServerDeps) {

    const session = deps.authManager.getSessionFromRequest(request)

-    const requiresAuthForApi = pathname.startsWith("/api/") || pathname.startsWith("/workspaces/") || pathname.startsWith("/sidecars/")
+    const requiresAuthForApi = pathname.startsWith("/api/") || pathname.startsWith("/workspaces/")
    if (requiresAuthForApi && !session) {
      // Allow OpenCode plugin -> CodeNomad calls with per-instance basic auth.
      const pluginMatch = pathname.match(/^\/workspaces\/([^/]+)\/plugin(?:\/|$)/)
@@ -264,34 +248,15 @@ 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,
    eventBus: deps.eventBus,
    workspaceManager: deps.workspaceManager,
  })
-  registerRemoteServerRoutes(app, { logger: apiLogger })
  registerSpeechRoutes(app, { speechService: deps.speechService })
-  registerSideCarRoutes(app, { sidecarManager: deps.sidecarManager })
-  registerSideCarProxyRoutes(app, { sidecarManager: deps.sidecarManager, logger: proxyLogger })
-  setupSideCarWebSocketProxy(app, {
-    sidecarManager: deps.sidecarManager,
-    authManager: deps.authManager,
-    logger: proxyLogger,
-  })
-  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 })

@@ -356,7 +321,6 @@ export function createHttpServer(deps: HttpServerDeps) {
    },
    stop: () => {
      closeSseClients()
-      clientConnectionManager.shutdown()
      return app.close()
    },
  }
@@ -367,68 +331,6 @@ interface InstanceProxyDeps {
  logger: Logger
 }

-interface SideCarProxyDeps {
-  sidecarManager: SideCarManager
-  logger: Logger
-}
-
-interface SideCarWebSocketProxyDeps extends SideCarProxyDeps {
-  authManager: AuthManager
-}
-
-function registerSideCarProxyRoutes(app: FastifyInstance, deps: SideCarProxyDeps) {
-  const proxyBaseHandler = async (
-    request: FastifyRequest<{ Params: { id: string } }>,
-    reply: FastifyReply,
-  ) => {
-    await proxySideCarRequest({
-      request,
-      reply,
-      sidecarManager: deps.sidecarManager,
-      logger: deps.logger,
-      pathSuffix: "",
-    })
-  }
-
-  const proxyWildcardHandler = async (
-    request: FastifyRequest<{ Params: { id: string; "*": string } }>,
-    reply: FastifyReply,
-  ) => {
-    await proxySideCarRequest({
-      request,
-      reply,
-      sidecarManager: deps.sidecarManager,
-      logger: deps.logger,
-      pathSuffix: request.params["*"] ?? "",
-    })
-  }
-
-  app.all("/sidecars/:id", proxyBaseHandler)
-  app.all("/sidecars/:id/*", proxyWildcardHandler)
-}
-
-function setupSideCarWebSocketProxy(app: FastifyInstance, deps: SideCarWebSocketProxyDeps) {
-  app.server.on("upgrade", (request, socket, head) => {
-    const rawUrl = request.url ?? "/"
-    const parsed = parseSideCarUpgradePath(rawUrl)
-    if (!parsed) {
-      return
-    }
-
-    void proxySideCarWebSocketUpgrade({
-      request,
-      socket: socket as Socket,
-      head,
-      sidecarId: parsed.sidecarId,
-      incomingPath: parsed.pathname,
-      search: parsed.search,
-      sidecarManager: deps.sidecarManager,
-      authManager: deps.authManager,
-      logger: deps.logger,
-    })
-  })
-}
-
 function registerInstanceProxyRoutes(app: FastifyInstance, deps: InstanceProxyDeps) {
  app.register(async (instance) => {
    instance.removeAllContentTypeParsers()
@@ -913,281 +815,3 @@ function buildProxyHeaders(headers: FastifyRequest["headers"]): Record<string, s
  }
  return result
 }
-
-async function proxySideCarRequest(args: {
-  request: FastifyRequest
-  reply: FastifyReply
-  sidecarManager: SideCarManager
-  logger: Logger
-  pathSuffix?: string
-}) {
-  const sidecarId = (args.request.params as { id?: string }).id ?? ""
-  const sidecar = await args.sidecarManager.get(sidecarId)
-  if (!sidecar) {
-    args.reply.code(404).send({ error: "SideCar not found" })
-    return
-  }
-
-  const pathname = (args.request.raw.url ?? args.request.url ?? "").split("?")[0] ?? ""
-  const queryIndex = (args.request.raw.url ?? args.request.url ?? "").indexOf("?")
-  const search = queryIndex >= 0 ? (args.request.raw.url ?? args.request.url ?? "").slice(queryIndex) : ""
-  const pathSuffix = args.pathSuffix ?? ""
-  const requestPath = pathSuffix ? `${args.sidecarManager.buildProxyBasePath(sidecarId)}/${pathSuffix.replace(/^\/+/, "")}` : args.sidecarManager.buildProxyBasePath(sidecarId)
-  const targetPath = args.sidecarManager.buildTargetPath(sidecarId, requestPath, search)
-  const targetOrigin = args.sidecarManager.buildTargetOrigin(sidecar)
-  const targetUrl = `${targetOrigin}${targetPath}`
-  args.logger.debug({ sidecarId: sidecar.id, targetUrl, pathname, prefixMode: sidecar.prefixMode }, "Proxying request to SideCar")
-
-  await args.reply.from(targetUrl, {
-    rewriteRequestHeaders: (_originalRequest, headers) =>
-      sanitizeSideCarProxyRequestHeaders(headers as Record<string, string | string[] | undefined>, targetOrigin),
-    rewriteHeaders: (headers) => rewriteSideCarResponseHeaders(headers, sidecarId, targetOrigin, sidecar.prefixMode),
-    onError: (reply, { error }) => {
-      args.logger.error({ sidecarId: sidecar.id, err: error, targetUrl }, "Failed to proxy SideCar request")
-      if (!reply.sent) {
-        reply.code(502).send({ error: "SideCar proxy failed" })
-      }
-    },
-  })
-}
-
-function parseSideCarUpgradePath(rawUrl: string): { sidecarId: string; pathname: string; search: string } | null {
-  let parsed: URL
-  try {
-    parsed = new URL(rawUrl, "http://localhost")
-  } catch {
-    return null
-  }
-
-  const match = parsed.pathname.match(/^\/sidecars\/([^/]+)(?:\/.*)?$/)
-  if (!match) {
-    return null
-  }
-
-  try {
-    return {
-      sidecarId: decodeURIComponent(match[1] ?? ""),
-      pathname: parsed.pathname,
-      search: parsed.search,
-    }
-  } catch {
-    return null
-  }
-}
-
-async function proxySideCarWebSocketUpgrade(args: {
-  request: import("http").IncomingMessage
-  socket: Socket
-  head: Buffer
-  sidecarId: string
-  incomingPath: string
-  search: string
-  sidecarManager: SideCarManager
-  authManager: AuthManager
-  logger: Logger
-}) {
-  const { request, socket, head, sidecarId, incomingPath, search, sidecarManager, authManager, logger } = args
-
-  if (!isWebSocketUpgradeRequest(request)) {
-    rejectUpgrade(socket, 400, "Bad Request")
-    return
-  }
-
-  const session = authManager.getSessionFromHeaders(request.headers)
-  if (!session) {
-    rejectUpgrade(socket, 401, "Unauthorized")
-    return
-  }
-
-  const sidecar = await sidecarManager.get(sidecarId)
-  if (!sidecar) {
-    rejectUpgrade(socket, 404, "Not Found")
-    return
-  }
-
-  const targetOrigin = sidecarManager.buildTargetOrigin(sidecar)
-  const targetPath = sidecarManager.buildTargetPath(sidecarId, incomingPath, search)
-  const targetUrl = new URL(`${targetOrigin}${targetPath}`)
-  logger.debug({ sidecarId, targetUrl: targetUrl.toString(), prefixMode: sidecar.prefixMode }, "Proxying websocket to SideCar")
-
-  const { socket: upstream, readyEvent } = createSideCarUpstreamSocket(targetUrl)
-
-  const closeBoth = () => {
-    if (!socket.destroyed) {
-      socket.destroy()
-    }
-    if (!upstream.destroyed) {
-      upstream.destroy()
-    }
-  }
-
-  upstream.once("error", (error) => {
-    logger.error({ sidecarId, err: error, targetUrl: targetUrl.toString() }, "Failed to proxy SideCar websocket")
-    rejectUpgrade(socket, 502, "Bad Gateway")
-    if (!upstream.destroyed) {
-      upstream.destroy()
-    }
-  })
-
-  socket.once("error", (error) => {
-    logger.debug({ sidecarId, err: error }, "SideCar websocket client socket errored")
-    if (!upstream.destroyed) {
-      upstream.destroy()
-    }
-  })
-
-  upstream.once(readyEvent, () => {
-    try {
-      upstream.write(buildSideCarWebSocketRequest(request, targetUrl))
-      if (head.length > 0) {
-        upstream.write(head)
-      }
-      upstream.pipe(socket)
-      socket.pipe(upstream)
-    } catch (error) {
-      logger.error({ sidecarId, err: error, targetUrl: targetUrl.toString() }, "Failed to forward SideCar websocket upgrade")
-      closeBoth()
-    }
-  })
-
-  upstream.once("close", () => {
-    if (!socket.destroyed) {
-      socket.end()
-    }
-  })
-
-  socket.once("close", () => {
-    if (!upstream.destroyed) {
-      upstream.end()
-    }
-  })
-}
-
-function createSideCarUpstreamSocket(targetUrl: URL): { socket: Socket | TLSSocket; readyEvent: "connect" | "secureConnect" } {
-  const port = Number(targetUrl.port || (targetUrl.protocol === "https:" ? 443 : 80))
-  if (targetUrl.protocol === "https:") {
-    return {
-      socket: connectTls({
-        host: targetUrl.hostname,
-        port,
-        servername: targetUrl.hostname,
-      }),
-      readyEvent: "secureConnect",
-    }
-  }
-  return {
-    socket: connectTcp(port, targetUrl.hostname),
-    readyEvent: "connect",
-  }
-}
-
-function buildSideCarWebSocketRequest(request: import("http").IncomingMessage, targetUrl: URL): string {
-  const pathWithQuery = `${targetUrl.pathname}${targetUrl.search}`
-  const requestLine = `${request.method ?? "GET"} ${pathWithQuery} HTTP/${request.httpVersion}\r\n`
-  const headerLines: string[] = []
-  const rawHeaders = request.rawHeaders ?? []
-  const blockedHeaders = getBlockedSideCarRequestHeaders()
-
-  for (let index = 0; index < rawHeaders.length; index += 2) {
-    const key = rawHeaders[index]
-    const value = rawHeaders[index + 1]
-    if (!key || value === undefined) continue
-    const lower = key.toLowerCase()
-    if (blockedHeaders.has(lower)) continue
-    if (lower === "origin") {
-      headerLines.push(`Origin: ${targetUrl.origin}\r\n`)
-      continue
-    }
-    headerLines.push(`${key}: ${value}\r\n`)
-  }
-
-  const hostValue = targetUrl.port ? `${targetUrl.hostname}:${targetUrl.port}` : targetUrl.hostname
-  headerLines.push(`Host: ${hostValue}\r\n`)
-  headerLines.push("\r\n")
-
-  return requestLine + headerLines.join("")
-}
-
-function isWebSocketUpgradeRequest(request: import("http").IncomingMessage): boolean {
-  const upgrade = request.headers.upgrade
-  if (typeof upgrade !== "string" || upgrade.toLowerCase() !== "websocket") {
-    return false
-  }
-  const connection = request.headers.connection
-  const connectionValue = Array.isArray(connection) ? connection.join(",") : connection ?? ""
-  return connectionValue.toLowerCase().split(",").map((part) => part.trim()).includes("upgrade")
-}
-
-function rejectUpgrade(socket: Socket, statusCode: number, statusText: string) {
-  if (socket.destroyed) {
-    return
-  }
-  socket.write(`HTTP/1.1 ${statusCode} ${statusText}\r\nConnection: close\r\nContent-Length: 0\r\n\r\n`)
-  socket.destroy()
-}
-
-function rewriteSideCarResponseHeaders(
-  headers: Record<string, string | string[] | undefined>,
-  sidecarId: string,
-  targetOrigin: string,
-  prefixMode: "strip" | "preserve",
-) {
-  if (prefixMode === "preserve") {
-    return headers
-  }
-
-  const next = { ...headers }
-  const locationHeader = next.location
-  const location = Array.isArray(locationHeader) ? locationHeader[0] : locationHeader
-  if (!location) {
-    return next
-  }
-
-  const publicBase = `/sidecars/${encodeURIComponent(sidecarId)}`
-
-  if (location.startsWith("/")) {
-    next.location = `${publicBase}${location}`
-    return next
-  }
-
-  try {
-    const parsed = new URL(location)
-    if (parsed.origin === targetOrigin) {
-      next.location = `${publicBase}${parsed.pathname}${parsed.search}${parsed.hash}`
-    }
-  } catch {
-    // Relative redirects should continue to resolve against the public sidecar path.
-  }
-
-  return next
-}
-
-function sanitizeSideCarProxyRequestHeaders(
-  headers: Record<string, string | string[] | undefined>,
-  targetOrigin: string,
-): Record<string, string | string[] | undefined> {
-  const blockedHeaders = getBlockedSideCarRequestHeaders()
-  const next: Record<string, string | string[] | undefined> = {}
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (!value) continue
-    if (blockedHeaders.has(key.toLowerCase())) continue
-    next[key] = value
-  }
-
-  next.origin = targetOrigin
-  return next
-}
-
-function getBlockedSideCarRequestHeaders(): Set<string> {
-  return new Set([
-    "host",
-    "authorization",
-    "proxy-authorization",
-    "forwarded",
-    "x-forwarded-for",
-    "x-forwarded-host",
-    "x-forwarded-port",
-    "x-forwarded-proto",
-  ])
-}
--- a/packages/server/src/server/routes/background-processes.ts
+++ b/packages/server/src/server/routes/background-processes.ts
@@ -9,21 +9,6 @@ interface RouteDeps {
 const StartSchema = z.object({
  title: z.string().trim().min(1),
  command: z.string().trim().min(1),
-  notify: z.boolean().optional(),
-  notification: z
-    .object({
-      sessionID: z.string().trim().min(1),
-      directory: z.string().trim().min(1),
-    })
-    .optional(),
-}).superRefine((value, ctx) => {
-  if (value.notify && !value.notification) {
-    ctx.addIssue({
-      code: z.ZodIssueCode.custom,
-      message: "Notification metadata is required when notify is enabled",
-      path: ["notification"],
-    })
-  }
 })

 const OutputQuerySchema = z.object({
@@ -42,10 +27,7 @@ export function registerBackgroundProcessRoutes(app: FastifyInstance, deps: Rout

  app.post<{ Params: { id: string } }>("/workspaces/:id/plugin/background-processes", async (request, reply) => {
    const payload = StartSchema.parse(request.body ?? {})
-    const process = await deps.backgroundProcessManager.start(request.params.id, payload.title, payload.command, {
-      notify: payload.notify,
-      notification: payload.notification,
-    })
+    const process = await deps.backgroundProcessManager.start(request.params.id, payload.title, payload.command)
    reply.code(201)
    return process
  })
--- a/packages/server/src/server/routes/events.ts
+++ b/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()
-  })
 }
--- a/packages/server/src/server/routes/plugin.ts
+++ b/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)
--- a/packages/server/src/server/routes/remote-servers.ts
+++ b/packages/server/src/server/routes/remote-servers.ts
@@ -1,166 +0,0 @@
-import { Agent, fetch } from "undici"
-import type { FastifyInstance } from "fastify"
-import { z } from "zod"
-import type { Logger } from "../../logger"
-import type { RemoteServerProbeResponse } from "../../api-types"
-
-interface RouteDeps {
-  logger: Logger
-}
-
-const ProbeSchema = z.object({
-  baseUrl: z.string().min(1),
-  skipTlsVerify: z.boolean().optional(),
-})
-
-const PROBE_TIMEOUT_MS = 8_000
-
-export function registerRemoteServerRoutes(app: FastifyInstance, deps: RouteDeps) {
-  app.post("/api/remote-servers/probe", async (request, reply) => {
-    try {
-      const body = ProbeSchema.parse(request.body ?? {})
-      return await probeRemoteServer(body.baseUrl, Boolean(body.skipTlsVerify))
-    } catch (error) {
-      deps.logger.warn({ err: error }, "Failed to probe remote server")
-      reply.code(400)
-      return { error: error instanceof Error ? error.message : "Invalid request" }
-    }
-  })
-}
-
-async function probeRemoteServer(baseUrl: string, skipTlsVerify: boolean): Promise<RemoteServerProbeResponse> {
-  const normalizedUrl = normalizeBaseUrl(baseUrl)
-  const probeUrl = new URL("./api/auth/status", `${normalizedUrl}/`)
-  const controller = new AbortController()
-  const timeout = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS)
-  const dispatcher = skipTlsVerify ? new Agent({ connect: { rejectUnauthorized: false } }) : undefined
-
-  try {
-    const response = await fetch(probeUrl, {
-      method: "GET",
-      dispatcher,
-      signal: controller.signal,
-      headers: {
-        Accept: "application/json",
-      },
-    })
-
-    if (!response.ok) {
-      return {
-        ok: false,
-        reachable: true,
-        normalizedUrl,
-        skipTlsVerify,
-        requiresAuth: false,
-        authenticated: false,
-        error: `Remote server returned HTTP ${response.status}`,
-        errorCode: "http_error",
-      }
-    }
-
-    const payload = (await response.json()) as { authenticated?: unknown }
-    if (typeof payload?.authenticated !== "boolean") {
-      return {
-        ok: false,
-        reachable: true,
-        normalizedUrl,
-        skipTlsVerify,
-        requiresAuth: false,
-        authenticated: false,
-        error: "Remote server did not return a valid CodeNomad auth response",
-        errorCode: "invalid_server",
-      }
-    }
-
-    return {
-      ok: true,
-      reachable: true,
-      normalizedUrl,
-      skipTlsVerify,
-      requiresAuth: !payload.authenticated,
-      authenticated: payload.authenticated,
-    }
-  } catch (error) {
-    const message = describeProbeError(error)
-    return {
-      ok: false,
-      reachable: false,
-      normalizedUrl,
-      skipTlsVerify,
-      requiresAuth: false,
-      authenticated: false,
-      error: message.message,
-      errorCode: message.code,
-    }
-  } finally {
-    clearTimeout(timeout)
-    await dispatcher?.close().catch(() => {})
-  }
-}
-
-function normalizeBaseUrl(input: string): string {
-  const parsed = new URL(input.trim())
-  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-    throw new Error("Server URL must use http:// or https://")
-  }
-
-  parsed.hash = ""
-  parsed.search = ""
-  parsed.pathname = parsed.pathname === "/" ? "/" : parsed.pathname.replace(/\/+$/, "") || "/"
-  const value = parsed.toString()
-  return parsed.pathname === "/" ? value.replace(/\/$/, "") : value.replace(/\/$/, "")
-}
-
-function describeProbeError(error: unknown): { code: string; message: string } {
-  const chain = unwrapErrorChain(error)
-  const detailed =
-    chain.find((entry) => {
-      const code = (entry?.code ?? "").toString()
-      return Boolean(code) && code !== "UND_ERR_RESPONSE_STATUS_CODE"
-    }) ?? chain[0]
-
-  const code = (detailed?.code ?? "").toString()
-  const exactMessage = detailed?.message?.trim() || chain.find((entry) => entry.message?.trim())?.message?.trim()
-
-  if (code === "DEPTH_ZERO_SELF_SIGNED_CERT" || code === "SELF_SIGNED_CERT_IN_CHAIN" || code === "CERT_HAS_EXPIRED") {
-    return {
-      code: "tls_error",
-      message: "Certificate check failed while connecting to the remote server.",
-    }
-  }
-
-  return {
-    code:
-      code === "ERR_INVALID_URL"
-        ? "invalid_url"
-        : code === "ECONNREFUSED"
-          ? "connection_refused"
-          : code === "ENOTFOUND"
-            ? "dns_error"
-            : code === "UND_ERR_CONNECT_TIMEOUT" || code === "ABORT_ERR"
-              ? "timeout"
-              : code
-                ? code.toLowerCase()
-                : "probe_failed",
-    message: exactMessage || "Failed to connect to the remote server.",
-  }
-}
-
-function unwrapErrorChain(error: unknown): Array<{ code?: unknown; message?: string }> {
-  const results: Array<{ code?: unknown; message?: string }> = []
-  let current: unknown = error
-  const seen = new Set<unknown>()
-
-  while (current && typeof current === "object" && !seen.has(current)) {
-    seen.add(current)
-    const entry = current as { code?: unknown; message?: string; cause?: unknown }
-    results.push({ code: entry.code, message: entry.message })
-    current = entry.cause
-  }
-
-  if (results.length === 0 && error instanceof Error) {
-    results.push({ message: error.message })
-  }
-
-  return results
-}
--- a/packages/server/src/server/routes/sidecars.ts
+++ b/packages/server/src/server/routes/sidecars.ts
@@ -1,56 +0,0 @@
-import { FastifyInstance } from "fastify"
-import { z } from "zod"
-import type { SideCarManager } from "../../sidecars/manager"
-
-interface RouteDeps {
-  sidecarManager: SideCarManager
-}
-
-const SideCarCreateSchema = z.object({
-  kind: z.literal("port").default("port"),
-  name: z.string().trim().min(1),
-  port: z.number().int().min(1).max(65535),
-  insecure: z.boolean().default(false),
-  prefixMode: z.enum(["strip", "preserve"]).default("strip"),
-})
-
-const SideCarUpdateSchema = SideCarCreateSchema.omit({ kind: true }).partial().refine((value) => Object.keys(value).length > 0, {
-  message: "At least one field is required",
-})
-
-export function registerSideCarRoutes(app: FastifyInstance, deps: RouteDeps) {
-  app.get("/api/sidecars", async () => {
-    return { sidecars: await deps.sidecarManager.list() }
-  })
-
-  app.post("/api/sidecars", async (request, reply) => {
-    try {
-      const body = SideCarCreateSchema.parse(request.body ?? {})
-      const sidecar = await deps.sidecarManager.create(body)
-      reply.code(201)
-      return sidecar
-    } catch (error) {
-      reply.code(400)
-      return { error: error instanceof Error ? error.message : "Failed to create SideCar" }
-    }
-  })
-
-  app.put<{ Params: { id: string } }>("/api/sidecars/:id", async (request, reply) => {
-    try {
-      const body = SideCarUpdateSchema.parse(request.body ?? {})
-      return await deps.sidecarManager.update(request.params.id, body)
-    } catch (error) {
-      reply.code(400)
-      return { error: error instanceof Error ? error.message : "Failed to update SideCar" }
-    }
-  })
-
-  app.delete<{ Params: { id: string } }>("/api/sidecars/:id", async (request, reply) => {
-    const removed = await deps.sidecarManager.delete(request.params.id)
-    if (!removed) {
-      reply.code(404)
-      return { error: "SideCar not found" }
-    }
-    reply.code(204)
-  })
-}
--- a/packages/server/src/server/routes/workspaces.ts
+++ b/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)
-    }
-  })
 }


--- a/packages/server/src/settings/migrate.ts
+++ b/packages/server/src/settings/migrate.ts
@@ -107,10 +107,6 @@ function mapLegacyToOwnerDocs(legacyConfig: unknown, legacyState: unknown): { co
    if (typeof listeningMode === "string") {
      serverConfig.listeningMode = listeningMode
    }
-    const logLevel = preferences.logLevel
-    if (typeof logLevel === "string") {
-      serverConfig.logLevel = logLevel
-    }
    const lastUsedBinary = preferences.lastUsedBinary
    if (typeof lastUsedBinary === "string") {
      serverConfig.opencodeBinary = lastUsedBinary
@@ -139,7 +135,6 @@ function mapLegacyToOwnerDocs(legacyConfig: unknown, legacyState: unknown): { co
    const moved = new Set([
      "environmentVariables",
      "listeningMode",
-      "logLevel",
      "lastUsedBinary",
      "modelRecents",
      "modelFavorites",
--- a/packages/server/src/settings/service.ts
+++ b/packages/server/src/settings/service.ts
@@ -1,7 +1,6 @@
 import type { Logger } from "../logger"
 import type { EventBus } from "../events/bus"
 import type { ConfigLocation } from "../config/location"
-import { z } from "zod"
 import { YamlDocStore, type SettingsDoc } from "./yaml-doc-store"
 import { migrateSettingsLayout } from "./migrate"
 import type { WorkspaceEventPayload } from "../api-types"
@@ -9,54 +8,6 @@ import { sanitizeConfigOwner } from "./public-config"

 export type DocKind = "config" | "state"

-const CanonicalLogLevelSchema = z.preprocess(
-  (value) => (typeof value === "string" ? value.trim().toUpperCase() : value),
-  z.enum(["DEBUG", "INFO", "WARN", "ERROR"]),
-)
-
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
-
-function isDeepEqual(a: unknown, b: unknown): boolean {
-  if (a === b) return true
-  try {
-    return JSON.stringify(a) === JSON.stringify(b)
-  } catch {
-    return false
-  }
-}
-
-function normalizeServerConfigOwner(value: SettingsDoc): SettingsDoc {
-  if (!isPlainObject(value)) {
-    return {}
-  }
-
-  const next: SettingsDoc = { ...value }
-  const parsedLogLevel = CanonicalLogLevelSchema.safeParse(next.logLevel)
-  if (parsedLogLevel.success) {
-    next.logLevel = parsedLogLevel.data
-  } else if (next.logLevel !== undefined) {
-    next.logLevel = "DEBUG"
-  }
-  return next
-}
-
-function normalizeConfigDoc(doc: SettingsDoc): SettingsDoc {
-  if (!isPlainObject(doc)) {
-    return {}
-  }
-
-  if (!isPlainObject(doc.server)) {
-    return doc
-  }
-
-  return {
-    ...doc,
-    server: normalizeServerConfigOwner(doc.server as SettingsDoc),
-  }
-}
-
 export class SettingsService {
  private readonly configStore: YamlDocStore
  private readonly stateStore: YamlDocStore
@@ -72,44 +23,22 @@ export class SettingsService {
  }

  getDoc(kind: DocKind): SettingsDoc {
-    if (kind !== "config") {
-      return this.stateStore.get()
-    }
-
-    const current = this.configStore.get()
-    const normalized = normalizeConfigDoc(current)
-    if (!isDeepEqual(current, normalized)) {
-      this.configStore.replace(normalized)
-    }
-    return normalized
+    return kind === "config" ? this.configStore.get() : this.stateStore.get()
  }

  mergePatchDoc(kind: DocKind, patch: unknown): SettingsDoc {
-    const updated =
-      kind === "config"
-        ? this.configStore.replace(normalizeConfigDoc(this.configStore.mergePatch(patch)))
-        : this.stateStore.mergePatch(patch)
+    const updated = kind === "config" ? this.configStore.mergePatch(patch) : this.stateStore.mergePatch(patch)
    this.publish(kind, "*")
    return updated
  }

  getOwner(kind: DocKind, owner: string): SettingsDoc {
-    if (kind !== "config") {
-      return this.stateStore.getOwner(owner)
-    }
-
-    return owner === "server"
-      ? normalizeServerConfigOwner(this.getDoc("config").server as SettingsDoc)
-      : this.getDoc("config")[owner] as SettingsDoc
+    return kind === "config" ? this.configStore.getOwner(owner) : this.stateStore.getOwner(owner)
  }

  mergePatchOwner(kind: DocKind, owner: string, patch: unknown): SettingsDoc {
    const updated =
-      kind === "config"
-        ? owner === "server"
-          ? this.configStore.replaceOwner(owner, normalizeServerConfigOwner(this.configStore.mergePatchOwner(owner, patch)))
-          : this.configStore.mergePatchOwner(owner, patch)
-        : this.stateStore.mergePatchOwner(owner, patch)
+      kind === "config" ? this.configStore.mergePatchOwner(owner, patch) : this.stateStore.mergePatchOwner(owner, patch)
    this.publish(kind, owner, updated)
    return updated
  }
--- a/packages/server/src/sidecars/manager.ts
+++ b/packages/server/src/sidecars/manager.ts
@@ -1,256 +0,0 @@
-import { connect } from "net"
-import type { EventBus } from "../events/bus"
-import type { Logger } from "../logger"
-import type { SettingsService } from "../settings/service"
-import type { SideCar, SideCarKind, SideCarPrefixMode, SideCarStatus } from "../api-types"
-
-interface SideCarManagerOptions {
-  settings: SettingsService
-  eventBus: EventBus
-  logger: Logger
-}
-
-interface SideCarConfigRecord {
-  id: string
-  kind: SideCarKind
-  name: string
-  port: number
-  insecure: boolean
-  prefixMode: SideCarPrefixMode
-  createdAt: string
-  updatedAt: string
-}
-
-interface SideCarRuntimeRecord {
-  status: SideCarStatus
-}
-
-export class SideCarManager {
-  private readonly configs = new Map<string, SideCarConfigRecord>()
-  private readonly runtime = new Map<string, SideCarRuntimeRecord>()
-
-  constructor(private readonly options: SideCarManagerOptions) {
-    for (const record of this.loadConfiguredSideCars()) {
-      this.configs.set(record.id, record)
-      this.runtime.set(record.id, { status: "stopped" })
-    }
-
-    queueMicrotask(() => {
-      for (const record of this.configs.values()) {
-        void this.refreshPortSideCar(record.id).catch((error) => {
-          this.options.logger.warn({ sidecarId: record.id, err: error }, "Failed to probe sidecar port")
-        })
-      }
-    })
-  }
-
-  async list(): Promise<SideCar[]> {
-    await this.refreshPortStatuses()
-    return Array.from(this.configs.values()).map((record) => this.toSideCar(record))
-  }
-
-  async get(id: string): Promise<SideCar | undefined> {
-    if (!this.configs.has(id)) return undefined
-    await this.refreshPortSideCar(id)
-    return this.toSideCar(this.requireConfig(id))
-  }
-
-  async create(input: {
-    kind: SideCarKind
-    name: string
-    port: number
-    insecure: boolean
-    prefixMode: SideCarPrefixMode
-  }): Promise<SideCar> {
-    const normalizedName = input.name.trim()
-    const id = this.buildSideCarId(normalizedName)
-    if (this.configs.has(id)) {
-      throw new Error(`SideCar '${id}' already exists`)
-    }
-
-    const now = new Date().toISOString()
-    const record: SideCarConfigRecord = {
-      id,
-      kind: input.kind,
-      name: normalizedName,
-      port: input.port,
-      insecure: input.insecure,
-      prefixMode: input.prefixMode,
-      createdAt: now,
-      updatedAt: now,
-    }
-
-    this.configs.set(record.id, record)
-    this.runtime.set(record.id, { status: "stopped" })
-    this.persistConfigs()
-    await this.refreshPortSideCar(record.id)
-    return this.toSideCar(record)
-  }
-
-  async update(
-    id: string,
-    input: Partial<{
-      name: string
-      port: number
-      insecure: boolean
-      prefixMode: SideCarPrefixMode
-    }>,
-  ): Promise<SideCar> {
-    const record = this.requireConfig(id)
-
-    record.name = typeof input.name === "string" ? input.name.trim() : record.name
-    record.port = typeof input.port === "number" ? input.port : record.port
-    record.insecure = typeof input.insecure === "boolean" ? input.insecure : record.insecure
-    record.prefixMode = typeof input.prefixMode === "string" ? input.prefixMode : record.prefixMode
-    record.updatedAt = new Date().toISOString()
-
-    this.persistConfigs()
-    await this.refreshPortSideCar(id)
-    return this.toSideCar(record)
-  }
-
-  async delete(id: string): Promise<boolean> {
-    const record = this.configs.get(id)
-    if (!record) return false
-
-    this.configs.delete(id)
-    this.runtime.delete(id)
-    this.persistConfigs()
-    this.options.eventBus.publish({ type: "sidecar.removed", sidecarId: id })
-    return true
-  }
-
-  async shutdown() {
-    return
-  }
-
-  buildTargetOrigin(sidecar: Pick<SideCar, "port" | "insecure">): string {
-    const protocol = sidecar.insecure ? "http" : "https"
-    return `${protocol}://127.0.0.1:${sidecar.port}`
-  }
-
-  buildProxyBasePath(id: string): string {
-    return `/sidecars/${encodeURIComponent(id)}`
-  }
-
-  buildTargetPath(id: string, incomingPath: string, search = ""): string {
-    const record = this.requireConfig(id)
-    const publicBase = this.buildProxyBasePath(id)
-    const normalizedPath = incomingPath || publicBase
-
-    if (record.prefixMode === "preserve") {
-      return `${normalizedPath}${search}`
-    }
-
-    let stripped = normalizedPath.startsWith(publicBase) ? normalizedPath.slice(publicBase.length) : normalizedPath
-    if (!stripped || stripped === "/") {
-      stripped = "/"
-    } else if (!stripped.startsWith("/")) {
-      stripped = `/${stripped}`
-    }
-    return `${stripped}${search}`
-  }
-
-  private async refreshPortStatuses() {
-    await Promise.all(Array.from(this.configs.values()).map((record) => this.refreshPortSideCar(record.id)))
-  }
-
-  private async refreshPortSideCar(id: string) {
-    const record = this.configs.get(id)
-    if (!record) return
-    const isAvailable = await this.isPortAvailable(record.port)
-    const current = this.runtime.get(id)
-    const nextStatus: SideCarStatus = isAvailable ? "running" : "stopped"
-    if (current?.status === nextStatus) {
-      return
-    }
-
-    this.runtime.set(id, { status: nextStatus })
-    record.updatedAt = new Date().toISOString()
-    this.publish(id)
-  }
-
-  private publish(id: string) {
-    const record = this.configs.get(id)
-    if (!record) return
-    this.options.eventBus.publish({ type: "sidecar.updated", sidecar: this.toSideCar(record) })
-  }
-
-  private toSideCar(record: SideCarConfigRecord): SideCar {
-    const runtime = this.runtime.get(record.id)
-    return {
-      id: record.id,
-      kind: record.kind,
-      name: record.name,
-      port: record.port,
-      insecure: record.insecure,
-      prefixMode: record.prefixMode,
-      status: runtime?.status ?? "stopped",
-      createdAt: record.createdAt,
-      updatedAt: record.updatedAt,
-    }
-  }
-
-  private requireConfig(id: string): SideCarConfigRecord {
-    const record = this.configs.get(id)
-    if (!record) {
-      throw new Error("SideCar not found")
-    }
-    return record
-  }
-
-  private persistConfigs() {
-    const sidecars = Array.from(this.configs.values()).map((record) => ({ ...record }))
-    this.options.settings.mergePatchOwner("config", "server", { sidecars })
-  }
-
-  private loadConfiguredSideCars(): SideCarConfigRecord[] {
-    const serverConfig = this.options.settings.getOwner("config", "server") as { sidecars?: unknown }
-    const list = Array.isArray(serverConfig?.sidecars) ? serverConfig.sidecars : []
-    const records: SideCarConfigRecord[] = []
-    for (const item of list) {
-      if (!item || typeof item !== "object") continue
-      const record = item as Record<string, unknown>
-      const kind = record.kind === "port" ? "port" : null
-      const id = typeof record.id === "string" && record.id.trim() ? record.id.trim() : null
-      const name = typeof record.name === "string" && record.name.trim() ? record.name.trim() : null
-      const port = typeof record.port === "number" && Number.isInteger(record.port) ? record.port : null
-      if (!kind || !id || !name || !port) continue
-
-      const insecure = record.insecure === true
-      const prefixMode = record.prefixMode === "preserve" ? "preserve" : "strip"
-      const createdAt = typeof record.createdAt === "string" && record.createdAt ? record.createdAt : new Date().toISOString()
-      const updatedAt = typeof record.updatedAt === "string" && record.updatedAt ? record.updatedAt : createdAt
-      records.push({ id, kind, name, port, insecure, prefixMode, createdAt, updatedAt })
-    }
-    return records
-  }
-
-  private isPortAvailable(port: number): Promise<boolean> {
-    return new Promise((resolve) => {
-      const socket = connect({ port, host: "127.0.0.1" }, () => {
-        socket.end()
-        resolve(true)
-      })
-      socket.once("error", () => {
-        socket.destroy()
-        resolve(false)
-      })
-    })
-  }
-
-  private buildSideCarId(name: string): string {
-    const normalized = name
-      .trim()
-      .toLowerCase()
-      .replace(/[^a-z0-9]+/g, "-")
-      .replace(/-{2,}/g, "-")
-      .replace(/^-|-$/g, "")
-
-    if (!normalized) {
-      throw new Error("SideCar name must include letters or numbers")
-    }
-
-    return normalized
-  }
-}
--- a/packages/server/src/speech/providers/openai-compatible.ts
+++ b/packages/server/src/speech/providers/openai-compatible.ts
@@ -147,49 +147,19 @@ export class OpenAICompatibleSpeechProvider {
    }

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

    if (!response.ok) {
      const detail = await response.text()
--- a/packages/server/src/ui/tests/remote-ui.test.ts
+++ b/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")
-  })
 })
--- a/packages/server/src/ui/remote-ui.ts
+++ b/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,
    })
  }

--- a/packages/server/src/workspaces/manager.ts
+++ b/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)}`
@@ -142,15 +136,12 @@ export class WorkspaceManager {
      [OPENCODE_SERVER_PASSWORD_ENV]: opencodePassword,
    }

-    const logLevel = (serverConfig as any)?.logLevel
-
    try {
      const { pid, port, exitPromise, getLastOutput } = await this.runtime.launch({
        workspaceId: id,
        folder: workspacePath,
        binaryPath: resolvedBinaryPath,
        environment,
-        logLevel,
        onExit: (info) => this.handleProcessExit(info.workspaceId, info),
      })

--- a/packages/server/src/workspaces/runtime.ts
+++ b/packages/server/src/workspaces/runtime.ts
@@ -116,7 +116,6 @@ interface LaunchOptions {
  folder: string
  binaryPath: string
  environment?: Record<string, string>
-  logLevel?: string
  onExit?: (info: ProcessExitInfo) => void
 }

@@ -140,8 +139,7 @@ export class WorkspaceRuntime {
  async launch(options: LaunchOptions): Promise<{ pid: number; port: number; exitPromise: Promise<ProcessExitInfo>; getLastOutput: () => string }> {
    this.validateFolder(options.folder)

-    const logLevel = typeof options.logLevel === "string" ? options.logLevel.toUpperCase() : "DEBUG"
-    const args = ["serve", "--port", "0", "--print-logs", "--log-level", logLevel]
+    const args = ["serve", "--port", "0", "--print-logs", "--log-level", "DEBUG"]
    const env = { ...process.env, ...(options.environment ?? {}) }

    let exitResolve: ((info: ProcessExitInfo) => void) | null = null
--- a/packages/tauri-app/Cargo.lock
+++ b/packages/tauri-app/Cargo.lock
@@ -458,7 +458,7 @@ dependencies = [

 [[package]]
 name = "codenomad-tauri"
-version = "0.13.3"
+version = "0.12.3"
 dependencies = [
 "anyhow",
 "dirs 5.0.1",
--- a/packages/tauri-app/package.json
+++ b/packages/tauri-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@codenomad/tauri-app",
-  "version": "0.13.3",
+  "version": "0.13.1",
  "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"
--- a/packages/tauri-app/scripts/prebuild.js
+++ b/packages/tauri-app/scripts/prebuild.js
@@ -56,7 +56,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",
--- a/packages/tauri-app/scripts/sync-tauri-version.js
+++ b/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)
-}
--- a/packages/tauri-app/src-tauri/Cargo.toml
+++ b/packages/tauri-app/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "codenomad-tauri"
-version = "0.13.3"
+version = "0.12.3"
 edition = "2021"
 license = "MIT"

--- a/packages/tauri-app/src-tauri/Info.plist
+++ b/packages/tauri-app/src-tauri/Info.plist
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>NSMicrophoneUsageDescription</key>
-  <string>CodeNomad needs microphone access for speech-to-text prompt input.</string>
-  <key>NSLocalNetworkUsageDescription</key>
-  <string>CodeNomad needs local network access to connect to locally hosted AI and speech services.</string>
-</dict>
-</plist>
--- a/packages/tauri-app/src-tauri/gen/schemas/capabilities.json
+++ b/packages/tauri-app/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"main-window-native-dialogs":{"identifier":"main-window-native-dialogs","description":"Grant the main window access to required core features and native dialog commands.","remote":{"urls":["http://127.0.0.1:*","http://localhost:*","http://tauri.localhost/*","https://tauri.localhost/*"]},"local":true,"windows":["main"],"permissions":["core:default","core:menu:default","dialog:allow-open","opener:allow-default-urls","opener:allow-open-url","notification:allow-is-permission-granted","notification:allow-request-permission","notification:allow-notify","notification:allow-show","core:webview:allow-set-webview-zoom"]}}
+{"main-window-native-dialogs":{"identifier":"main-window-native-dialogs","description":"Grant the main window access to required core features and native dialog commands.","remote":{"urls":["http://127.0.0.1:*","http://localhost:*","http://tauri.localhost/*","https://tauri.localhost/*"]},"local":true,"windows":["main"],"permissions":["core:default","core:menu:default","dialog:allow-open","opener:allow-default-urls","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"]}}
--- a/packages/tauri-app/src-tauri/gen/schemas/macOS-schema.json
+++ b/packages/tauri-app/src-tauri/gen/schemas/macOS-schema.json
@@ -2378,72 +2378,6 @@
          "const": "dialog:deny-save",
          "markdownDescription": "Denies the save command without any pre-configured scope."
        },
-        {
-          "description": "No features are enabled by default, as we believe\nthe shortcuts can be inherently dangerous and it is\napplication specific if specific shortcuts should be\nregistered or unregistered.\n",
-          "type": "string",
-          "const": "global-shortcut:default",
-          "markdownDescription": "No features are enabled by default, as we believe\nthe shortcuts can be inherently dangerous and it is\napplication specific if specific shortcuts should be\nregistered or unregistered.\n"
-        },
-        {
-          "description": "Enables the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-is-registered",
-          "markdownDescription": "Enables the is_registered command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-register",
-          "markdownDescription": "Enables the register command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-register-all",
-          "markdownDescription": "Enables the register_all command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the unregister command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-unregister",
-          "markdownDescription": "Enables the unregister command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the unregister_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:allow-unregister-all",
-          "markdownDescription": "Enables the unregister_all command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-is-registered",
-          "markdownDescription": "Denies the is_registered command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-register",
-          "markdownDescription": "Denies the register command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-register-all",
-          "markdownDescription": "Denies the register_all command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the unregister command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-unregister",
-          "markdownDescription": "Denies the unregister command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the unregister_all command without any pre-configured scope.",
-          "type": "string",
-          "const": "global-shortcut:deny-unregister-all",
-          "markdownDescription": "Denies the unregister_all command without any pre-configured scope."
-        },
        {
          "description": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`",
          "type": "string",
--- a/packages/tauri-app/src-tauri/src/cli_manager.rs
+++ b/packages/tauri-app/src-tauri/src/cli_manager.rs
@@ -534,9 +534,7 @@ impl CliProcessManager {
            log_line(&format!("using cwd={}", c.display()));
        }

-        let use_user_shell = supports_user_shell();
-
-        let command_info = if use_user_shell {
+        let command_info = if supports_user_shell() {
            log_line("spawning via user shell");
            ShellCommandType::UserShell(build_shell_command_string(&resolution, &args)?)
        } else {
@@ -547,7 +545,7 @@ impl CliProcessManager {
            })
        };

-        if !use_user_shell {
+        if !supports_user_shell() {
            if which::which(&resolution.node_binary).is_err() {
                return Err(anyhow::anyhow!(
                    "Node binary not found. Make sure Node.js is installed."
@@ -561,8 +559,6 @@ impl CliProcessManager {
                let mut c = Command::new(&cmd.shell);
                c.args(&cmd.args)
                    .env("ELECTRON_RUN_AS_NODE", "1")
-                    .env_remove("npm_config_prefix")
-                    .env_remove("NPM_CONFIG_PREFIX")
                    .stdout(Stdio::piped())
                    .stderr(Stdio::piped());
                configure_spawn(&mut c);
@@ -623,41 +619,26 @@ impl CliProcessManager {
                .map(BufReader::new);

            if let Some(reader) = stdout {
-                let app = app_clone.clone();
-                let status = status_clone.clone();
-                let ready = ready_clone.clone();
-                let token = token_clone.clone();
-                let auth_cookie_name = auth_cookie_name_clone.clone();
-                thread::spawn(move || {
-                    Self::process_stream(
-                        reader,
-                        "stdout",
-                        &app,
-                        &status,
-                        &ready,
-                        &token,
-                        auth_cookie_name.as_str(),
-                    );
-                });
+                Self::process_stream(
+                    reader,
+                    "stdout",
+                    &app_clone,
+                    &status_clone,
+                    &ready_clone,
+                    &token_clone,
+                    auth_cookie_name_clone.as_str(),
+                );
            }
-
            if let Some(reader) = stderr {
-                let app = app_clone.clone();
-                let status = status_clone.clone();
-                let ready = ready_clone.clone();
-                let token = token_clone.clone();
-                let auth_cookie_name = auth_cookie_name_clone.clone();
-                thread::spawn(move || {
-                    Self::process_stream(
-                        reader,
-                        "stderr",
-                        &app,
-                        &status,
-                        &ready,
-                        &token,
-                        auth_cookie_name.as_str(),
-                    );
-                });
+                Self::process_stream(
+                    reader,
+                    "stderr",
+                    &app_clone,
+                    &status_clone,
+                    &ready_clone,
+                    &token_clone,
+                    auth_cookie_name_clone.as_str(),
+                );
            }
        });

@@ -776,7 +757,8 @@ impl CliProcessManager {
        auth_cookie_name: &str,
    ) {
        let mut buffer = String::new();
-        let local_url_regex = Regex::new(r"^Local\s+Connection\s+URL\s*:\s*(https?://\S+)\s*$").ok();
+        let local_url_regex = Regex::new(r"^Local\s+Connection\s+URL\s*:\s*(https?://\S+)").ok();
+        let http_regex = Regex::new(r":(\d{2,5})(?!.*:\d)").ok();
        let token_prefix = "CODENOMAD_BOOTSTRAP_TOKEN:";

        loop {
@@ -819,6 +801,37 @@ impl CliProcessManager {
                            continue;
                        }

+                        if line.to_lowercase().contains("http server listening") {
+                            if let Some(port) = http_regex
+                                .as_ref()
+                                .and_then(|re| re.captures(line).and_then(|c| c.get(1)))
+                                .and_then(|m| m.as_str().parse::<u16>().ok())
+                            {
+                                Self::mark_ready(
+                                    app,
+                                    status,
+                                    ready,
+                                    bootstrap_token,
+                                    auth_cookie_name,
+                                    format!("http://localhost:{port}"),
+                                );
+                                continue;
+                            }
+
+                            if let Ok(value) = serde_json::from_str::<serde_json::Value>(line) {
+                                if let Some(port) = value.get("port").and_then(|p| p.as_u64()) {
+                                    Self::mark_ready(
+                                        app,
+                                        status,
+                                        ready,
+                                        bootstrap_token,
+                                        auth_cookie_name,
+                                        format!("http://localhost:{}", port),
+                                    );
+                                    continue;
+                                }
+                            }
+                        }
                    }
                }
                Err(_) => break,
@@ -963,7 +976,6 @@ impl CliEntry {
            "--auth-cookie-name".to_string(),
            auth_cookie_name.to_string(),
            "--generate-token".to_string(),
-            "--unrestricted-root".to_string(),
        ];

        if dev {
@@ -1019,50 +1031,27 @@ impl CliEntry {
 }

 fn resolve_tsx(_app: &AppHandle) -> Option<String> {
-    let cwd = std::env::current_dir().ok();
-    let workspace = workspace_root();
-    let mut candidates = vec![
-        cwd.as_ref().map(|p| p.join("node_modules/tsx/dist/cli.mjs")),
-        cwd.as_ref().map(|p| p.join("node_modules/tsx/dist/cli.cjs")),
-        cwd.as_ref().map(|p| p.join("node_modules/tsx/dist/cli.js")),
-        cwd.as_ref().map(|p| p.join("../node_modules/tsx/dist/cli.mjs")),
-        cwd.as_ref().map(|p| p.join("../node_modules/tsx/dist/cli.cjs")),
-        cwd.as_ref().map(|p| p.join("../node_modules/tsx/dist/cli.js")),
-        cwd.as_ref().map(|p| p.join("../../node_modules/tsx/dist/cli.mjs")),
-        cwd.as_ref().map(|p| p.join("../../node_modules/tsx/dist/cli.cjs")),
-        cwd.as_ref().map(|p| p.join("../../node_modules/tsx/dist/cli.js")),
-        workspace
-            .as_ref()
-            .map(|p| p.join("node_modules/tsx/dist/cli.mjs")),
-        workspace
-            .as_ref()
-            .map(|p| p.join("node_modules/tsx/dist/cli.cjs")),
-        workspace
-            .as_ref()
+    let candidates = vec![
+        std::env::current_dir()
+            .ok()
            .map(|p| p.join("node_modules/tsx/dist/cli.js")),
+        std::env::current_exe().ok().and_then(|ex| {
+            ex.parent()
+                .map(|p| p.join("../node_modules/tsx/dist/cli.js"))
+        }),
    ];

-    if let Ok(exe) = std::env::current_exe() {
-        if let Some(dir) = exe.parent() {
-            candidates.push(Some(dir.join("../node_modules/tsx/dist/cli.mjs")));
-            candidates.push(Some(dir.join("../node_modules/tsx/dist/cli.cjs")));
-            candidates.push(Some(dir.join("../node_modules/tsx/dist/cli.js")));
-        }
-    }
-
    first_existing(candidates)
 }

 fn resolve_dev_entry(_app: &AppHandle) -> Option<String> {
-    let cwd = std::env::current_dir().ok();
-    let workspace = workspace_root();
    let candidates = vec![
-        workspace
-            .as_ref()
+        std::env::current_dir()
+            .ok()
            .map(|p| p.join("packages/server/src/index.ts")),
-        cwd.as_ref().map(|p| p.join("packages/server/src/index.ts")),
-        cwd.as_ref().map(|p| p.join("../server/src/index.ts")),
-        cwd.as_ref().map(|p| p.join("../../server/src/index.ts")),
+        std::env::current_dir()
+            .ok()
+            .map(|p| p.join("../server/src/index.ts")),
    ];

    first_existing(candidates)
@@ -1164,8 +1153,11 @@ fn build_shell_args(shell: &str, command: &str) -> Vec<String> {
        .unwrap_or("")
        .to_lowercase();

-    let _ = shell_name;
-    vec!["-l".into(), "-c".into(), command.into()]
+    if shell_name.contains("zsh") {
+        vec!["-l".into(), "-i".into(), "-c".into(), command.into()]
+    } else {
+        vec!["-l".into(), "-c".into(), command.into()]
+    }
 }

 fn first_existing(paths: Vec<Option<PathBuf>>) -> Option<String> {
--- a/packages/tauri-app/src-tauri/src/main.rs
+++ b/packages/tauri-app/src-tauri/src/main.rs
@@ -6,16 +6,13 @@ use cli_manager::{CliProcessManager, CliStatus};
 use keepawake::KeepAwake;
 use serde::Deserialize;
 use serde_json::json;
-use std::collections::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
-use std::time::{Instant, SystemTime, UNIX_EPOCH};
+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, WebviewUrl, WebviewWindowBuilder, WindowEvent, Wry,
-};
+use tauri::{AppHandle, Emitter, Manager, Runtime, WindowEvent, Wry};
 use tauri_plugin_global_shortcut::{
    Code as ShortcutCode, GlobalShortcutExt, Shortcut, ShortcutState,
 };
@@ -32,12 +29,10 @@ use std::os::windows::ffi::OsStrExt;
 use windows_sys::Win32::UI::Shell::SetCurrentProcessExplicitAppUserModelID;

 static QUIT_REQUESTED: AtomicBool = AtomicBool::new(false);
-static LAST_ZOOM_TIME: Mutex<Option<Instant>> = Mutex::new(None);
 const DEFAULT_ZOOM_LEVEL: f64 = 1.0;
-const ZOOM_STEP: f64 = 0.1;
+const ZOOM_STEP: f64 = 0.2;
 const MIN_ZOOM_LEVEL: f64 = 0.2;
 const MAX_ZOOM_LEVEL: f64 = 5.0;
-const ZOOM_DEBOUNCE_MS: u64 = 50;

 #[cfg(windows)]
 const WINDOWS_APP_USER_MODEL_ID: &str = "ai.neuralnomads.codenomad.client";
@@ -46,16 +41,6 @@ pub struct AppState {
    pub manager: CliProcessManager,
    pub wake_lock: Mutex<Option<KeepAwake>>,
    pub zoom_level: Mutex<f64>,
-    pub remote_origins: Mutex<HashMap<String, String>>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct RemoteWindowPayload {
-    id: String,
-    name: String,
-    base_url: String,
-    skip_tls_verify: bool,
 }

 #[derive(Debug, Default, Deserialize)]
@@ -133,29 +118,8 @@ fn should_allow_internal(url: &Url) -> bool {
    }
 }

-fn should_allow_window_origin<R: Runtime>(
-    app_handle: &AppHandle<R>,
-    window_label: &str,
-    url: &Url,
-) -> bool {
-    if should_allow_internal(url) {
-        return true;
-    }
-
-    let state = app_handle.state::<AppState>();
-    let Ok(allowed) = state.remote_origins.lock() else {
-        return false;
-    };
-    if let Some(origin) = allowed.get(window_label) {
-        return origin == &url.origin().ascii_serialization();
-    }
-
-    false
-}
-
 fn intercept_navigation<R: Runtime>(webview: &Webview<R>, url: &Url) -> bool {
-    let window_label = webview.label().to_string();
-    if should_allow_window_origin(&webview.app_handle(), &window_label, url) {
+    if should_allow_internal(url) {
        return true;
    }

@@ -169,58 +133,6 @@ fn intercept_navigation<R: Runtime>(webview: &Webview<R>, url: &Url) -> bool {
    false
 }

-#[tauri::command]
-fn open_remote_window(app: AppHandle, payload: RemoteWindowPayload) -> Result<(), String> {
-    if payload.skip_tls_verify && payload.base_url.starts_with("https://") {
-        return Err(
-            "Tauri cannot bypass self-signed HTTPS certificates automatically yet. Trust the certificate in your OS first, then reconnect, or use the CodeNomad Electron app."
-                .to_string(),
-        );
-    }
-
-    let parsed = Url::parse(&payload.base_url).map_err(|err| err.to_string())?;
-    let label = format!("remote-{}", payload.id);
-    let title = format!(
-        "{} - {}",
-        payload.name,
-        parsed.host_str().unwrap_or(payload.base_url.as_str())
-    );
-
-    if let Some(existing) = app.get_webview_window(&label) {
-        let _ = existing.navigate(parsed.clone());
-        let _ = existing.set_title(&title);
-        let _ = existing.show();
-        let _ = existing.unminimize();
-        let _ = existing.set_focus();
-        return Ok(());
-    }
-
-    app.state::<AppState>()
-        .remote_origins
-        .lock()
-        .map_err(|err| err.to_string())?
-        .insert(label.clone(), parsed.origin().ascii_serialization());
-
-    let window =
-        WebviewWindowBuilder::new(&app, label.clone(), WebviewUrl::External(parsed.clone()))
-            .title(title)
-            .inner_size(1400.0, 900.0)
-            .min_inner_size(800.0, 600.0)
-            .build()
-            .map_err(|err| err.to_string())?;
-
-    let app_handle = app.clone();
-    window.on_window_event(move |event| {
-        if let WindowEvent::Destroyed = event {
-            if let Ok(mut origins) = app_handle.state::<AppState>().remote_origins.lock() {
-                origins.remove(&label);
-            }
-        }
-    });
-
-    Ok(())
-}
-
 fn collect_directory_paths(paths: &[std::path::PathBuf]) -> Vec<String> {
    paths
        .iter()
@@ -259,15 +171,6 @@ fn clamp_zoom_level(value: f64) -> f64 {
 }

 fn set_main_window_zoom(app_handle: &AppHandle, next_zoom: f64) {
-    if let Ok(mut last_zoom_time) = LAST_ZOOM_TIME.lock() {
-        if let Some(last_time) = *last_zoom_time {
-            if last_time.elapsed().as_millis() < ZOOM_DEBOUNCE_MS as u128 {
-                return;
-            }
-        }
-        *last_zoom_time = Some(Instant::now());
-    }
-
    if let Some(window) = app_handle.get_webview_window("main") {
        let normalized = clamp_zoom_level(next_zoom);
        if window.set_zoom(normalized).is_ok() {
@@ -383,7 +286,6 @@ fn main() {
            manager: CliProcessManager::new(),
            wake_lock: Mutex::new(None),
            zoom_level: Mutex::new(DEFAULT_ZOOM_LEVEL),
-            remote_origins: Mutex::new(HashMap::new()),
        })
        .setup(|app| {
            set_windows_app_user_model_id();
@@ -421,8 +323,7 @@ fn main() {
            cli_get_status,
            cli_restart,
            wake_lock_start,
-            wake_lock_stop,
-            open_remote_window
+            wake_lock_stop
        ])
        .on_menu_event(|app_handle, event| {
            match event.id().0.as_str() {
@@ -554,24 +455,11 @@ fn main() {
                event: tauri::WindowEvent::CloseRequested { api, .. },
                ..
            } => {
-                // Let windows close normally. App shutdown is handled only after the
-                // last window is actually gone so remote windows can outlive `main`.
-                let _ = api;
-            }
-            tauri::RunEvent::WindowEvent {
-                event: tauri::WindowEvent::Destroyed,
-                ..
-            } => {
-                if !app_handle.webview_windows().is_empty() {
-                    return;
-                }
-
-                // Stop the CLI only when the final window is gone and the app is
-                // truly exiting.
+                // Ensure we have time to stop the CLI process before the app exits.
                if QUIT_REQUESTED.swap(true, Ordering::SeqCst) {
                    return;
                }
-
+                api.prevent_close();
                let app = app_handle.clone();
                std::thread::spawn(move || {
                    if let Some(state) = app.try_state::<AppState>() {
--- a/packages/tauri-app/src-tauri/tauri.conf.json
+++ b/packages/tauri-app/src-tauri/tauri.conf.json
@@ -1,13 +1,16 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "CodeNomad",
-  "version": "0.13.3",
+  "version": "0.12.3",
  "identifier": "ai.neuralnomads.codenomad.client",
  "build": {
    "beforeDevCommand": "npm run dev:bootstrap",
    "beforeBuildCommand": "npm run bundle:server",
    "frontendDist": "resources/ui-loading"
  },
+
+ 
+
  "app": {
    "withGlobalTauri": true,
    "windows": [
@@ -23,7 +26,6 @@
        "resizable": true,
        "fullscreen": false,
        "decorations": true,
-        "transparent": true,
        "theme": "Dark",
        "backgroundColor": "#1a1a1a",
        "zoomHotkeysEnabled": true
@@ -31,13 +33,9 @@
    ],
    "security": {
      "assetProtocol": {
-        "scope": [
-          "**"
-        ]
+        "scope": ["**"]
      },
-      "capabilities": [
-        "main-window-native-dialogs"
-      ]
+      "capabilities": ["main-window-native-dialogs"]
    }
  },
  "bundle": {
@@ -46,17 +44,7 @@
      "resources/server",
      "resources/ui-loading"
    ],
-    "icon": [
-      "icon.icns",
-      "icon.ico",
-      "icon.png"
-    ],
-    "targets": [
-      "app",
-      "appimage",
-      "deb",
-      "rpm",
-      "nsis"
-    ]
+    "icon": ["icon.icns", "icon.ico", "icon.png"],
+    "targets": ["app", "appimage", "deb", "rpm", "nsis"]
  }
 }
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@codenomad/ui",
-  "version": "0.13.3",
+  "version": "0.13.1",
  "private": true,
  "license": "MIT",
  "type": "module",
--- a/packages/ui/src/App.tsx
+++ b/packages/ui/src/App.tsx
@@ -10,10 +10,7 @@ import InstanceTabs from "./components/instance-tabs"
 import InstanceDisconnectedModal from "./components/instance-disconnected-modal"
 import InstanceShell from "./components/instance/instance-shell2"
 import { SettingsScreen } from "./components/settings-screen"
-import { SideCarPickerDialog } from "./components/sidecar-picker-dialog"
-import { SideCarView } from "./components/sidecar-view"
 import { InstanceMetadataProvider } from "./lib/contexts/instance-metadata-context"
-import { showAlertDialog } from "./stores/alerts"
 import { initGithubStars } from "./stores/github-stars"

 import { useCommands } from "./lib/hooks/use-commands"
@@ -26,6 +23,7 @@ import { runtimeEnv } from "./lib/runtime-env"
 import { useI18n } from "./lib/i18n"
 import { setWakeLockDesired } from "./lib/native/wake-lock"
 import {
+  hasInstances,
  isSelectingFolder,
  setIsSelectingFolder,
  showFolderSelection,
@@ -35,7 +33,10 @@ import { useConfig } from "./stores/preferences"
 import {
  createInstance,
  instances,
+  activeInstanceId,
+  setActiveInstanceId,
  stopInstance,
+  getActiveInstance,
  disconnectedInstance,
  acknowledgeDisconnectedInstance,
 } from "./stores/instances"
@@ -52,22 +53,6 @@ import {

 import { getInstanceSessionIndicatorStatus } from "./stores/session-status"
 import { openSettings } from "./stores/settings-screen"
-import {
-  closeSidecarTab,
-  ensureSidecarsLoaded,
-  openSidecarTab,
-} from "./stores/sidecars"
-import {
-  activeAppTab,
-  activeAppTabId,
-  appTabs,
-  ensureActiveAppTab,
-  getAdjacentAppTabId,
-  getAppTabById,
-  selectAppTab,
-  selectInstanceTab,
-  selectSidecarTab,
-} from "./stores/app-tabs"

 const log = getLogger("actions")

@@ -92,7 +77,6 @@ const App: Component = () => {
  } = useConfig()
  const [escapeInDebounce, setEscapeInDebounce] = createSignal(false)
  const [instanceTabBarHeight, setInstanceTabBarHeight] = createSignal(0)
-  const [sidecarPickerOpen, setSidecarPickerOpen] = createSignal(false)

  const phoneQuery = useMediaQuery("(max-width: 767px)")
  const isPhoneLayout = createMemo(() => phoneQuery())
@@ -222,7 +206,8 @@ const App: Component = () => {
  })

  createEffect(() => {
-    appTabs()
+    instances()
+    hasInstances()
    requestAnimationFrame(() => updateInstanceTabBarHeight())
  })

@@ -234,15 +219,7 @@ const App: Component = () => {
    onCleanup(() => window.removeEventListener("resize", handleResize))
  })

-  createEffect(() => {
-    appTabs()
-    ensureActiveAppTab()
-  })
-
-  const activeInstance = createMemo(() => {
-    const tab = activeAppTab()
-    return tab?.kind === "instance" ? tab.instance : null
-  })
+  const activeInstance = createMemo(() => getActiveInstance())
  const activeSessionIdForInstance = createMemo(() => {
    const instance = activeInstance()
    if (!instance) return null
@@ -267,7 +244,6 @@ const App: Component = () => {
      recordWorkspaceLaunch(folderPath, selectedBinary)
      clearLaunchError()
      const instanceId = await createInstance(folderPath, selectedBinary)
-      selectInstanceTab(instanceId)
      setShowFolderSelection(false)

      log.info("Created instance", {
@@ -294,27 +270,8 @@ const App: Component = () => {
  }

  function handleNewInstanceRequest() {
-    setShowFolderSelection(true)
-  }
-
-  function handleOpenSidecarPicker() {
-    setSidecarPickerOpen(true)
-    void ensureSidecarsLoaded()
-  }
-
-  async function handleOpenSidecar(sidecarId: string) {
-    try {
-      const tab = await openSidecarTab(sidecarId)
-      selectSidecarTab(tab.token)
-      setShowFolderSelection(false)
-      setSidecarPickerOpen(false)
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error)
-      showAlertDialog(message, {
-        variant: "error",
-        title: t("sidecars.open.errorTitle"),
-      })
-      log.error("Failed to open SideCar", error)
+    if (hasInstances()) {
+      setShowFolderSelection(true)
    }
  }

@@ -375,23 +332,6 @@ const App: Component = () => {
    }
  }

-  async function handleCloseAppTab(tabId: string) {
-    const tab = getAppTabById(tabId)
-    if (!tab) return
-
-    const fallbackTabId = activeAppTabId() === tabId ? getAdjacentAppTabId(tabId) : activeAppTabId()
-
-    if (tab.kind === "instance") {
-      await handleCloseInstance(tab.instance.id)
-    } else {
-      closeSidecarTab(tab.sidecarTab.token)
-    }
-
-    if (!getAppTabById(tabId)) {
-      ensureActiveAppTab(fallbackTabId)
-    }
-  }
-
  const handleSidebarAgentChange = async (instanceId: string, sessionId: string, agent: string) => {
    if (!instanceId || !sessionId || sessionId === "info") return
    await updateSessionAgent(instanceId, sessionId, agent)
@@ -421,7 +361,6 @@ const App: Component = () => {
    setThinkingBlocksExpansion,
    setToolInputsVisibility,
    handleNewInstanceRequest,
-    handleCloseActiveTab: () => handleCloseAppTab(activeAppTabId() ?? ""),
    handleCloseInstance,
    handleNewSession,
    handleCloseSession,
@@ -432,7 +371,6 @@ const App: Component = () => {
  useAppLifecycle({
    setEscapeInDebounce,
    handleNewInstanceRequest,
-    handleCloseActiveTab: () => handleCloseAppTab(activeAppTabId() ?? ""),
    handleCloseInstance,
    handleNewSession,
    handleCloseSession,
@@ -532,60 +470,52 @@ const App: Component = () => {
          </div>
        </Show>
        <Show
-          when={appTabs().length === 0}
+          when={!hasInstances()}
          fallback={
            <>
              <Show when={!isPhoneLayout() || !mobileFullscreenMode()}>
                <InstanceTabs
-                  tabs={appTabs()}
-                  activeTabId={activeAppTabId()}
-                  onSelect={selectAppTab}
-                  onClose={(tabId) => void handleCloseAppTab(tabId)}
+                  instances={instances()}
+                  activeInstanceId={activeInstanceId()}
+                  onSelect={setActiveInstanceId}
+                  onClose={handleCloseInstance}
                  onNew={handleNewInstanceRequest}
                />
              </Show>
+ 
+              <For each={Array.from(instances().values())}>
+                {(instance) => {
+                  const isActiveInstance = () => activeInstanceId() === instance.id
+                  const isVisible = () => isActiveInstance() && !showFolderSelection()
+                    return (
+                       <div
+                         class="flex-1 min-h-0 overflow-hidden"
+                         style={{ display: isVisible() ? "flex" : "none" }}
+                         data-instance-id={instance.id}
+                         data-instance-active={isActiveInstance() ? "true" : "false"}
+                         data-instance-visible={isVisible() ? "true" : "false"}
+                       >
+                         <InstanceMetadataProvider instance={instance}>
+                           <InstanceShell
+                             instance={instance}
+                             isActiveInstance={isActiveInstance()}
+                             escapeInDebounce={escapeInDebounce()}
+                             paletteCommands={paletteCommands}
+                             onCloseSession={(sessionId) => handleCloseSession(instance.id, sessionId)}
+                             onNewSession={() => handleNewSession(instance.id)}
+                             handleSidebarAgentChange={(sessionId, agent) => handleSidebarAgentChange(instance.id, sessionId, agent)}
+                             handleSidebarModelChange={(sessionId, model) => handleSidebarModelChange(instance.id, sessionId, model)}
+                             onExecuteCommand={executeCommand}
+                            tabBarOffset={isPhoneLayout() && mobileFullscreenMode() ? 0 : instanceTabBarHeight()}
+                            mobileFullscreenMode={isPhoneLayout() && mobileFullscreenMode()}
+                            onEnterMobileFullscreen={() => void enterMobileFullscreen()}
+                            onExitMobileFullscreen={() => void exitMobileFullscreen()}
+                          />
+                        </InstanceMetadataProvider>
+
+                      </div>
+                    )

-              <For each={appTabs()}>
-                {(tab) => {
-                  const isVisible = () => activeAppTabId() === tab.id && !showFolderSelection()
-                  return tab.kind === "instance" ? (
-                    <div
-                      class="flex-1 min-h-0 overflow-hidden"
-                      style={{ display: isVisible() ? "flex" : "none" }}
-                      data-instance-id={tab.instance.id}
-                      data-tab-id={tab.id}
-                      data-tab-kind={tab.kind}
-                      data-tab-visible={isVisible() ? "true" : "false"}
-                    >
-                      <InstanceMetadataProvider instance={tab.instance}>
-                        <InstanceShell
-                          instance={tab.instance}
-                          isActiveInstance={isVisible()}
-                          escapeInDebounce={escapeInDebounce()}
-                          paletteCommands={paletteCommands}
-                          onCloseSession={(sessionId) => handleCloseSession(tab.instance.id, sessionId)}
-                          onNewSession={() => handleNewSession(tab.instance.id)}
-                          handleSidebarAgentChange={(sessionId, agent) => handleSidebarAgentChange(tab.instance.id, sessionId, agent)}
-                          handleSidebarModelChange={(sessionId, model) => handleSidebarModelChange(tab.instance.id, sessionId, model)}
-                          onExecuteCommand={executeCommand}
-                          tabBarOffset={isPhoneLayout() && mobileFullscreenMode() ? 0 : instanceTabBarHeight()}
-                          mobileFullscreenMode={isPhoneLayout() && mobileFullscreenMode()}
-                          onEnterMobileFullscreen={() => void enterMobileFullscreen()}
-                          onExitMobileFullscreen={() => void exitMobileFullscreen()}
-                        />
-                      </InstanceMetadataProvider>
-                    </div>
-                  ) : (
-                    <div
-                      class="flex-1 min-h-0 overflow-hidden"
-                      style={{ display: isVisible() ? "flex" : "none" }}
-                      data-tab-id={tab.id}
-                      data-tab-kind={tab.kind}
-                      data-tab-visible={isVisible() ? "true" : "false"}
-                    >
-                      <SideCarView tab={tab.sidecarTab} />
-                    </div>
-                  )
                }}
              </For>

@@ -595,7 +525,6 @@ const App: Component = () => {
          <FolderSelectionView
            onSelectFolder={handleSelectFolder}
            isLoading={isSelectingFolder()}
-            onOpenSidecar={handleOpenSidecarPicker}
          />
        </Show>

@@ -605,7 +534,6 @@ const App: Component = () => {
              <FolderSelectionView
                onSelectFolder={handleSelectFolder}
                isLoading={isSelectingFolder()}
-                onOpenSidecar={handleOpenSidecarPicker}
                onClose={() => {
                  setShowFolderSelection(false)
                  clearLaunchError()
@@ -616,7 +544,6 @@ const App: Component = () => {
        </Show>
 
        <SettingsScreen />
-        <SideCarPickerDialog open={sidecarPickerOpen()} onClose={() => setSidecarPickerOpen(false)} onOpenSidecar={handleOpenSidecar} />
 
        <AlertDialog />

--- a/packages/ui/src/components/alert-dialog.tsx
+++ b/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>
--- a/packages/ui/src/components/diff-viewer.tsx
+++ b/packages/ui/src/components/diff-viewer.tsx
@@ -1,4 +1,4 @@
-import { createMemo, Show, createEffect } from "solid-js"
+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"
@@ -20,7 +20,6 @@ interface ToolCallDiffViewerProps {
  filePath?: string
  theme: "light" | "dark"
  mode: DiffViewMode
-  wrap?: boolean
  onRendered?: () => void
  cachedHtml?: string
  cacheEntryParams?: CacheEntryParams
@@ -32,183 +31,11 @@ type DiffData = {
  hunks: string[]
 }

-function measureTextWidth(container: HTMLElement, text: string, source: HTMLElement) {
-  const computed = window.getComputedStyle(source)
-  const probe = document.createElement("span")
-  probe.textContent = text || ""
-  probe.style.position = "absolute"
-  probe.style.visibility = "hidden"
-  probe.style.pointerEvents = "none"
-  probe.style.display = "inline-block"
-  probe.style.width = "auto"
-  probe.style.maxWidth = "none"
-  probe.style.whiteSpace = "nowrap"
-  probe.style.fontFamily = computed.fontFamily
-  probe.style.fontSize = computed.fontSize
-  probe.style.fontWeight = computed.fontWeight
-  probe.style.fontStyle = computed.fontStyle
-  probe.style.letterSpacing = computed.letterSpacing
-  probe.style.fontVariant = computed.fontVariant
-  probe.style.textTransform = computed.textTransform
-  probe.style.lineHeight = computed.lineHeight
-  container.appendChild(probe)
-  const width = Math.ceil(probe.getBoundingClientRect().width)
-  probe.remove()
-  return width
-}
-
-function computeCompactWidth(
-  container: HTMLElement,
-  entries: Array<{ text: string; source: HTMLElement }>,
-  maxWidthPx = 40,
-) {
-  const measuredLabelWidthPx = entries.reduce((max, entry) => {
-    return Math.max(max, measureTextWidth(container, entry.text, entry.source))
-  }, 0)
-  const fallbackTextLength = entries.reduce((max, entry) => Math.max(max, entry.text.length), 1)
-  const fallbackWidthPx = Math.round(fallbackTextLength * 7 + 4)
-  return Math.max(2, Math.min(maxWidthPx, measuredLabelWidthPx > 0 ? measuredLabelWidthPx + 2 : fallbackWidthPx))
-}
-
-function applyCompactUnifiedGutter(container: HTMLElement, wrap: boolean) {
-  const tableWrapper = container.querySelector<HTMLElement>(".unified-diff-table-wrapper")
-  const table = container.querySelector<HTMLTableElement>(".unified-diff-table")
-  const numberCol = container.querySelector<HTMLTableColElement>(".unified-diff-table-num-col")
-  const gutterRows = container.querySelectorAll<HTMLElement>(".diff-line-num")
-  const hunkGutters = container.querySelectorAll<HTMLElement>(".diff-line-hunk-action, .diff-line-widget-wrapper, .diff-line-extend-wrapper")
-  const entries: Array<{ gutter: HTMLElement; label: HTMLElement; text: string }> = []
-
-  if (table) {
-    if (wrap) {
-      table.classList.add("table-fixed")
-      table.style.tableLayout = "fixed"
-      table.style.width = "100%"
-      table.style.minWidth = "100%"
-    } else {
-      table.classList.remove("table-fixed")
-      table.style.tableLayout = "auto"
-      table.style.width = "max-content"
-      table.style.minWidth = "100%"
-    }
-  }
-
-  gutterRows.forEach((gutter) => {
-    const oldSpan = gutter.querySelector<HTMLElement>("[data-line-old-num]")
-    const newSpan = gutter.querySelector<HTMLElement>("[data-line-new-num]")
-    const spacer = gutter.querySelector<HTMLElement>(".shrink-0")
-    const flexWrapper = gutter.querySelector<HTMLElement>(":scope > .flex")
-    const currentLabel = gutter.querySelector<HTMLElement>(":scope > .tool-call-diff-compact-line-number")
-
-    const oldText = oldSpan?.textContent?.trim() ?? ""
-    const newText = newSpan?.textContent?.trim() ?? ""
-    const hasUsableNew = newText.length > 0 && newText !== "0"
-    const hasUsableOld = oldText.length > 0 && oldText !== "0"
-    const visibleText = hasUsableNew ? newText : hasUsableOld ? oldText : newText || oldText
-
-    if (flexWrapper) flexWrapper.style.display = "none"
-    if (spacer) spacer.style.display = "none"
-    if (oldSpan) { oldSpan.style.display = "none"; oldSpan.style.width = "auto" }
-    if (newSpan) { newSpan.style.display = "none"; newSpan.style.width = "auto" }
-
-    gutter.style.paddingLeft = "1px"
-    gutter.style.paddingRight = "1px"
-    gutter.style.textAlign = "left"
-
-    const label = currentLabel ?? document.createElement("span")
-    label.className = "tool-call-diff-compact-line-number"
-    label.textContent = visibleText
-    label.setAttribute("aria-hidden", visibleText ? "false" : "true")
-    if (!currentLabel) gutter.appendChild(label)
-
-    entries.push({ gutter, label, text: visibleText })
-  })
-
-  const gutterWidthPx = computeCompactWidth(container, entries.map((entry) => ({ text: entry.text, source: entry.label })))
-  const gutterWidth = `${gutterWidthPx}px`
-  const compactAsideWidth = `${Math.max(8, gutterWidthPx - 10)}px`
-
-  if (tableWrapper) {
-    tableWrapper.style.setProperty("--diff-aside-width", compactAsideWidth)
-    tableWrapper.style.setProperty("--diff-aside-width--", compactAsideWidth)
-  }
-  if (numberCol) {
-    numberCol.style.width = gutterWidth
-  }
-
-  entries.forEach(({ gutter, label }) => {
-    gutter.style.width = gutterWidth
-    gutter.style.minWidth = gutterWidth
-    gutter.style.maxWidth = gutterWidth
-    label.style.width = "auto"
-    label.style.maxWidth = "none"
-  })
-
-  hunkGutters.forEach((gutter) => {
-    gutter.style.width = gutterWidth
-    gutter.style.minWidth = gutterWidth
-    gutter.style.maxWidth = gutterWidth
-    gutter.style.paddingLeft = "0"
-    gutter.style.paddingRight = "0"
-  })
-}
-
-function applyCompactSplitGutter(container: HTMLElement) {
-  const oldWrapper = container.querySelector<HTMLElement>(".old-diff-table-wrapper")
-  const newWrapper = container.querySelector<HTMLElement>(".new-diff-table-wrapper")
-  const numberCells = Array.from(container.querySelectorAll<HTMLElement>(".diff-line-old-num, .diff-line-new-num"))
-  const hunkActions = Array.from(container.querySelectorAll<HTMLElement>(".diff-line-hunk-action, .diff-line-widget-wrapper, .diff-line-extend-wrapper"))
-  const numberSpans = numberCells
-    .map((cell) => ({ cell, span: cell.querySelector<HTMLElement>("[data-line-num]") }))
-    .filter((entry): entry is { cell: HTMLElement; span: HTMLElement } => Boolean(entry.span))
-
-  const gutterWidthPx = computeCompactWidth(
-    container,
-    numberSpans.map(({ span }) => ({ text: span.textContent?.trim() ?? "", source: span })),
-    64,
-  )
-  const gutterWidth = `${gutterWidthPx}px`
-
-  ;[oldWrapper, newWrapper].forEach((wrapper) => {
-    if (wrapper) {
-      wrapper.style.setProperty("--diff-aside-width", gutterWidth)
-    }
-  })
-
-  numberCells.forEach((cell) => {
-    cell.style.width = gutterWidth
-    cell.style.minWidth = gutterWidth
-    cell.style.maxWidth = gutterWidth
-    cell.style.paddingLeft = "2px"
-    cell.style.paddingRight = "2px"
-    cell.style.textAlign = "left"
-    cell.style.whiteSpace = "nowrap"
-    cell.style.overflowWrap = "normal"
-    cell.style.wordBreak = "normal"
-  })
-
-  numberSpans.forEach(({ span }) => {
-    span.style.whiteSpace = "nowrap"
-    span.style.overflowWrap = "normal"
-    span.style.wordBreak = "normal"
-  })
-
-  hunkActions.forEach((cell) => {
-    cell.style.width = gutterWidth
-    cell.style.minWidth = gutterWidth
-    cell.style.maxWidth = gutterWidth
-    cell.style.paddingLeft = "0"
-    cell.style.paddingRight = "0"
-  })
-}
-
-function applyCompactDiffLayout(container: HTMLElement, mode: DiffViewMode, wrap = false) {
-  if (mode === "unified") {
-    applyCompactUnifiedGutter(container, wrap)
-    return
-  }
-  if (mode === "split") {
-    applyCompactSplitGutter(container)
-  }
+type CaptureContext = {
+  theme: ToolCallDiffViewerProps["theme"]
+  mode: DiffViewMode
+  diffText: string
+  cacheEntryParams?: CacheEntryParams
 }

 export function ToolCallDiffViewer(props: ToolCallDiffViewerProps) {
@@ -240,15 +67,12 @@ export function ToolCallDiffViewer(props: ToolCallDiffViewerProps) {
  const contextKey = createMemo(() => {
    const data = diffData()
    if (!data) return ""
-    return `${props.theme}|${props.mode}|${props.wrap ? "wrap" : "nowrap"}|${props.diffText}`
+    return `${props.theme}|${props.mode}|${props.diffText}`
  })
 
  createEffect(() => {
    const cachedHtml = props.cachedHtml
    if (cachedHtml) {
-      if (diffContainerRef) {
-        applyCompactDiffLayout(diffContainerRef, props.mode, Boolean(props.wrap))
-      }
      // When we are given cached HTML, we rely on the caller's cache
      // and simply notify once rendered.
      props.onRendered?.()
@@ -259,10 +83,9 @@ export function ToolCallDiffViewer(props: ToolCallDiffViewerProps) {
    if (!key) return
    if (!diffContainerRef) return
    if (lastCapturedKey === key) return
-
+ 
    requestAnimationFrame(() => {
      if (!diffContainerRef) return
-      applyCompactDiffLayout(diffContainerRef, props.mode, Boolean(props.wrap))
      const markup = diffContainerRef.innerHTML
      if (!markup) return
      lastCapturedKey = key
@@ -272,7 +95,6 @@ export function ToolCallDiffViewer(props: ToolCallDiffViewerProps) {
          html: markup,
          theme: props.theme,
          mode: props.mode,
-          wrap: props.wrap,
        })
      }
      props.onRendered?.()
@@ -300,7 +122,7 @@ export function ToolCallDiffViewer(props: ToolCallDiffViewerProps) {
                    diffViewMode={props.mode === "split" ? DiffModeEnum.Split : DiffModeEnum.Unified}
                    diffViewTheme={props.theme}
                    diffViewHighlight
-                    diffViewWrap={Boolean(props.wrap)}
+                    diffViewWrap={false}
                    diffViewFontSize={13}
                  />
                </ErrorBoundary>
@@ -309,7 +131,7 @@ export function ToolCallDiffViewer(props: ToolCallDiffViewerProps) {
          </div>
        }
      >
-        <div ref={diffContainerRef} innerHTML={props.cachedHtml} />
+        <div innerHTML={props.cachedHtml} />
      </Show>
    </div>
  )
--- a/packages/ui/src/components/file-viewer/monaco-diff-viewer.tsx
+++ b/packages/ui/src/components/file-viewer/monaco-diff-viewer.tsx
@@ -1,17 +1,15 @@
-import { createEffect, createMemo, createSignal, onCleanup, onMount } from "solid-js"
+import { createEffect, createSignal, onCleanup, onMount } from "solid-js"
 import { loadMonaco } from "../../lib/monaco/setup"
 import { getOrCreateTextModel } from "../../lib/monaco/model-cache"
 import { inferMonacoLanguageId } from "../../lib/monaco/language"
 import { ensureMonacoLanguageLoaded } from "../../lib/monaco/setup"
 import { useTheme } from "../../lib/theme"
-import { parsePatchToBeforeAfter } from "../../lib/diff-utils"

 interface MonacoDiffViewerProps {
  scopeKey: string
  path: string
-  patch?: string
-  before?: string
-  after?: string
+  before: string
+  after: string
  viewMode?: "split" | "unified"
  contextMode?: "expanded" | "collapsed"
  wordWrap?: "on" | "off"
@@ -25,16 +23,6 @@ export function MonacoDiffViewer(props: MonacoDiffViewerProps) {
  let monaco: any = null
  const [ready, setReady] = createSignal(false)

-  const resolvedContent = createMemo(() => {
-    if (props.patch !== undefined && props.patch !== null) {
-      return parsePatchToBeforeAfter(props.patch)
-    }
-    return {
-      before: props.before ?? "",
-      after: props.after ?? "",
-    }
-  })
-
  const disposeEditor = () => {
    try {
      diffEditor?.setModel(null as any)
@@ -127,12 +115,11 @@ export function MonacoDiffViewer(props: MonacoDiffViewerProps) {
  createEffect(() => {
    if (!ready() || !monaco || !diffEditor) return
    const languageId = inferMonacoLanguageId(monaco, props.path)
-    const { before, after } = resolvedContent()
    const beforeKey = `${props.scopeKey}:diff:${props.path}:before`
    const afterKey = `${props.scopeKey}:diff:${props.path}:after`

-    const original = getOrCreateTextModel({ monaco, cacheKey: beforeKey, value: before, languageId })
-    const modified = getOrCreateTextModel({ monaco, cacheKey: afterKey, value: after, languageId })
+    const original = getOrCreateTextModel({ monaco, cacheKey: beforeKey, value: props.before, languageId })
+    const modified = getOrCreateTextModel({ monaco, cacheKey: afterKey, value: props.after, languageId })
    diffEditor.setModel({ original, modified })

    void ensureMonacoLanguageLoaded(languageId).then(() => {
--- a/packages/ui/src/components/file-viewer/monaco-file-viewer.tsx
+++ b/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)
    })()

--- a/packages/ui/src/components/folder-selection-view.tsx
+++ b/packages/ui/src/components/folder-selection-view.tsx
@@ -1,7 +1,6 @@
-import { Dialog } from "@kobalte/core/dialog"
 import { Select } from "@kobalte/core/select"
 import { Component, createSignal, Show, For, onMount, onCleanup, createEffect } from "solid-js"
-import { Folder, Clock, Trash2, FolderPlus, Settings, ChevronRight, MonitorUp, Star, Languages, ChevronDown, X, Globe, Loader2 } from "lucide-solid"
+import { Folder, Clock, Trash2, FolderPlus, Settings, ChevronRight, MonitorUp, Star, Languages, ChevronDown, X } from "lucide-solid"
 import { useConfig } from "../stores/preferences"
 import DirectoryBrowserDialog from "./directory-browser-dialog"
 import Kbd from "./kbd"
@@ -15,48 +14,25 @@ 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"
-import { serverApi } from "../lib/api-client"
-import { openRemoteServerWindow } from "../lib/native/remote-window"

 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"

-type HomeTab = "local" | "servers"
-

 interface FolderSelectionViewProps {
  onSelectFolder: (folder: string, binaryPath?: string) => void
-  onOpenSidecar?: () => void
  isLoading?: boolean
  onClose?: () => void
 }

 const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
-  const {
-    recentFolders,
-    removeRecentFolder,
-    preferences,
-    updatePreferences,
-    serverSettings,
-    remoteServers,
-    saveRemoteServerProfile,
-    markRemoteServerConnected,
-    removeRemoteServerProfile,
-  } = useConfig()
+  const { recentFolders, removeRecentFolder, preferences, updatePreferences, serverSettings } = useConfig()
  const { t, locale } = useI18n()
  const [selectedIndex, setSelectedIndex] = createSignal(0)
  const [focusMode, setFocusMode] = createSignal<"recent" | "new" | null>("recent")
  const [selectedBinary, setSelectedBinary] = createSignal(serverSettings().opencodeBinary || "opencode")
  const [isFolderBrowserOpen, setIsFolderBrowserOpen] = createSignal(false)
-  const [activeTab, setActiveTab] = createSignal<HomeTab>("local")
-  const [isServerDialogOpen, setIsServerDialogOpen] = createSignal(false)
-  const [serverName, setServerName] = createSignal("")
-  const [serverUrl, setServerUrl] = createSignal("")
-  const [skipTlsVerify, setSkipTlsVerify] = createSignal(false)
-  const [serverDialogError, setServerDialogError] = createSignal<string | null>(null)
-  const [isSavingServer, setIsSavingServer] = createSignal(false)
-  const [connectingServerId, setConnectingServerId] = createSignal<string | null>(null)
  const nativeDialogsAvailable = supportsNativeDialogs()
  let recentListRef: HTMLDivElement | undefined

@@ -73,15 +49,10 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
  ]

  const selectedLanguageOption = () => languageOptions.find((opt) => opt.value === locale()) ?? languageOptions[0]
-  
+ 
  const folders = () => recentFolders()
-  const serverList = () => remoteServers()
  const isLoading = () => Boolean(props.isLoading)

-  function getActiveListLength() {
-    return activeTab() === "local" ? folders().length : serverList().length
-  }
-
  // Update selected binary when preferences change
  createEffect(() => {
    const lastUsed = serverSettings().opencodeBinary
@@ -93,7 +64,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
  function scrollToIndex(index: number) {
    const container = recentListRef
    if (!container) return
-    const element = container.querySelector(`[data-list-index="${index}"]`) as HTMLElement | null
+    const element = container.querySelector(`[data-folder-index="${index}"]`) as HTMLElement | null
    if (!element) return

    const containerRect = container.getBoundingClientRect()
@@ -142,18 +113,19 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
      return
    }

+    const folderList = folders()
+
    if (isBrowseShortcut) {
      e.preventDefault()
      void handleBrowse()
      return
    }

-    const listLength = getActiveListLength()
-    if (listLength === 0) return
+    if (folderList.length === 0) return

    if (e.key === "ArrowDown") {
      e.preventDefault()
-      const newIndex = Math.min(selectedIndex() + 1, listLength - 1)
+      const newIndex = Math.min(selectedIndex() + 1, folderList.length - 1)
      setSelectedIndex(newIndex)
      setFocusMode("recent")
      scrollToIndex(newIndex)
@@ -166,7 +138,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
    } else if (e.key === "PageDown") {
      e.preventDefault()
      const pageSize = 5
-      const newIndex = Math.min(selectedIndex() + pageSize, listLength - 1)
+      const newIndex = Math.min(selectedIndex() + pageSize, folderList.length - 1)
      setSelectedIndex(newIndex)
      setFocusMode("recent")
      scrollToIndex(newIndex)
@@ -184,7 +156,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
      scrollToIndex(0)
    } else if (e.key === "End") {
      e.preventDefault()
-      const newIndex = listLength - 1
+      const newIndex = folderList.length - 1
      setSelectedIndex(newIndex)
      setFocusMode("recent")
      scrollToIndex(newIndex)
@@ -193,17 +165,10 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
      handleEnterKey()
    } else if (e.key === "Backspace" || e.key === "Delete") {
      e.preventDefault()
-      if (listLength > 0 && focusMode() === "recent") {
-        if (activeTab() === "local") {
-          const folder = folders()[selectedIndex()]
-          if (folder) {
-            handleRemove(folder.path)
-          }
-        } else {
-          const server = serverList()[selectedIndex()]
-          if (server) {
-            removeRemoteServerProfile(server.id)
-          }
+      if (folderList.length > 0 && focusMode() === "recent") {
+        const folder = folderList[selectedIndex()]
+        if (folder) {
+          handleRemove(folder.path)
        }
      }
    }
@@ -212,40 +177,15 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {

  function handleEnterKey() {
    if (isLoading()) return
+    const folderList = folders()
    const index = selectedIndex()

-    if (activeTab() === "local") {
-      const folder = folders()[index]
-      if (folder) {
-        handleFolderSelect(folder.path)
-      }
-      return
-    }
-
-    const server = serverList()[index]
-    if (server) {
-      void handleConnectSavedServer(server.id)
+    const folder = folderList[index]
+    if (folder) {
+      handleFolderSelect(folder.path)
    }
  }

-  createEffect(() => {
-    activeTab()
-    setSelectedIndex(0)
-    setFocusMode("recent")
-  })
-
-  createEffect(() => {
-    const length = getActiveListLength()
-    if (length === 0) {
-      setSelectedIndex(0)
-      return
-    }
-
-    if (selectedIndex() >= length) {
-      setSelectedIndex(length - 1)
-    }
-  })
-

  onMount(() => {
    window.addEventListener("keydown", handleKeyDown)
@@ -296,87 +236,6 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
    props.onSelectFolder(path, selectedBinary())
  }

-  function resetServerDialog() {
-    setServerName("")
-    setServerUrl("")
-    setSkipTlsVerify(false)
-    setServerDialogError(null)
-  }
-
-  function openServerDialog() {
-    resetServerDialog()
-    setIsServerDialogOpen(true)
-  }
-
-  async function probeAndOpenServer(input: { id?: string; name: string; baseUrl: string; skipTlsVerify: boolean }, openWindow: boolean) {
-    const trimmedName = input.name.trim()
-    const trimmedUrl = input.baseUrl.trim()
-    if (!trimmedName || !trimmedUrl) {
-      throw new Error(t("folderSelection.servers.dialog.errorRequired"))
-    }
-
-    const probe = await serverApi.probeRemoteServer({
-      baseUrl: trimmedUrl,
-      skipTlsVerify: input.skipTlsVerify,
-    })
-
-    if (!probe.ok) {
-      throw new Error(probe.error || t("folderSelection.servers.dialog.errorConnect"))
-    }
-
-    const profile = await saveRemoteServerProfile({
-      id: input.id,
-      name: trimmedName,
-      baseUrl: probe.normalizedUrl,
-      skipTlsVerify: input.skipTlsVerify,
-    })
-
-    if (openWindow) {
-      await openRemoteServerWindow(profile)
-      await markRemoteServerConnected(profile.id)
-    }
-
-    return profile
-  }
-
-  async function handleSaveServer(openWindow: boolean) {
-    if (isSavingServer()) return
-    setIsSavingServer(true)
-    setServerDialogError(null)
-    try {
-      await probeAndOpenServer(
-        {
-          name: serverName(),
-          baseUrl: serverUrl(),
-          skipTlsVerify: skipTlsVerify(),
-        },
-        openWindow,
-      )
-      setIsServerDialogOpen(false)
-      resetServerDialog()
-    } catch (error) {
-      setServerDialogError(error instanceof Error ? error.message : String(error))
-    } finally {
-      setIsSavingServer(false)
-    }
-  }
-
-  async function handleConnectSavedServer(id: string) {
-    const target = remoteServers().find((entry) => entry.id === id)
-    if (!target || connectingServerId()) return
-    setConnectingServerId(id)
-    try {
-      await probeAndOpenServer(target, true)
-    } catch (error) {
-      showAlertDialog(error instanceof Error ? error.message : String(error), {
-        title: t("folderSelection.servers.errorTitle"),
-        variant: "warning",
-      })
-    } finally {
-      setConnectingServerId(null)
-    }
-  }
-
  async function handleBrowse() {
    if (isLoading()) return
    setFocusMode("new")
@@ -584,7 +443,7 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
                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")
@@ -617,223 +476,90 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
            <div class="flex-1 min-h-0 overflow-hidden flex flex-col lg:flex-row gap-4">
              {/* Right column: recent folders */}
              <div class="order-1 lg:order-2 flex flex-col gap-4 flex-1 min-h-0 overflow-hidden">
-                <div class="panel flex flex-col flex-1 min-h-0">
-                  <div class="panel-header !gap-0 !p-0">
-                    <div class="grid grid-cols-2 gap-0 overflow-hidden border border-base rounded-t-lg rounded-b-none">
-                      <button
-                        type="button"
-                        class="border-r border-base px-4 py-3 text-left transition-colors"
-                        classList={{
-                          "text-primary": activeTab() === "local",
-                          "text-muted hover:text-secondary": activeTab() !== "local",
-                        }}
-                        style={{
-                          "background-color": "var(--surface-secondary)",
-                        }}
-                        onClick={() => setActiveTab("local")}
-                      >
-                        <div
-                          class="panel-title text-base"
-                          style={{
-                            color: activeTab() === "local" ? "var(--text-primary)" : "var(--text-secondary)",
-                          }}
-                        >
-                          {t("folderSelection.recent.title")}
-                        </div>
-                        <p
-                          class="panel-subtitle mt-1"
-                          style={{
-                            color: activeTab() === "local" ? "var(--text-muted)" : "var(--text-secondary)",
-                          }}
-                        >
-                          {t(
-                            folders().length === 1
-                              ? "folderSelection.recent.subtitle.one"
-                              : "folderSelection.recent.subtitle.other",
-                            { count: folders().length },
-                          )}
-                        </p>
-                      </button>
-                      <button
-                        type="button"
-                        class="px-4 py-3 text-left transition-colors"
-                        classList={{
-                          "text-primary": activeTab() === "servers",
-                          "text-muted hover:text-secondary": activeTab() !== "servers",
-                        }}
-                        style={{
-                          "background-color": "var(--surface-secondary)",
-                        }}
-                        onClick={() => setActiveTab("servers")}
-                      >
-                        <div
-                          class="panel-title text-base"
-                          style={{
-                            color: activeTab() === "servers" ? "var(--text-primary)" : "var(--text-secondary)",
-                          }}
-                        >
-                          {t("folderSelection.tabs.servers")}
-                        </div>
-                        <p
-                          class="panel-subtitle mt-1"
-                          style={{
-                            color: activeTab() === "servers" ? "var(--text-muted)" : "var(--text-secondary)",
-                          }}
-                        >
-                          {t("folderSelection.servers.count", { count: remoteServers().length })}
-                        </p>
-                      </button>
+              <Show
+                when={folders().length > 0}
+                fallback={
+                  <div class="panel panel-empty-state flex-1">
+                    <div class="panel-empty-state-icon">
+                      <Clock class="w-12 h-12 mx-auto" />
                    </div>
+                    <p class="panel-empty-state-title">{t("folderSelection.empty.title")}</p>
+                    <p class="panel-empty-state-description">{t("folderSelection.empty.description")}</p>
                  </div>
-
-                  <Show
-                    when={activeTab() === "local"}
-                    fallback={
-                      <Show
-                        when={remoteServers().length > 0}
-                        fallback={
-                          <div class="panel-empty-state flex-1">
-                            <div class="panel-empty-state-icon">
-                              <Globe class="w-12 h-12 mx-auto" />
-                            </div>
-                            <p class="panel-empty-state-title">{t("folderSelection.servers.empty.title")}</p>
-                            <p class="panel-empty-state-description">{t("folderSelection.servers.empty.description")}</p>
-                            <button
-                              type="button"
-                              class="button-primary mt-4 w-auto self-center inline-flex items-center justify-center gap-2 px-4"
-                              onClick={openServerDialog}
-                            >
-                              <Globe class="w-4 h-4" />
-                              <span>{t("folderSelection.actions.connectButton")}</span>
-                            </button>
-                          </div>
-                        }
-                      >
-                        <div
-                          class="panel-list panel-list--fill flex-1 min-h-0 overflow-auto"
-                          ref={(el) => (recentListRef = el)}
-                        >
-                          <For each={remoteServers()}>
-                            {(server, index) => (
-                              <div
-                                class="panel-list-item"
-                                classList={{
-                                  "panel-list-item-highlight": focusMode() === "recent" && selectedIndex() === index(),
-                                }}
-                              >
-                                <div class="flex items-center gap-2 w-full px-1">
-                                  <button
-                                    data-list-index={index()}
-                                    class="panel-list-item-content flex-1"
-                                    onClick={() => void handleConnectSavedServer(server.id)}
-                                    onMouseEnter={() => {
-                                      setFocusMode("recent")
-                                      setSelectedIndex(index())
-                                    }}
-                                  >
-                                    <div class="flex items-center justify-between gap-3 w-full">
-                                      <div class="flex-1 min-w-0 text-left">
-                                        <div class="flex items-center gap-2 mb-1">
-                                          <Globe class="w-4 h-4 flex-shrink-0 icon-muted" />
-                                          <span class="text-sm font-medium truncate text-primary">{server.name}</span>
-                                        </div>
-                                        <div class="flex items-center gap-2 pl-6 text-xs text-muted min-w-0">
-                                          <span class="font-mono truncate-start flex-1 min-w-0">{server.baseUrl}</span>
-                                        </div>
-                                      </div>
-                                      <Show when={connectingServerId() === server.id} fallback={<Show when={focusMode() === "recent" && selectedIndex() === index()}><kbd class="kbd">↵</kbd></Show>}>
-                                        <Loader2 class="w-4 h-4 animate-spin icon-muted" />
-                                      </Show>
-                                    </div>
-                                  </button>
-                                  <button
-                                    onClick={() => removeRemoteServerProfile(server.id)}
-                                    class="p-2 transition-all hover:bg-red-100 dark:hover:bg-red-900/30 opacity-70 hover:opacity-100 rounded"
-                                    title={t("folderSelection.servers.remove")}
-                                  >
-                                    <Trash2 class="w-3.5 h-3.5 transition-colors icon-muted hover:text-red-600 dark:hover:text-red-400" />
-                                  </button>
-                                </div>
-                              </div>
-                            )}
-                          </For>
-                        </div>
-                      </Show>
-                    }
+                }
+              >
+                <div class="panel flex flex-col flex-1 min-h-0">
+                  <div class="panel-header">
+                    <h2 class="panel-title">{t("folderSelection.recent.title")}</h2>
+                    <p class="panel-subtitle">
+                      {t(
+                        folders().length === 1
+                          ? "folderSelection.recent.subtitle.one"
+                          : "folderSelection.recent.subtitle.other",
+                        { count: folders().length },
+                      )}
+                    </p>
+                  </div>
+                  <div
+                    class="panel-list panel-list--fill flex-1 min-h-0 overflow-auto"
+                    ref={(el) => (recentListRef = el)}
                  >
-                    <Show
-                      when={folders().length > 0}
-                      fallback={
-                        <div class="panel-empty-state flex-1">
-                          <div class="panel-empty-state-icon">
-                            <Clock class="w-12 h-12 mx-auto" />
-                          </div>
-                          <p class="panel-empty-state-title">{t("folderSelection.empty.title")}</p>
-                          <p class="panel-empty-state-description">{t("folderSelection.empty.description")}</p>
-                        </div>
-                      }
-                    >
-                      <div
-                        class="panel-list panel-list--fill flex-1 min-h-0 overflow-auto"
-                        ref={(el) => (recentListRef = el)}
-                      >
-                        <For each={folders()}>
-                          {(folder, index) => (
-                            <div
-                              class="panel-list-item"
-                              classList={{
-                                "panel-list-item-highlight": focusMode() === "recent" && selectedIndex() === index(),
-                                "panel-list-item-disabled": isLoading(),
+                    <For each={folders()}>
+                      {(folder, index) => (
+                        <div
+                          class="panel-list-item"
+                          classList={{
+                            "panel-list-item-highlight": focusMode() === "recent" && selectedIndex() === index(),
+                            "panel-list-item-disabled": isLoading(),
+                          }}
+                        >
+                          <div class="flex items-center gap-2 w-full px-1">
+                            <button
+                              data-folder-index={index()}
+                              class="panel-list-item-content flex-1"
+                              disabled={isLoading()}
+                              onClick={() => handleFolderSelect(folder.path)}
+                              onMouseEnter={() => {
+                                if (isLoading()) return
+                                setFocusMode("recent")
+                                setSelectedIndex(index())
                              }}
                            >
-                              <div class="flex items-center gap-2 w-full px-1">
-                                <button
-                                  data-list-index={index()}
-                                  class="panel-list-item-content flex-1"
-                                  disabled={isLoading()}
-                                  onClick={() => handleFolderSelect(folder.path)}
-                                  onMouseEnter={() => {
-                                    if (isLoading()) return
-                                    setFocusMode("recent")
-                                    setSelectedIndex(index())
-                                  }}
-                                >
-                                  <div class="flex items-center justify-between gap-3 w-full">
-                                    <div class="flex-1 min-w-0">
-                                      <div class="flex items-center gap-2 mb-1">
-                                        <Folder class="w-4 h-4 flex-shrink-0 icon-muted" />
-                                        <span class="text-sm font-medium truncate text-primary">
-                                          {splitFolderPath(folder.path).baseName}
-                                        </span>
-                                      </div>
-                                      <div class="flex items-center gap-2 pl-6 text-xs text-muted min-w-0">
-                                        <span class="font-mono truncate-start flex-1 min-w-0">
-                                          {getDisplayPath(folder.path)}
-                                        </span>
-                                        <span class="flex-shrink-0">{formatRelativeTime(folder.lastAccessed)}</span>
-                                      </div>
-                                    </div>
-                                    <Show when={focusMode() === "recent" && selectedIndex() === index()}>
-                                      <kbd class="kbd">↵</kbd>
-                                    </Show>
+                              <div class="flex items-center justify-between gap-3 w-full">
+                                <div class="flex-1 min-w-0">
+                                  <div class="flex items-center gap-2 mb-1">
+                                    <Folder class="w-4 h-4 flex-shrink-0 icon-muted" />
+                                    <span class="text-sm font-medium truncate text-primary">
+                                      {splitFolderPath(folder.path).baseName}
+                                    </span>
                                  </div>
-                                </button>
-                                <button
-                                  onClick={(e) => handleRemove(folder.path, e)}
-                                  disabled={isLoading()}
-                                  class="p-2 transition-all hover:bg-red-100 dark:hover:bg-red-900/30 opacity-70 hover:opacity-100 rounded"
-                                  title={t("folderSelection.recent.remove")}
-                                >
-                                  <Trash2 class="w-3.5 h-3.5 transition-colors icon-muted hover:text-red-600 dark:hover:text-red-400" />
-                                </button>
+                                  <div class="flex items-center gap-2 pl-6 text-xs text-muted min-w-0">
+                                    <span class="font-mono truncate-start flex-1 min-w-0">
+                                      {getDisplayPath(folder.path)}
+                                    </span>
+                                    <span class="flex-shrink-0">{formatRelativeTime(folder.lastAccessed)}</span>
+                                  </div>
+                                </div>
+                                <Show when={focusMode() === "recent" && selectedIndex() === index()}>
+                                  <kbd class="kbd">↵</kbd>
+                                </Show>
                              </div>
-                            </div>
-                          )}
-                        </For>
-                      </div>
-                    </Show>
-                  </Show>
+                            </button>
+                            <button
+                              onClick={(e) => handleRemove(folder.path, e)}
+                              disabled={isLoading()}
+                              class="p-2 transition-all hover:bg-red-100 dark:hover:bg-red-900/30 opacity-70 hover:opacity-100 rounded"
+                              title={t("folderSelection.recent.remove")}
+                            >
+                              <Trash2 class="w-3.5 h-3.5 transition-colors icon-muted hover:text-red-600 dark:hover:text-red-400" />
+                            </button>
+                          </div>
+                        </div>
+                      )}
+                    </For>
+                  </div>
                </div>
+              </Show>

              </div>

@@ -841,11 +567,11 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
              <div class="order-2 lg:order-1 flex flex-col gap-4 flex-1 min-h-0">
              <div class="panel shrink-0">
                <div class="panel-header hidden sm:block">
-                  <h2 class="panel-title">{t("folderSelection.actions.title")}</h2>
-                  <p class="panel-subtitle">{t("folderSelection.actions.subtitle")}</p>
+                  <h2 class="panel-title">{t("folderSelection.browse.title")}</h2>
+                  <p class="panel-subtitle">{t("folderSelection.browse.subtitle")}</p>
                </div>

-                <div class="panel-body flex flex-col gap-3">
+                <div class="panel-body">
                  <button
                    onClick={() => void handleBrowse()}
                    disabled={props.isLoading}
@@ -862,27 +588,6 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
                    </div>
                    <Kbd shortcut="cmd+n" class="ml-2 kbd-hint" />
                  </button>
-
-                  <button
-                    type="button"
-                    onClick={() => props.onOpenSidecar?.()}
-                    class="button-primary mt-3 w-full flex items-center justify-center text-sm"
-                  >
-                    <div class="flex items-center gap-2">
-                      <MonitorUp class="w-4 h-4" />
-                      <span>{t("folderSelection.sidecars.button")}</span>
-                    </div>
-                  </button>
-
-                  <button
-                    onClick={openServerDialog}
-                    class="button-primary w-full flex items-center justify-center text-sm"
-                  >
-                    <div class="flex items-center gap-2">
-                      <Globe class="w-4 h-4" />
-                      <span>{t("folderSelection.actions.connectButton")}</span>
-                    </div>
-                  </button>
                </div>

                {/* OpenCode settings section */}
@@ -958,82 +663,6 @@ const FolderSelectionView: Component<FolderSelectionViewProps> = (props) => {
        onClose={() => setIsFolderBrowserOpen(false)}
        onSelect={handleBrowserSelect}
      />
-
-      <Dialog open={isServerDialogOpen()} onOpenChange={(open) => !open && setIsServerDialogOpen(false)}>
-        <Dialog.Portal>
-          <Dialog.Overlay class="modal-overlay" />
-          <div class="fixed inset-0 z-[1300] flex items-center justify-center p-4">
-            <Dialog.Content class="modal-surface w-full max-w-lg p-6 flex flex-col gap-5" tabIndex={-1}>
-              <div>
-                <Dialog.Title class="text-xl font-semibold text-primary">
-                  {t("folderSelection.servers.dialog.title")}
-                </Dialog.Title>
-                <Dialog.Description class="text-sm text-secondary mt-2">
-                  {t("folderSelection.servers.dialog.description")}
-                </Dialog.Description>
-              </div>
-
-              <label class="flex flex-col gap-2 text-sm text-secondary">
-                <span>{t("folderSelection.servers.dialog.name")}</span>
-                <input
-                  class="selector-input w-full"
-                  value={serverName()}
-                  onInput={(event) => setServerName(event.currentTarget.value)}
-                  placeholder={t("folderSelection.servers.dialog.namePlaceholder")}
-                />
-              </label>
-
-              <label class="flex flex-col gap-2 text-sm text-secondary">
-                <span>{t("folderSelection.servers.dialog.url")}</span>
-                <input
-                  class="selector-input w-full"
-                  value={serverUrl()}
-                  onInput={(event) => setServerUrl(event.currentTarget.value)}
-                  placeholder={t("folderSelection.servers.dialog.urlPlaceholder")}
-                />
-              </label>
-
-              <label class="flex items-start gap-3 text-sm text-secondary">
-                <input
-                  type="checkbox"
-                  checked={skipTlsVerify()}
-                  onChange={(event) => setSkipTlsVerify(event.currentTarget.checked)}
-                />
-                <span>{t("folderSelection.servers.dialog.skipTls")}</span>
-              </label>
-
-              <Show when={serverDialogError()}>
-                {(message) => <p class="text-sm text-red-500 break-words">{message()}</p>}
-              </Show>
-
-              <div class="flex items-center justify-end gap-3">
-                <button class="selector-button selector-button-secondary w-auto px-4" onClick={() => setIsServerDialogOpen(false)}>
-                  {t("folderSelection.servers.dialog.cancel")}
-                </button>
-                <button
-                  class="selector-button selector-button-secondary w-auto px-4"
-                  disabled={isSavingServer()}
-                  onClick={() => void handleSaveServer(false)}
-                >
-                  {t("folderSelection.servers.dialog.save")}
-                </button>
-                <button
-                  class="selector-button selector-button-secondary w-auto px-4"
-                  disabled={isSavingServer()}
-                  onClick={() => void handleSaveServer(true)}
-                >
-                  <Show when={isSavingServer()} fallback={<span>{t("folderSelection.servers.dialog.connect")}</span>}>
-                    <span class="inline-flex items-center gap-2">
-                      <Loader2 class="w-4 h-4 animate-spin" />
-                      {t("folderSelection.servers.dialog.connecting")}
-                    </span>
-                  </Show>
-                </button>
-              </div>
-            </Dialog.Content>
-          </div>
-        </Dialog.Portal>
-      </Dialog>
    </>
  )
 }
--- a/packages/ui/src/components/instance-info.tsx
+++ b/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
--- a/packages/ui/src/components/instance-tabs.tsx
+++ b/packages/ui/src/components/instance-tabs.tsx
@@ -1,5 +1,6 @@
 import { Component, For, Show, createMemo } from "solid-js"
 import { Dynamic } from "solid-js/web"
+import type { Instance } from "../types/instance"
 import InstanceTab from "./instance-tab"
 import KeyboardHint from "./keyboard-hint"
 import { Plus, MonitorUp, Bell, BellOff, Settings } from "lucide-solid"
@@ -8,13 +9,12 @@ import { useI18n } from "../lib/i18n"
 import { isOsNotificationSupportedSync } from "../lib/os-notifications"
 import { useConfig } from "../stores/preferences"
 import { openSettings } from "../stores/settings-screen"
-import type { AppTabRecord } from "../stores/app-tabs"

 interface InstanceTabsProps {
-  tabs: AppTabRecord[]
-  activeTabId: string | null
-  onSelect: (tabId: string) => void
-  onClose: (tabId: string) => void
+  instances: Map<string, Instance>
+  activeInstanceId: string | null
+  onSelect: (instanceId: string) => void
+  onClose: (instanceId: string) => void
  onNew: () => void
 }

@@ -42,25 +42,15 @@ const InstanceTabs: Component<InstanceTabsProps> = (props) => {
        <div class="tab-scroll">
          <div class="tab-strip">
            <div class="tab-strip-tabs">
-              <For each={props.tabs}>
-                {(tab) =>
-                  tab.kind === "instance" ? (
-                    <InstanceTab
-                      instance={tab.instance}
-                      active={tab.id === props.activeTabId}
-                      onSelect={() => props.onSelect(tab.id)}
-                      onClose={() => props.onClose(tab.id)}
-                    />
-                  ) : (
-                    <div class={`tab-pill ${tab.id === props.activeTabId ? "tab-pill-active" : ""}`}>
-                      <button class="tab-pill-button" onClick={() => props.onSelect(tab.id)}>
-                        <span class="truncate max-w-[180px]">{tab.sidecarTab.name}</span>
-                      </button>
-                      <button class="tab-pill-close" onClick={() => props.onClose(tab.id)} aria-label={tab.sidecarTab.name}>
-                        ×
-                      </button>
-                    </div>
-                  )}
+              <For each={Array.from(props.instances.entries())}>
+                {([id, instance]) => (
+                  <InstanceTab
+                    instance={instance}
+                    active={id === props.activeInstanceId}
+                    onSelect={() => props.onSelect(id)}
+                    onClose={() => props.onClose(id)}
+                  />
+                )}
              </For>
              <button
                class="new-tab-button"
@@ -72,7 +62,7 @@ const InstanceTabs: Component<InstanceTabsProps> = (props) => {
              </button>
            </div>
            <div class="tab-strip-spacer" />
-            <Show when={props.tabs.length > 1}>
+            <Show when={Array.from(props.instances.entries()).length > 1}>
              <div class="tab-shortcuts">
                <KeyboardHint
                  shortcuts={[keyboardRegistry.get("instance-prev")!, keyboardRegistry.get("instance-next")!].filter(
--- a/packages/ui/src/components/instance/instance-shell2.tsx
+++ b/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")

@@ -104,7 +97,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 +230,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 +252,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 +272,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 +290,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)
  }
@@ -498,7 +420,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
        onClose={closeLeftDrawer}
        ModalProps={modalProps}
        sx={{
-          zIndex: 60,
          "& .MuiDrawer-paper": {
            width: isPhoneLayout() ? "100vw" : `${sessionSidebarWidth()}px`,
            boxSizing: "border-box",
@@ -609,7 +530,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
        onClose={closeRightDrawer}
        ModalProps={modalProps}
        sx={{
-          zIndex: 60,
          "& .MuiDrawer-paper": {
            width: isPhoneLayout() ? "100vw" : `${rightDrawerWidth()}px`,
            boxSizing: "border-box",
@@ -700,7 +620,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 +717,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>

--- a/packages/ui/src/components/instance/shell/SessionSidebar.tsx
+++ b/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
--- a/packages/ui/src/components/instance/shell/right-panel/RightPanel.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/RightPanel.tsx
@@ -24,9 +24,6 @@ import type { DiffContextMode, DiffViewMode, DiffWordWrapMode, RightPanelTab } f

 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 {
@@ -89,7 +86,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 +102,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",
@@ -546,8 +539,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 +559,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 +566,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
@@ -677,7 +578,6 @@ const RightPanel: Component<RightPanelProps> = (props) => {
    setBrowserSelectedContent(null)
    setBrowserSelectedLoading(false)
    setBrowserSelectedError(null)
-    setBrowserSelectedDirty(false)
  })

  createEffect(() => {
@@ -730,22 +630,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 +651,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 +670,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())
@@ -948,15 +830,11 @@ const RightPanel: Component<RightPanelProps> = (props) => {
              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)}
+              onOpenFile={(path: string) => void openBrowserFile(path)}
              onRefresh={() => void refreshFilesTab()}
-              onSave={(content: string) => void saveBrowserFile(content)}
-              onContentChange={(content: string) => handleBrowserFileChange(content)}
              listOpen={filesListOpen}
              onToggleList={toggleFilesList}
              splitWidth={filesSplitWidth}
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/ChangesTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/ChangesTab.tsx
@@ -115,22 +115,23 @@ 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 || "")}
-                    patch={String((file() as any).patch || "")}
-                    viewMode={props.diffViewMode()}
-                    contextMode={props.diffContextMode()}
-                    wordWrap={props.diffWordWrapMode()}
-                  />
-                </Suspense>
+              <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>
            )}
          </Show>
        </div>
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx
@@ -1,7 +1,7 @@
 import { For, Show, Suspense, lazy, 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 SplitFilePanel from "../components/SplitFilePanel"

@@ -21,17 +21,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 +38,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 || []
@@ -97,13 +86,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
                          </div>
                        }
                      >
-                        <LazyMonacoFileViewer
-                          scopeKey={props.scopeKey()}
-                          path={payload().path}
-                          content={payload().content}
-                          onSave={props.onSave}
-                          onContentChange={props.onContentChange}
-                        />
+                        <LazyMonacoFileViewer scopeKey={props.scopeKey()} path={payload().path} content={payload().content} />
                      </Suspense>
                    )}
                  </Show>
@@ -152,7 +135,7 @@ const FilesTab: Component<FilesTabProps> = (props) => {
                  props.onLoadEntries(item.path)
                  return
                }
-                props.onRequestOpenFile(item.path)
+                props.onOpenFile(item.path)
              }}
              title={item.path}
            >
@@ -185,25 +168,14 @@ const FilesTab: Component<FilesTabProps> = (props) => {
              </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-inline-start": "auto" }}
              onClick={() => props.onRefresh()}
            >
              <RefreshCw class={`h-4 w-4${props.browserLoading() ? " animate-spin" : ""}`} />
@@ -226,4 +198,4 @@ const FilesTab: Component<FilesTabProps> = (props) => {
  return <>{renderContent()}</>
 }

-export default FilesTab
+export default FilesTab
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/StatusTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/StatusTab.tsx
@@ -2,9 +2,8 @@ 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 { BellRing, ChevronDown, Info, TerminalSquare, Trash2, XOctagon } from "lucide-solid"
+import { ChevronDown, Info, TerminalSquare, Trash2, XOctagon } from "lucide-solid"

 import type { Instance } from "../../../../../types/instance"
 import type { BackgroundProcess } from "../../../../../../../server/src/api-types"
@@ -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") {
@@ -187,24 +156,6 @@ const StatusTab: Component<StatusTabProps> = (props) => {
              <div class="status-process-header">
                <span class="status-process-title">{process.title}</span>
                <div class="status-process-meta">
-                  <span
-                    classList={{
-                      "text-success": Boolean(process.notifyEnabled),
-                      "text-tertiary": !process.notifyEnabled,
-                    }}
-                    aria-label={props.t(
-                      process.notifyEnabled
-                        ? "instanceShell.backgroundProcesses.notify.enabled"
-                        : "instanceShell.backgroundProcesses.notify.disabled",
-                    )}
-                    title={props.t(
-                      process.notifyEnabled
-                        ? "instanceShell.backgroundProcesses.notify.enabled"
-                        : "instanceShell.backgroundProcesses.notify.disabled",
-                    )}
-                  >
-                    <BellRing class="h-3.5 w-3.5" />
-                  </span>
                  <span>{props.t("instanceShell.backgroundProcesses.status", { status: process.status })}</span>
                  <Show when={typeof process.outputSizeBytes === "number"}>
                    <span>
@@ -253,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",
@@ -336,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>
--- a/packages/ui/src/components/markdown.tsx
+++ b/packages/ui/src/components/markdown.tsx
@@ -83,7 +83,6 @@ interface MarkdownProps {
  isDark?: boolean
  size?: "base" | "sm" | "tight"
  disableHighlight?: boolean
-  escapeRawHtml?: boolean
  onRendered?: () => void
 }

@@ -104,12 +103,11 @@ export function Markdown(props: MarkdownProps) {
    const text = decodeHtmlEntitiesLocally(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 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 }
+    const requestKey = `${cacheId}:${themeKey}:${highlightEnabled ? 1 : 0}:${version}`
+    return { part, text, themeKey, highlightEnabled, partId, cacheId, version, requestKey }
  })

  const cacheHandle = useGlobalCache({
@@ -118,26 +116,20 @@ export function Markdown(props: MarkdownProps) {
    scope: "markdown",
    cacheId: () => {
      const { cacheId, themeKey, highlightEnabled } = resolved()
-      return `${cacheId}:${themeKey}:${highlightEnabled ? 1 : 0}:${resolved().escapeRawHtml ? 1 : 0}`
+      return `${cacheId}:${themeKey}:${highlightEnabled ? 1 : 0}`
    },
    version: () => resolved().version,
  })

-  const commitCacheEntry = (
-    snapshot: ReturnType<typeof resolved>,
-    renderedHtml: string,
-    options?: { cache?: boolean },
-  ) => {
+  const commitCacheEntry = (snapshot: ReturnType<typeof resolved>, renderedHtml: string) => {
    const cacheEntry: RenderCache = {
      text: snapshot.text,
      html: renderedHtml,
      theme: snapshot.themeKey,
-      mode: `${snapshot.version}:${snapshot.escapeRawHtml ? "escaped" : "raw"}`,
+      mode: snapshot.version,
    }
    setHtml(renderedHtml)
-    if (options?.cache ?? true) {
-      cacheHandle.set(cacheEntry)
-    }
+    cacheHandle.set(cacheEntry)
    notifyRendered()
  }

@@ -146,23 +138,20 @@ export function Markdown(props: MarkdownProps) {
    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)

    if (latestRequestKey === snapshot.requestKey) {
-      commitCacheEntry(snapshot, rendered, { cache: shouldCache })
+      commitCacheEntry(snapshot, rendered)
    }
  }

  createEffect(() => {
    const snapshot = resolved()
    latestRequestKey = snapshot.requestKey
-    const cacheMode = `${snapshot.version}:${snapshot.escapeRawHtml ? "escaped" : "raw"}`

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

    const localCache = snapshot.part.renderCache
--- a/packages/ui/src/components/message-block.tsx
+++ b/packages/ui/src/components/message-block.tsx
@@ -1,22 +1,21 @@
-import { For, Index, Match, Show, Suspense, Switch, createEffect, createMemo, createSignal, lazy, onCleanup, untrack, type Accessor } from "solid-js"
+import { For, Match, Show, Suspense, Switch, createEffect, createMemo, createSignal, lazy, onCleanup, untrack } from "solid-js"
 import { ChevronsDownUp, ChevronsUpDown, ExternalLink, FoldVertical, ListStart, Trash } from "lucide-solid"
 import MessageItem from "./message-item"
 import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
 import type { ClientPart, MessageInfo } from "../types/message"
-import { isHiddenSyntheticTextPart, partHasRenderableText } from "../types/message"
+import { partHasRenderableText } from "../types/message"
 import { buildRecordDisplayData, clearRecordDisplayCacheForInstance } from "../stores/message-v2/record-display-cache"
 import type { MessageRecord } from "../stores/message-v2/types"
 import { messageStoreBus } from "../stores/message-v2/bus"
 import { formatTokenTotal } from "../lib/formatters"
 import { sessions, setActiveParentSession, setActiveSession } from "../stores/sessions"
-import { selectInstanceTab } from "../stores/app-tabs"
+import { setActiveInstanceId } from "../stores/instances"
 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"
-import { createFollowScroll } from "../lib/follow-scroll"

 function DeleteUpToIcon() {
  return (
@@ -30,7 +29,6 @@ const TOOL_ICON = "🔧"
 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 REASONING_SCROLL_SENTINEL_MARGIN_PX = 48

 const LazyToolCall = lazy(() => import("./tool-call"))

@@ -132,7 +130,7 @@ function findTaskSessionLocation(sessionId: string, preferredInstanceId?: string
 }

 function navigateToTaskSession(location: TaskSessionLocation) {
-  selectInstanceTab(location.instanceId)
+  setActiveInstanceId(location.instanceId)
  const parentToActivate = location.parentId ?? location.sessionId
  setActiveParentSession(location.instanceId, parentToActivate)
  if (location.parentId) {
@@ -231,12 +229,6 @@ function isContentPartType(type: unknown): boolean {
  return type === "text" || type === "file"
 }

-function isVisibleContentPart(part: ClientPart): boolean {
-  if (!part || !isContentPartType((part as any).type)) return false
-  if (isHiddenSyntheticTextPart(part)) return false
-  return partHasRenderableText(part)
-}
-
 function MessageContentItem(props: MessageContentItemProps) {
  const record = createMemo(() => props.store().getMessage(props.messageId))
  const messageInfo = createMemo(() => props.store().getMessageInfo(props.messageId))
@@ -270,15 +262,13 @@ function MessageContentItem(props: MessageContentItemProps) {
    return resolved
  })

-  const visibleParts = createMemo(() => parts().filter((part) => isVisibleContentPart(part)))
-
  const showAgentMeta = createMemo(() => {
    const current = record()
    if (!current) return false
    if (current.role !== "assistant") return false

    const currentParts = parts()
-    if (visibleParts().length === 0) {
+    if (!currentParts.some((part) => partHasRenderableText(part))) {
      return false
    }

@@ -294,10 +284,10 @@ function MessageContentItem(props: MessageContentItemProps) {
      if (!isSupportedPartType(part)) continue

      if (!isContentPartType((part as any).type)) continue
-        if (isVisibleContentPart(part)) {
-          return false
-        }
+      if (partHasRenderableText(part)) {
+        return false
      }
+    }

    return true
  })
@@ -308,7 +298,7 @@ function MessageContentItem(props: MessageContentItemProps) {
        <MessageItem
          record={resolvedRecord()}
          messageInfo={messageInfo()}
-          parts={visibleParts()}
+          parts={parts()}
          instanceId={props.instanceId}
          sessionId={props.sessionId}
          isQueued={isQueued()}
@@ -629,12 +619,13 @@ export default function MessageBlock(props: MessageBlockProps) {
    const lastAssistantIdx = props.lastAssistantIndex()
    const isQueued = current.role === "user" && (lastAssistantIdx === -1 || index > lastAssistantIdx)

-    const messageInfoVersion = props.store().state.messageInfoVersion[current.id] ?? 0
+    // Intentionally untracked: messageInfoVersion updates should not trigger
+    // a full message block rebuild; record revision is the invalidation key.
+    const info = untrack(messageInfo)

    const cacheSignature = [
      current.id,
      current.revision,
-      messageInfoVersion,
      isQueued ? 1 : 0,
      props.showThinking() ? 1 : 0,
      props.thinkingDefaultExpanded() ? 1 : 0,
@@ -646,9 +637,6 @@ export default function MessageBlock(props: MessageBlockProps) {
      return cachedBlock.block
    }

-    // Only capture info after cache check fails - ensures fresh data on version bump
-    const info = untrack(messageInfo)
-
    const { orderedParts } = buildRecordDisplayData(props.instanceId, current)
    const items: MessageBlockItem[] = []
    const blockContentKeys: string[] = []
@@ -815,19 +803,19 @@ export default function MessageBlock(props: MessageBlockProps) {
          data-message-id={resolvedBlock().record.id}
          data-delete-message-hover={isDeleteMessageHovered() ? "true" : undefined}
        >
-          <Index each={resolvedBlock().items}>
+          <For each={resolvedBlock().items}>
            {(item, index) => (
              <Switch>
-                <Match when={item().type === "content"}>
+                <Match when={item.type === "content"}>
                  <MessageContentItem
                    instanceId={props.instanceId}
                    sessionId={props.sessionId}
                    store={props.store}
-                    messageId={(item() as ContentDisplayItem).messageId}
-                    startPartId={(item() as ContentDisplayItem).startPartId}
+                    messageId={(item as ContentDisplayItem).messageId}
+                    startPartId={(item as ContentDisplayItem).startPartId}
                    messageIndex={props.messageIndex}
                    lastAssistantIndex={props.lastAssistantIndex}
-                    showDeleteMessage={index === 0}
+                    showDeleteMessage={index() === 0}
                    onDeleteHoverChange={props.onDeleteHoverChange}
                    onRevert={props.onRevert}
                    onDeleteMessagesUpTo={props.onDeleteMessagesUpTo}
@@ -837,18 +825,18 @@ export default function MessageBlock(props: MessageBlockProps) {
                    onContentRendered={props.onContentRendered}
                  />
                </Match>
-                <Match when={item().type === "tool"}>
+                <Match when={item.type === "tool"}>
                  {(() => {
-                    const toolItem = item() as ToolDisplayItem
+                    const toolItem = item as ToolDisplayItem
                    return (
                      <div class="tool-call-message" data-key={toolItem.key}>
-                          <ToolCallItem
-                            instanceId={props.instanceId}
-                            sessionId={props.sessionId}
-                            store={props.store}
-                            messageId={toolItem.messageId}
-                            partId={toolItem.partId}
-                            showDeleteMessage={index === 0}
+                        <ToolCallItem
+                          instanceId={props.instanceId}
+                          sessionId={props.sessionId}
+                          store={props.store}
+                          messageId={toolItem.messageId}
+                          partId={toolItem.partId}
+                          showDeleteMessage={index() === 0}
                          deleteHover={props.deleteHover}
                          onDeleteHoverChange={props.onDeleteHoverChange}
                          onDeleteMessagesUpTo={props.onDeleteMessagesUpTo}
@@ -861,13 +849,13 @@ export default function MessageBlock(props: MessageBlockProps) {
                    )
                  })()}
                </Match>
-                <Match when={item().type === "step-start"}>
+                <Match when={item.type === "step-start"}>
                  <StepCard
                    kind="start"
-                    part={(item() as StepDisplayItem).part}
-                    messageInfo={(item() as StepDisplayItem).messageInfo}
+                    part={(item as StepDisplayItem).part}
+                    messageInfo={(item as StepDisplayItem).messageInfo}
                    showAgentMeta
-                    showDeleteMessage={index === 0}
+                    showDeleteMessage={index() === 0}
                    instanceId={props.instanceId}
                    sessionId={props.sessionId}
                    messageId={props.messageId}
@@ -877,14 +865,14 @@ export default function MessageBlock(props: MessageBlockProps) {
                    onToggleSelectedMessage={props.onToggleSelectedMessage}
                  />
                </Match>
-                <Match when={item().type === "step-finish"}>
+                <Match when={item.type === "step-finish"}>
                  <StepCard
                    kind="finish"
-                    part={(item() as StepDisplayItem).part}
-                    messageInfo={(item() as StepDisplayItem).messageInfo}
+                    part={(item as StepDisplayItem).part}
+                    messageInfo={(item as StepDisplayItem).messageInfo}
                    showUsage={props.showUsageMetrics()}
-                    borderColor={(item() as StepDisplayItem).accentColor}
-                    showDeleteMessage={index === 0}
+                    borderColor={(item as StepDisplayItem).accentColor}
+                    showDeleteMessage={index() === 0}
                    instanceId={props.instanceId}
                    sessionId={props.sessionId}
                    messageId={props.messageId}
@@ -894,31 +882,31 @@ export default function MessageBlock(props: MessageBlockProps) {
                    onToggleSelectedMessage={props.onToggleSelectedMessage}
                  />
                </Match>
-                <Match when={item().type === "compaction"}>
+                <Match when={item.type === "compaction"}>
                  <CompactionCard
-                    part={(item() as CompactionDisplayItem).part}
-                    messageInfo={(item() as CompactionDisplayItem).messageInfo}
-                    borderColor={(item() as CompactionDisplayItem).accentColor}
+                    part={(item as CompactionDisplayItem).part}
+                    messageInfo={(item as CompactionDisplayItem).messageInfo}
+                    borderColor={(item as CompactionDisplayItem).accentColor}
                    instanceId={props.instanceId}
                    sessionId={props.sessionId}
-                    messageId={(item() as CompactionDisplayItem).messageId}
-                    showDeleteMessage={index === 0}
+                    messageId={(item as CompactionDisplayItem).messageId}
+                    showDeleteMessage={index() === 0}
                    onDeleteHoverChange={props.onDeleteHoverChange}
                    onDeleteMessagesUpTo={props.onDeleteMessagesUpTo}
                    selectedMessageIds={props.selectedMessageIds}
                    onToggleSelectedMessage={props.onToggleSelectedMessage}
                  />
                </Match>
-                <Match when={item().type === "reasoning"}>
+                <Match when={item.type === "reasoning"}>
                  <ReasoningCard
-                    part={(item() as ReasoningDisplayItem).part}
-                    messageInfo={(item() as ReasoningDisplayItem).messageInfo}
+                    part={(item as ReasoningDisplayItem).part}
+                    messageInfo={(item as ReasoningDisplayItem).messageInfo}
                    instanceId={props.instanceId}
                    sessionId={props.sessionId}
-                    messageId={(item() as ReasoningDisplayItem).messageId}
-                    showAgentMeta={(item() as ReasoningDisplayItem).showAgentMeta}
-                    defaultExpanded={(item() as ReasoningDisplayItem).defaultExpanded}
-                    showDeleteMessage={index === 0}
+                    messageId={(item as ReasoningDisplayItem).messageId}
+                    showAgentMeta={(item as ReasoningDisplayItem).showAgentMeta}
+                    defaultExpanded={(item as ReasoningDisplayItem).defaultExpanded}
+                    showDeleteMessage={index() === 0}
                    onDeleteHoverChange={props.onDeleteHoverChange}
                    onDeleteMessagesUpTo={props.onDeleteMessagesUpTo}
                    selectedMessageIds={props.selectedMessageIds}
@@ -928,7 +916,7 @@ export default function MessageBlock(props: MessageBlockProps) {
                </Match>
              </Switch>
            )}
-          </Index>
+          </For>
        </div>
      )}
    </Show>
@@ -1110,23 +1098,17 @@ function StepCard(props: StepCardProps) {
      return null
    }
    const info = props.messageInfo
-    const part = props.part as any
-    
-    // step-finish parts have tokens embedded; also check messageInfo
-    const partTokens = part?.tokens
-    const infoTokens = info && info.role === "assistant" ? info.tokens : undefined
-    const tokens = partTokens ?? infoTokens
-    if (!tokens) {
+    if (!info || info.role !== "assistant" || !info.tokens) {
      return null
    }
-    
+    const tokens = info.tokens
    return {
      input: tokens.input ?? 0,
      output: tokens.output ?? 0,
      reasoning: tokens.reasoning ?? 0,
      cacheRead: tokens.cache?.read ?? 0,
      cacheWrite: tokens.cache?.write ?? 0,
-      cost: (part?.cost ?? (info && info.role === "assistant" ? info.cost : 0)) ?? 0,
+      cost: info.cost ?? 0,
    }
  }

@@ -1311,23 +1293,14 @@ interface ReasoningCardProps {
  onContentRendered?: () => void
 }

-function ReasoningStreamOutput(props: {
-  text: Accessor<string>
-  scrollTopSnapshot: Accessor<number>
-  setScrollTopSnapshot: (next: number) => void
-  onContentRendered?: () => void
-  ariaLabel: string
-}) {
-  let preRef: HTMLPreElement | undefined
+function ReasoningCard(props: ReasoningCardProps) {
+  const { t } = useI18n()
+  const [expanded, setExpanded] = createSignal(Boolean(props.defaultExpanded))
+  const [deletingMessage, setDeletingMessage] = createSignal(false)
+  const [deletingUpTo, setDeletingUpTo] = createSignal(false)
+  const isSelectedForDeletion = () => Boolean(props.selectedMessageIds?.().has(props.messageId))
  let pendingRenderNotificationFrame: number | null = null

-  const followScroll = createFollowScroll({
-    getScrollTopSnapshot: props.scrollTopSnapshot,
-    setScrollTopSnapshot: props.setScrollTopSnapshot,
-    sentinelMarginPx: REASONING_SCROLL_SENTINEL_MARGIN_PX,
-    sentinelClassName: "reasoning-scroll-sentinel",
-  })
-
  const notifyContentRendered = () => {
    if (!props.onContentRendered || typeof requestAnimationFrame !== "function") return
    if (pendingRenderNotificationFrame !== null) {
@@ -1339,17 +1312,6 @@ function ReasoningStreamOutput(props: {
    })
  }

-  createEffect(() => {
-    const nextText = props.text()
-    if (preRef && preRef.textContent !== nextText) {
-      preRef.textContent = nextText
-    }
-    if (followScroll.autoScroll()) {
-      followScroll.restoreAfterRender({ forceBottom: true })
-    }
-    notifyContentRendered()
-  })
-
  onCleanup(() => {
    if (pendingRenderNotificationFrame !== null) {
      cancelAnimationFrame(pendingRenderNotificationFrame)
@@ -1357,37 +1319,6 @@ function ReasoningStreamOutput(props: {
    }
  })

-  return (
-    <div
-      ref={followScroll.registerContainer}
-      class="message-reasoning-output"
-      role="region"
-      aria-label={props.ariaLabel}
-      onScroll={followScroll.handleScroll}
-    >
-      <pre
-        ref={(element) => {
-          preRef = element || undefined
-          if (preRef) {
-            preRef.textContent = props.text() || ""
-          }
-        }}
-        class="message-reasoning-text"
-        dir="auto"
-      />
-      {followScroll.renderSentinel()}
-    </div>
-  )
-}
-
-function ReasoningCard(props: ReasoningCardProps) {
-  const { t } = useI18n()
-  const [expanded, setExpanded] = createSignal(Boolean(props.defaultExpanded))
-  const [deletingMessage, setDeletingMessage] = createSignal(false)
-  const [deletingUpTo, setDeletingUpTo] = createSignal(false)
-  const [scrollTopSnapshot, setScrollTopSnapshot] = createSignal(0)
-  const isSelectedForDeletion = () => Boolean(props.selectedMessageIds?.().has(props.messageId))
-
  createEffect(() => {
    setExpanded(Boolean(props.defaultExpanded))
  })
@@ -1462,6 +1393,12 @@ function ReasoningCard(props: ReasoningCardProps) {

  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) => {
@@ -1616,13 +1553,9 @@ function ReasoningCard(props: ReasoningCardProps) {
      <Show when={expanded()}>
        <div class="message-reasoning-expanded">
          <div class="message-reasoning-body">
-            <ReasoningStreamOutput
-              text={reasoningText}
-              scrollTopSnapshot={scrollTopSnapshot}
-              setScrollTopSnapshot={setScrollTopSnapshot}
-              onContentRendered={props.onContentRendered}
-              ariaLabel={t("messageBlock.reasoning.detailsAriaLabel")}
-            />
+            <div class="message-reasoning-output" role="region" aria-label={t("messageBlock.reasoning.detailsAriaLabel")}>
+              <pre class="message-reasoning-text" dir="auto">{reasoningText() || ""}</pre>
+            </div>
          </div>
        </div>
      </Show>
--- a/packages/ui/src/components/message-item.tsx
+++ b/packages/ui/src/components/message-item.tsx
@@ -2,7 +2,7 @@ import { For, Show, createEffect, createSignal, onCleanup } from "solid-js"
 import { Portal } from "solid-js/web"
 import { Copy, ListStart, Split, Trash, Undo } from "lucide-solid"
 import type { MessageInfo, ClientPart, SDKAssistantMessageV2 } from "../types/message"
-import { isHiddenSyntheticTextPart, partHasRenderableText } from "../types/message"
+import { partHasRenderableText } from "../types/message"
 import type { MessageRecord } from "../stores/message-v2/types"
 import MessagePart from "./message-part"
 import { copyToClipboard } from "../lib/clipboard"
@@ -290,9 +290,9 @@ export default function MessageItem(props: MessageItemProps) {

  const getRawContent = () => {
    return props.parts
-      .filter((part) => part.type === "text" && !isHiddenSyntheticTextPart(part))
-      .map((part) => (part as { text?: string }).text || "")
-      .filter((text) => text.trim().length > 0)
+      .filter(part => part.type === "text")
+      .map(part => (part as { text?: string }).text || "")
+      .filter(text => text.trim().length > 0)
      .join("\n\n")
  }

@@ -338,7 +338,7 @@ export default function MessageItem(props: MessageItemProps) {
    }
  }

-  if (!hasContent() && !isGenerating()) {
+  if (!isUser() && !hasContent() && !isGenerating()) {
    return null
  }

--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -33,7 +33,19 @@ export default function MessagePart(props: MessagePartProps) {
  const shouldHideTextPart = () => {
    const part = props.part
    if (!part || part.type !== "text") return false
-    return Boolean((part as any).synthetic)
+
+    const isSynthetic = Boolean((part as any).synthetic)
+    if (!isSynthetic) return false
+
+    // Keep optimistic user prompts visible; hide other synthetic user helper parts.
+    if (props.messageType === "user") {
+      const primaryId = props.primaryUserTextPartId
+      if (!primaryId) return false
+      return part.id !== primaryId
+    }
+
+    // Hide synthetic assistant text.
+    return true
  }


@@ -134,7 +146,6 @@ export default function MessagePart(props: MessagePartProps) {
                sessionId={props.sessionId}
                isDark={isDark()}
                size={isAssistantMessage() ? "tight" : "base"}
-                escapeRawHtml={props.messageType === "user"}
                onRendered={props.onRendered}
              />
            </Show>
--- a/packages/ui/src/components/message-section.tsx
+++ b/packages/ui/src/components/message-section.tsx
@@ -46,33 +46,6 @@ export default function MessageSection(props: MessageSectionProps) {
  const showTimelineToolsPreference = () => preferences().showTimelineTools ?? true
  const store = createMemo<InstanceMessageStore>(() => messageStoreBus.getOrCreate(props.instanceId))
  const messageIds = createMemo(() => store().getSessionMessageIds(props.sessionId))
-  const visibleMessageIds = createMemo(() => {
-    const resolvedStore = store()
-    return messageIds().filter((messageId) => {
-      const record = resolvedStore.getMessage(messageId)
-      if (!record) return false
-
-      if (buildTimelineSegments(props.instanceId, record, t).length > 0) {
-        return true
-      }
-
-      if (record.role !== "assistant") {
-        return false
-      }
-
-      const info = resolvedStore.getMessageInfo(messageId)
-      if (!info || info.role !== "assistant") {
-        return false
-      }
-
-      if (info.error) {
-        return true
-      }
-
-      const timeInfo = info.time as { created: number; end?: number } | undefined
-      return Boolean(timeInfo && (timeInfo.end === undefined || timeInfo.end === 0))
-    })
-  })

  const scrollCache = useScrollCache({
    instanceId: props.instanceId,
@@ -156,8 +129,6 @@ export default function MessageSection(props: MessageSectionProps) {
    return map
  })

-  const lastAssistantMessageId = createMemo(() => store().getLastAssistantMessageId(props.sessionId))
-
  const lastCompactionIndex = createMemo(() => {
    // Depend on a single session revision signal (not every message/part read)
    // to keep reactive overhead small.
@@ -344,9 +315,15 @@ export default function MessageSection(props: MessageSectionProps) {
  }

  const lastAssistantIndex = createMemo(() => {
-    const messageId = lastAssistantMessageId()
-    if (!messageId) return -1
-    return messageIndexById().get(messageId) ?? -1
+    const ids = messageIds()
+    const resolvedStore = store()
+    for (let index = ids.length - 1; index >= 0; index--) {
+      const record = resolvedStore.getMessage(ids[index])
+      if (record?.role === "assistant") {
+        return index
+      }
+    }
+    return -1
  })
 
  const [timelineSegments, setTimelineSegments] = createSignal<TimelineSegment[]>([])
@@ -638,7 +615,7 @@ export default function MessageSection(props: MessageSectionProps) {
    const api = listApi()
    if (!element || !api) return
    if (props.loading) return
-    if (visibleMessageIds().length === 0) return
+    if (messageIds().length === 0) return
    if (didRestoreScroll()) return

    scrollCache.restore(element, {
@@ -757,93 +734,88 @@ export default function MessageSection(props: MessageSectionProps) {
    const loading = Boolean(props.loading)
    const ids = messageIds()

-    // Wrap all iteration of the store-proxied `ids` array in untrack()
-    // to prevent O(n) per-element reactive subscriptions.  The effect
-    // only needs to re-run when `messageIds` (memo) changes.
-    untrack(() => {
-      if (loading) {
-        handleClearTimelineSelection()
-        previousTimelineIds = []
-        setTimelineSegments([])
-        seenTimelineMessageIds.clear()
-        seenTimelineSegmentKeys.clear()
-        timelinePartCountsByMessageId.clear()
-        pendingTimelineMessagePartUpdates.clear()
-        if (pendingTimelinePartUpdateFrame !== null) {
-          cancelAnimationFrame(pendingTimelinePartUpdateFrame)
-          pendingTimelinePartUpdateFrame = null
+    if (loading) {
+      handleClearTimelineSelection()
+      previousTimelineIds = []
+      setTimelineSegments([])
+      seenTimelineMessageIds.clear()
+      seenTimelineSegmentKeys.clear()
+      timelinePartCountsByMessageId.clear()
+      pendingTimelineMessagePartUpdates.clear()
+      if (pendingTimelinePartUpdateFrame !== null) {
+        cancelAnimationFrame(pendingTimelinePartUpdateFrame)
+        pendingTimelinePartUpdateFrame = null
+      }
+      return
+    }
+
+    if (previousTimelineIds.length === 0 && ids.length > 0) {
+      seedTimeline()
+      previousTimelineIds = ids.slice()
+      return
+    }
+
+    if (ids.length < previousTimelineIds.length) {
+      seedTimeline()
+      previousTimelineIds = ids.slice()
+      return
+    }
+
+    if (ids.length === previousTimelineIds.length) {
+      let changedIndex = -1
+      let changeCount = 0
+      for (let index = 0; index < ids.length; index++) {
+        if (ids[index] !== previousTimelineIds[index]) {
+          changedIndex = index
+          changeCount += 1
+          if (changeCount > 1) break
        }
-        return
      }
-
-      if (previousTimelineIds.length === 0 && ids.length > 0) {
-        seedTimeline()
-        previousTimelineIds = [...ids]
-        return
-      }
-
-      if (ids.length < previousTimelineIds.length) {
-        seedTimeline()
-        previousTimelineIds = [...ids]
-        return
-      }
-
-      if (ids.length === previousTimelineIds.length) {
-        let changedIndex = -1
-        let changeCount = 0
-        for (let index = 0; index < ids.length; index++) {
-          if (ids[index] !== previousTimelineIds[index]) {
-            changedIndex = index
-            changeCount += 1
-            if (changeCount > 1) break
-          }
-        }
-        if (changeCount === 1 && changedIndex >= 0) {
-          const oldId = previousTimelineIds[changedIndex]
-          const newId = ids[changedIndex]
-          if (seenTimelineMessageIds.has(oldId) && !seenTimelineMessageIds.has(newId)) {
-            seenTimelineMessageIds.delete(oldId)
-            seenTimelineMessageIds.add(newId)
-            setTimelineSegments((prev) => {
-              const next = prev.map((segment) => {
-                if (segment.messageId !== oldId) return segment
-                const updatedId = segment.id.replace(oldId, newId)
-                return { ...segment, messageId: newId, id: updatedId }
-              })
-              seenTimelineSegmentKeys.clear()
-              next.forEach((segment) => seenTimelineSegmentKeys.add(makeTimelineKey(segment)))
-              return next
+      if (changeCount === 1 && changedIndex >= 0) {
+        const oldId = previousTimelineIds[changedIndex]
+        const newId = ids[changedIndex]
+        if (seenTimelineMessageIds.has(oldId) && !seenTimelineMessageIds.has(newId)) {
+          seenTimelineMessageIds.delete(oldId)
+          seenTimelineMessageIds.add(newId)
+          setTimelineSegments((prev) => {
+            const next = prev.map((segment) => {
+              if (segment.messageId !== oldId) return segment
+              const updatedId = segment.id.replace(oldId, newId)
+              return { ...segment, messageId: newId, id: updatedId }
            })
+            seenTimelineSegmentKeys.clear()
+            next.forEach((segment) => seenTimelineSegmentKeys.add(makeTimelineKey(segment)))
+            return next
+          })

-            // Keep part count tracking in sync with id replacement.
-            const existingPartCount = timelinePartCountsByMessageId.get(oldId)
-            if (existingPartCount !== undefined) {
-              timelinePartCountsByMessageId.delete(oldId)
-              timelinePartCountsByMessageId.set(newId, existingPartCount)
-            }
-
-            previousTimelineIds = [...ids]
-            return
+          // Keep part count tracking in sync with id replacement.
+          const existingPartCount = timelinePartCountsByMessageId.get(oldId)
+          if (existingPartCount !== undefined) {
+            timelinePartCountsByMessageId.delete(oldId)
+            timelinePartCountsByMessageId.set(newId, existingPartCount)
          }
+
+          previousTimelineIds = ids.slice()
+          return
        }
      }
+    }

-      const newIds: string[] = []
-      ids.forEach((id) => {
-        if (!seenTimelineMessageIds.has(id)) {
-          newIds.push(id)
-        }
-      })
-
-      if (newIds.length > 0) {
-        newIds.forEach((id) => {
-          seenTimelineMessageIds.add(id)
-          appendTimelineForMessage(id)
-        })
+    const newIds: string[] = []
+    ids.forEach((id) => {
+      if (!seenTimelineMessageIds.has(id)) {
+        newIds.push(id)
      }
-
-      previousTimelineIds = [...ids]
    })
+
+    if (newIds.length > 0) {
+      newIds.forEach((id) => {
+        seenTimelineMessageIds.add(id)
+        appendTimelineForMessage(id)
+      })
+    }
+
+    previousTimelineIds = ids.slice()
  })

  function clearPendingTimelinePartUpdateFrame() {
@@ -914,49 +886,36 @@ export default function MessageSection(props: MessageSectionProps) {
  createEffect(() => {
    if (props.loading) return
    const ids = messageIds()
-    // Also re-run when sessionRevision bumps (covers part additions within
-    // existing messages) but read individual records inside untrack() to
-    // avoid creating O(n) fine-grained subscriptions.
-    sessionRevision()
+    const resolvedStore = store()

-    // Wrap the iteration in untrack() so that accessing individual elements
-    // of the store-proxied `ids` array does not create O(n) per-element
-    // reactive subscriptions.  We only need to re-run when the memo
-    // (messageIds) or sessionRevision changes — not per-element.
-    untrack(() => {
-      const resolvedStore = store()
-      const idsSet = new Set(ids)
-      let hasChanges = false
+    let hasChanges = false
+    for (const messageId of ids) {
+      const record = resolvedStore.getMessage(messageId)
+      const partCount = record?.partIds.length ?? 0
+      const previousCount = timelinePartCountsByMessageId.get(messageId)

-      for (const messageId of ids) {
-        const record = resolvedStore.getMessage(messageId)
-        const partCount = record?.partIds.length ?? 0
-        const previousCount = timelinePartCountsByMessageId.get(messageId)
-
-        if (previousCount === undefined) {
-          timelinePartCountsByMessageId.set(messageId, partCount)
-          continue
-        }
-
-        if (previousCount !== partCount) {
-          timelinePartCountsByMessageId.set(messageId, partCount)
-          pendingTimelineMessagePartUpdates.add(messageId)
-          hasChanges = true
-        }
+      if (previousCount === undefined) {
+        timelinePartCountsByMessageId.set(messageId, partCount)
+        continue
      }

-      // Drop tracking for ids that are no longer present.
-      // Use the Set for O(1) lookups instead of ids.includes() which is O(n).
-      for (const trackedId of Array.from(timelinePartCountsByMessageId.keys())) {
-        if (!idsSet.has(trackedId)) {
-          timelinePartCountsByMessageId.delete(trackedId)
-        }
+      if (previousCount !== partCount) {
+        timelinePartCountsByMessageId.set(messageId, partCount)
+        pendingTimelineMessagePartUpdates.add(messageId)
+        hasChanges = true
      }
+    }

-      if (hasChanges) {
-        scheduleTimelinePartUpdateFlush()
+    // Drop tracking for ids that are no longer present.
+    for (const trackedId of Array.from(timelinePartCountsByMessageId.keys())) {
+      if (!ids.includes(trackedId)) {
+        timelinePartCountsByMessageId.delete(trackedId)
      }
-    })
+    }
+
+    if (hasChanges) {
+      scheduleTimelinePartUpdateFlush()
+    }
  })

  createEffect(() => {
@@ -1030,7 +989,7 @@ export default function MessageSection(props: MessageSectionProps) {
        data-scroll-buttons={scrollButtonsCount()}
      >
        <VirtualFollowList
-          items={visibleMessageIds}
+          items={messageIds}
          getKey={(messageId) => messageId}
          getAnchorId={getMessageAnchorId}
          getKeyFromAnchorId={getMessageIdFromAnchorId}
@@ -1076,7 +1035,7 @@ export default function MessageSection(props: MessageSectionProps) {
          registerState={(state) => setListState(state)}
          renderBeforeItems={() => (
            <>
-              <Show when={!props.loading && visibleMessageIds().length === 0}>
+              <Show when={!props.loading && messageIds().length === 0}>
                <div class="empty-state">
                  <div class="empty-state-content">
                    <div class="flex flex-col items-center gap-3 mb-6">
--- a/packages/ui/src/components/message-timeline.tsx
+++ b/packages/ui/src/components/message-timeline.tsx
@@ -2,7 +2,6 @@ import { For, Show, createEffect, createMemo, createSignal, onCleanup, on, untra
 import MessagePreview from "./message-preview"
 import { messageStoreBus } from "../stores/message-v2/bus"
 import type { ClientPart } from "../types/message"
-import { isHiddenSyntheticTextPart } from "../types/message"
 import type { MessageRecord } from "../stores/message-v2/types"
 import { buildRecordDisplayData } from "../stores/message-v2/record-display-cache"
 import { getPartCharCount } from "../lib/token-utils"
@@ -106,7 +105,6 @@ function collectReasoningText(part: ClientPart): string {

 function collectTextFromPart(part: ClientPart, t: (key: string, params?: Record<string, unknown>) => string): string {
  if (!part) return ""
-  if (isHiddenSyntheticTextPart(part)) return ""
  if (typeof (part as any).text === "string") {
    return (part as any).text as string
  }
--- a/packages/ui/src/components/prompt-input.tsx
+++ b/packages/ui/src/components/prompt-input.tsx
@@ -19,12 +19,7 @@ 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"
+import { canUseConversationMode, isConversationModeEnabled, toggleConversationMode } from "../stores/conversation-speech"
 const log = getLogger("actions")
 const LazyUnifiedPicker = lazy(() => import("./unified-picker"))

@@ -497,8 +492,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
@@ -540,10 +533,6 @@ export default function PromptInput(props: PromptInputProps) {
              mode={pickerMode()}
              onClose={handlePickerClose}
              onSelect={handlePickerSelect}
-              onSubmitWithoutSelection={() => {
-                handlePickerClose()
-                void handleSend()
-              }}
              agents={instanceAgents()}
              commands={getCommands(props.instanceId)}
              instanceClient={instance()!.client}
--- a/packages/ui/src/components/prompt-input/usePromptPicker.ts
+++ b/packages/ui/src/components/prompt-input/usePromptPicker.ts
@@ -324,6 +324,28 @@ export function usePromptPicker(options: PromptPickerOptions): PromptPickerContr
    const pos = atPosition()
    if (pickerMode() === "mention" && pos !== null) {
      setIgnoredAtPositions((prev) => new Set(prev).add(pos))
+
+      // Remove the partial @mention text from the textarea when ESC is pressed
+      const textarea = options.getTextarea()
+      if (textarea) {
+        const currentPrompt = options.prompt()
+        const cursorPos = textarea.selectionStart
+        // Remove text from @ position to cursor position
+        const before = currentPrompt.substring(0, pos)
+        const after = currentPrompt.substring(cursorPos)
+        options.setPrompt(before + after)
+
+        // Restore cursor position to where @ was
+        setTimeout(() => {
+          const nextTextarea = options.getTextarea()
+          if (nextTextarea) {
+            nextTextarea.setSelectionRange(pos, pos)
+          }
+        }, 0)
+
+        // Clear ignoredAtPositions so typing @ again will work
+        setIgnoredAtPositions(new Set<number>())
+      }
    }
    setShowPicker(false)
    setAtPosition(null)
--- a/packages/ui/src/components/prompt-input/usePromptVoiceInput.ts
+++ b/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)

@@ -169,25 +160,18 @@ export function usePromptVoiceInput(options: UsePromptVoiceInputOptions) {
    const textarea = options.getTextarea()
    const start = textarea ? textarea.selectionStart : current.length
    const end = textarea ? textarea.selectionEnd : current.length
-    const wasCursorAtEnd = end === current.length
-    const wasScrolledToBottom = textarea
-      ? textarea.scrollHeight - (textarea.scrollTop + textarea.clientHeight) <= 4
-      : false
    const before = current.slice(0, start)
    const after = current.slice(end)
-    const prefix = ""
-    const suffix = after.length > 0 && !after.startsWith("\n") ? "\n" : ""
+    const prefix = before.length > 0 && !/\s$/.test(before) ? " " : ""
+    const suffix = after.length > 0 && !/^\s/.test(after) ? " " : ""
    const nextValue = `${before}${prefix}${text}${suffix}${after}`
-    const cursor = before.length + prefix.length + text.length + suffix.length
+    const cursor = before.length + prefix.length + text.length

    options.setPrompt(nextValue)
    if (textarea) {
      setTimeout(() => {
        textarea.focus()
        textarea.setSelectionRange(cursor, cursor)
-        if (wasCursorAtEnd || wasScrolledToBottom) {
-          textarea.scrollTop = textarea.scrollHeight
-        }
      }, 0)
    }
  }
--- a/packages/ui/src/components/remote-access-overlay.tsx
+++ b/packages/ui/src/components/remote-access-overlay.tsx
@@ -100,7 +100,6 @@ export function RemoteAccessOverlay(props: RemoteAccessOverlayProps) {
      variant: "warning",
      confirmLabel: t("remoteAccess.listeningMode.restartConfirm.confirmLabel"),
      cancelLabel: t("remoteAccess.listeningMode.restartConfirm.cancelLabel"),
-      dismissible: false,
    })

    if (!confirmed) {
--- a/packages/ui/src/components/session-list.tsx
+++ b/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)

@@ -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) => {
--- a/packages/ui/src/components/settings-screen.tsx
+++ b/packages/ui/src/components/settings-screen.tsx
@@ -1,5 +1,5 @@
 import { Dialog } from "@kobalte/core/dialog"
-import { Settings, Bell, MonitorUp, Paintbrush, Terminal, Volume2, Globe, X } from "lucide-solid"
+import { Settings, Bell, MonitorUp, Paintbrush, Terminal, Volume2, X } from "lucide-solid"
 import { createMemo, For, type Component } from "solid-js"
 import { useI18n } from "../lib/i18n"
 import {
@@ -14,7 +14,6 @@ import { NotificationsSettingsSection } from "./settings/notifications-settings-
 import { OpenCodeSettingsSection } from "./settings/opencode-settings-section"
 import { RemoteAccessSettingsSection } from "./settings/remote-access-settings-section"
 import { SpeechSettingsSection } from "./settings/speech-settings-section"
-import { SideCarsSettingsSection } from "./settings/sidecars-settings-section"

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

@@ -36,8 +34,6 @@ export const SettingsScreen: Component = () => {
        return <RemoteAccessSettingsSection />
      case "speech":
        return <SpeechSettingsSection />
-      case "sidecars":
-        return <SideCarsSettingsSection />
      case "opencode":
        return <OpenCodeSettingsSection />
      case "appearance":
--- a/packages/ui/src/components/settings/opencode-settings-section.tsx
+++ b/packages/ui/src/components/settings/opencode-settings-section.tsx
@@ -1,30 +1,14 @@
-import { Select } from "@kobalte/core/select"
-import { createEffect, createMemo, createSignal, type Component } from "solid-js"
-import { ChevronDown, Terminal } from "lucide-solid"
+import { createEffect, createSignal, type Component } from "solid-js"
+import { Terminal } from "lucide-solid"
 import OpenCodeBinarySelector from "../opencode-binary-selector"
 import EnvironmentVariablesEditor from "../environment-variables-editor"
 import { useConfig } from "../../stores/preferences"
-import type { ServerLogLevel } from "../../stores/preferences"
 import { useI18n } from "../../lib/i18n"

-type LogLevelOption = {
-  value: ServerLogLevel
-  label: string
-}
-
 export const OpenCodeSettingsSection: Component = () => {
  const { t } = useI18n()
-  const { serverSettings, updateLastUsedBinary, updateLogLevel } = useConfig()
+  const { serverSettings, updateLastUsedBinary } = useConfig()
  const [selectedBinary, setSelectedBinary] = createSignal(serverSettings().opencodeBinary || "opencode")
-  const logLevelOptions = createMemo<LogLevelOption[]>(() => [
-    { value: "DEBUG", label: t("settings.opencode.logLevel.option.debug") },
-    { value: "INFO", label: t("settings.opencode.logLevel.option.info") },
-    { value: "WARN", label: t("settings.opencode.logLevel.option.warn") },
-    { value: "ERROR", label: t("settings.opencode.logLevel.option.error") },
-  ])
-  const selectedLogLevel = createMemo(
-    () => logLevelOptions().find((option) => option.value === serverSettings().logLevel) ?? logLevelOptions()[0],
-  )

  createEffect(() => {
    const binary = serverSettings().opencodeBinary || "opencode"
@@ -53,60 +37,6 @@ export const OpenCodeSettingsSection: Component = () => {
        <OpenCodeBinarySelector selectedBinary={selectedBinary()} onBinaryChange={handleBinaryChange} isVisible />
      </div>

-      <div class="settings-card">
-        <div class="settings-card-header">
-          <div>
-            <h3 class="settings-card-title">{t("settings.opencode.logLevel.title")}</h3>
-            <p class="settings-card-subtitle">{t("settings.opencode.logLevel.subtitle")}</p>
-          </div>
-          <span class="settings-scope-badge settings-scope-badge-server">{t("settings.scope.server")}</span>
-        </div>
-        <div class="settings-card-body">
-          <div class="settings-toggle-row settings-toggle-row-compact">
-            <div>
-              <div class="settings-toggle-title">{t("settings.opencode.logLevel.selector.title")}</div>
-              <div class="settings-toggle-caption">{t("settings.opencode.logLevel.selector.subtitle")}</div>
-            </div>
-            <Select<LogLevelOption>
-              value={selectedLogLevel()}
-              onChange={(option) => {
-                if (!option) return
-                updateLogLevel(option.value)
-              }}
-              options={logLevelOptions()}
-              optionValue="value"
-              optionTextValue="label"
-              itemComponent={(itemProps) => (
-                <Select.Item item={itemProps.item} class="selector-option">
-                  <Select.ItemLabel class="selector-option-label">{itemProps.item.rawValue.label}</Select.ItemLabel>
-                </Select.Item>
-              )}
-            >
-              <Select.Trigger class="selector-trigger" aria-label={t("settings.opencode.logLevel.title")}>
-                <div class="flex-1 min-w-0">
-                  <Select.Value<LogLevelOption>>
-                    {(state) => (
-                      <span class="selector-trigger-primary selector-trigger-primary--align-left">
-                        {state.selectedOption()?.label}
-                      </span>
-                    )}
-                  </Select.Value>
-                </div>
-                <Select.Icon class="selector-trigger-icon">
-                  <ChevronDown class="w-3 h-3" />
-                </Select.Icon>
-              </Select.Trigger>
-
-              <Select.Portal>
-                <Select.Content class="selector-popover">
-                  <Select.Listbox class="selector-listbox" />
-                </Select.Content>
-              </Select.Portal>
-            </Select>
-          </div>
-        </div>
-      </div>
-
      <div class="settings-card">
        <div class="settings-card-header">
          <div>
--- a/packages/ui/src/components/settings/remote-access-settings-section.tsx
+++ b/packages/ui/src/components/settings/remote-access-settings-section.tsx
@@ -89,7 +89,6 @@ export const RemoteAccessSettingsSection: Component = () => {
      variant: "warning",
      confirmLabel: t("remoteAccess.listeningMode.restartConfirm.confirmLabel"),
      cancelLabel: t("remoteAccess.listeningMode.restartConfirm.cancelLabel"),
-      dismissible: false,
    })

    if (!confirmed) return
--- a/packages/ui/src/components/settings/sidecars-settings-section.tsx
+++ b/packages/ui/src/components/settings/sidecars-settings-section.tsx
@@ -1,201 +0,0 @@
-import { createMemo, createSignal, For, Show, onMount, type Component } from "solid-js"
-import { Globe, Loader2, Plus, Trash2 } from "lucide-solid"
-import { useI18n } from "../../lib/i18n"
-import { serverApi } from "../../lib/api-client"
-import { ensureSidecarsLoaded, sidecars, sidecarsLoading } from "../../stores/sidecars"
-
-function deriveSidecarId(value: string): string {
-  return value
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/-{2,}/g, "-")
-    .replace(/^-|-$/g, "")
-}
-
-export const SideCarsSettingsSection: Component = () => {
-  const { t } = useI18n()
-  const [name, setName] = createSignal("")
-  const [port, setPort] = createSignal("3000")
-  const [insecure, setInsecure] = createSignal(false)
-  const [prefixMode, setPrefixMode] = createSignal<"strip" | "preserve">("strip")
-  const [busyId, setBusyId] = createSignal<string | null>(null)
-  const [creating, setCreating] = createSignal(false)
-  const [formError, setFormError] = createSignal<string | null>(null)
-  const [actionError, setActionError] = createSignal<string | null>(null)
-
-  onMount(() => {
-    void ensureSidecarsLoaded()
-  })
-
-  const orderedSidecars = createMemo(() => Array.from(sidecars().values()).sort((a, b) => a.name.localeCompare(b.name)))
-  const derivedId = createMemo(() => deriveSidecarId(name()) || "your-sidecar")
-
-  async function handleCreate() {
-    const trimmedName = name().trim()
-    const nextPort = Number(port())
-    if (!trimmedName || !Number.isInteger(nextPort) || nextPort <= 0 || nextPort > 65535) {
-      setFormError(t("sidecars.form.validation"))
-      return
-    }
-
-    setCreating(true)
-    setFormError(null)
-    try {
-      await serverApi.createSidecar({
-        kind: "port",
-        name: trimmedName,
-        port: nextPort,
-        insecure: insecure(),
-        prefixMode: prefixMode(),
-      })
-      setName("")
-      setPort("3000")
-      setInsecure(false)
-      setPrefixMode("strip")
-    } catch (error) {
-      setFormError(error instanceof Error ? error.message : String(error))
-    } finally {
-      setCreating(false)
-    }
-  }
-
-  async function handleDelete(id: string) {
-    setBusyId(id)
-    setActionError(null)
-    try {
-      await serverApi.deleteSidecar(id)
-    } catch (error) {
-      setActionError(error instanceof Error ? error.message : String(error))
-    } finally {
-      setBusyId(null)
-    }
-  }
-
-  return (
-    <div class="settings-section-stack">
-      <div class="settings-card">
-        <div class="settings-card-header">
-          <div class="settings-card-heading-with-icon">
-            <Globe class="settings-card-heading-icon" />
-            <div>
-              <h3 class="settings-card-title">{t("settings.section.sidecars.title")}</h3>
-              <p class="settings-card-subtitle">{t("settings.section.sidecars.subtitle")}</p>
-            </div>
-          </div>
-          <span class="settings-scope-badge settings-scope-badge-server">{t("settings.scope.server")}</span>
-        </div>
-
-        <div class="settings-card-content">
-          <div class="settings-toggle-row settings-toggle-row-compact">
-            <div>
-              <div class="settings-toggle-title">{t("sidecars.form.name")}</div>
-              <div class="settings-toggle-caption">{t("sidecars.basePath")}: <code>/sidecars/{derivedId()}</code></div>
-            </div>
-            <input
-              class="selector-input w-full max-w-xs"
-              value={name()}
-              onInput={(event) => {
-                setFormError(null)
-                setName(event.currentTarget.value)
-              }}
-            />
-          </div>
-
-          <div class="settings-toggle-row settings-toggle-row-compact">
-            <div>
-              <div class="settings-toggle-title">{t("sidecars.form.port")}</div>
-              <div class="settings-toggle-caption">127.0.0.1</div>
-            </div>
-            <input
-              class="selector-input w-full max-w-xs"
-              value={port()}
-              onInput={(event) => {
-                setFormError(null)
-                setPort(event.currentTarget.value)
-              }}
-              inputMode="numeric"
-            />
-          </div>
-
-          <div class="settings-toggle-row settings-toggle-row-compact">
-            <div>
-              <div class="settings-toggle-title">{t("sidecars.form.protocol")}</div>
-              <div class="settings-toggle-caption">{t("sidecars.form.protocol.help")}</div>
-            </div>
-            <select class="selector-input w-full max-w-xs" value={insecure() ? "http" : "https"} onChange={(event) => setInsecure(event.currentTarget.value === "http") }>
-              <option value="https">{t("sidecars.form.protocol.https")}</option>
-              <option value="http">{t("sidecars.form.protocol.http")}</option>
-            </select>
-          </div>
-
-          <div class="settings-toggle-row settings-toggle-row-compact">
-            <div>
-              <div class="settings-toggle-title">{t("sidecars.form.prefixMode")}</div>
-              <div class="settings-toggle-caption">{t("sidecars.form.prefixMode.help")}</div>
-            </div>
-            <select class="selector-input w-full max-w-xs" value={prefixMode()} onChange={(event) => setPrefixMode(event.currentTarget.value as "strip" | "preserve") }>
-              <option value="strip">{t("sidecars.form.prefixMode.strip")}</option>
-              <option value="preserve">{t("sidecars.form.prefixMode.preserve")}</option>
-            </select>
-          </div>
-
-          <Show when={formError()}>
-            <div class="text-sm text-red-500">{formError()}</div>
-          </Show>
-
-          <div class="flex justify-end">
-            <button type="button" class="selector-button selector-button-primary" disabled={creating()} onClick={() => void handleCreate()}>
-              <Show when={creating()} fallback={<Plus class="w-4 h-4" />}>
-                <Loader2 class="w-4 h-4 animate-spin" />
-              </Show>
-              <span>{t("sidecars.form.add")}</span>
-            </button>
-          </div>
-        </div>
-      </div>
-
-      <div class="settings-card">
-        <div class="settings-card-header">
-          <div>
-            <h3 class="settings-card-title">{t("sidecars.settings.listTitle")}</h3>
-            <p class="settings-card-subtitle">{t("sidecars.settings.listSubtitle")}</p>
-          </div>
-        </div>
-
-        <div class="settings-card-content">
-          <Show when={actionError()}>
-            <div class="text-sm text-red-500">{actionError()}</div>
-          </Show>
-
-          <Show when={!sidecarsLoading()} fallback={<div class="settings-card-message">{t("sidecars.picker.loading")}</div>}>
-            <Show when={orderedSidecars().length > 0} fallback={<div class="settings-card-message">{t("sidecars.settings.empty")}</div>}>
-              <For each={orderedSidecars()}>
-                {(sidecar) => (
-                  <div class="settings-toggle-row settings-toggle-row-compact">
-                    <div>
-                      <div class="settings-toggle-title">{sidecar.name}</div>
-                      <div class="settings-toggle-caption">
-                        {t("sidecars.kind.port")} · {sidecar.insecure ? "http" : "https"}://127.0.0.1:{sidecar.port}
-                      </div>
-                      <div class="settings-toggle-caption">
-                        {t("sidecars.basePath")}: <code>/sidecars/{sidecar.id}</code> · {t(`sidecars.form.prefixMode.${sidecar.prefixMode}`)}
-                      </div>
-                    </div>
-
-                    <div class="flex items-center gap-2">
-                      <span class="text-xs text-secondary min-w-[4.5rem] text-right">{t(`sidecars.status.${sidecar.status}`)}</span>
-                      <button type="button" class="selector-button selector-button-secondary" disabled={busyId() === sidecar.id} onClick={() => void handleDelete(sidecar.id)}>
-                        <Trash2 class="w-4 h-4" />
-                      </button>
-                    </div>
-                  </div>
-                )}
-              </For>
-            </Show>
-          </Show>
-        </div>
-      </div>
-    </div>
-  )
-}
--- a/packages/ui/src/components/sidecar-picker-dialog.tsx
+++ b/packages/ui/src/components/sidecar-picker-dialog.tsx
@@ -1,82 +0,0 @@
-import { Dialog } from "@kobalte/core/dialog"
-import { For, Show, createEffect, createMemo, type Component } from "solid-js"
-import { Globe, Square } from "lucide-solid"
-import { useI18n } from "../lib/i18n"
-import { ensureSidecarsLoaded, sidecars, sidecarsLoading } from "../stores/sidecars"
-
-interface SideCarPickerDialogProps {
-  open: boolean
-  onClose: () => void
-  onOpenSidecar: (sidecarId: string) => void | Promise<void>
-}
-
-export const SideCarPickerDialog: Component<SideCarPickerDialogProps> = (props) => {
-  const { t } = useI18n()
-  const orderedSidecars = createMemo(() => Array.from(sidecars().values()).sort((a, b) => a.name.localeCompare(b.name)))
-
-  createEffect(() => {
-    if (props.open) {
-      void ensureSidecarsLoaded()
-    }
-  })
-
-  return (
-    <Dialog open={props.open} onOpenChange={(open) => !open && props.onClose()}>
-      <Dialog.Portal>
-        <Dialog.Overlay class="modal-overlay" />
-        <div class="fixed inset-0 z-50 flex items-center justify-center p-4">
-          <Dialog.Content class="modal-surface w-full max-w-2xl p-6 flex flex-col gap-4 max-h-[80vh] overflow-hidden">
-            <div>
-              <Dialog.Title class="text-xl font-semibold text-primary">{t("sidecars.picker.title")}</Dialog.Title>
-              <Dialog.Description class="text-sm text-secondary mt-2">
-                {t("sidecars.picker.subtitle")}
-              </Dialog.Description>
-            </div>
-
-            <div class="flex-1 overflow-auto flex flex-col gap-3">
-              <Show when={!sidecarsLoading()} fallback={<div class="panel panel-empty-state">{t("sidecars.picker.loading")}</div>}>
-                <Show when={orderedSidecars().length > 0} fallback={<div class="panel panel-empty-state">{t("sidecars.picker.empty")}</div>}>
-                  <For each={orderedSidecars()}>
-                    {(sidecar) => (
-                      <button
-                        type="button"
-                        class="panel-list-item panel-list-item-content text-left disabled:cursor-not-allowed disabled:opacity-60"
-                        disabled={sidecar.status !== "running"}
-                        onClick={() => void props.onOpenSidecar(sidecar.id)}
-                      >
-                        <div class="flex items-center justify-between gap-4 w-full">
-                          <div class="flex items-center gap-3 min-w-0">
-                            <span class="panel-empty-state-icon !w-10 !h-10">
-                              <Globe class="w-5 h-5" />
-                            </span>
-                            <div class="min-w-0">
-                              <div class="text-sm font-medium text-primary truncate">{sidecar.name}</div>
-                              <div class="text-xs text-muted">
-                                {t("sidecars.kind.port")} - {sidecar.insecure ? "http" : "https"}://127.0.0.1:{sidecar.port}
-                              </div>
-                              <div class="text-xs text-muted mt-1">{t("sidecars.basePath")}: <code>/sidecars/{sidecar.id}</code></div>
-                            </div>
-                          </div>
-                          <div class="text-xs text-secondary flex items-center gap-2">
-                            <Square class="w-4 h-4" />
-                            <span>{t(`sidecars.status.${sidecar.status}`)}</span>
-                          </div>
-                        </div>
-                      </button>
-                    )}
-                  </For>
-                </Show>
-              </Show>
-            </div>
-
-            <div class="flex justify-end">
-              <button type="button" class="selector-button selector-button-secondary" onClick={props.onClose}>
-                {t("sidecars.picker.close")}
-              </button>
-            </div>
-          </Dialog.Content>
-        </div>
-      </Dialog.Portal>
-    </Dialog>
-  )
-}
--- a/packages/ui/src/components/sidecar-view.tsx
+++ b/packages/ui/src/components/sidecar-view.tsx
@@ -1,197 +0,0 @@
-import { ArrowLeft, ArrowRight, RefreshCw } from "lucide-solid"
-import { createEffect, createMemo, createSignal, type Component } from "solid-js"
-import type { SideCarTabRecord } from "../stores/sidecars"
-import { useI18n } from "../lib/i18n"
-
-interface SideCarViewProps {
-  tab: SideCarTabRecord
-}
-
-export const SideCarView: Component<SideCarViewProps> = (props) => {
-  const { t } = useI18n()
-  const [frameSrc, setFrameSrc] = createSignal(props.tab.shellUrl)
-  const [pathInput, setPathInput] = createSignal("/")
-  let iframeRef: HTMLIFrameElement | undefined
-
-  const lockedBaseLabel = createMemo(() => {
-    const hostLabel = props.tab.port ? `${props.tab.name}:${props.tab.port}` : props.tab.name
-    if (props.tab.prefixMode === "preserve") {
-      return `${hostLabel}${props.tab.proxyBasePath}`
-    }
-    return hostLabel
-  })
-
-  const getEditablePathFromUrl = (url: string): string => {
-    try {
-      const parsed = new URL(url, window.location.origin)
-      const basePath = props.tab.proxyBasePath
-      let pathname = parsed.pathname
-
-      if (basePath && pathname.startsWith(basePath)) {
-        pathname = pathname.slice(basePath.length) || "/"
-      }
-
-      if (!pathname.startsWith("/")) {
-        pathname = `/${pathname}`
-      }
-
-      return `${pathname}${parsed.search}${parsed.hash}`
-    } catch {
-      return "/"
-    }
-  }
-
-  const buildNormalizedTargetUrl = (rawInput: string): string => {
-    const trimmed = rawInput.trim()
-    const withLeadingSlash = trimmed.startsWith("/") ? trimmed : `/${trimmed}`
-    const parsed = new URL(withLeadingSlash || "/", window.location.origin)
-
-    const safeSegments: string[] = []
-    for (const segment of parsed.pathname.split("/")) {
-      if (!segment || segment === ".") {
-        continue
-      }
-      if (segment === "..") {
-        if (safeSegments.length > 0) {
-          safeSegments.pop()
-        }
-        continue
-      }
-      safeSegments.push(segment)
-    }
-
-    const normalizedPath = `/${safeSegments.join("/")}` || "/"
-    const basePath = props.tab.proxyBasePath
-    return `${basePath}${normalizedPath}${parsed.search}${parsed.hash}`
-  }
-
-  const syncPathInputFromFrame = () => {
-    try {
-      const currentHref = iframeRef?.contentWindow?.location.href
-      if (!currentHref) {
-        return
-      }
-      setPathInput(getEditablePathFromUrl(currentHref))
-    } catch {
-      setPathInput(getEditablePathFromUrl(frameSrc()))
-    }
-  }
-
-  createEffect(() => {
-    setFrameSrc(props.tab.shellUrl)
-    setPathInput(getEditablePathFromUrl(props.tab.shellUrl))
-  })
-
-  const handleBack = (event: MouseEvent) => {
-    event.preventDefault()
-    event.stopPropagation()
-
-    try {
-      const frameWindow = iframeRef?.contentWindow
-      if (!frameWindow) {
-        return
-      }
-
-      if (frameWindow.history.length <= 1) {
-        return
-      }
-
-      frameWindow.focus()
-      frameWindow.history.go(-1)
-    } catch {
-      // Ignore navigation errors from pages that do not expose history access.
-    }
-  }
-
-  const handleRefresh = () => {
-    try {
-      iframeRef?.contentWindow?.location.reload()
-      return
-    } catch {
-      // Fall back to resetting the iframe source if the frame cannot be reloaded directly.
-    }
-
-    setFrameSrc("about:blank")
-    requestAnimationFrame(() => setFrameSrc(props.tab.shellUrl))
-  }
-
-  const handleGo = (event?: Event) => {
-    event?.preventDefault()
-
-    const nextUrl = buildNormalizedTargetUrl(pathInput())
-    setFrameSrc(nextUrl)
-    setPathInput(getEditablePathFromUrl(nextUrl))
-  }
-
-  return (
-    <div class="flex h-full min-h-0 w-full flex-col bg-surface">
-      <div
-        class="flex shrink-0 items-center gap-2 px-3 py-2"
-        style={{ "border-bottom": "1px solid var(--border-base)" }}
-      >
-        <button
-          type="button"
-          class="new-tab-button"
-          onClick={handleBack}
-          title={t("sidecars.back")}
-          aria-label={t("sidecars.back")}
-        >
-          <ArrowLeft class="h-4 w-4" />
-        </button>
-        <button
-          type="button"
-          class="new-tab-button"
-          onClick={handleRefresh}
-          title={t("sidecars.refresh")}
-          aria-label={t("sidecars.refresh")}
-        >
-          <RefreshCw class="h-4 w-4" />
-        </button>
-        <div
-          class="shrink-0 rounded-md px-3 py-1.5 text-sm"
-          style={{
-            background: "var(--surface-secondary)",
-            color: "var(--text-secondary)",
-            border: "1px solid var(--border-base)",
-          }}
-        >
-          {lockedBaseLabel()}
-        </div>
-        <form class="flex min-w-0 flex-1 items-center gap-2" onSubmit={(event) => handleGo(event)}>
-          <input
-            type="text"
-            class="min-w-0 flex-1 rounded-md px-3 py-1.5 text-sm outline-none"
-            style={{
-              background: "var(--surface-secondary)",
-              color: "var(--text-primary)",
-              border: "1px solid var(--border-base)",
-            }}
-            value={pathInput()}
-            onInput={(event) => setPathInput(event.currentTarget.value)}
-            spellcheck={false}
-            autocomplete="off"
-            autocorrect="off"
-            autocapitalize="off"
-            aria-label={t("sidecars.path")}
-          />
-          <button
-            type="submit"
-            class="new-tab-button"
-            title={t("sidecars.go")}
-            aria-label={t("sidecars.go")}
-          >
-            <ArrowRight class="h-4 w-4" />
-          </button>
-        </form>
-      </div>
-      <iframe
-        ref={iframeRef}
-        src={frameSrc()}
-        title={props.tab.name}
-        class="min-h-0 flex-1 w-full border-0 bg-surface"
-        referrerPolicy="same-origin"
-        onLoad={syncPathInputFromFrame}
-      />
-    </div>
-  )
-}
--- a/packages/ui/src/components/tool-call.tsx
+++ b/packages/ui/src/components/tool-call.tsx
@@ -1,4 +1,4 @@
-import { createSignal, Show, createEffect, createMemo, onCleanup, type Accessor } from "solid-js"
+import { createSignal, Show, createEffect, createMemo, onCleanup } from "solid-js"
 import { ArrowRightSquare, Check, Copy, Hourglass, Loader2, XCircle } from "lucide-solid"
 import { stringify as stringifyYaml } from "yaml"
 import { messageStoreBus } from "../stores/message-v2/bus"
@@ -44,7 +44,6 @@ 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"
-import { createFollowScroll } from "../lib/follow-scroll"

 const log = getLogger("session")

@@ -52,6 +51,8 @@ type ToolState = import("@opencode-ai/sdk/v2").ToolState

 const TOOL_CALL_CACHE_SCOPE = "tool-call"
 const TOOL_SCROLL_SENTINEL_MARGIN_PX = 48
+const TOOL_SCROLL_INTENT_WINDOW_MS = 600
+const TOOL_SCROLL_INTENT_KEYS = new Set(["ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End", " ", "Spacebar"])

 function makeRenderCacheKey(
  toolCallId?: string | null,
@@ -81,27 +82,6 @@ interface ToolCallProps {
  forceCollapsed?: boolean
 }

-function ToolStatusIndicator(props: { status: Accessor<string> }) {
-  const isVisible = (value: string) => props.status() === value
-
-  return (
-    <span class="tool-call-header-status" aria-hidden="true" data-status={props.status() || "pending"}>
-      <span style={{ display: isVisible("pending") ? "inline-flex" : "none" }}>
-        <Hourglass class="w-4 h-4" />
-      </span>
-      <span style={{ display: isVisible("running") ? "inline-flex" : "none" }}>
-        <Loader2 class="w-4 h-4 animate-spin" />
-      </span>
-      <span style={{ display: isVisible("completed") ? "inline-flex" : "none" }}>
-        <Check class="w-4 h-4" />
-      </span>
-      <span style={{ display: isVisible("error") ? "inline-flex" : "none" }}>
-        <XCircle class="w-4 h-4" />
-      </span>
-    </span>
-  )
-}
-
 function ToolCallDetails(props: {
  toolCallMemo: () => ToolCallPart
  toolState: () => ToolState | undefined
@@ -186,26 +166,180 @@ function ToolCallDetails(props: {
  const [permissionSubmitting, setPermissionSubmitting] = createSignal(false)
  const [permissionError, setPermissionError] = createSignal<string | null>(null)

-  const followScroll = createFollowScroll({
-    getScrollTopSnapshot: props.scrollTopSnapshot,
-    setScrollTopSnapshot: props.setScrollTopSnapshot,
-    sentinelMarginPx: TOOL_SCROLL_SENTINEL_MARGIN_PX,
-    sentinelClassName: "tool-call-scroll-sentinel",
-  })
+  const [scrollContainer, setScrollContainer] = createSignal<HTMLDivElement | undefined>()
+  const [bottomSentinel, setBottomSentinel] = createSignal<HTMLDivElement | null>(null)
+  const [autoScroll, setAutoScroll] = createSignal(true)
+  const [bottomSentinelVisible, setBottomSentinelVisible] = createSignal(true)

-  const scrollHelpers: ToolScrollHelpers = {
-    registerContainer: (element, options) => {
-      followScroll.registerContainer(element, options)
-    },
-    handleScroll: followScroll.handleScroll,
-    renderSentinel: followScroll.renderSentinel,
-    restoreAfterRender: followScroll.restoreAfterRender,
+  let scrollContainerRef: HTMLDivElement | undefined
+  let detachScrollIntentListeners: (() => void) | undefined
+
+  let pendingScrollFrame: number | null = null
+  let pendingAnchorScroll: number | null = null
+  let userScrollIntentUntil = 0
+  let lastKnownScrollTop = props.scrollTopSnapshot()
+
+  function restoreScrollPosition(forceBottom = false) {
+    const container = scrollContainerRef
+    if (!container) return
+    if (forceBottom) {
+      container.scrollTop = container.scrollHeight
+      lastKnownScrollTop = container.scrollTop
+      props.setScrollTopSnapshot(lastKnownScrollTop)
+    } else {
+      container.scrollTop = lastKnownScrollTop
+    }
+  }
+
+  const persistScrollSnapshot = (element?: HTMLElement | null) => {
+    if (!element) return
+    lastKnownScrollTop = element.scrollTop
+    props.setScrollTopSnapshot(lastKnownScrollTop)
+  }
+
+  function markUserScrollIntent() {
+    const now = typeof performance !== "undefined" ? performance.now() : Date.now()
+    userScrollIntentUntil = now + TOOL_SCROLL_INTENT_WINDOW_MS
+  }
+
+  function hasUserScrollIntent() {
+    const now = typeof performance !== "undefined" ? performance.now() : Date.now()
+    return now <= userScrollIntentUntil
+  }
+
+  function attachScrollIntentListeners(element: HTMLDivElement) {
+    if (detachScrollIntentListeners) {
+      detachScrollIntentListeners()
+      detachScrollIntentListeners = undefined
+    }
+    const handlePointerIntent = () => markUserScrollIntent()
+    const handleKeyIntent = (event: KeyboardEvent) => {
+      if (TOOL_SCROLL_INTENT_KEYS.has(event.key)) {
+        markUserScrollIntent()
+      }
+    }
+    element.addEventListener("wheel", handlePointerIntent, { passive: true })
+    element.addEventListener("pointerdown", handlePointerIntent)
+    element.addEventListener("touchstart", handlePointerIntent, { passive: true })
+    element.addEventListener("keydown", handleKeyIntent)
+    detachScrollIntentListeners = () => {
+      element.removeEventListener("wheel", handlePointerIntent)
+      element.removeEventListener("pointerdown", handlePointerIntent)
+      element.removeEventListener("touchstart", handlePointerIntent)
+      element.removeEventListener("keydown", handleKeyIntent)
+    }
+  }
+
+  function scheduleAnchorScroll(immediate = false) {
+    if (!autoScroll()) return
+    const sentinel = bottomSentinel()
+    const container = scrollContainerRef
+    if (!sentinel || !container) return
+    if (pendingAnchorScroll !== null) {
+      cancelAnimationFrame(pendingAnchorScroll)
+      pendingAnchorScroll = null
+    }
+    pendingAnchorScroll = requestAnimationFrame(() => {
+      pendingAnchorScroll = null
+      const containerRect = container.getBoundingClientRect()
+      const sentinelRect = sentinel.getBoundingClientRect()
+      const delta = sentinelRect.bottom - containerRect.bottom + TOOL_SCROLL_SENTINEL_MARGIN_PX
+      if (Math.abs(delta) > 1) {
+        container.scrollBy({ top: delta, behavior: immediate ? "auto" : "smooth" })
+      }
+      lastKnownScrollTop = container.scrollTop
+      props.setScrollTopSnapshot(lastKnownScrollTop)
+    })
+  }
+
+  function handleScroll() {
+    const container = scrollContainer()
+    if (!container) return
+    if (pendingScrollFrame !== null) {
+      cancelAnimationFrame(pendingScrollFrame)
+    }
+    const isUserScroll = hasUserScrollIntent()
+    pendingScrollFrame = requestAnimationFrame(() => {
+      pendingScrollFrame = null
+      const atBottom = bottomSentinelVisible()
+      if (isUserScroll) {
+        if (atBottom) {
+          if (!autoScroll()) setAutoScroll(true)
+        } else if (autoScroll()) {
+          setAutoScroll(false)
+        }
+      }
+    })
+  }
+
+  const handleScrollEvent = (event: Event & { currentTarget: HTMLDivElement }) => {
+    handleScroll()
+    persistScrollSnapshot(event.currentTarget)
  }

  const handleScrollRendered = () => {
-    scrollHelpers.restoreAfterRender()
+    requestAnimationFrame(() => {
+      restoreScrollPosition(autoScroll())
+      scheduleAnchorScroll(true)
+    })
  }

+  const initializeScrollContainer = (element: HTMLDivElement | null | undefined) => {
+    const next = element || undefined
+    if (next === scrollContainerRef) {
+      return
+    }
+    scrollContainerRef = next
+    setScrollContainer(scrollContainerRef)
+    if (scrollContainerRef) {
+      // Refresh our snapshot on mount (e.g. when remounting after collapse)
+      lastKnownScrollTop = props.scrollTopSnapshot()
+      restoreScrollPosition(autoScroll())
+    }
+  }
+
+  const scrollHelpers: ToolScrollHelpers = {
+    registerContainer: (element, options) => {
+      if (options?.disableTracking) return
+      initializeScrollContainer(element)
+    },
+    handleScroll: handleScrollEvent,
+    renderSentinel: (options) => {
+      if (options?.disableTracking) return null
+      return <div ref={setBottomSentinel} aria-hidden="true" class="tool-call-scroll-sentinel" style={{ height: "1px" }} />
+    },
+  }
+
+  createEffect(() => {
+    const container = scrollContainer()
+    if (!container) return
+    attachScrollIntentListeners(container)
+    onCleanup(() => {
+      if (detachScrollIntentListeners) {
+        detachScrollIntentListeners()
+        detachScrollIntentListeners = undefined
+      }
+    })
+  })
+
+  createEffect(() => {
+    const container = scrollContainer()
+    const sentinel = bottomSentinel()
+    if (!container || !sentinel) return
+    const observer = new IntersectionObserver(
+      (entries) => {
+        entries.forEach((entry) => {
+          if (entry.target === sentinel) {
+            setBottomSentinelVisible(entry.isIntersecting)
+          }
+        })
+      },
+      { root: container, threshold: 0, rootMargin: `0px 0px ${TOOL_SCROLL_SENTINEL_MARGIN_PX}px 0px` },
+    )
+    observer.observe(sentinel)
+    onCleanup(() => observer.disconnect())
+  })
+
  createEffect(() => {
    const permission = permissionDetails()
    if (!permission) {
@@ -430,13 +564,11 @@ function ToolCallDetails(props: {
          partVersion={options.partVersion}
          instanceId={props.instanceId}
          sessionId={options.sessionId}
-          onContentRendered={props.onContentRendered}
          forceCollapsed={options.forceCollapsed}
        />
      )
    },
    scrollHelpers,
-    onContentRendered: props.onContentRendered,
  }

  let previousPartVersion: number | undefined
@@ -449,12 +581,12 @@ function ToolCallDetails(props: {
      return
    }
    previousPartVersion = version
-    scrollHelpers.restoreAfterRender()
+    scheduleAnchorScroll(true)
  })

  createEffect(() => {
-    if (followScroll.autoScroll()) {
-      scrollHelpers.restoreAfterRender({ forceBottom: true })
+    if (autoScroll()) {
+      scheduleAnchorScroll(true)
    }
  })

@@ -502,6 +634,21 @@ function ToolCallDetails(props: {
    />
  )

+  onCleanup(() => {
+    if (pendingScrollFrame !== null) {
+      cancelAnimationFrame(pendingScrollFrame)
+      pendingScrollFrame = null
+    }
+    if (pendingAnchorScroll !== null) {
+      cancelAnimationFrame(pendingAnchorScroll)
+      pendingAnchorScroll = null
+    }
+    if (detachScrollIntentListeners) {
+      detachScrollIntentListeners()
+      detachScrollIntentListeners = undefined
+    }
+  })
+
  return (
    <div class="tool-call-details">
      <Show
@@ -703,6 +850,24 @@ export default function ToolCall(props: ToolCallProps) {
      return !current
    })
  }
+
+
+  const statusIcon = () => {
+    const status = toolState()?.status || ""
+    switch (status) {
+      case "pending":
+        return <Hourglass class="w-4 h-4" />
+      case "running":
+        return <Loader2 class="w-4 h-4 animate-spin" />
+      case "completed":
+        return <Check class="w-4 h-4" />
+      case "error":
+        return <XCircle class="w-4 h-4" />
+      default:
+        return ""
+    }
+  }
+
  const statusClass = () => {
    const status = toolState()?.status || "pending"
    return `tool-call-status-${status}`
@@ -886,7 +1051,9 @@ export default function ToolCall(props: ToolCallProps) {
          />
        </Show>

-        <ToolStatusIndicator status={status} />
+        <span class="tool-call-header-status" aria-hidden="true">
+          {statusIcon()}
+        </span>
      </div>

      <Show when={expanded()}>
--- a/packages/ui/src/components/tool-call/ansi-render.tsx
+++ b/packages/ui/src/components/tool-call/ansi-render.tsx
@@ -1,4 +1,4 @@
-import { createEffect, onCleanup, type Accessor, type JSXElement } from "solid-js"
+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"
@@ -11,97 +11,6 @@ type CacheHandle = {
  set(value: unknown): void
 }

-export interface StableAnsiStreamUpdater {
-  update: (element: HTMLElement, content: string) => void
-  reset: () => void
-}
-
-export function createStableAnsiStreamUpdater(): StableAnsiStreamUpdater {
-  const renderer = createAnsiStreamRenderer()
-  let previousContent = ""
-  let ansiActive = false
-
-  return {
-    update(element: HTMLElement, content: string) {
-      const resetStreaming = !previousContent || !content.startsWith(previousContent)
-
-      if (resetStreaming) {
-        ansiActive = hasAnsi(content)
-        renderer.reset()
-        element.innerHTML = ansiActive ? renderer.render(content) : escapeHtml(content)
-        previousContent = content
-        return
-      }
-
-      const delta = content.slice(previousContent.length)
-      if (delta.length === 0) {
-        return
-      }
-
-      if (!ansiActive && hasAnsi(delta)) {
-        ansiActive = true
-        renderer.reset()
-        element.innerHTML = renderer.render(content)
-        previousContent = content
-        return
-      }
-
-      if (ansiActive) {
-        const htmlChunk = renderer.render(delta)
-        if (htmlChunk.length > 0) {
-          element.insertAdjacentHTML("beforeend", htmlChunk)
-        }
-      } else {
-        const escapedDelta = escapeHtml(delta)
-        if (escapedDelta.length > 0) {
-          element.insertAdjacentHTML("beforeend", escapedDelta)
-        }
-      }
-
-      previousContent = content
-    },
-    reset() {
-      previousContent = ""
-      ansiActive = false
-      renderer.reset()
-    },
-  }
-}
-
-function StreamingAnsiContent(props: {
-  html: string
-  htmlChunk?: string
-  updateMode: "replace" | "append" | "noop"
-}) {
-  let preRef: HTMLPreElement | undefined
-
-  createEffect(() => {
-    const element = preRef
-    if (!element) return
-    if (props.updateMode === "noop") return
-    if (props.updateMode === "append") {
-      if (element.innerHTML.length === 0) {
-        element.innerHTML = props.html
-        return
-      }
-      const chunk = props.htmlChunk ?? ""
-      if (chunk.length > 0) {
-        element.insertAdjacentHTML("beforeend", chunk)
-      }
-      return
-    }
-    if (element.innerHTML !== props.html) {
-      element.innerHTML = props.html
-    }
-  })
-
-  onCleanup(() => {
-    preRef = undefined
-  })
-
-  return <pre ref={preRef} class="tool-call-content tool-call-ansi" dir="auto" />
-}
-
 export function createAnsiContentRenderer(params: {
  ansiRunningCache: CacheHandle
  ansiFinalCache: CacheHandle
@@ -137,8 +46,6 @@ export function createAnsiContentRenderer(params: {
    const isRunningVariant = options.variant === "running"
    const disableScrollTracking = !isRunningVariant
    const registerRef = disableScrollTracking ? registerUntracked : registerTracked
-    let updateMode: "replace" | "append" | "noop" = "replace"
-    let htmlChunk = ""

    let nextCache: AnsiRenderCache

@@ -147,7 +54,6 @@ export function createAnsiContentRenderer(params: {
      const resetStreaming = !cached || !cached.text || !content.startsWith(cached.text) || cached.text !== runningAnsiSource

      if (resetStreaming) {
-        updateMode = "replace"
        const detectedAnsi = hasAnsi(content)
        if (detectedAnsi) {
          runningAnsiRenderer.reset()
@@ -160,21 +66,15 @@ export function createAnsiContentRenderer(params: {
      } else {
        const delta = content.slice(cached.text.length)
        if (delta.length === 0) {
-          updateMode = "noop"
          nextCache = { ...cached, mode }
        } else if (!cached.hasAnsi && hasAnsi(delta)) {
-          updateMode = "replace"
          runningAnsiRenderer.reset()
          const html = runningAnsiRenderer.render(content)
          nextCache = { text: content, html, mode, hasAnsi: true }
        } else if (cached.hasAnsi) {
-          const appendedHtml = runningAnsiRenderer.render(delta)
-          updateMode = "append"
-          htmlChunk = appendedHtml
-          nextCache = { text: content, html: `${cached.html}${appendedHtml}`, mode, hasAnsi: true }
+          const htmlChunk = runningAnsiRenderer.render(delta)
+          nextCache = { text: content, html: `${cached.html}${htmlChunk}`, mode, hasAnsi: true }
        } else {
-          updateMode = "append"
-          htmlChunk = escapeHtml(delta)
          nextCache = { text: content, html: `${cached.html}${escapeHtml(delta)}`, mode, hasAnsi: false }
        }
      }
@@ -198,7 +98,7 @@ export function createAnsiContentRenderer(params: {

    return (
      <div class={messageClass} ref={registerRef} onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}>
-        <StreamingAnsiContent html={nextCache.html} htmlChunk={htmlChunk} updateMode={updateMode} />
+        <pre class="tool-call-content tool-call-ansi" dir="auto" innerHTML={nextCache.html} />
        {params.scrollHelpers.renderSentinel({ disableTracking: disableScrollTracking })}
      </div>
    )
--- a/packages/ui/src/components/tool-call/diff-render.tsx
+++ b/packages/ui/src/components/tool-call/diff-render.tsx
@@ -1,13 +1,10 @@
-import { Suspense, createEffect, createMemo, createSignal, lazy, onMount, type Accessor, type JSXElement } from "solid-js"
+import { Suspense, lazy, onMount, type Accessor, type JSXElement } from "solid-js"
 import type { ToolState } from "@opencode-ai/sdk/v2"
-import useMediaQuery from "@suid/material/useMediaQuery"
-import { AlignJustify, Copy, Split, WrapText } from "lucide-solid"
 import type { RenderCache } from "../../types/message"
 import type { DiffViewMode } from "../../stores/preferences"
 import type { DiffPayload, DiffRenderOptions, ToolScrollHelpers } from "./types"
 import { getRelativePath } from "./utils"
 import { getCacheEntry } from "../../lib/global-cache"
-import { copyToClipboard } from "../../lib/clipboard"

 const LazyToolCallDiffViewer = lazy(() =>
  import("../diff-viewer").then((module) => ({ default: module.ToolCallDiffViewer })),
@@ -46,16 +43,6 @@ export function createDiffContentRenderer(params: {
  handleScrollRendered: () => void
  onContentRendered?: () => void
 }) {
-  const compactDiffQuery = useMediaQuery("(max-width: 640px)")
-  const [mobileModeOverride, setMobileModeOverride] = createSignal<DiffViewMode | undefined>(undefined)
-  const [wordWrapEnabled, setWordWrapEnabled] = createSignal(true)
-
-  createEffect(() => {
-    if (!compactDiffQuery()) {
-      setMobileModeOverride(undefined)
-    }
-  })
-
  const registerTracked = (element: HTMLDivElement | null) => {
    params.scrollHelpers.registerContainer(element)
  }
@@ -71,12 +58,7 @@ export function createDiffContentRenderer(params: {
      : params.t("toolCall.diff.label"))
    const selectedVariant = options?.variant === "permission-diff" ? "permission-diff" : "diff"
    const cacheHandle = selectedVariant === "permission-diff" ? params.permissionDiffCache : params.diffCache
-    const preferredMode = () => (params.preferences().diffViewMode || "split") as DiffViewMode
-    const effectiveMode = () => {
-      if (!compactDiffQuery()) return preferredMode()
-      return mobileModeOverride() || "unified"
-    }
-    const shouldWrap = () => wordWrapEnabled()
+    const diffMode = () => (params.preferences().diffViewMode || "split") as DiffViewMode
    const themeKey = params.isDark() ? "dark" : "light"
    const state = params.toolState()
    const disableScrollTracking = Boolean(
@@ -94,94 +76,60 @@ export function createDiffContentRenderer(params: {
      }
    })()

-    const currentMode = createMemo(() => effectiveMode())
-    const currentWrap = createMemo(() => shouldWrap())
-    const cachedHtml = createMemo(() => {
-      const cached = getCacheEntry<RenderCache>(cacheEntryParams)
-      if (
-        cached
-        && cached.text === payload.diffText
-        && cached.theme === themeKey
-        && cached.mode === currentMode()
-        && cached.wrap === currentWrap()
-      ) {
-        return cached.html
-      }
-      return undefined
-    })
+    let cachedHtml: string | undefined
+    const cached = getCacheEntry<RenderCache>(cacheEntryParams)
+    const currentMode = diffMode()
+    if (cached && cached.text === payload.diffText && cached.theme === themeKey && cached.mode === currentMode) {
+      cachedHtml = cached.html
+    }

    const handleModeChange = (mode: DiffViewMode) => {
-      if (compactDiffQuery()) {
-        setMobileModeOverride(mode)
-      }
      params.setDiffViewMode(mode)
    }

-    const nextViewMode = (): DiffViewMode => (currentMode() === "split" ? "unified" : "split")
-    const viewModeTitle = () =>
-      nextViewMode() === "split"
-        ? params.t("toolCall.diff.switchToSplit")
-        : params.t("toolCall.diff.switchToUnified")
-    const wordWrapTitle = () =>
-      wordWrapEnabled()
-        ? params.t("toolCall.diff.disableWordWrap")
-        : params.t("toolCall.diff.enableWordWrap")
-    const copyPatchTitle = () => params.t("toolCall.diff.copyPatch")
-
    const handleDiffRendered = () => {
-      params.handleScrollRendered()
+      if (!disableScrollTracking) {
+        params.handleScrollRendered()
+      }
      params.onContentRendered?.()
    }

    return (
-        <div
-          class="message-text tool-call-markdown tool-call-markdown-large tool-call-diff-shell"
-          data-diff-mode={currentMode()}
-          ref={registerRef}
-          onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}
-        >
+      <div
+        class="message-text tool-call-markdown tool-call-markdown-large tool-call-diff-shell"
+        ref={registerRef}
+        onScroll={disableScrollTracking ? undefined : params.scrollHelpers.handleScroll}
+      >
        <div class="tool-call-diff-toolbar" role="group" aria-label={params.t("toolCall.diff.viewMode.ariaLabel")}>
          <span class="tool-call-diff-toolbar-label">{toolbarLabel}</span>
-          <div class="file-viewer-toolbar">
+          <div class="tool-call-diff-toggle">
            <button
              type="button"
-              class="file-viewer-toolbar-icon-button"
-              onClick={() => void copyToClipboard(payload.diffText)}
-              aria-label={copyPatchTitle()}
-              title={copyPatchTitle()}
+              class={`tool-call-diff-mode-button${diffMode() === "split" ? " active" : ""}`}
+              aria-pressed={diffMode() === "split"}
+              onClick={() => handleModeChange("split")}
            >
-              <Copy class="h-4 w-4" aria-hidden="true" />
+              {params.t("toolCall.diff.viewMode.split")}
            </button>
            <button
              type="button"
-              class="file-viewer-toolbar-icon-button"
-              onClick={() => handleModeChange(nextViewMode())}
-              aria-label={viewModeTitle()}
-              title={viewModeTitle()}
+              class={`tool-call-diff-mode-button${diffMode() === "unified" ? " active" : ""}`}
+              aria-pressed={diffMode() === "unified"}
+              onClick={() => handleModeChange("unified")}
            >
-              {nextViewMode() === "split" ? <Split class="h-4 w-4" aria-hidden="true" /> : <AlignJustify class="h-4 w-4" aria-hidden="true" />}
-            </button>
-            <button
-              type="button"
-              class={`file-viewer-toolbar-icon-button${wordWrapEnabled() ? " active" : ""}`}
-              onClick={() => setWordWrapEnabled((enabled) => !enabled)}
-              aria-label={wordWrapTitle()}
-              title={wordWrapTitle()}
-            >
-              <WrapText class="h-4 w-4" aria-hidden="true" />
+              {params.t("toolCall.diff.viewMode.unified")}
            </button>
          </div>
        </div>
-        {cachedHtml() ? (
-          <CachedDiffMarkup html={cachedHtml()!} onRendered={handleDiffRendered} />
+        {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={currentMode()}
-              wrap={currentWrap()}
+              mode={diffMode()}
              cacheEntryParams={cacheEntryParams as any}
              onRendered={handleDiffRendered}
            />
--- a/packages/ui/src/components/tool-call/renderers/bash.tsx
+++ b/packages/ui/src/components/tool-call/renderers/bash.tsx
@@ -1,107 +1,6 @@
-import { Show, createEffect, createMemo, onCleanup, type Accessor } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk/v2"
-import type { ToolRenderer, ToolScrollHelpers } from "../types"
+import type { ToolRenderer } from "../types"
 import { ensureMarkdownContent, formatUnknown, getToolName, isToolStateCompleted, isToolStateError, isToolStateRunning, readToolStatePayload } from "../utils"
 import { tGlobal } from "../../../lib/i18n"
-import { createStableAnsiStreamUpdater } from "../ansi-render"
-import { ansiToHtml, hasAnsi } from "../../../lib/ansi"
-
-function RunningBashOutput(props: {
-  content: Accessor<string>
-  scrollHelpers?: ToolScrollHelpers
-}) {
-  let preRef: HTMLPreElement | undefined
-  const updater = createStableAnsiStreamUpdater()
-
-  createEffect(() => {
-    const element = preRef
-    if (!element) return
-    updater.update(element, props.content())
-  })
-
-  onCleanup(() => {
-    preRef = undefined
-    updater.reset()
-  })
-
-  return (
-    <div
-      class="message-text tool-call-markdown"
-      ref={props.scrollHelpers?.registerContainer}
-      onScroll={props.scrollHelpers ? (event) => props.scrollHelpers!.handleScroll(event as Event & { currentTarget: HTMLDivElement }) : undefined}
-    >
-      <pre ref={preRef} class="tool-call-content tool-call-ansi" dir="auto" />
-      {props.scrollHelpers?.renderSentinel?.()}
-    </div>
-  )
-}
-
-function BashToolBody(props: {
-  toolState: Accessor<ToolState | undefined>
-  renderMarkdown: (options: { content: string }) => ReturnType<ToolRenderer["renderBody"]>
-  scrollHelpers?: ToolScrollHelpers
-}) {
-  const state = createMemo(() => props.toolState())
-
-  const joinedContent = createMemo(() => {
-    const current = state()
-    if (!current || current.status === "pending") return ""
-
-    const { input, metadata } = readToolStatePayload(current)
-    const command = typeof input.command === "string" && input.command.length > 0 ? `$ ${input.command}` : ""
-    const outputResult = formatUnknown(
-      isToolStateCompleted(current)
-        ? current.output
-        : (isToolStateRunning(current) || isToolStateError(current)) && metadata.output
-          ? metadata.output
-          : undefined,
-    )
-    return [command, outputResult?.text].filter(Boolean).join("\n")
-  })
-
-  const finalMarkdown = createMemo(() => {
-    const current = state()
-    const content = joinedContent()
-    if (!current || current.status === "pending" || current.status === "running" || content.length === 0) {
-      return null
-    }
-    if (hasAnsi(content)) {
-      return null
-    }
-    return ensureMarkdownContent(content, "bash", true)
-  })
-
-  const finalAnsiHtml = createMemo(() => {
-    const current = state()
-    const content = joinedContent()
-    if (!current || current.status === "pending" || current.status === "running" || content.length === 0) {
-      return null
-    }
-    if (!hasAnsi(content)) {
-      return null
-    }
-    return ansiToHtml(content)
-  })
-
-  return (
-    <Show when={state() && joinedContent().length > 0}>
-      <Show
-        when={state()?.status === "running"}
-        fallback={
-          <Show when={finalAnsiHtml()} fallback={finalMarkdown() ? props.renderMarkdown({ content: finalMarkdown()! as string }) : null}>
-            {(html) => (
-              <div class="message-text tool-call-markdown" ref={props.scrollHelpers?.registerContainer}>
-                <pre class="tool-call-content tool-call-ansi" dir="auto" innerHTML={html()} />
-              </div>
-            )}
-          </Show>
-        }
-      >
-        <RunningBashOutput content={joinedContent} scrollHelpers={props.scrollHelpers} />
-      </Show>
-    </Show>
-  )
-}

 export const bashRenderer: ToolRenderer = {
  tools: ["bash"],
@@ -122,7 +21,35 @@ export const bashRenderer: ToolRenderer = {
    const timeoutLabel = `${timeout}ms`
    return `${baseTitle} · ${tGlobal("toolCall.renderer.bash.title.timeout", { timeout: timeoutLabel })}`
  },
-  renderBody({ toolState, renderMarkdown, scrollHelpers }) {
-    return <BashToolBody toolState={toolState} renderMarkdown={renderMarkdown as any} scrollHelpers={scrollHelpers} />
+  renderBody({ toolState, renderMarkdown, renderAnsi }) {
+    const state = toolState()
+    if (!state || state.status === "pending") return null
+
+    const { input, metadata } = readToolStatePayload(state)
+    const command = typeof input.command === "string" && input.command.length > 0 ? `$ ${input.command}` : ""
+    const outputResult = formatUnknown(
+      isToolStateCompleted(state)
+        ? state.output
+        : (isToolStateRunning(state) || isToolStateError(state)) && metadata.output
+          ? metadata.output
+          : undefined,
+    )
+    const parts = [command, outputResult?.text].filter(Boolean)
+    if (parts.length === 0) return null
+
+    const joined = parts.join("\n")
+    if (state.status === "running") {
+      return renderAnsi({ content: joined, variant: "running" })
+    }
+
+    const ansiBody = renderAnsi({ content: joined, requireAnsi: true, variant: "final" })
+    if (ansiBody) {
+      return ansiBody
+    }
+
+    const content = ensureMarkdownContent(joined, "bash", true)
+    if (!content) return null
+
+    return renderMarkdown({ content })
  },
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shantur Rathore	2236350f1b	fix(server): prefer LAN remote addresses over public IPs	2026-04-01 22:09:23 +01:00
VooDisss	5f3e9317ca	refactor(ui): align password action with status summary Keep the Change password control on the same row as the username and password-status copy in the settings card, so the summary reads as one horizontal unit instead of stacked text followed by a separate action row.	2026-04-01 17:32:27 +03:00
VooDisss	750e73f540	refactor(ui): let settings modal use full viewport frame Make the settings dialog fill the height inside a frame that explicitly reserves about five percent of the screen above and below. This removes the old fixed height cap and reduces unnecessary inner scrolling on taller displays.	2026-04-01 17:17:42 +03:00
VooDisss	61e06ef883	refactor(ui): group extra remote addresses behind disclosure Replace the standalone show/hide button with a full-width collapsible disclosure container in both remote access surfaces. This keeps the hidden address list visually grouped, makes the header easier to scan and click, and centers the label so it reads as structure rather than an unrelated action button. Keep the first recommended remote address visible by default while preserving access to the full list behind the compact disclosure header.	2026-04-01 17:04:20 +03:00
VooDisss	b0b0a55e14	refactor(server): centralize remote address selection Unify remote address resolution so startup logging, primary remote URL selection, and /api/meta all consume the same server-side policy. Keep all external addresses user-visible, preserve stable interface ordering, and only de-prioritize link-local addresses when choosing the primary recommended remote URL. On the UI side, introduce a shared helper that keeps the first remote address visible by default and collapses the remaining addresses behind a reveal action, with i18n coverage and targeted tests for the new selection behavior.	2026-04-01 17:03:41 +03:00
VooDisss	984743f3c7	fix(server): show sane remote URLs for 0.0.0.0 binds When CodeNomad was started with --host 0.0.0.0, the CLI picked the first external IPv4 address it discovered and advertised only that one as the remote URL. On Windows machines with WSL, Hyper-V, Docker, or other virtual adapters, this often surfaced a virtual 172.x address even though a normal LAN address such as 192.168.x.x was also reachable and usable from other devices. Tighten remote URL presentation so the startup log reuses the resolved address list, prefers an advertisable external address for the primary Remote Connection URL, and prints additional accessible URLs instead of hiding them. Keep address ordering stable across private RFC1918 ranges instead of hard-coding one subnet family as universally better, while filtering out link-local addresses from the user-facing advertised list to avoid noisy or misleading output. Add targeted tests around address ordering and advertisability so link-local-first interface enumeration does not regress the primary LAN URL selection again. # Conflicts: # packages/server/src/index.ts	2026-03-31 02:58:42 +03:00