chore(release): cut 0.1.50

docs(changelog): add 0.1.50 release notes
Fix OpenCode usage regression and update workspace tests
2026-07-29 12:01:31 +00:00 · 2026-04-07 20:04:13 +07:00 · 2026-04-07 20:03:22 +07:00 · 2026-04-07 20:02:48 +07:00 · 2026-04-07 20:00:46 +07:00 · 2026-04-07 18:57:03 +07:00
140 changed files with 10084 additions and 2003 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,69 @@
 # Changelog

+## 0.1.50 - 2026-04-07
+
+### Added
+- Context window meter — live token usage indicator for Claude Code, Codex, and OpenCode shows how much of the context window has been consumed, with color thresholds at 70% and 90%.
+- Open in editor — open the current workspace directory in Cursor, VS Code, Zed, or the system file manager directly from the toolbar. Remembers your preferred editor.
+- Side-by-side diff layout — toggle between unified and split-column diff views in the Changes pane, with a whitespace visibility toggle.
+- Spoken messages — voice-mode speak tool calls now render inline in the conversation as labeled spoken messages instead of raw tool call blocks.
+- Plan approval actions — plan permission cards now show provider-defined action buttons (e.g. "Implement", "Deny") instead of hardcoded accept/reject.
+- Background git fetch — the daemon periodically fetches from origin so the Changes pane shows accurate ahead/behind counts without manual refreshes.
+
+### Improved
+- File explorer and diff pane expanded/collapsed state persists across tab switches and rehydration.
+- Workspace list and updates are served instantly on connect; reconciliation happens in the background, eliminating the initial loading delay.
+- Provider list in Settings now includes a Refresh button and shows inline error details.
+- Workspace tabs close optimistically — the tab disappears immediately while the daemon archives the agent in the background.
+- Reload agent action moved away from the close button to prevent accidental taps.
+
+### Fixed
+- WorkingIndicator no longer remounts on every stream update on native.
+- Silero VAD state is now reset between voice turns, preventing LSTM drift that could cause false speech detections in long sessions.
+- OpenCode context window meter updates correctly after the first turn.
+- Garbled overlapping text in plan card markdown.
+- Worktree branch tracking now prefers `origin/{branch}` over the local branch ref, fixing stale diff baselines.
+- Session ID reset on query restart prevents an overwrite crash when restarting an agent quickly.
+- Copilot ACP permission prompts are now bypassed in autopilot mode.
+- Direct connection and pairing modal content now displays correctly on tablets.
+- `wait_for_finish` errors from agents are now surfaced to the caller instead of silently swallowed.
+- Workspace diff stats preserved across rehydration instead of resetting to zero.
+- Diff toolbar toggle buttons polished for consistent sizing and alignment.
+
+## 0.1.49 - 2026-04-07
+
+### Fixed
+- Models and providers now load reliably on first app connect instead of requiring a second status refresh.
+- Model picker on running agents now only shows models from the agent's own provider, not every provider on the server.
+- Model data is now prefetched consistently regardless of which screen you open first.
+- Draft and running-agent flows now share the same provider data path, eliminating stale model lists from legacy fallbacks.
+
+## 0.1.48 - 2026-04-05
+
+### Added
+- Provider diagnostics — tap a provider in Settings to see binary path, version, model count, and status at a glance. Helps troubleshoot why an agent type isn't available.
+- Provider snapshot system — daemon now pushes real-time provider availability and model lists to the app, replacing the old poll-based approach. Models and modes update live as providers come online or go offline.
+- Codex question handling — Codex agents can now ask the user questions mid-session (e.g. "which file?") and receive answers inline, matching the Claude Code question flow.
+- Reload tab action — right-click a workspace tab to reload its agent list without restarting the app.
+
+### Improved
+- Model selector redesigned — grouped by provider with status badges, search, and better touch targets on mobile.
+- Enter key now submits question card answers and confirms dictation, matching the expected keyboard flow.
+- Removed noisy agent lifecycle toasts that fired on every state change.
+
+### Fixed
+- Desktop app now resolves the user's full login shell environment at startup, fixing tools like `codex`, `node`, `bun`, and `direnv` not being found when Paseo is launched from Finder or Dock. Terminals spawned by Paseo now inherit the same PATH and environment variables as a normal terminal session. Approach adapted from VS Code's battle-tested shell environment resolution.
+- Input field on running agent screens now correctly receives keyboard focus.
+- Mobile model selector alignment and sizing.
+
+## 0.1.47 - 2026-04-05
+
+### Fixed
+- Voice TTS in Electron — sherpa now requests copied buffers and the voice MCP bridge sets `ELECTRON_RUN_AS_NODE`, preventing "external buffers not allowed" crashes.
+- QR pairing in desktop — CLI JSON output parsing now tolerates Node deprecation warnings in stdout.
+- STT segment race condition — segment ID and audio buffer are snapshotted before the async transcription call, so rapid commits no longer interleave.
+- Per-host "Add connection" button removed — it blocked multi-host setups by scoping new connections to a single server.
+
 ## 0.1.46 - 2026-04-04

 ### Fixed
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -45,7 +45,7 @@ See [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md) for full setup, build sync requir
 - **NEVER assume a timeout means the service needs restarting** — timeouts can be transient.
 - **NEVER add auth checks to tests** — agent providers handle their own auth.
 - **Always run typecheck after every change.**
- **NEVER make breaking changes to WebSocket or message schemas.** The mobile app in the App Store always lags behind the daemon, and daemons in the wild lag behind new app releases. Both directions must work. Every schema change MUST be backward-compatible:
+- **NEVER make breaking changes to WebSocket or message schemas.** The primary compatibility path is old mobile app clients talking to newly updated daemons. Users update desktop and daemon first, then keep running the old app for a while. Every schema change MUST be backward-compatible for old clients against new daemons:
  - New fields: always `.optional()` with a sensible default or `.transform()` fallback.
  - Never change a field from optional to required.
  - Never remove a field — deprecate it (keep accepting it, stop sending it).
--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -11,6 +11,12 @@ There are two supported ways to ship from `main`:

 ## Standard release (patch)

+Before running any stable patch release command:
+
+- Make sure the intended release commit is already committed to `main` and the working tree is clean.
+- Make sure local `npm run typecheck` passes on that commit.
+- Do not use `npm run release:patch` as a substitute for checking whether the current commit is actually ready.
+
 ```bash
 npm run release:patch
 ```
@@ -24,6 +30,7 @@ Use the direct stable path when the current `main` changes are ready to become t
 ## Manual step-by-step

 ```bash
+npm run typecheck            # Verify the exact commit you intend to release
 npm run release:check        # Typecheck, build, dry-run pack
 npm run version:all:patch    # Bump version, create commit + tag
 npm run release:publish      # Publish to npm
@@ -131,7 +138,7 @@ Load the `paseo` skill and launch a **Codex 5.4** agent with a prompt like:
 > Review the diff between the latest release tag and HEAD. Focus on:
 >
 > 1. **Breaking changes** — especially in the WebSocket protocol, agent lifecycle, and any server↔client contract.
-> 2. **Backward compatibility** — mobile apps lag behind desktop/daemon updates by days. Users will update desktop and daemon immediately but keep running the old app. Flag anything that requires both sides to update in lockstep.
+> 2. **Backward compatibility** — the important direction is old app clients talking to newly updated daemons. Users update desktop and daemon first, then keep running the old app for a while. Flag anything that breaks old clients against new daemons or requires both sides to update in lockstep.
 > 3. **Regressions** — anything that looks like it could break existing functionality.
 >
 > Diff: `git diff <latest-release-tag>..HEAD`
@@ -150,6 +157,8 @@ In other words, RCs are checkpoints along the way; the changelog only records th
 ## Completion checklist

 - [ ] Run the pre-release sanity check (see above) and address any findings
+- [ ] Ensure the intended release commit is already committed and the git worktree is clean before running any `release:*` patch/promote command
+- [ ] Ensure local `npm run typecheck` passes on that exact commit before running any `release:*` patch/promote command
 - [ ] Update `CHANGELOG.md` with user-facing release notes (features, fixes — not refactors)
 - [ ] Verify the changelog heading follows strict `## X.Y.Z - YYYY-MM-DD` format
 - [ ] `npm run release:patch` or `npm run release:promote` completes successfully
--- a/docs/plan-approval-normalization.md
+++ b/docs/plan-approval-normalization.md
@@ -0,0 +1,68 @@
+# Plan Approval Normalization
+
+## Goal
+
+Normalize plan approval across providers so the UI renders one consistent plan approval card and action row, while each provider keeps its own execution quirks behind the session permission interface.
+
+## Compatibility Constraints
+
+- Older clients must remain compatible with newer daemons.
+- All new wire fields must be optional.
+- Existing plan permissions without action metadata must still render and work.
+- Existing question permissions must keep their current behavior.
+
+## Design
+
+### Shared abstraction
+
+Add optional permission action definitions to the shared permission request/response types.
+
+- Permission requests may include `actions`.
+- Permission responses may include `selectedActionId`.
+- `kind: "plan"` remains the normalized concept for plan approval.
+- The UI renders actions from the permission request instead of hardcoding provider-specific buttons.
+
+### Claude
+
+Keep Claude's plan permission flow, but enrich it with explicit action definitions.
+
+- Always expose `Reject`.
+- Always expose `Implement`.
+- If the agent entered plan mode from a more permissive mode like `bypassPermissions`, also expose `Implement with <previous mode>`.
+- Resolve the selected action entirely inside `respondToPermission()`.
+
+### Codex
+
+Synthesize a normalized `kind: "plan"` permission after a Codex plan-mode turn completes with a plan result.
+
+- Emit a plan permission with `Reject` and `Implement` actions.
+- On `Implement`, disable `plan_mode`, disable `fast_mode`, and automatically start a follow-up implementation turn.
+- On `Reject`, resolve without starting a follow-up turn.
+- Keep the implementation prompt and state transitions inside the Codex provider.
+
+### Manager and state sync
+
+After permission resolution, refresh provider-derived state so the UI sees internal mode/feature changes without knowing provider quirks.
+
+- Refresh current mode
+- Refresh pending permissions
+- Refresh runtime info
+- Refresh features
+- Persist refreshed state
+
+### UI
+
+Render plan permissions through the existing plan card, but generate buttons from normalized permission actions.
+
+- If `actions` are absent, fall back to legacy buttons.
+- Plan cards should use `Implement` as the default primary label.
+- Do not add provider-specific rendering branches.
+
+## Verification
+
+1. Shared schema/type tests for optional `actions` and `selectedActionId`
+2. App tests for generic plan-action rendering
+3. Claude tests for third action when resuming from a more permissive mode
+4. Codex tests for synthetic plan approval and automatic implementation follow-up
+5. Manager tests for post-permission state refresh
+6. `npm run typecheck`
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -42,7 +42,7 @@ buildNpmPackage rec {

  # To update: run `nix build` with lib.fakeHash, copy the `got:` hash.
  # CI auto-updates this when package-lock.json changes (see .github/workflows/).
-  npmDepsHash = "sha256-015LlfVboo21Cm6Hbbq0vhaO1nds1A99Z1D6hyqWYiE=";
+  npmDepsHash = "sha256-TEsFzJRgVubRnjAy7OO6Xkn6HY7CRO3LVxsVdbw3IH4=";

  # Prevent onnxruntime-node's install script from running during automatic
  # npm rebuild (it tries to download from api.nuget.org, which fails in the sandbox).
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
@@ -15932,18 +15932,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/default-shell": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/default-shell/-/default-shell-2.2.0.tgz",
-      "integrity": "sha512-sPpMZcVhRQ0nEMDtuMJ+RtCxt7iHPAMBU+I4tAlo5dU1sjRpNax0crj6nR3qKpvVnckaQ9U38enXcwW9nZJeCw==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/defaults": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
@@ -18545,35 +18533,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execa/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "license": "ISC"
-    },
    "node_modules/expect": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
@@ -21859,18 +21818,6 @@
        "node": ">= 0.4"
      }
    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/get-symbol-description": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
@@ -22582,15 +22529,6 @@
        "node": ">= 6"
      }
    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
    "node_modules/humanize-ms": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
@@ -23319,6 +23257,7 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=8"
@@ -26558,6 +26497,7 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6"
@@ -27464,18 +27404,6 @@
      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
      "license": "ISC"
    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/nth-check": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -27701,6 +27629,7 @@
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "mimic-fn": "^2.1.0"
@@ -31124,50 +31053,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/shell-env": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/shell-env/-/shell-env-4.0.3.tgz",
-      "integrity": "sha512-Ioe5h+hCDZ7pKL5+JGzbtPvZ5ESMHePZ8nLxohlDL+twmlcmutttMhRkrQOed8DeLT8mkYBgbwZfohe8pqaA3g==",
-      "license": "MIT",
-      "dependencies": {
-        "default-shell": "^2.0.0",
-        "execa": "^5.1.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/shell-env/node_modules/ansi-regex": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/shell-env/node_modules/strip-ansi": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
-      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.2.2"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
    "node_modules/shell-quote": {
      "version": "1.8.3",
      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
@@ -32100,15 +31985,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/strip-indent": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.1.1.tgz",
@@ -35030,16 +34906,16 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "dependencies": {
        "@dnd-kit/core": "^6.3.1",
        "@dnd-kit/sortable": "^10.0.0",
        "@dnd-kit/utilities": "^3.2.2",
        "@expo/vector-icons": "^15.0.2",
        "@floating-ui/react-native": "^0.10.7",
-        "@getpaseo/expo-two-way-audio": "0.1.46",
-        "@getpaseo/highlight": "0.1.46",
-        "@getpaseo/server": "0.1.46",
+        "@getpaseo/expo-two-way-audio": "0.1.50",
+        "@getpaseo/highlight": "0.1.50",
+        "@getpaseo/server": "0.1.50",
        "@gorhom/bottom-sheet": "^5.2.6",
        "@gorhom/portal": "^1.0.14",
        "@react-native-async-storage/async-storage": "2.2.0",
@@ -35156,11 +35032,11 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/relay": "0.1.46",
-        "@getpaseo/server": "0.1.46",
+        "@getpaseo/relay": "0.1.50",
+        "@getpaseo/server": "0.1.50",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -35201,11 +35077,11 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
-        "@getpaseo/cli": "0.1.46",
-        "@getpaseo/server": "0.1.46",
+        "@getpaseo/cli": "0.1.50",
+        "@getpaseo/server": "0.1.50",
        "electron-log": "^5.4.3",
        "electron-updater": "^6.6.2",
        "ws": "^8.14.2"
@@ -35239,7 +35115,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "license": "MIT",
      "devDependencies": {
        "@biomejs/biome": "1.9.4",
@@ -35440,7 +35316,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "dependencies": {
        "@lezer/common": "^1.5.0",
        "@lezer/cpp": "^1.1.5",
@@ -35466,7 +35342,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -35482,14 +35358,14 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@ai-sdk/openai": "2.0.52",
        "@anthropic-ai/claude-agent-sdk": "^0.2.11",
        "@deepgram/sdk": "^3.4.0",
-        "@getpaseo/highlight": "0.1.46",
-        "@getpaseo/relay": "0.1.46",
+        "@getpaseo/highlight": "0.1.50",
+        "@getpaseo/relay": "0.1.50",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "^1.20.1",
        "@opencode-ai/sdk": "1.2.6",
@@ -35510,7 +35386,6 @@
        "pino-pretty": "^13.1.3",
        "qrcode": "^1.5.4",
        "rotating-file-stream": "^3.2.9",
-        "shell-env": "^4.0.3",
        "sherpa-onnx": "1.12.28",
        "sherpa-onnx-node": "1.12.28",
        "strip-ansi": "^7.1.2",
@@ -35889,7 +35764,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.1.46",
+      "version": "0.1.50",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.20.3",
        "@cloudflare/workers-types": "^4.20260114.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "private": true,
  "workspaces": [
    "packages/expo-two-way-audio",
--- a/packages/app/assets/images/editor-apps/cursor.png
+++ b/packages/app/assets/images/editor-apps/cursor.png
--- a/packages/app/assets/images/editor-apps/file-explorer.png
+++ b/packages/app/assets/images/editor-apps/file-explorer.png
--- a/packages/app/assets/images/editor-apps/finder.png
+++ b/packages/app/assets/images/editor-apps/finder.png
--- a/packages/app/assets/images/editor-apps/vscode.png
+++ b/packages/app/assets/images/editor-apps/vscode.png
--- a/packages/app/assets/images/editor-apps/zed.png
+++ b/packages/app/assets/images/editor-apps/zed.png
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@getpaseo/app",
  "main": "index.ts",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "private": true,
  "scripts": {
    "start": "expo start",
@@ -31,9 +31,9 @@
    "@dnd-kit/utilities": "^3.2.2",
    "@expo/vector-icons": "^15.0.2",
    "@floating-ui/react-native": "^0.10.7",
-    "@getpaseo/expo-two-way-audio": "0.1.46",
-    "@getpaseo/highlight": "0.1.46",
-    "@getpaseo/server": "0.1.46",
+    "@getpaseo/expo-two-way-audio": "0.1.50",
+    "@getpaseo/highlight": "0.1.50",
+    "@getpaseo/server": "0.1.50",
    "@gorhom/bottom-sheet": "^5.2.6",
    "@gorhom/portal": "^1.0.14",
    "@react-native-async-storage/async-storage": "2.2.0",
--- a/packages/app/src/components/adaptive-modal-sheet.tsx
+++ b/packages/app/src/components/adaptive-modal-sheet.tsx
@@ -28,6 +28,8 @@ const styles = StyleSheet.create((theme) => ({
    width: "100%",
    maxWidth: 520,
    maxHeight: "85%",
+    flexShrink: 1,
+    minHeight: 0,
    backgroundColor: theme.colors.surface1,
    borderRadius: theme.borderRadius.xl,
    borderWidth: 1,
@@ -54,11 +56,13 @@ const styles = StyleSheet.create((theme) => ({
    backgroundColor: theme.colors.surface2,
  },
  desktopScroll: {
-    flex: 1,
+    flexShrink: 1,
+    minHeight: 0,
  },
  desktopContent: {
    padding: theme.spacing[6],
    gap: theme.spacing[4],
+    flexGrow: 1,
  },
  bottomSheetHandle: {
    backgroundColor: theme.colors.surface2,
--- a/packages/app/src/components/agent-input-area.tsx
+++ b/packages/app/src/components/agent-input-area.tsx
@@ -12,6 +12,7 @@ import {
  DraftAgentStatusBar,
  type DraftAgentStatusBarProps,
 } from "./agent-status-bar";
+import { ContextWindowMeter } from "./context-window-meter";
 import { useImageAttachmentPicker } from "@/hooks/use-image-attachment-picker";
 import { useSessionStore } from "@/stores/session-store";
 import {
@@ -74,6 +75,8 @@ interface AgentInputAreaProps {
  autoFocus?: boolean;
  /** Callback to expose the addImages function to parent components */
  onAddImages?: (addImages: (images: ImageAttachment[]) => void) => void;
+  /** Callback to expose a focus function to parent components (desktop only). */
+  onFocusInput?: (focus: () => void) => void;
  /** Optional draft context for listing commands before an agent exists. */
  commandDraftConfig?: DraftCommandConfig;
  /** Called when a message is about to be sent (any path: keyboard, dictation, queued). */
@@ -103,6 +106,7 @@ export function AgentInputArea({
  clearDraft,
  autoFocus = false,
  onAddImages,
+  onFocusInput,
  commandDraftConfig,
  onMessageSent,
  onComposerHeightChange,
@@ -132,6 +136,8 @@ export function AgentInputArea({
      const agent = state.sessions[serverId]?.agents?.get(agentId) ?? null;
      return {
        status: agent?.status ?? null,
+        contextWindowMaxTokens: agent?.lastUsage?.contextWindowMaxTokens ?? null,
+        contextWindowUsedTokens: agent?.lastUsage?.contextWindowUsedTokens ?? null,
      };
    }),
  );
@@ -208,6 +214,21 @@ export function AgentInputArea({
    onAddImages?.(addImages);
  }, [addImages, onAddImages]);

+  const focusInput = useCallback(() => {
+    if (Platform.OS !== "web") return;
+    focusWithRetries({
+      focus: () => messageInputRef.current?.focus(),
+      isFocused: () => {
+        const el = messageInputRef.current?.getNativeElement?.() ?? null;
+        return el != null && document.activeElement === el;
+      },
+    });
+  }, []);
+
+  useEffect(() => {
+    onFocusInput?.(focusInput);
+  }, [focusInput, onFocusInput]);
+
  const submitMessage = useCallback(
    async (text: string, images?: ImageAttachment[]) => {
      onMessageSent?.();
@@ -402,6 +423,10 @@ export function AgentInputArea({
      }

      switch (action.id) {
+        case "message-input.send":
+          return messageInputRef.current?.runKeyboardAction("send") ?? false;
+        case "message-input.dictation-confirm":
+          return messageInputRef.current?.runKeyboardAction("dictation-confirm") ?? false;
        case "message-input.focus":
          if (Platform.OS !== "web") {
            messageInputRef.current?.focus();
@@ -440,8 +465,10 @@ export function AgentInputArea({
    handlerId: keyboardHandlerIdRef.current,
    actions: [
      "message-input.focus",
+      "message-input.send",
      "message-input.dictation-toggle",
      "message-input.dictation-cancel",
+      "message-input.dictation-confirm",
      "message-input.voice-toggle",
      "message-input.voice-mute-toggle",
    ],
@@ -612,11 +639,30 @@ export function AgentInputArea({
    </View>
  );

+  const hasContextWindowMeter =
+    typeof agentState.contextWindowMaxTokens === "number" &&
+    typeof agentState.contextWindowUsedTokens === "number";
+  const contextWindowMaxTokens = hasContextWindowMeter ? agentState.contextWindowMaxTokens : null;
+  const contextWindowUsedTokens = hasContextWindowMeter
+    ? agentState.contextWindowUsedTokens
+    : null;
+
+  const beforeVoiceContent = (
+    <View style={styles.contextWindowMeterSlot}>
+      {contextWindowMaxTokens !== null && contextWindowUsedTokens !== null ? (
+        <ContextWindowMeter
+          maxTokens={contextWindowMaxTokens}
+          usedTokens={contextWindowUsedTokens}
+        />
+      ) : null}
+    </View>
+  );
+
  const leftContent =
    resolveStatusControlMode(statusControls) === "draft" && statusControls ? (
      <DraftAgentStatusBar {...statusControls} />
    ) : (
-      <AgentStatusBar agentId={agentId} serverId={serverId} />
+      <AgentStatusBar agentId={agentId} serverId={serverId} onDropdownClose={focusInput} />
    );

  return (
@@ -691,6 +737,7 @@ export function AgentInputArea({
              disabled={isSubmitLoading}
              isInputActive={isInputActive}
              leftContent={leftContent}
+              beforeVoiceContent={beforeVoiceContent}
              rightContent={rightContent}
              voiceServerId={serverId}
              voiceAgentId={agentId}
@@ -766,6 +813,12 @@ const styles = StyleSheet.create(((theme: Theme) => ({
    alignItems: "center",
    gap: theme.spacing[2],
  },
+  contextWindowMeterSlot: {
+    width: 28,
+    height: 28,
+    alignItems: "center",
+    justifyContent: "center",
+  },
  realtimeVoiceButton: {
    width: 28,
    height: 28,
--- a/packages/app/src/components/agent-status-bar.tsx
+++ b/packages/app/src/components/agent-status-bar.tsx
@@ -15,8 +15,8 @@ import {
 } from "lucide-react-native";
 import { getProviderIcon } from "@/components/provider-icons";
 import { CombinedModelSelector } from "@/components/combined-model-selector";
-import { useQuery } from "@tanstack/react-query";
 import { useSessionStore } from "@/stores/session-store";
+import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import {
  buildFavoriteModelKey,
  mergeProviderPreferences,
@@ -51,7 +51,6 @@ import {
  getStatusSelectorHint,
  resolveAgentModelSelection,
 } from "@/components/agent-status-bar.utils";
-import { isProviderModelsQueryLoading } from "@/components/agent-status-bar.model-loading";

 type StatusOption = {
  id: string;
@@ -75,6 +74,7 @@ type ControlledAgentStatusBarProps = {
  modelOptions?: StatusOption[];
  selectedModelId?: string;
  onSelectModel?: (modelId: string) => void;
+  onSelectProviderAndModel?: (provider: string, modelId: string) => void;
  thinkingOptions?: StatusOption[];
  selectedThinkingOptionId?: string;
  onSelectThinkingOption?: (thinkingOptionId: string) => void;
@@ -87,6 +87,7 @@ type ControlledAgentStatusBarProps = {
  onToggleFavoriteModel?: (provider: string, modelId: string) => void;
  features?: AgentFeature[];
  onSetFeature?: (featureId: string, value: unknown) => void;
+  onDropdownClose?: () => void;
 };

 export interface DraftAgentStatusBarProps {
@@ -108,12 +109,14 @@ export interface DraftAgentStatusBarProps {
  onSelectThinkingOption: (thinkingOptionId: string) => void;
  features?: AgentFeature[];
  onSetFeature?: (featureId: string, value: unknown) => void;
+  onDropdownClose?: () => void;
  disabled?: boolean;
 }

 interface AgentStatusBarProps {
  agentId: string;
  serverId: string;
+  onDropdownClose?: () => void;
 }

 function findOptionLabel(
@@ -200,6 +203,7 @@ function ControlledStatusBar({
  modelOptions,
  selectedModelId,
  onSelectModel,
+  onSelectProviderAndModel,
  thinkingOptions,
  selectedThinkingOptionId,
  onSelectThinkingOption,
@@ -212,6 +216,7 @@ function ControlledStatusBar({
  onToggleFavoriteModel,
  features,
  onSetFeature,
+  onDropdownClose,
 }: ControlledAgentStatusBarProps) {
  const { theme } = useUnistyles();
  const isWeb = Platform.OS === "web";
@@ -260,7 +265,7 @@ function ControlledStatusBar({
    return null;
  }

-  const modelDisabled = disabled || isModelLoading || !modelOptions || modelOptions.length === 0;
+  const modelDisabled = disabled;

  const SEARCH_THRESHOLD = 6;

@@ -331,8 +336,11 @@ function ControlledStatusBar({
  const handleOpenChange = useCallback(
    (selector: StatusSelector) => (nextOpen: boolean) => {
      setOpenSelector(nextOpen ? selector : null);
+      if (!nextOpen) {
+        onDropdownClose?.();
+      }
    },
-    [],
+    [onDropdownClose],
  );

  const handleSelectorPress = useCallback(
@@ -403,6 +411,7 @@ function ControlledStatusBar({
                    onToggleFavorite={onToggleFavoriteModel}
                    isLoading={isModelLoading}
                    disabled={modelDisabled}
+                    onClose={onDropdownClose}
                  />
                </View>
              </TooltipTrigger>
@@ -555,9 +564,7 @@ function ControlledStatusBar({
                <DropdownMenu
                  key={`feature-${feature.id}`}
                  open={openSelector === `feature-${feature.id}`}
-                  onOpenChange={(open) =>
-                    setOpenSelector(open ? `feature-${feature.id}` : null)
-                  }
+                  onOpenChange={handleOpenChange(`feature-${feature.id}`)}
                >
                  <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
                    <TooltipTrigger asChild triggerRefProp="ref">
@@ -642,15 +649,20 @@ function ControlledStatusBar({
                  selectedModel={selectedModelId ?? ""}
                  canSelectProvider={canSelectProviderInModelMenu}
                  onSelect={(selectedProviderId, modelId) => {
-                    if (selectedProviderId !== provider) {
-                      onSelectProvider?.(selectedProviderId);
+                    if (onSelectProviderAndModel) {
+                      onSelectProviderAndModel(selectedProviderId, modelId);
+                    } else {
+                      if (selectedProviderId !== provider) {
+                        onSelectProvider?.(selectedProviderId);
+                      }
+                      onSelectModel?.(modelId);
                    }
-                    onSelectModel?.(modelId);
                  }}
                  favoriteKeys={favoriteKeys}
                  onToggleFavorite={onToggleFavoriteModel}
                  isLoading={isModelLoading}
                  disabled={modelDisabled}
+                  onClose={onDropdownClose}
                  renderTrigger={({ selectedModelLabel }) => (
                    <View
                      style={[
@@ -660,6 +672,7 @@ function ControlledStatusBar({
                      pointerEvents="none"
                      testID="agent-preferences-model"
                    >
+                      <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
                      <Text style={styles.sheetSelectText}>{selectedModelLabel}</Text>
                      <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
                    </View>
@@ -685,6 +698,7 @@ function ControlledStatusBar({
                    accessibilityLabel="Select thinking option"
                    testID="agent-preferences-thinking"
                  >
+                    <Brain size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
                    <Text style={styles.sheetSelectText}>{displayThinking}</Text>
                    <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
                  </DropdownMenuTrigger>
@@ -784,9 +798,7 @@ function ControlledStatusBar({
                  <View key={`feature-${feature.id}`} style={styles.sheetSection}>
                    <DropdownMenu
                      open={openSelector === `feature-${feature.id}`}
-                      onOpenChange={(open) =>
-                        setOpenSelector(open ? `feature-${feature.id}` : null)
-                      }
+                      onOpenChange={handleOpenChange(`feature-${feature.id}`)}
                    >
                      <DropdownMenuTrigger
                        disabled={disabled}
@@ -833,7 +845,7 @@ function ControlledStatusBar({

 const EMPTY_MODES: AgentMode[] = [];

-export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
+export function AgentStatusBar({ agentId, serverId, onDropdownClose }: AgentStatusBarProps) {
  const { preferences, updatePreferences } = useFormPreferences();
  const agent = useSessionStore(
    useShallow((state) => {
@@ -847,6 +859,7 @@ export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
            model: currentAgent.model,
            features: currentAgent.features,
            thinkingOptionId: currentAgent.thinkingOptionId,
+            lastUsage: currentAgent.lastUsage,
          }
        : null;
    }),
@@ -858,52 +871,34 @@ export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
  );
  const client = useSessionStore((state) => state.sessions[serverId]?.client ?? null);

-  const modelsQuery = useQuery({
-    queryKey: ["providerModels", serverId, agent?.provider ?? "__missing_provider__"],
-    enabled: Boolean(client && agent?.provider),
-    staleTime: 5 * 60 * 1000,
-    queryFn: async () => {
-      if (!client || !agent) {
-        throw new Error("Daemon client unavailable");
-      }
-      const payload = await client.listProviderModels(agent.provider, { cwd: agent.cwd });
-      if (payload.error) {
-        throw new Error(payload.error);
-      }
-      return payload.models ?? [];
-    },
-  });
+  const {
+    entries: snapshotEntries,
+    isLoading: snapshotIsLoading,
+    isFetching: snapshotIsFetching,
+  } = useProvidersSnapshot(serverId);
+
+  const snapshotModels = useMemo(() => {
+    if (!snapshotEntries || !agent?.provider) {
+      return null;
+    }
+    const entry = snapshotEntries.find((e) => e.provider === agent.provider);
+    return entry?.models ?? null;
+  }, [snapshotEntries, agent?.provider]);
+
+  const models = snapshotModels;

  const agentProviderDefinitions = useMemo(() => {
    const definition = AGENT_PROVIDER_DEFINITIONS.find((d) => d.id === agent?.provider);
    return definition ? [definition] : [];
  }, [agent?.provider]);

-  const agentProviderModelQuery = useQuery({
-    queryKey: ["providerModels", serverId, agent?.provider, agent?.cwd ?? ""],
-    enabled: Boolean(client && agent?.cwd && agent?.provider),
-    staleTime: 5 * 60 * 1000,
-    queryFn: async () => {
-      if (!client || !agent) {
-        throw new Error("Daemon client unavailable");
-      }
-      const payload = await client.listProviderModels(agent.provider, { cwd: agent.cwd });
-      if (payload.error) {
-        throw new Error(payload.error);
-      }
-      return payload.models ?? [];
-    },
-  });
-
  const agentProviderModels = useMemo(() => {
    const map = new Map<string, AgentModelDefinition[]>();
-    if (agent?.provider && agentProviderModelQuery.data) {
-      map.set(agent.provider, agentProviderModelQuery.data);
+    if (agent?.provider && snapshotModels) {
+      map.set(agent.provider, snapshotModels);
    }
    return map;
-  }, [agent?.provider, agentProviderModelQuery.data]);
-
-  const models = modelsQuery.data ?? null;
+  }, [agent?.provider, snapshotModels]);

  const displayMode =
    availableModes.find((mode) => mode.id === agent?.currentModeId)?.label ||
@@ -1023,7 +1018,8 @@ export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
          console.warn("[AgentStatusBar] setAgentFeature failed", error);
        });
      }}
-      isModelLoading={isProviderModelsQueryLoading(modelsQuery)}
+      isModelLoading={snapshotIsLoading || snapshotIsFetching}
+      onDropdownClose={onDropdownClose}
      disabled={!client}
    />
  );
@@ -1048,6 +1044,7 @@ export function DraftAgentStatusBar({
  onSelectThinkingOption,
  features,
  onSetFeature,
+  onDropdownClose,
  disabled = false,
 }: DraftAgentStatusBarProps) {
  const isWeb = Platform.OS === "web";
@@ -1092,6 +1089,7 @@ export function DraftAgentStatusBar({
          }}
          isLoading={isAllModelsLoading}
          disabled={disabled}
+          onClose={onDropdownClose}
        />
        <ControlledStatusBar
          provider={selectedProvider}
@@ -1103,6 +1101,7 @@ export function DraftAgentStatusBar({
          onSelectThinkingOption={onSelectThinkingOption}
          features={features}
          onSetFeature={onSetFeature}
+          onDropdownClose={onDropdownClose}
          disabled={disabled}
        />
      </View>
@@ -1115,30 +1114,33 @@ export function DraftAgentStatusBar({
  }));

  return (
-    <ControlledStatusBar
-      provider={selectedProvider}
-      providerDefinitions={providerDefinitions}
-      allProviderModels={allProviderModels}
-      modeOptions={mappedModeOptions}
-      selectedModeId={effectiveSelectedMode}
-      onSelectMode={onSelectMode}
-      modelOptions={modelOptions}
-      selectedModelId={selectedModel}
-      onSelectModel={(modelId) => onSelectModel(modelId)}
-      isModelLoading={isAllModelsLoading}
-      favoriteKeys={favoriteKeys}
-      onToggleFavoriteModel={(provider, modelId) => {
-        void updatePreferences(toggleFavoriteModel({ preferences, provider, modelId })).catch((error) => {
-          console.warn("[DraftAgentStatusBar] toggle favorite model failed", error);
-        });
-      }}
-      thinkingOptions={mappedThinkingOptions.length > 0 ? mappedThinkingOptions : undefined}
-      selectedThinkingOptionId={effectiveSelectedThinkingOption}
-      onSelectThinkingOption={onSelectThinkingOption}
-      features={features}
-      onSetFeature={onSetFeature}
-      disabled={disabled}
-    />
+    <>
+      <ControlledStatusBar
+        provider={selectedProvider}
+        providerDefinitions={providerDefinitions}
+        allProviderModels={allProviderModels}
+        modeOptions={mappedModeOptions}
+        selectedModeId={effectiveSelectedMode}
+        onSelectMode={onSelectMode}
+        modelOptions={modelOptions}
+        selectedModelId={selectedModel}
+        onSelectModel={(modelId) => onSelectModel(modelId)}
+        onSelectProviderAndModel={onSelectProviderAndModel}
+        isModelLoading={isAllModelsLoading}
+        favoriteKeys={favoriteKeys}
+        onToggleFavoriteModel={(provider, modelId) => {
+          void updatePreferences(toggleFavoriteModel({ preferences, provider, modelId })).catch((error) => {
+            console.warn("[DraftAgentStatusBar] toggle favorite model failed", error);
+          });
+        }}
+        thinkingOptions={mappedThinkingOptions.length > 0 ? mappedThinkingOptions : undefined}
+        selectedThinkingOptionId={effectiveSelectedThinkingOption}
+        onSelectThinkingOption={onSelectThinkingOption}
+        features={features}
+        onSetFeature={onSetFeature}
+        disabled={disabled}
+      />
+    </>
  );
 }

--- a/packages/app/src/components/agent-stream-view.tsx
+++ b/packages/app/src/components/agent-stream-view.tsx
@@ -26,6 +26,7 @@ import { Check, ChevronDown, X } from "lucide-react-native";
 import { usePanelStore } from "@/stores/panel-store";
 import {
  AssistantMessage,
+  SpeakMessage,
  UserMessage,
  ActivityLog,
  ToolCall,
@@ -38,7 +39,10 @@ import {
 import { PlanCard } from "./plan-card";
 import type { StreamItem } from "@/types/stream";
 import type { PendingPermission } from "@/types/shared";
-import type { AgentPermissionResponse } from "@server/server/agent/agent-sdk-types";
+import type {
+  AgentPermissionAction,
+  AgentPermissionResponse,
+} from "@server/server/agent/agent-sdk-types";
 import type { AgentScreenAgent } from "@/hooks/use-agent-screen-state-machine";
 import { useSessionStore } from "@/stores/session-store";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
@@ -264,44 +268,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
      [looseGap, tightGap],
    );

-    // ---------------------------------------------------------------------------
-    // DEBUG: track when render callback deps change
-    // ---------------------------------------------------------------------------
-    const debugStreamPrevRef = useRef<Record<string, unknown>>({});
-    useEffect(() => {
-      const prev = debugStreamPrevRef.current;
-      const curr: Record<string, unknown> = {
-        // handleInlinePathPress deps (line 196-205)
-        "hip.agent.cwd": agent.cwd,
-        "hip.openFileExplorer": openFileExplorer,
-        "hip.requestDirectoryListing": requestDirectoryListing,
-        "hip.resolvedServerId": resolvedServerId,
-        "hip.router": router,
-        "hip.setExplorerTabForCheckout": setExplorerTabForCheckout,
-        "hip.onOpenWorkspaceFile": onOpenWorkspaceFile,
-        "hip.workspaceId": workspaceId,
-        // top-level deps
-        handleInlinePathPress,
-        "agent.status": agent.status,
-        streamRenderStrategy,
-        getGapBetween,
-        streamItems,
-        "streamItems.length": streamItems.length,
-        streamHead,
-        baseRenderModel,
-      };
-      const changed: string[] = [];
-      for (const key of Object.keys(curr)) {
-        if (!Object.is(prev[key], curr[key])) {
-          changed.push(key);
-        }
-      }
-      if (changed.length > 0 && Object.keys(prev).length > 0) {
-        console.log("[AgentStreamView] deps changed:", changed.join(", "));
-      }
-      debugStreamPrevRef.current = curr;
-    });
-
    const renderStreamItemContent = useCallback(
      (
        item: StreamItem,
@@ -394,6 +360,21 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi

            if (payload.source === "agent") {
              const data = payload.data;
+
+              if (
+                data.name === "speak" &&
+                data.detail.type === "unknown" &&
+                typeof data.detail.input === "string" &&
+                data.detail.input.trim()
+              ) {
+                return (
+                  <SpeakMessage
+                    message={data.detail.input}
+                    timestamp={item.timestamp.getTime()}
+                  />
+                );
+              }
+
              return (
                <ToolCall
                  toolName={data.name}
@@ -732,6 +713,29 @@ function PermissionRequestCard({
  const isPlanRequest = request.kind === "plan";
  const title = isPlanRequest ? "Plan" : (request.title ?? request.name ?? "Permission Required");
  const description = request.description ?? "";
+  const resolvedActions = useMemo((): AgentPermissionAction[] => {
+    if (request.kind === "question") {
+      return [];
+    }
+    if (Array.isArray(request.actions) && request.actions.length > 0) {
+      return request.actions;
+    }
+    return [
+      {
+        id: "reject",
+        label: "Deny",
+        behavior: "deny",
+        variant: "danger",
+        intent: "dismiss",
+      },
+      {
+        id: "accept",
+        label: isPlanRequest ? "Implement" : "Accept",
+        behavior: "allow",
+        variant: "primary",
+      },
+    ];
+  }, [isPlanRequest, request]);

  const planMarkdown = useMemo(() => {
    if (!request) {
@@ -772,11 +776,11 @@ function PermissionRequestCard({
    isPending: isResponding,
  } = permissionMutation;

-  const [respondingAction, setRespondingAction] = useState<"accept" | "deny" | null>(null);
+  const [respondingActionId, setRespondingActionId] = useState<string | null>(null);

  useEffect(() => {
    resetPermissionMutation();
-    setRespondingAction(null);
+    setRespondingActionId(null);
  }, [permission.request.id, resetPermissionMutation]);
  const handleResponse = useCallback(
    (response: AgentPermissionResponse) => {
@@ -790,6 +794,24 @@ function PermissionRequestCard({
    },
    [permission.agentId, permission.request.id, respondToPermission],
  );
+  const handleActionPress = useCallback(
+    (action: AgentPermissionAction) => {
+      setRespondingActionId(action.id);
+      if (action.behavior === "allow") {
+        handleResponse({
+          behavior: "allow",
+          selectedActionId: action.id,
+        });
+        return;
+      }
+      handleResponse({
+        behavior: "deny",
+        selectedActionId: action.id,
+        message: "Denied by user",
+      });
+    },
+    [handleResponse],
+  );

  if (request.kind === "question") {
    return (
@@ -816,64 +838,48 @@ function PermissionRequestCard({
          !isMobile && permissionStyles.optionsContainerDesktop,
        ]}
      >
-        <Pressable
-          testID="permission-request-deny"
-          style={({ pressed, hovered = false }) => [
-            permissionStyles.optionButton,
-            {
-              backgroundColor: hovered ? theme.colors.surface2 : theme.colors.surface1,
-              borderColor: theme.colors.borderAccent,
-            },
-            pressed ? permissionStyles.optionButtonPressed : null,
-          ]}
-          onPress={() => {
-            setRespondingAction("deny");
-            handleResponse({
-              behavior: "deny",
-              message: "Denied by user",
-            });
-          }}
-          disabled={isResponding}
-        >
-          {respondingAction === "deny" ? (
-            <ActivityIndicator size="small" color={theme.colors.foregroundMuted} />
-          ) : (
-            <View style={permissionStyles.optionContent}>
-              <X size={14} color={theme.colors.foregroundMuted} />
-              <Text style={[permissionStyles.optionText, { color: theme.colors.foregroundMuted }]}>
-                Deny
-              </Text>
-            </View>
-          )}
-        </Pressable>
+        {resolvedActions.map((action) => {
+          const isDanger = action.variant === "danger" || action.behavior === "deny";
+          const isPrimary = action.variant === "primary";
+          const isRespondingAction = respondingActionId === action.id;
+          const textColor = isPrimary ? theme.colors.foreground : theme.colors.foregroundMuted;
+          const iconColor = textColor;
+          const Icon = action.behavior === "allow" ? Check : X;
+          const testID =
+            action.behavior === "deny"
+              ? "permission-request-deny"
+              : action.id === "accept" || action.id === "implement"
+                ? "permission-request-accept"
+                : `permission-request-action-${action.id}`;

-        <Pressable
-          testID="permission-request-accept"
-          style={({ pressed, hovered = false }) => [
-            permissionStyles.optionButton,
-            {
-              backgroundColor: hovered ? theme.colors.surface2 : theme.colors.surface1,
-              borderColor: theme.colors.borderAccent,
-            },
-            pressed ? permissionStyles.optionButtonPressed : null,
-          ]}
-          onPress={() => {
-            setRespondingAction("accept");
-            handleResponse({ behavior: "allow" });
-          }}
-          disabled={isResponding}
-        >
-          {respondingAction === "accept" ? (
-            <ActivityIndicator size="small" color={theme.colors.foreground} />
-          ) : (
-            <View style={permissionStyles.optionContent}>
-              <Check size={14} color={theme.colors.foreground} />
-              <Text style={[permissionStyles.optionText, { color: theme.colors.foreground }]}>
-                Accept
-              </Text>
-            </View>
-          )}
-        </Pressable>
+          return (
+            <Pressable
+              key={action.id}
+              testID={testID}
+              style={({ pressed, hovered = false }) => [
+                permissionStyles.optionButton,
+                {
+                  backgroundColor: hovered ? theme.colors.surface2 : theme.colors.surface1,
+                  borderColor: isDanger ? theme.colors.borderAccent : theme.colors.borderAccent,
+                },
+                pressed ? permissionStyles.optionButtonPressed : null,
+              ]}
+              onPress={() => handleActionPress(action)}
+              disabled={isResponding}
+            >
+              {isRespondingAction ? (
+                <ActivityIndicator size="small" color={textColor} />
+              ) : (
+                <View style={permissionStyles.optionContent}>
+                  <Icon size={14} color={iconColor} />
+                  <Text style={[permissionStyles.optionText, { color: textColor }]}>
+                    {action.label}
+                  </Text>
+                </View>
+              )}
+            </Pressable>
+          );
+        })}
      </View>
    </>
  );
--- a/packages/app/src/components/combined-model-selector.tsx
+++ b/packages/app/src/components/combined-model-selector.tsx
@@ -2,11 +2,13 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
  View,
  Text,
+  TextInput,
  Pressable,
  Platform,
  ActivityIndicator,
  type GestureResponderEvent,
 } from "react-native";
+import { BottomSheetTextInput } from "@gorhom/bottom-sheet";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import {
  ArrowLeft,
@@ -15,10 +17,14 @@ import {
  Search,
  Star,
 } from "lucide-react-native";
-import type { AgentModelDefinition, AgentProvider } from "@server/server/agent/agent-sdk-types";
+import type {
+  AgentModelDefinition,
+  AgentProvider,
+} from "@server/server/agent/agent-sdk-types";
 import type { AgentProviderDefinition } from "@server/server/agent/provider-manifest";
-import { Combobox, ComboboxItem, SearchInput } from "@/components/ui/combobox";
-import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
+const IS_WEB = Platform.OS === "web";
+
+import { Combobox, ComboboxItem } from "@/components/ui/combobox";
 import { getProviderIcon } from "@/components/provider-icons";
 import type { FavoriteModelRow } from "@/hooks/use-form-preferences";
 import {
@@ -29,7 +35,8 @@ import {
  type SelectorModelRow,
 } from "./combined-model-selector.utils";

-const INLINE_MODEL_THRESHOLD = Number.POSITIVE_INFINITY;
+// TODO: this should be configured per provider in the provider manifest
+const PROVIDERS_WITH_MODEL_DESCRIPTIONS = new Set(["opencode", "pi"]);

 type SelectorView =
  | { kind: "all" }
@@ -51,6 +58,7 @@ interface CombinedModelSelectorProps {
    disabled: boolean;
    isOpen: boolean;
  }) => React.ReactNode;
+  onClose?: () => void;
  disabled?: boolean;
 }

@@ -67,7 +75,6 @@ interface SelectorContentProps {
  canSelectProvider: (provider: string) => boolean;
  onToggleFavorite?: (provider: string, modelId: string) => void;
  onDrillDown: (providerId: string, providerLabel: string) => void;
-  onBack?: () => void;
 }

 function resolveDefaultModelLabel(models: AgentModelDefinition[] | undefined): string {
@@ -99,6 +106,22 @@ function partitionRows(
  return { favoriteRows, regularRows };
 }

+function sortFavoritesFirst(
+  rows: SelectorModelRow[],
+  favoriteKeys: Set<string>,
+): SelectorModelRow[] {
+  const favorites: SelectorModelRow[] = [];
+  const rest: SelectorModelRow[] = [];
+  for (const row of rows) {
+    if (favoriteKeys.has(row.favoriteKey)) {
+      favorites.push(row);
+    } else {
+      rest.push(row);
+    }
+  }
+  return [...favorites, ...rest];
+}
+
 function groupRowsByProvider(
  rows: SelectorModelRow[],
 ): Array<{ providerId: string; providerLabel: string; rows: SelectorModelRow[] }> {
@@ -126,6 +149,7 @@ function ModelRow({
  isSelected,
  isFavorite,
  disabled = false,
+  elevated = false,
  onPress,
  onToggleFavorite,
 }: {
@@ -133,12 +157,12 @@ function ModelRow({
  isSelected: boolean;
  isFavorite: boolean;
  disabled?: boolean;
+  elevated?: boolean;
  onPress: () => void;
  onToggleFavorite?: (provider: string, modelId: string) => void;
 }) {
  const { theme } = useUnistyles();
  const ProviderIcon = getProviderIcon(row.provider);
-  const isWeb = Platform.OS === "web";

  const handleToggleFavorite = useCallback(
    (event: GestureResponderEvent) => {
@@ -148,13 +172,18 @@ function ModelRow({
    [onToggleFavorite, row.modelId, row.provider],
  );

-  const item = (
+  const showDescription =
+    row.description && PROVIDERS_WITH_MODEL_DESCRIPTIONS.has(row.provider);
+
+  return (
    <ComboboxItem
      label={row.modelLabel}
+      description={showDescription ? row.description : undefined}
      selected={isSelected}
      disabled={disabled}
+      elevated={elevated}
      onPress={onPress}
-      leadingSlot={<ProviderIcon size={14} color={theme.colors.foregroundMuted} />}
+      leadingSlot={<ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />}
      trailingSlot={
        onToggleFavorite && !disabled ? (
          <Pressable
@@ -187,21 +216,6 @@ function ModelRow({
      }
    />
  );
-
-  if (!isWeb || !row.description) {
-    return item;
-  }
-
-  return (
-    <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
-      <TooltipTrigger asChild triggerRefProp="ref">
-        <View>{item}</View>
-      </TooltipTrigger>
-      <TooltipContent side="right" align="center" offset={4}>
-        <Text style={styles.tooltipText}>{row.description}</Text>
-      </TooltipContent>
-    </Tooltip>
-  );
 }

 function FavoritesSection({
@@ -228,7 +242,7 @@ function FavoritesSection({
  }

  return (
-    <View>
+    <View style={styles.favoritesContainer}>
      <View style={styles.sectionHeading}>
        <Text style={styles.sectionHeadingText}>Favorites</Text>
      </View>
@@ -239,11 +253,11 @@ function FavoritesSection({
          isSelected={row.provider === selectedProvider && row.modelId === selectedModel}
          isFavorite={favoriteKeys.has(row.favoriteKey)}
          disabled={!canSelectProvider(row.provider)}
+          elevated
          onPress={() => onSelect(row.provider, row.modelId)}
          onToggleFavorite={onToggleFavorite}
        />
      ))}
-      <View style={styles.separator} />
    </View>
  );
 }
@@ -258,6 +272,7 @@ function GroupedProviderRows({
  canSelectProvider,
  onToggleFavorite,
  onDrillDown,
+  viewKind,
 }: {
  providerDefinitions: AgentProviderDefinition[];
  groupedRows: Array<{ providerId: string; providerLabel: string; rows: SelectorModelRow[] }>;
@@ -268,6 +283,7 @@ function GroupedProviderRows({
  canSelectProvider: (provider: string) => boolean;
  onToggleFavorite?: (provider: string, modelId: string) => void;
  onDrillDown: (providerId: string, providerLabel: string) => void;
+  viewKind: SelectorView["kind"];
 }) {
  const { theme } = useUnistyles();

@@ -276,19 +292,14 @@ function GroupedProviderRows({
      {groupedRows.map((group, index) => {
        const providerDefinition = providerDefinitions.find((definition) => definition.id === group.providerId);
        const ProvIcon = getProviderIcon(group.providerId);
-        const isInline = group.rows.length <= INLINE_MODEL_THRESHOLD;
+        const isInline = viewKind === "provider";

        return (
          <View key={group.providerId}>
            {index > 0 ? <View style={styles.separator} /> : null}
            {isInline ? (
              <>
-                <View style={styles.sectionHeading}>
-                  <Text style={styles.sectionHeadingText}>
-                    {providerDefinition?.label ?? group.providerLabel}
-                  </Text>
-                </View>
-                {group.rows.map((row) => (
+                {sortFavoritesFirst(group.rows, favoriteKeys).map((row) => (
                  <ModelRow
                    key={row.favoriteKey}
                    row={row}
@@ -309,11 +320,13 @@ function GroupedProviderRows({
                  pressed && styles.drillDownRowPressed,
                ]}
              >
-                <ProvIcon size={14} color={theme.colors.foregroundMuted} />
+                <ProvIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
                <Text style={styles.drillDownText}>{group.providerLabel}</Text>
                <View style={styles.drillDownTrailing}>
-                  <Text style={styles.drillDownCount}>{group.rows.length}</Text>
-                  <ChevronRight size={14} color={theme.colors.foregroundMuted} />
+                  <Text style={styles.drillDownCount}>
+                    {group.rows.length} {group.rows.length === 1 ? "model" : "models"}
+                  </Text>
+                  <ChevronRight size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
                </View>
              </Pressable>
            )}
@@ -324,6 +337,46 @@ function GroupedProviderRows({
  );
 }

+function ProviderSearchInput({
+  value,
+  onChangeText,
+  autoFocus = false,
+}: {
+  value: string;
+  onChangeText: (text: string) => void;
+  autoFocus?: boolean;
+}) {
+  const { theme } = useUnistyles();
+  const inputRef = useRef<TextInput>(null);
+  const InputComponent = Platform.OS === "web" ? TextInput : BottomSheetTextInput;
+
+  useEffect(() => {
+    if (autoFocus && Platform.OS === "web" && inputRef.current) {
+      const timer = setTimeout(() => {
+        inputRef.current?.focus();
+      }, 50);
+      return () => clearTimeout(timer);
+    }
+  }, [autoFocus]);
+
+  return (
+    <View style={styles.providerSearchContainer}>
+      <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+      <InputComponent
+        ref={inputRef as any}
+        // @ts-expect-error - outlineStyle is web-only
+        style={[styles.providerSearchInput, Platform.OS === "web" && { outlineStyle: "none" }]}
+        placeholder="Search models..."
+        placeholderTextColor={theme.colors.foregroundMuted}
+        value={value}
+        onChangeText={onChangeText}
+        autoCapitalize="none"
+        autoCorrect={false}
+      />
+    </View>
+  );
+}
+
 function SelectorContent({
  view,
  providerDefinitions,
@@ -337,8 +390,8 @@ function SelectorContent({
  canSelectProvider,
  onToggleFavorite,
  onDrillDown,
-  onBack,
 }: SelectorContentProps) {
+  const { theme } = useUnistyles();
  const allRows = useMemo(
    () => buildModelRows(providerDefinitions, allProviderModels),
    [allProviderModels, providerDefinitions],
@@ -363,35 +416,41 @@ function SelectorContent({
    [favoriteKeys, visibleRows],
  );

-  const groupedRegularRows = useMemo(() => groupRowsByProvider(regularRows), [regularRows]);
+  // Group ALL visible rows by provider — favorites are a cross-cutting view,
+  // not a partition. A model being favorited doesn't remove it from its provider.
+  const allGroupedRows = useMemo(() => groupRowsByProvider(visibleRows), [visibleRows]);
+
+  // When searching at Level 1, filter grouped rows to only providers whose name or models match
+  const filteredGroupedRows = useMemo(() => {
+    if (view.kind === "provider" || !normalizedQuery) {
+      return allGroupedRows;
+    }
+    return allGroupedRows.filter(
+      (group) =>
+        group.providerLabel.toLowerCase().includes(normalizedQuery) || group.rows.length > 0,
+    );
+  }, [allGroupedRows, normalizedQuery, view.kind]);
+
+  const hasResults = favoriteRows.length > 0 || filteredGroupedRows.length > 0;

  return (
    <View>
-      {view.kind === "provider" ? (
-        <ProviderBackButton providerId={view.providerId} providerLabel={view.providerLabel} onBack={onBack} />
+      {view.kind === "all" ? (
+        <FavoritesSection
+          favoriteRows={favoriteRows}
+          selectedProvider={selectedProvider}
+          selectedModel={selectedModel}
+          favoriteKeys={favoriteKeys}
+          onSelect={onSelect}
+          canSelectProvider={canSelectProvider}
+          onToggleFavorite={onToggleFavorite}
+        />
      ) : null}

-      <SearchInput
-        placeholder={view.kind === "provider" ? "Search models..." : "Search models or providers..."}
-        value={searchQuery}
-        onChangeText={onSearchChange}
-        autoFocus={Platform.OS === "web"}
-      />
-
-      <FavoritesSection
-        favoriteRows={favoriteRows}
-        selectedProvider={selectedProvider}
-        selectedModel={selectedModel}
-        favoriteKeys={favoriteKeys}
-        onSelect={onSelect}
-        canSelectProvider={canSelectProvider}
-        onToggleFavorite={onToggleFavorite}
-      />
-
-      {groupedRegularRows.length > 0 ? (
+      {filteredGroupedRows.length > 0 ? (
        <GroupedProviderRows
          providerDefinitions={providerDefinitions}
-          groupedRows={groupedRegularRows}
+          groupedRows={filteredGroupedRows}
          selectedProvider={selectedProvider}
          selectedModel={selectedModel}
          favoriteKeys={favoriteKeys}
@@ -399,12 +458,13 @@ function SelectorContent({
          canSelectProvider={canSelectProvider}
          onToggleFavorite={onToggleFavorite}
          onDrillDown={onDrillDown}
+          viewKind={view.kind}
        />
      ) : null}

-      {favoriteRows.length === 0 && groupedRegularRows.length === 0 ? (
+      {!hasResults ? (
        <View style={styles.emptyState}>
-          <Search size={16} color="#777" />
+          <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
          <Text style={styles.emptyStateText}>No models match your search</Text>
        </View>
      ) : null}
@@ -437,8 +497,8 @@ function ProviderBackButton({
        pressed && styles.backButtonPressed,
      ]}
    >
-      <ArrowLeft size={14} color={theme.colors.foregroundMuted} />
-      <ProviderIcon size={14} color={theme.colors.foregroundMuted} />
+      <ArrowLeft size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+      <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
      <Text style={styles.backButtonText}>{providerLabel}</Text>
    </Pressable>
  );
@@ -455,6 +515,7 @@ export function CombinedModelSelector({
  favoriteKeys = new Set<string>(),
  onToggleFavorite,
  renderTrigger,
+  onClose,
  disabled = false,
 }: CombinedModelSelectorProps) {
  const { theme } = useUnistyles();
@@ -465,25 +526,35 @@ export function CombinedModelSelector({
  const [view, setView] = useState<SelectorView>({ kind: "all" });
  const [searchQuery, setSearchQuery] = useState("");

+  // Single-provider mode: only one provider with models → skip Level 1 entirely
+  const singleProviderView = useMemo<SelectorView | null>(() => {
+    const providers = Array.from(allProviderModels.keys());
+    if (providers.length !== 1) return null;
+    const providerId = providers[0]!;
+    const label = resolveProviderLabel(providerDefinitions, providerId);
+    return { kind: "provider", providerId, providerLabel: label };
+  }, [allProviderModels, providerDefinitions]);
+
  const handleOpenChange = useCallback(
    (open: boolean) => {
      setIsOpen(open);
-      setView({ kind: "all" });
+      setView(singleProviderView ?? { kind: "all" });
      if (!open) {
        setSearchQuery("");
+        onClose?.();
      }
    },
-    [],
+    [onClose, singleProviderView],
  );

  const handleSelect = useCallback(
    (provider: string, modelId: string) => {
      onSelect(provider as AgentProvider, modelId);
      setIsOpen(false);
-      setView({ kind: "all" });
+      setView(singleProviderView ?? { kind: "all" });
      setSearchQuery("");
    },
-    [onSelect],
+    [onSelect, singleProviderView],
  );

  const ProviderIcon = getProviderIcon(selectedProvider);
@@ -501,6 +572,15 @@ export function CombinedModelSelector({
    return model?.label ?? resolveDefaultModelLabel(models);
  }, [allProviderModels, isLoading, selectedModel, selectedProvider]);

+  const desktopFixedHeight = useMemo(() => {
+    if (view.kind !== "provider") {
+      return undefined;
+    }
+    const models = allProviderModels.get(view.providerId);
+    const modelCount = models?.length ?? 0;
+    return Math.min(80 + modelCount * 40, 400);
+  }, [allProviderModels, view]);
+
  const triggerLabel = useMemo(() => {
    if (selectedModelLabel === "Loading..." || selectedModelLabel === "Select model") {
      return selectedModelLabel;
@@ -568,7 +648,30 @@ export function CombinedModelSelector({
        stackBehavior="push"
        anchorRef={anchorRef}
        desktopPlacement="top-start"
+        desktopMinWidth={360}
+        desktopFixedHeight={desktopFixedHeight}
        title="Select model"
+        stickyHeader={
+          view.kind === "provider" ? (
+            <View style={styles.level2Header}>
+              {!singleProviderView ? (
+                <ProviderBackButton
+                  providerId={view.providerId}
+                  providerLabel={view.providerLabel}
+                  onBack={() => {
+                    setView({ kind: "all" });
+                    setSearchQuery("");
+                  }}
+                />
+              ) : null}
+              <ProviderSearchInput
+                value={searchQuery}
+                onChangeText={setSearchQuery}
+                autoFocus={Platform.OS === "web"}
+              />
+            </View>
+          ) : undefined
+        }
      >
        {isContentReady ? (
          <SelectorContent
@@ -586,13 +689,6 @@ export function CombinedModelSelector({
            onDrillDown={(providerId, providerLabel) => {
              setView({ kind: "provider", providerId, providerLabel });
            }}
-            onBack={
-              view.kind === "provider"
-                ? () => {
-                    setView({ kind: "all" });
-                  }
-                : undefined
-            }
          />
        ) : (
          <View style={styles.sheetLoadingState}>
@@ -634,17 +730,23 @@ const styles = StyleSheet.create((theme) => ({
    paddingVertical: 0,
    height: "auto",
  },
+  favoritesContainer: {
+    backgroundColor: theme.colors.surface1,
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.border,
+  },
  separator: {
    height: 1,
    backgroundColor: theme.colors.border,
-    marginVertical: theme.spacing[1],
  },
  sectionHeading: {
    flexDirection: "row",
    alignItems: "center",
    gap: theme.spacing[2],
    paddingHorizontal: theme.spacing[3],
-    paddingVertical: theme.spacing[1],
+    paddingTop: theme.spacing[2],
+    paddingBottom: theme.spacing[1],
+    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
  },
  sectionHeadingText: {
    fontSize: theme.fontSize.xs,
@@ -658,6 +760,7 @@ const styles = StyleSheet.create((theme) => ({
    paddingHorizontal: theme.spacing[3],
    paddingVertical: theme.spacing[2],
    minHeight: 36,
+    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
  },
  drillDownRowHovered: {
    backgroundColor: theme.colors.surface1,
@@ -667,8 +770,8 @@ const styles = StyleSheet.create((theme) => ({
  },
  drillDownText: {
    flex: 1,
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foreground,
  },
  drillDownTrailing: {
    flexDirection: "row",
@@ -679,6 +782,11 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.xs,
    color: theme.colors.foregroundMuted,
  },
+  level2Header: {
+    backgroundColor: theme.colors.surface1,
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.border,
+  },
  backButton: {
    flexDirection: "row",
    alignItems: "center",
@@ -687,9 +795,10 @@ const styles = StyleSheet.create((theme) => ({
    paddingVertical: theme.spacing[2],
    borderBottomWidth: 1,
    borderBottomColor: theme.colors.border,
+    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
  },
  backButtonHovered: {
-    backgroundColor: theme.colors.surface1,
+    backgroundColor: theme.colors.surface2,
  },
  backButtonPressed: {
    backgroundColor: theme.colors.surface2,
@@ -720,10 +829,6 @@ const styles = StyleSheet.create((theme) => ({
  favoriteButtonPressed: {
    backgroundColor: theme.colors.surface1,
  },
-  tooltipText: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.xs,
-  },
  sheetLoadingState: {
    minHeight: 160,
    justifyContent: "center",
@@ -734,4 +839,17 @@ const styles = StyleSheet.create((theme) => ({
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.sm,
  },
+  providerSearchContainer: {
+    flexDirection: "row",
+    alignItems: "center",
+    paddingHorizontal: theme.spacing[3],
+    gap: theme.spacing[2],
+    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
+  },
+  providerSearchInput: {
+    flex: 1,
+    paddingVertical: theme.spacing[3],
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+  },
 }));
--- a/packages/app/src/components/context-window-meter.tsx
+++ b/packages/app/src/components/context-window-meter.tsx
@@ -0,0 +1,153 @@
+import { Pressable, Text, View } from "react-native";
+import Svg, { Circle } from "react-native-svg";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+
+type ContextWindowMeterProps = {
+  maxTokens: number;
+  usedTokens: number;
+};
+
+const SVG_SIZE = 20;
+const CENTER = SVG_SIZE / 2;
+const RADIUS = 7;
+const STROKE_WIDTH = 2.25;
+const CIRCUMFERENCE = 2 * Math.PI * RADIUS;
+
+function isValidMaxTokens(value: number): boolean {
+  return Number.isFinite(value) && value > 0;
+}
+
+function isValidUsedTokens(value: number): boolean {
+  return Number.isFinite(value) && value >= 0;
+}
+
+function getUsagePercentage(maxTokens: number, usedTokens: number): number | null {
+  if (!isValidMaxTokens(maxTokens) || !isValidUsedTokens(usedTokens)) {
+    return null;
+  }
+  return (usedTokens / maxTokens) * 100;
+}
+
+function clampPercentage(value: number): number {
+  return Math.max(0, Math.min(100, value));
+}
+
+function formatTokenCount(value: number): string {
+  if (value >= 1_000_000) {
+    return `${Math.round(value / 1_000_000)}m`;
+  }
+  if (value >= 1_000) {
+    return `${Math.round(value / 1_000)}k`;
+  }
+  return Math.round(value).toString();
+}
+
+function getMeterColors(
+  percentage: number,
+  theme: ReturnType<typeof useUnistyles>["theme"],
+): { progress: string; track: string } {
+  const track = theme.colors.surface3;
+  if (percentage > 90) {
+    return { progress: theme.colors.destructive, track };
+  }
+  if (percentage >= 70) {
+    return { progress: theme.colors.palette.amber[500], track };
+  }
+  return { progress: theme.colors.foregroundMuted, track };
+}
+
+export function ContextWindowMeter({ maxTokens, usedTokens }: ContextWindowMeterProps) {
+  const { theme } = useUnistyles();
+  const percentage = getUsagePercentage(maxTokens, usedTokens);
+
+  if (percentage === null) {
+    return null;
+  }
+
+  const clampedPercentage = clampPercentage(percentage);
+  const roundedPercentage = Math.round(percentage);
+  const dashOffset = CIRCUMFERENCE - (clampedPercentage / 100) * CIRCUMFERENCE;
+  const colors = getMeterColors(clampedPercentage, theme);
+
+  return (
+    <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile>
+      <TooltipTrigger asChild triggerRefProp="ref">
+        <Pressable
+          style={styles.container}
+          accessibilityRole="image"
+          accessibilityLabel={`Context window ${roundedPercentage}% used`}
+        >
+          <Svg
+            width={SVG_SIZE}
+            height={SVG_SIZE}
+            viewBox={`0 0 ${SVG_SIZE} ${SVG_SIZE}`}
+            style={styles.svg}
+            accessibilityElementsHidden
+            importantForAccessibility="no-hide-descendants"
+          >
+            <Circle
+              cx={CENTER}
+              cy={CENTER}
+              r={RADIUS}
+              fill="none"
+              stroke={colors.track}
+              strokeWidth={STROKE_WIDTH}
+            />
+            <Circle
+              cx={CENTER}
+              cy={CENTER}
+              r={RADIUS}
+              fill="none"
+              stroke={colors.progress}
+              strokeWidth={STROKE_WIDTH}
+              strokeLinecap="round"
+              strokeDasharray={CIRCUMFERENCE}
+              strokeDashoffset={dashOffset}
+            />
+          </Svg>
+        </Pressable>
+      </TooltipTrigger>
+      <TooltipContent side="top" align="center" offset={8}>
+        <View style={styles.tooltipContent}>
+          <Text style={styles.tooltipTitle}>Context window</Text>
+          <Text style={styles.tooltipText}>{`${roundedPercentage}% used`}</Text>
+          <Text
+            style={styles.tooltipDetail}
+          >{`${formatTokenCount(usedTokens)} / ${formatTokenCount(maxTokens)} tokens`}</Text>
+        </View>
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  container: {
+    width: 28,
+    height: 28,
+    borderRadius: theme.borderRadius.full,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  svg: {
+    transform: [{ rotate: "-90deg" }],
+  },
+  tooltipContent: {
+    gap: theme.spacing[1],
+  },
+  tooltipTitle: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.semibold,
+  },
+  tooltipText: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    lineHeight: theme.fontSize.sm * 1.4,
+  },
+  tooltipDetail: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.xs,
+    lineHeight: theme.fontSize.xs * 1.4,
+  },
+}));
--- a/packages/app/src/components/file-explorer-pane.tsx
+++ b/packages/app/src/components/file-explorer-pane.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
  ActivityIndicator,
@@ -118,7 +118,6 @@ export function FileExplorerPane({
  );

  const {
-    workspaceStateKey: actionsWorkspaceStateKey,
    requestDirectoryListing,
    requestFileDownloadToken,
    selectExplorerEntry,
@@ -129,6 +128,16 @@ export function FileExplorerPane({
  });
  const sortOption = usePanelStore((state) => state.explorerSortOption);
  const setSortOption = usePanelStore((state) => state.setExplorerSortOption);
+  const expandedPathsArray = usePanelStore((state) =>
+    workspaceStateKey ? state.expandedPathsByWorkspace[workspaceStateKey] : undefined,
+  );
+  const setExpandedPathsForWorkspace = usePanelStore(
+    (state) => state.setExpandedPathsForWorkspace,
+  );
+  const expandedPaths = useMemo(
+    () => new Set(expandedPathsArray && expandedPathsArray.length > 0 ? expandedPathsArray : ["."]),
+    [expandedPathsArray],
+  );

  const directories = explorerState?.directories ?? new Map();
  const pendingRequest = explorerState?.pendingRequest ?? null;
@@ -144,7 +153,6 @@ export function FileExplorerPane({
    [isExplorerLoading, pendingRequest?.mode, pendingRequest?.path],
  );

-  const [expandedPaths, setExpandedPaths] = useState<Set<string>>(() => new Set(["."]));
  const treeListRef = useRef<FlatList<TreeRow>>(null);
  const scrollbar = useWebScrollViewScrollbar(treeListRef, {
    enabled: showDesktopWebScrollbar,
@@ -154,8 +162,7 @@ export function FileExplorerPane({

  useEffect(() => {
    hasInitializedRef.current = false;
-    setExpandedPaths(new Set(["."]));
-  }, [actionsWorkspaceStateKey]);
+  }, [workspaceStateKey]);

  useEffect(() => {
    if (!hasWorkspaceScope) {
@@ -169,23 +176,35 @@ export function FileExplorerPane({
      recordHistory: false,
      setCurrentPath: false,
    });
-  }, [hasWorkspaceScope, requestDirectoryListing]);
+    const persistedPaths = usePanelStore.getState().expandedPathsByWorkspace[workspaceStateKey ?? ""];
+    if (persistedPaths) {
+      for (const path of persistedPaths) {
+        if (path !== ".") {
+          void requestDirectoryListing(path, {
+            recordHistory: false,
+            setCurrentPath: false,
+          });
+        }
+      }
+    }
+  }, [hasWorkspaceScope, requestDirectoryListing, workspaceStateKey]);

  // Expand ancestor directories when a file is selected (e.g., from an inline path click)
  useEffect(() => {
-    if (!selectedEntryPath || !hasWorkspaceScope) {
+    if (!selectedEntryPath || !workspaceStateKey) {
      return;
    }
    const parentDir = getParentDirectory(selectedEntryPath);
    const ancestors = getAncestorDirectories(parentDir);
-
-    setExpandedPaths((prev) => {
-      const next = new Set(prev);
-      ancestors.forEach((path) => next.add(path));
-      return next;
-    });
-
-    ancestors.forEach((path) => {
+    const newPaths = ancestors.filter((path) => !expandedPaths.has(path));
+    if (newPaths.length === 0) {
+      return;
+    }
+    setExpandedPathsForWorkspace(
+      workspaceStateKey,
+      [...Array.from(expandedPaths), ...newPaths],
+    );
+    newPaths.forEach((path) => {
      if (!directories.has(path)) {
        void requestDirectoryListing(path, {
          recordHistory: false,
@@ -193,34 +212,46 @@ export function FileExplorerPane({
        });
      }
    });
-  }, [directories, hasWorkspaceScope, requestDirectoryListing, selectedEntryPath]);
+  }, [
+    directories,
+    workspaceStateKey,
+    expandedPaths,
+    requestDirectoryListing,
+    selectedEntryPath,
+    setExpandedPathsForWorkspace,
+  ]);

  const handleToggleDirectory = useCallback(
    (entry: ExplorerEntry) => {
-      if (!hasWorkspaceScope) {
+      if (!workspaceStateKey) {
        return;
      }
-
      const isExpanded = expandedPaths.has(entry.path);
-      const nextExpanded = !isExpanded;
-      setExpandedPaths((prev) => {
-        const next = new Set(prev);
-        if (isExpanded) {
-          next.delete(entry.path);
-        } else {
-          next.add(entry.path);
+      if (isExpanded) {
+        setExpandedPathsForWorkspace(
+          workspaceStateKey,
+          Array.from(expandedPaths).filter((path) => path !== entry.path),
+        );
+      } else {
+        setExpandedPathsForWorkspace(
+          workspaceStateKey,
+          [...Array.from(expandedPaths), entry.path],
+        );
+        if (!directories.has(entry.path)) {
+          void requestDirectoryListing(entry.path, {
+            recordHistory: false,
+            setCurrentPath: false,
+          });
        }
-        return next;
-      });
-
-      if (nextExpanded && !directories.has(entry.path)) {
-        void requestDirectoryListing(entry.path, {
-          recordHistory: false,
-          setCurrentPath: false,
-        });
      }
    },
-    [directories, expandedPaths, hasWorkspaceScope, requestDirectoryListing],
+    [
+      workspaceStateKey,
+      expandedPaths,
+      directories,
+      requestDirectoryListing,
+      setExpandedPathsForWorkspace,
+    ],
  );

  const handleOpenFile = useCallback(
--- a/packages/app/src/components/git-diff-pane.tsx
+++ b/packages/app/src/components/git-diff-pane.tsx
--- a/packages/app/src/components/icons/editor-app-icons.tsx
+++ b/packages/app/src/components/icons/editor-app-icons.tsx
@@ -0,0 +1,32 @@
+import { Image, type ImageSourcePropType } from "react-native";
+import type { EditorTargetId } from "@server/shared/messages";
+
+interface EditorAppIconProps {
+  editorId: EditorTargetId;
+  size?: number;
+  color?: string;
+}
+
+/* eslint-disable @typescript-eslint/no-require-imports */
+const EDITOR_APP_IMAGES: Record<EditorTargetId, ImageSourcePropType> = {
+  cursor: require("../../../assets/images/editor-apps/cursor.png"),
+  vscode: require("../../../assets/images/editor-apps/vscode.png"),
+  zed: require("../../../assets/images/editor-apps/zed.png"),
+  finder: require("../../../assets/images/editor-apps/finder.png"),
+  explorer: require("../../../assets/images/editor-apps/file-explorer.png"),
+  "file-manager": require("../../../assets/images/editor-apps/file-explorer.png"),
+};
+/* eslint-enable @typescript-eslint/no-require-imports */
+
+export function EditorAppIcon({
+  editorId,
+  size = 16,
+}: EditorAppIconProps) {
+  return (
+    <Image
+      source={EDITOR_APP_IMAGES[editorId]}
+      style={{ width: size, height: size }}
+      resizeMode="contain"
+    />
+  );
+}
--- a/packages/app/src/components/message-input.tsx
+++ b/packages/app/src/components/message-input.tsx
@@ -79,6 +79,8 @@ export interface MessageInputProps {
  isInputActive?: boolean;
  /** Content to render on the left side of the button row (e.g., AgentStatusBar) */
  leftContent?: React.ReactNode;
+  /** Content to render on the right side before the voice button (e.g., context window meter) */
+  beforeVoiceContent?: React.ReactNode;
  /** Content to render on the right side after voice button (e.g., realtime button, cancel button) */
  rightContent?: React.ReactNode;
  voiceServerId?: string;
@@ -100,7 +102,7 @@ export interface MessageInputProps {
 export interface MessageInputRef {
  focus: () => void;
  blur: () => void;
-  runKeyboardAction: (action: MessageInputKeyboardActionKind) => void;
+  runKeyboardAction: (action: MessageInputKeyboardActionKind) => boolean;
  /**
   * Web-only: return the underlying DOM element for focus assertions/retries.
   * May return null if not mounted or on native.
@@ -201,6 +203,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
    disabled = false,
    isInputActive = true,
    leftContent,
+    beforeVoiceContent,
    rightContent,
    voiceServerId,
    voiceAgentId,
@@ -242,26 +245,35 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
    runKeyboardAction: (action) => {
      if (action === "focus") {
        textInputRef.current?.focus();
-        return;
+        return true;
+      }
+
+      if (action === "send" || action === "dictation-confirm") {
+        if (isDictatingRef.current) {
+          sendAfterTranscriptRef.current = true;
+          confirmDictation();
+          return true;
+        }
+        return false;
      }

      if (action === "voice-toggle") {
        handleToggleRealtimeVoiceShortcut();
-        return;
+        return true;
      }

      if (action === "voice-mute-toggle") {
        if (isRealtimeVoiceForCurrentAgent) {
          voice?.toggleMute();
        }
-        return;
+        return true;
      }

      if (action === "dictation-cancel") {
        if (isDictatingRef.current) {
          cancelDictation();
        }
-        return;
+        return true;
      }

      if (action === "dictation-toggle") {
@@ -271,7 +283,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
        } else {
          void startDictationIfAvailable();
        }
+        return true;
      }
+
+      return false;
    },
    getNativeElement: () => {
      if (!IS_WEB) return null;
@@ -1003,6 +1018,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct

          {/* Right: voice button, contextual button (realtime/send/cancel) */}
          <View style={styles.rightButtonGroup}>
+            {beforeVoiceContent}
            <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
              <TooltipTrigger
                onPress={handleVoicePress}
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -39,6 +39,7 @@ import {
  Copy,
  TriangleAlertIcon,
  Scissors,
+  MicVocal,
 } from "lucide-react-native";
 import { StyleSheet, useUnistyles, UnistylesRuntime } from "react-native-unistyles";
 import Animated, {
@@ -717,13 +718,6 @@ export const AssistantMessage = memo(function AssistantMessage({
  workspaceRoot,
  disableOuterSpacing,
 }: AssistantMessageProps) {
-  // DEBUG: log when AssistantMessage actually renders (inside memo boundary)
-  console.log("[AssistantMessage] render", {
-    messageLength: message?.length,
-    timestamp,
-    hasOnInlinePathPress: !!onInlinePathPress,
-  });
-
  const { theme, rt } = useUnistyles();
  const resolvedDisableOuterSpacing = useDisableOuterSpacing(disableOuterSpacing);

@@ -920,6 +914,65 @@ export const AssistantMessage = memo(function AssistantMessage({
  );
 });

+interface SpeakMessageProps {
+  message: string;
+  timestamp: number;
+  disableOuterSpacing?: boolean;
+}
+
+const speakMessageStylesheet = StyleSheet.create((theme) => ({
+  container: {
+    paddingHorizontal: theme.spacing[2],
+    paddingVertical: theme.spacing[3],
+  },
+  containerSpacing: {
+    marginBottom: theme.spacing[4],
+  },
+  header: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    marginBottom: theme.spacing[2],
+  },
+  headerLabel: {
+    fontFamily: Fonts.sans,
+    fontSize: 12,
+    fontWeight: "500",
+    color: theme.colors.foregroundMuted,
+  },
+  text: {
+    fontFamily: Fonts.sans,
+    fontSize: theme.fontSize.base,
+    lineHeight: 22,
+    color: theme.colors.foreground,
+  },
+}));
+
+export const SpeakMessage = memo(function SpeakMessage({
+  message,
+  timestamp,
+  disableOuterSpacing,
+}: SpeakMessageProps) {
+  const { theme } = useUnistyles();
+  const resolvedDisableOuterSpacing = useDisableOuterSpacing(disableOuterSpacing);
+
+  return (
+    <View
+      testID="speak-message"
+      style={[
+        speakMessageStylesheet.container,
+        !resolvedDisableOuterSpacing && speakMessageStylesheet.containerSpacing,
+      ]}
+    >
+      <View style={speakMessageStylesheet.header}>
+        <MicVocal size={14} color={theme.colors.foregroundMuted} />
+        <Text style={speakMessageStylesheet.headerLabel}>Spoke</Text>
+      </View>
+      <Text style={speakMessageStylesheet.text}>{message}</Text>
+    </View>
+  );
+});
+
 interface ActivityLogProps {
  type: "system" | "info" | "success" | "error" | "artifact";
  message: string;
@@ -1765,9 +1818,6 @@ export const ToolCall = memo(function ToolCall({
  onInlineDetailsHoverChange,
  onInlineDetailsExpandedChange,
 }: ToolCallProps) {
-  // DEBUG: log when ToolCall actually renders (inside memo boundary)
-  console.log("[ToolCall] render", { toolName, status });
-
  const { openToolCall } = useToolCallSheet();
  const [isExpanded, setIsExpanded] = useState(false);

--- a/packages/app/src/components/plan-card.tsx
+++ b/packages/app/src/components/plan-card.tsx
@@ -78,9 +78,17 @@ function createPlanMarkdownRules() {
      const contentStyle = isOrdered ? styles.ordered_list_content : styles.bullet_list_content;

      return (
-        <View key={node.key} style={[styles.list_item, { flexShrink: 0 }]}>
+        <View key={node.key} style={styles.list_item}>
          <Text style={iconStyle}>{marker}</Text>
-          <Text style={[contentStyle, { flex: 1, flexShrink: 1, minWidth: 0 }]}>{children}</Text>
+          <View style={[contentStyle, { flex: 1, flexShrink: 1, minWidth: 0 }]}>{children}</View>
+        </View>
+      );
+    },
+    paragraph: (node: any, children: ReactNode[], parent: any, styles: any) => {
+      const isLastChild = parent[0]?.children?.at(-1)?.key === node.key;
+      return (
+        <View key={node.key} style={[styles.paragraph, isLastChild && { marginBottom: 0 }]}>
+          {children}
        </View>
      );
    },
--- a/packages/app/src/components/provider-diagnostic-sheet.tsx
+++ b/packages/app/src/components/provider-diagnostic-sheet.tsx
@@ -0,0 +1,102 @@
+import { useCallback, useEffect, useState } from "react";
+import { View, Text, ActivityIndicator, ScrollView } from "react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { useHostRuntimeClient } from "@/runtime/host-runtime";
+import type { AgentProvider } from "@server/server/agent/agent-sdk-types";
+import { AGENT_PROVIDER_DEFINITIONS } from "@server/server/agent/provider-manifest";
+
+interface ProviderDiagnosticSheetProps {
+  provider: string;
+  visible: boolean;
+  onClose: () => void;
+  serverId: string;
+}
+
+export function ProviderDiagnosticSheet({
+  provider,
+  visible,
+  onClose,
+  serverId,
+}: ProviderDiagnosticSheetProps) {
+  const { theme } = useUnistyles();
+  const client = useHostRuntimeClient(serverId);
+  const [diagnostic, setDiagnostic] = useState<string | null>(null);
+  const [loading, setLoading] = useState(false);
+
+  const providerLabel = AGENT_PROVIDER_DEFINITIONS.find((d) => d.id === provider)?.label ?? provider;
+
+  const fetchDiagnostic = useCallback(async () => {
+    if (!client || !provider) return;
+
+    setLoading(true);
+    setDiagnostic(null);
+
+    try {
+      const result = await client.getProviderDiagnostic(provider as AgentProvider);
+      setDiagnostic(result.diagnostic);
+    } catch (err) {
+      setDiagnostic(err instanceof Error ? err.message : "Failed to fetch diagnostic");
+    } finally {
+      setLoading(false);
+    }
+  }, [client, provider]);
+
+  useEffect(() => {
+    if (visible) {
+      fetchDiagnostic();
+    } else {
+      setDiagnostic(null);
+    }
+  }, [visible, fetchDiagnostic]);
+
+  return (
+    <AdaptiveModalSheet
+      title={providerLabel}
+      visible={visible}
+      onClose={onClose}
+      snapPoints={["50%", "85%"]}
+    >
+      {loading ? (
+        <View style={sheetStyles.loadingContainer}>
+          <ActivityIndicator size="small" color={theme.colors.foregroundMuted} />
+          <Text style={sheetStyles.loadingText}>Fetching diagnostic…</Text>
+        </View>
+      ) : diagnostic ? (
+        <ScrollView
+          horizontal
+          style={sheetStyles.scrollContainer}
+          contentContainerStyle={sheetStyles.scrollContent}
+        >
+          <Text style={sheetStyles.diagnosticText} selectable>
+            {diagnostic}
+          </Text>
+        </ScrollView>
+      ) : null}
+    </AdaptiveModalSheet>
+  );
+}
+
+const sheetStyles = StyleSheet.create((theme) => ({
+  loadingContainer: {
+    paddingVertical: theme.spacing[6],
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  loadingText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+  },
+  scrollContainer: {
+    flex: 1,
+  },
+  scrollContent: {
+    paddingBottom: theme.spacing[4],
+  },
+  diagnosticText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foreground,
+    fontFamily: "monospace",
+    lineHeight: theme.fontSize.sm * 1.6,
+  },
+}));
--- a/packages/app/src/components/question-form-card.tsx
+++ b/packages/app/src/components/question-form-card.tsx
@@ -119,6 +119,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
  });

  function handleSubmit() {
+    if (!allAnswered || isResponding) return;
    setRespondingAction("submit");
    const answers: Record<string, string> = {};
    for (let i = 0; i < questions!.length; i++) {
@@ -228,7 +229,9 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
              placeholderTextColor={theme.colors.foregroundMuted}
              value={otherText}
              onChangeText={(text) => setOtherText(qIndex, text)}
+              onSubmitEditing={handleSubmit}
              editable={!isResponding}
+              blurOnSubmit={false}
            />
          </View>
        );
--- a/packages/app/src/components/split-container.tsx
+++ b/packages/app/src/components/split-container.tsx
@@ -84,6 +84,7 @@ interface SplitContainerProps {
  onCloseTab: (tabId: string) => Promise<void> | void;
  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
  onCloseTabsToLeft: (tabId: string, paneTabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
  onCloseTabsToRight: (tabId: string, paneTabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
  onCloseOtherTabs: (tabId: string, paneTabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
@@ -176,18 +177,6 @@ const MountedTabSlot = memo(function MountedTabSlot({
  paneId,
  buildPaneContentModel,
 }: MountedTabSlotProps) {
-  useEffect(() => {
-    if (tabDescriptor.target.kind !== "terminal") {
-      return;
-    }
-    console.log("[terminal-tab-slot]", {
-      paneId,
-      tabId: tabDescriptor.tabId,
-      terminalId: tabDescriptor.target.terminalId,
-      isVisible,
-      isPaneFocused,
-    });
-  }, [isPaneFocused, isVisible, paneId, tabDescriptor]);

  const content = useMemo(
    () =>
@@ -265,6 +254,7 @@ export function SplitContainer({
  onCloseTab,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTabsToLeft,
  onCloseTabsToRight,
  onCloseOtherTabs,
@@ -534,6 +524,7 @@ export function SplitContainer({
        onCloseTab={onCloseTab}
        onCopyResumeCommand={onCopyResumeCommand}
        onCopyAgentId={onCopyAgentId}
+        onReloadAgent={onReloadAgent}
        onCloseTabsToLeft={onCloseTabsToLeft}
        onCloseTabsToRight={onCloseTabsToRight}
        onCloseOtherTabs={onCloseOtherTabs}
@@ -656,6 +647,7 @@ function SplitNodeView({
  onCloseTab,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTabsToLeft,
  onCloseTabsToRight,
  onCloseOtherTabs,
@@ -691,6 +683,7 @@ function SplitNodeView({
        onCloseTab={onCloseTab}
        onCopyResumeCommand={onCopyResumeCommand}
        onCopyAgentId={onCopyAgentId}
+        onReloadAgent={onReloadAgent}
        onCloseTabsToLeft={onCloseTabsToLeft}
        onCloseTabsToRight={onCloseTabsToRight}
        onCloseOtherTabs={onCloseOtherTabs}
@@ -741,6 +734,7 @@ function SplitNodeView({
              onCloseTab={onCloseTab}
              onCopyResumeCommand={onCopyResumeCommand}
              onCopyAgentId={onCopyAgentId}
+              onReloadAgent={onReloadAgent}
              onCloseTabsToLeft={onCloseTabsToLeft}
              onCloseTabsToRight={onCloseTabsToRight}
              onCloseOtherTabs={onCloseOtherTabs}
@@ -790,6 +784,7 @@ function SplitPaneView({
  onCloseTab,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTabsToLeft,
  onCloseTabsToRight,
  onCloseOtherTabs,
@@ -901,6 +896,7 @@ function SplitPaneView({
          onCloseTab={onCloseTab}
          onCopyResumeCommand={onCopyResumeCommand}
          onCopyAgentId={onCopyAgentId}
+          onReloadAgent={onReloadAgent}
          onCloseTabsToLeft={(tabId) => onCloseTabsToLeft(tabId, paneTabs)}
          onCloseTabsToRight={(tabId) => onCloseTabsToRight(tabId, paneTabs)}
          onCloseOtherTabs={(tabId) => onCloseOtherTabs(tabId, paneTabs)}
--- a/packages/app/src/components/stream-strategy-native.tsx
+++ b/packages/app/src/components/stream-strategy-native.tsx
@@ -313,7 +313,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
      keyExtractor={(item) => item.id}
      testID="agent-chat-scroll"
      nativeID="agent-chat-scroll-native-virtualized"
-      ListHeaderComponent={liveHeaderContent ? () => liveHeaderContent : undefined}
+      ListHeaderComponent={liveHeaderContent ?? undefined}
      contentContainerStyle={baseListContentContainerStyle}
      style={listStyle}
      onLayout={handleListLayout}
--- a/packages/app/src/components/ui/combobox.tsx
+++ b/packages/app/src/components/ui/combobox.tsx
@@ -73,6 +73,12 @@ export interface ComboboxProps {
   * for that combobox instance to avoid animation overriding hidden opacity.
   */
  desktopPreventInitialFlash?: boolean;
+  /** Minimum width for the desktop popover (overrides trigger-based width). */
+  desktopMinWidth?: number;
+  /** Fixed height for the desktop popover (overrides default 400px max). */
+  desktopFixedHeight?: number;
+  /** Content rendered above the scroll area on desktop (sticky header). */
+  stickyHeader?: ReactNode;
  anchorRef: React.RefObject<View | null>;
  children?: ReactNode;
 }
@@ -150,6 +156,8 @@ export interface ComboboxItemProps {
  selected?: boolean;
  active?: boolean;
  disabled?: boolean;
+  /** When true, bumps hover/pressed colors up one surface level (for items on elevated backgrounds). */
+  elevated?: boolean;
  onPress: () => void;
  testID?: string;
 }
@@ -163,6 +171,7 @@ export function ComboboxItem({
  selected,
  active,
  disabled,
+  elevated,
  onPress,
  testID,
 }: ComboboxItemProps): ReactElement {
@@ -187,19 +196,19 @@ export function ComboboxItem({
      onPress={onPress}
      style={({ pressed, hovered = false }) => [
        styles.comboboxItem,
-        hovered && styles.comboboxItemHovered,
-        pressed && styles.comboboxItemPressed,
+        hovered && (elevated ? styles.comboboxItemHoveredElevated : styles.comboboxItemHovered),
+        pressed && (elevated ? styles.comboboxItemPressedElevated : styles.comboboxItemPressed),
        active && styles.comboboxItemActive,
        disabled && styles.comboboxItemDisabled,
      ]}
    >
      {leadingContent}
-      <View style={styles.comboboxItemContent}>
+      <View style={[styles.comboboxItemContent, description && styles.comboboxItemContentInline]}>
        <Text numberOfLines={1} style={styles.comboboxItemLabel}>
          {label}
        </Text>
        {description ? (
-          <Text numberOfLines={2} style={styles.comboboxItemDescription}>
+          <Text numberOfLines={1} style={styles.comboboxItemDescription}>
            {description}
          </Text>
        ) : null}
@@ -246,6 +255,9 @@ export function Combobox({
  stackBehavior,
  desktopPlacement = "top-start",
  desktopPreventInitialFlash = true,
+  desktopMinWidth,
+  desktopFixedHeight,
+  stickyHeader,
  anchorRef,
  children,
 }: ComboboxProps): ReactElement {
@@ -390,12 +402,27 @@ export function Combobox({
    ((floatingTop ?? 0) !== 0 || floatingLeft !== 0 || referenceAtOrigin);
  const shouldHideDesktopContent = desktopPreventInitialFlash && !hasResolvedDesktopPosition;
  const shouldUseDesktopFade = !desktopPreventInitialFlash;
+  // For top-placed popups: once position resolves, use bottom-based CSS positioning
+  // so height changes grow upward naturally without floating-ui needing to reposition.
+  const useStableBottom =
+    !isDesktopAboveSearch &&
+    IS_WEB &&
+    !isMobile &&
+    hasResolvedDesktopPosition &&
+    desktopPlacement.startsWith("top") &&
+    referenceTop !== null;
+
  const desktopPositionStyle = isDesktopAboveSearch
    ? {
        left: floatingLeft ?? 0,
        bottom: desktopAboveSearchBottom ?? 0,
      }
-    : floatingStyles;
+    : useStableBottom
+      ? {
+          left: floatingLeft ?? 0,
+          bottom: Math.max(windowHeight - referenceTop!, collisionPadding),
+        }
+      : floatingStyles;

  useEffect(() => {
    if (!isMobile) return;
@@ -662,6 +689,7 @@ export function Combobox({
        <View style={styles.bottomSheetHeader}>
          <Text style={styles.comboboxTitle}>{title}</Text>
        </View>
+        {stickyHeader}
        <BottomSheetScrollView
          contentContainerStyle={styles.comboboxScrollContent}
          keyboardShouldPersistTaps="handled"
@@ -687,13 +715,16 @@ export function Combobox({
            styles.desktopContainer,
            {
              position: "absolute",
-              minWidth: referenceWidth ?? 200,
-              maxWidth: 400,
+              minWidth: desktopMinWidth ?? referenceWidth ?? 200,
+              maxWidth: Math.max(400, desktopMinWidth ?? 0),
            },
+            desktopFixedHeight != null
+              ? { minHeight: desktopFixedHeight, maxHeight: desktopFixedHeight }
+              : null,
            desktopPositionStyle,
            shouldHideDesktopContent ? { opacity: 0 } : null,
            typeof availableSize?.height === "number"
-              ? { maxHeight: Math.min(availableSize.height, 400) }
+              ? { maxHeight: Math.min(availableSize.height, desktopFixedHeight ?? 400) }
              : null,
          ]}
          ref={refs.setFloating}
@@ -701,14 +732,17 @@ export function Combobox({
          onLayout={() => update()}
        >
          {children ? (
-            <ScrollView
-              contentContainerStyle={styles.desktopScrollContent}
-              keyboardShouldPersistTaps="handled"
-              showsVerticalScrollIndicator={false}
-              style={styles.desktopScroll}
-            >
-              {content}
-            </ScrollView>
+            <>
+              {stickyHeader}
+              <ScrollView
+                contentContainerStyle={styles.desktopChildrenScrollContent}
+                keyboardShouldPersistTaps="handled"
+                showsVerticalScrollIndicator={false}
+                style={styles.desktopScroll}
+              >
+                {content}
+              </ScrollView>
+            </>
          ) : (
            <>
              {effectiveOptionsPosition === "above-search" ? (
@@ -783,9 +817,15 @@ const styles = StyleSheet.create((theme) => ({
  comboboxItemHovered: {
    backgroundColor: theme.colors.surface1,
  },
+  comboboxItemHoveredElevated: {
+    backgroundColor: theme.colors.surface2,
+  },
  comboboxItemPressed: {
    backgroundColor: theme.colors.surface1,
  },
+  comboboxItemPressedElevated: {
+    backgroundColor: theme.colors.surface2,
+  },
  comboboxItemActive: {
    backgroundColor: theme.colors.surface1,
  },
@@ -807,6 +847,11 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
    flexShrink: 1,
  },
+  comboboxItemContentInline: {
+    flexDirection: "row",
+    alignItems: "baseline",
+    gap: theme.spacing[2],
+  },
  comboboxItemLeadingSlot: {
    width: 16,
    alignItems: "center",
@@ -817,9 +862,9 @@ const styles = StyleSheet.create((theme) => ({
    color: theme.colors.foreground,
  },
  comboboxItemDescription: {
-    marginTop: 2,
    fontSize: theme.fontSize.xs,
    color: theme.colors.foregroundMuted,
+    flexShrink: 1,
  },
  emptyText: {
    paddingHorizontal: theme.spacing[3],
@@ -876,6 +921,9 @@ const styles = StyleSheet.create((theme) => ({
  desktopScrollContent: {
    paddingVertical: theme.spacing[1],
  },
+  desktopChildrenScrollContent: {
+    // No padding — custom children (e.g. model selector) control their own spacing
+  },
  desktopScrollContentAboveSearch: {
    flexGrow: 1,
    justifyContent: "flex-end",
--- a/packages/app/src/components/ui/context-menu.tsx
+++ b/packages/app/src/components/ui/context-menu.tsx
@@ -30,6 +30,7 @@ import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { StyleSheet, UnistylesRuntime, useUnistyles } from "react-native-unistyles";
 import { Check, CheckCircle } from "lucide-react-native";
 import { BottomSheetBackdrop, BottomSheetModal, BottomSheetScrollView } from "@gorhom/bottom-sheet";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";

 // Keep parity with dropdown-menu action statuses.
 export type ActionStatus = "idle" | "pending" | "success";
@@ -595,6 +596,7 @@ export function ContextMenuItem({
  successLabel,
  closeOnSelect = true,
  testID,
+  tooltip,
 }: PropsWithChildren<{
  description?: string;
  onSelect?: () => void;
@@ -612,6 +614,7 @@ export function ContextMenuItem({
  successLabel?: string;
  closeOnSelect?: boolean;
  testID?: string;
+  tooltip?: string;
 }>): ReactElement {
  const { theme } = useUnistyles();
  const { setOpen } = useContextMenuContext("ContextMenuItem");
@@ -642,7 +645,7 @@ export function ContextMenuItem({
      <Check size={16} color={theme.colors.foregroundMuted} />
    ) : null);

-  return (
+  const content = (
    <Pressable
      testID={testID}
      accessibilityRole="button"
@@ -704,6 +707,19 @@ export function ContextMenuItem({
      {trailingContent ? <View style={styles.trailingSlot}>{trailingContent}</View> : null}
    </Pressable>
  );
+
+  if (!tooltip) {
+    return content;
+  }
+
+  return (
+    <Tooltip delayDuration={250} enabledOnDesktop enabledOnMobile={false}>
+      <TooltipTrigger asChild>{content}</TooltipTrigger>
+      <TooltipContent side="right" align="center" offset={10}>
+        <Text style={styles.tooltipText}>{tooltip}</Text>
+      </TooltipContent>
+    </Tooltip>
+  );
 }

 const styles = StyleSheet.create((theme) => ({
@@ -762,6 +778,10 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.xs,
    color: theme.colors.foregroundMuted,
  },
+  tooltipText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foreground,
+  },
  item: {
    flexDirection: "row",
    alignItems: "center",
--- a/packages/app/src/components/ui/dropdown-menu.tsx
+++ b/packages/app/src/components/ui/dropdown-menu.tsx
@@ -27,6 +27,7 @@ import {
 import Animated, { Keyframe, runOnJS } from "react-native-reanimated";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { Check, CheckCircle } from "lucide-react-native";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";

 // Action status for menu items with loading/success feedback
 export type ActionStatus = "idle" | "pending" | "success";
@@ -471,6 +472,7 @@ export function DropdownMenuItem({
  successLabel,
  closeOnSelect = true,
  testID,
+  tooltip,
 }: PropsWithChildren<{
  description?: string;
  onSelect?: () => void;
@@ -491,6 +493,7 @@ export function DropdownMenuItem({
  successLabel?: string;
  closeOnSelect?: boolean;
  testID?: string;
+  tooltip?: string;
 }>): ReactElement {
  const { theme } = useUnistyles();
  const { setOpen } = useDropdownMenuContext("DropdownMenuItem");
@@ -524,7 +527,7 @@ export function DropdownMenuItem({
      <Check size={16} color={theme.colors.foregroundMuted} />
    ) : null);

-  return (
+  const content = (
    <Pressable
      testID={testID}
      accessibilityRole="button"
@@ -586,6 +589,19 @@ export function DropdownMenuItem({
      {trailingContent ? <View style={styles.trailingSlot}>{trailingContent}</View> : null}
    </Pressable>
  );
+
+  if (!tooltip) {
+    return content;
+  }
+
+  return (
+    <Tooltip delayDuration={250} enabledOnDesktop enabledOnMobile={false}>
+      <TooltipTrigger asChild>{content}</TooltipTrigger>
+      <TooltipContent side="right" align="center" offset={10}>
+        <Text style={styles.tooltipText}>{tooltip}</Text>
+      </TooltipContent>
+    </Tooltip>
+  );
 }

 const styles = StyleSheet.create((theme) => ({
@@ -630,6 +646,10 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.xs,
    color: theme.colors.foregroundMuted,
  },
+  tooltipText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foreground,
+  },
  item: {
    flexDirection: "row",
    alignItems: "center",
--- a/packages/app/src/components/ui/status-badge.tsx
+++ b/packages/app/src/components/ui/status-badge.tsx
@@ -0,0 +1,65 @@
+import { View, Text } from "react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+
+type StatusBadgeVariant = "success" | "error" | "muted";
+
+interface StatusBadgeProps {
+  label: string;
+  variant?: StatusBadgeVariant;
+}
+
+export function StatusBadge({ label, variant = "muted" }: StatusBadgeProps) {
+  const { theme } = useUnistyles();
+
+  return (
+    <View
+      style={[
+        styles.pill,
+        variant === "success" && styles.pillSuccess,
+        variant === "error" && styles.pillError,
+      ]}
+    >
+      <Text
+        style={[
+          styles.pillText,
+          variant === "success" && styles.pillTextSuccess,
+          variant === "error" && styles.pillTextError,
+        ]}
+      >
+        {label}
+      </Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  pill: {
+    flexDirection: "row",
+    alignItems: "center",
+    borderRadius: theme.borderRadius.full,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    backgroundColor: theme.colors.surface3,
+    paddingHorizontal: theme.spacing[2],
+    paddingVertical: 3,
+  },
+  pillSuccess: {
+    backgroundColor: theme.colors.palette.green[900],
+    borderColor: theme.colors.palette.green[800],
+  },
+  pillError: {
+    backgroundColor: theme.colors.palette.red[900],
+    borderColor: theme.colors.palette.red[800],
+  },
+  pillText: {
+    fontSize: theme.fontSize.xs,
+    fontWeight: theme.fontWeight.normal,
+    color: theme.colors.foregroundMuted,
+  },
+  pillTextSuccess: {
+    color: theme.colors.palette.green[400],
+  },
+  pillTextError: {
+    color: theme.colors.palette.red[500],
+  },
+}));
--- a/packages/app/src/components/ui/tooltip.tsx
+++ b/packages/app/src/components/ui/tooltip.tsx
@@ -44,6 +44,7 @@ type TooltipContextValue = {
  setOpen: (open: boolean) => void;
  triggerRef: React.RefObject<View | null>;
  enabled: boolean;
+  openOnPress: boolean;
  delayDuration: number;
 };

@@ -107,6 +108,18 @@ function measureElement(element: View): Promise<Rect> {
  });
 }

+function isMobileTooltipEnvironment(): boolean {
+  if (Platform.OS !== "web") {
+    return true;
+  }
+
+  if (typeof navigator === "undefined") {
+    return false;
+  }
+
+  return /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent ?? "");
+}
+
 function computePosition({
  triggerRect,
  contentSize,
@@ -214,12 +227,8 @@ export function Tooltip({
    onOpenChange,
  });

-  const isWeb = Platform.OS === "web";
-  const isMobileWeb =
-    isWeb &&
-    typeof navigator !== "undefined" &&
-    /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent ?? "");
-  const enabled = isWeb ? (isMobileWeb ? enabledOnMobile : enabledOnDesktop) : enabledOnMobile;
+  const isMobile = isMobileTooltipEnvironment();
+  const enabled = isMobile ? enabledOnMobile : enabledOnDesktop;

  const value = useMemo<TooltipContextValue>(
    () => ({
@@ -227,9 +236,10 @@ export function Tooltip({
      setOpen: setIsOpen,
      triggerRef,
      enabled,
+      openOnPress: isMobile,
      delayDuration,
    }),
-    [isOpen, setIsOpen, enabled, delayDuration],
+    [isOpen, setIsOpen, enabled, isMobile, delayDuration],
  );

  return <TooltipContext.Provider value={value}>{children}</TooltipContext.Provider>;
@@ -323,9 +333,17 @@ export function TooltipTrigger({
  const handlePress = useCallback(
    (e: any) => {
      onPress?.(e);
+      if (!ctx.enabled || disabled) {
+        return;
+      }
+      if (ctx.openOnPress) {
+        clearOpenTimer();
+        ctx.setOpen(true);
+        return;
+      }
      close();
    },
-    [close, onPress],
+    [clearOpenTimer, close, ctx, disabled, onPress],
  );

  const triggerProps = {
@@ -492,7 +510,7 @@ export function TooltipContent({
      statusBarTranslucent={Platform.OS === "android"}
      onRequestClose={() => ctx.setOpen(false)}
    >
-      <View pointerEvents="box-none" style={styles.overlay}>
+      <Pressable style={styles.overlay} onPress={() => ctx.setOpen(false)}>
        <Animated.View
          pointerEvents="none"
          entering={FadeIn.duration(80)}
@@ -513,7 +531,7 @@ export function TooltipContent({
        >
          {children}
        </Animated.View>
-      </View>
+      </Pressable>
    </Modal>
  );
 }
--- a/packages/app/src/contexts/session-context.tsx
+++ b/packages/app/src/contexts/session-context.tsx
@@ -5,6 +5,7 @@ import { useQueryClient } from "@tanstack/react-query";
 import { useClientActivity } from "@/hooks/use-client-activity";
 import { usePushTokenRegistration } from "@/hooks/use-push-token-registration";
 import { clearArchiveAgentPending } from "@/hooks/use-archive-agent";
+import { prefetchProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { generateMessageId, type StreamItem } from "@/types/stream";
 import {
  processTimelineResponse,
@@ -32,6 +33,7 @@ import {
  type Agent,
  type SessionState,
  type WorkspaceDescriptor,
+  mergeWorkspaceSnapshotWithExisting,
  normalizeWorkspaceDescriptor,
 } from "@/stores/session-store";
 import { useDraftStore } from "@/stores/draft-store";
@@ -67,6 +69,22 @@ export type {
 const HISTORY_STALE_AFTER_MS = 60_000;
 const AUTHORITATIVE_REVALIDATION_DEBOUNCE_MS = 300;

+function hasAgentUsageChanged(
+  incomingUsage: Agent["lastUsage"] | undefined,
+  currentUsage: Agent["lastUsage"] | undefined,
+): boolean {
+  const keys: Array<keyof NonNullable<Agent["lastUsage"]>> = [
+    "inputTokens",
+    "outputTokens",
+    "cachedInputTokens",
+    "totalCostUsd",
+    "contextWindowMaxTokens",
+    "contextWindowUsedTokens",
+  ];
+
+  return keys.some((key) => incomingUsage?.[key] !== currentUsage?.[key]);
+}
+
 type AudioOutputPayload = Extract<SessionOutboundMessage, { type: "audio_output" }>["payload"];

 interface BufferedAudioChunk {
@@ -309,6 +327,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      }

      const workspaces = new Map<string, WorkspaceDescriptor>();
+      const existingWorkspaces = useSessionStore.getState().sessions[serverId]?.workspaces;
      let cursor: string | null = null;
      let includeSubscribe = options?.subscribe ?? false;

@@ -324,7 +343,13 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider

        for (const entry of payload.entries) {
          const workspace = normalizeWorkspaceDescriptor(entry);
-          workspaces.set(workspace.id, workspace);
+          workspaces.set(
+            workspace.id,
+            mergeWorkspaceSnapshotWithExisting({
+              incoming: workspace,
+              existing: existingWorkspaces?.get(workspace.id),
+            }),
+          );
        }

        if (!payload.pageInfo.hasMore || !payload.pageInfo.nextCursor) {
@@ -349,6 +374,15 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      setAgents(serverId, (prev) => {
        const current = prev.get(agent.id);
        if (current && agent.updatedAt.getTime() < current.updatedAt.getTime()) {
+          const hasUsageUpdate = hasAgentUsageChanged(agent.lastUsage, current.lastUsage);
+          if (hasUsageUpdate) {
+            const next = new Map(prev);
+            next.set(agent.id, {
+              ...current,
+              lastUsage: agent.lastUsage,
+            });
+            return next;
+          }
          return prev;
        }
        const next = new Map(prev);
@@ -603,6 +637,34 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    updateSessionClient(serverId, client);
  }, [serverId, client, updateSessionClient]);

+  useEffect(() => {
+    const serverInfo = client.getLastServerInfoMessage();
+    if (!serverInfo) {
+      return;
+    }
+
+    updateSessionServerInfo(serverId, {
+      serverId: serverInfo.serverId,
+      hostname: serverInfo.hostname,
+      version: serverInfo.version,
+      ...(serverInfo.capabilities ? { capabilities: serverInfo.capabilities } : {}),
+      ...(serverInfo.features ? { features: serverInfo.features } : {}),
+    });
+  }, [client, serverId, updateSessionServerInfo]);
+
+  useEffect(() => {
+    if (!isConnected) {
+      return;
+    }
+
+    const serverInfo = client.getLastServerInfoMessage();
+    if (!serverInfo?.features?.providersSnapshot) {
+      return;
+    }
+
+    prefetchProvidersSnapshot(serverId, client);
+  }, [client, isConnected, serverId]);
+
  useEffect(() => {
    if (!voiceRuntime) {
      return;
@@ -1105,6 +1167,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
          hostname: serverInfo.hostname,
          version: serverInfo.version,
          ...(serverInfo.capabilities ? { capabilities: serverInfo.capabilities } : {}),
+          ...(serverInfo.features ? { features: serverInfo.features } : {}),
        });
        return;
      }
--- a/packages/app/src/hooks/use-agent-form-state.ts
+++ b/packages/app/src/hooks/use-agent-form-state.ts
@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useQuery, useQueries } from "@tanstack/react-query";
 import {
  AGENT_PROVIDER_DEFINITIONS,
  type AgentProviderDefinition,
@@ -8,9 +7,10 @@ import type {
  AgentMode,
  AgentModelDefinition,
  AgentProvider,
+  ProviderSnapshotEntry,
 } from "@server/server/agent/agent-sdk-types";
 import { useHosts } from "@/runtime/host-runtime";
-import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { useProvidersSnapshot } from "./use-providers-snapshot";
 import {
  useFormPreferences,
  mergeProviderPreferences,
@@ -84,6 +84,7 @@ type UseAgentFormStateResult = {
  providerDefinitions: AgentProviderDefinition[];
  providerDefinitionMap: Map<AgentProvider, AgentProviderDefinition>;
  agentDefinition?: AgentProviderDefinition;
+  allProviderEntries?: ProviderSnapshotEntry[];
  modeOptions: AgentMode[];
  availableModels: AgentModelDefinition[];
  allProviderModels: Map<string, AgentModelDefinition[]>;
@@ -368,141 +369,61 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
    }
  }, [isVisible]);

-  // Session state for provider model listing
-  const client = useHostRuntimeClient(formState.serverId ?? "");
-  const isConnected = useHostRuntimeIsConnected(formState.serverId ?? "");
+  const {
+    entries: snapshotEntries,
+    isLoading: snapshotIsLoading,
+    isFetching: snapshotIsFetching,
+    error: snapshotError,
+    refresh: refreshSnapshot,
+  } = useProvidersSnapshot(formState.serverId);

-  const availableProvidersQuery = useQuery({
-    queryKey: ["availableProviders", formState.serverId],
-    enabled: Boolean(
-      isVisible && isTargetDaemonReady && formState.serverId && client && isConnected,
-    ),
-    staleTime: 60 * 1000,
-    queryFn: async () => {
-      if (!client) {
-        throw new Error("Host is not connected");
-      }
-      const payload = await client.listAvailableProviders();
-      if (payload.error) {
-        throw new Error(payload.error);
-      }
-      return payload.providers.filter((entry) => entry.available).map((entry) => entry.provider);
-    },
-  });
-
-  const providerDefinitions = useMemo(() => {
-    const availableProviders = availableProvidersQuery.data;
-    if (!availableProviders) {
-      return [];
-    }
-    const available = new Set(availableProviders);
-    return allProviderDefinitions.filter((definition) =>
-      available.has(definition.id as AgentProvider),
-    );
-  }, [availableProvidersQuery.data]);
-
-  const providerDefinitionMap = useMemo(
+  const allProviderEntries = useMemo(() => snapshotEntries ?? [], [snapshotEntries]);
+  const snapshotProviderDefinitions = useMemo(() => {
+    const snapshotProviders = new Set((snapshotEntries ?? []).map((entry) => entry.provider));
+    return allProviderDefinitions.filter((definition) => snapshotProviders.has(definition.id));
+  }, [snapshotEntries]);
+  const snapshotProviderDefinitionMap = useMemo(
    () =>
      new Map<AgentProvider, AgentProviderDefinition>(
-        providerDefinitions.map((definition) => [definition.id as AgentProvider, definition]),
+        snapshotProviderDefinitions.map((definition) => [definition.id, definition]),
      ),
-    [providerDefinitions],
+    [snapshotProviderDefinitions],
  );
-
-  const [debouncedCwd, setDebouncedCwd] = useState<string | undefined>(undefined);
-  useEffect(() => {
-    const trimmed = formState.workingDir.trim();
-    const next = trimmed.length > 0 ? trimmed : undefined;
-    const timer = setTimeout(() => setDebouncedCwd(next), 180);
-    return () => clearTimeout(timer);
-  }, [formState.workingDir]);
-
-  const providerModelsQuery = useQuery({
-    queryKey: ["providerModels", formState.serverId, formState.provider],
-    enabled: Boolean(
-      isVisible &&
-        isTargetDaemonReady &&
-        formState.serverId &&
-        client &&
-        isConnected &&
-        providerDefinitionMap.has(formState.provider),
-    ),
-    staleTime: 5 * 60 * 1000,
-    queryFn: async () => {
-      if (!client) {
-        throw new Error("Host is not connected");
-      }
-      const payload = await client.listProviderModels(formState.provider, {
-        cwd: debouncedCwd,
-      });
-      if (payload.error) {
-        throw new Error(payload.error);
-      }
-      return payload.models ?? [];
-    },
-  });
-
-  const availableModels = providerModelsQuery.data ?? null;
-
-  const providerModesQuery = useQuery({
-    queryKey: ["providerModes", formState.serverId, formState.provider, debouncedCwd],
-    enabled: Boolean(
-      isVisible &&
-        isTargetDaemonReady &&
-        formState.serverId &&
-        client &&
-        isConnected &&
-        providerDefinitionMap.has(formState.provider),
-    ),
-    staleTime: 5 * 60 * 1000,
-    queryFn: async () => {
-      if (!client) {
-        throw new Error("Host is not connected");
-      }
-      const payload = await client.listProviderModes(formState.provider, {
-        cwd: debouncedCwd,
-      });
-      if (payload.error) {
-        throw new Error(payload.error);
-      }
-      return payload.modes ?? [];
-    },
-  });
-
-  const allProviderModelQueries = useQueries({
-    queries: providerDefinitions.map((def) => ({
-      queryKey: ["providerModels", formState.serverId, def.id],
-      enabled: Boolean(
-        isVisible && isTargetDaemonReady && formState.serverId && client && isConnected,
-      ),
-      staleTime: 5 * 60 * 1000,
-      queryFn: async () => {
-        if (!client) {
-          throw new Error("Host is not connected");
-        }
-        const payload = await client.listProviderModels(def.id as AgentProvider, {
-          cwd: debouncedCwd,
-        });
-        if (payload.error) {
-          throw new Error(payload.error);
-        }
-        return payload.models ?? [];
-      },
-    })),
-  });
-
-  const allProviderModels = useMemo(() => {
+  const snapshotSelectableProviderDefinitionMap = useMemo(() => {
+    const readyProviders = new Set(
+      (snapshotEntries ?? [])
+        .filter((entry) => entry.status === "ready")
+        .map((entry) => entry.provider),
+    );
+    return new Map<AgentProvider, AgentProviderDefinition>(
+      snapshotProviderDefinitions
+        .filter((definition) => readyProviders.has(definition.id))
+        .map((definition) => [definition.id, definition]),
+    );
+  }, [snapshotEntries, snapshotProviderDefinitions]);
+  const snapshotAllProviderModels = useMemo(() => {
    const map = new Map<string, AgentModelDefinition[]>();
-    for (let i = 0; i < providerDefinitions.length; i++) {
-      const query = allProviderModelQueries[i];
-      if (query?.data) {
-        map.set(providerDefinitions[i]!.id, query.data);
-      }
+    for (const entry of snapshotEntries ?? []) {
+      map.set(entry.provider, entry.models ?? []);
    }
    return map;
-  }, [allProviderModelQueries, providerDefinitions]);
-
-  const isAllModelsLoading = allProviderModelQueries.some((q) => q.isLoading);
+  }, [snapshotEntries]);
+  const snapshotSelectedEntry = useMemo(
+    () => (snapshotEntries ?? []).find((entry) => entry.provider === formState.provider) ?? null,
+    [formState.provider, snapshotEntries],
+  );
+  const snapshotSelectedProviderModels = snapshotSelectedEntry?.models ?? null;
+  const snapshotSelectedProviderModes =
+    snapshotSelectedEntry?.modes ??
+    snapshotProviderDefinitionMap.get(formState.provider)?.modes ??
+    [];
+  const providerDefinitions = snapshotProviderDefinitions;
+  const providerDefinitionMap = snapshotProviderDefinitionMap;
+  const selectableProviderDefinitionMap = snapshotSelectableProviderDefinitionMap;
+  const allProviderModels = snapshotAllProviderModels;
+  const availableModels = snapshotSelectedProviderModels;
+  const modeOptions = snapshotSelectedProviderModes;
+  const isAllModelsLoading = snapshotIsLoading || snapshotIsFetching;

  // Combine initialValues with initialServerId for resolution
  const combinedInitialValues = useMemo((): FormInitialValues | undefined => {
@@ -527,7 +448,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      userModified,
      formStateRef.current,
      validServerIds,
-      providerDefinitionMap,
+      selectableProviderDefinitionMap,
    );

    // Only update if something changed
@@ -552,7 +473,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
    availableModels,
    userModified,
    validServerIds,
-    providerDefinitionMap,
+    selectableProviderDefinitionMap,
  ]);

  // Auto-select the first online host when:
@@ -592,8 +513,11 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg

  const setProviderFromUser = useCallback(
    (provider: AgentProvider) => {
+      if (!selectableProviderDefinitionMap.has(provider)) {
+        return;
+      }
      const providerModels = allProviderModels.get(provider) ?? null;
-      const providerDef = providerDefinitionMap.get(provider);
+      const providerDef = selectableProviderDefinitionMap.get(provider);
      const providerPrefs = preferences?.providerPreferences?.[provider];

      const isValidModel = (m: string) =>
@@ -631,12 +555,20 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
        thinkingOptionId: nextThinkingOptionId,
      }));
    },
-    [allProviderModels, preferences?.providerPreferences, providerDefinitionMap, updatePreferences],
+    [
+      allProviderModels,
+      preferences?.providerPreferences,
+      selectableProviderDefinitionMap,
+      updatePreferences,
+    ],
  );

  const setProviderAndModelFromUser = useCallback(
    (provider: AgentProvider, modelId: string) => {
-      const providerDef = providerDefinitionMap.get(provider);
+      if (!selectableProviderDefinitionMap.has(provider)) {
+        return;
+      }
+      const providerDef = selectableProviderDefinitionMap.get(provider);
      const providerModels = allProviderModels.get(provider) ?? null;
      const normalizedModelId = normalizeSelectedModelId(modelId);
      const nextModelId = normalizedModelId || resolveDefaultModelId(providerModels);
@@ -656,7 +588,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      setUserModified((prev) => ({ ...prev, provider: true, model: true }));
      void updatePreferences({ provider });
    },
-    [allProviderModels, providerDefinitionMap, updatePreferences],
+    [allProviderModels, selectableProviderDefinitionMap, updatePreferences],
  );

  const setModeFromUser = useCallback(
@@ -713,8 +645,8 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
  }, []);

  const refreshProviderModels = useCallback(() => {
-    void providerModelsQuery.refetch();
-  }, [providerModelsQuery]);
+    refreshSnapshot();
+  }, [refreshSnapshot]);

  const persistFormPreferences = useCallback(async () => {
    const resolvedModel = resolveEffectiveModel(availableModels, formState.model);
@@ -747,13 +679,11 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
  ]);

  const agentDefinition = providerDefinitionMap.get(formState.provider);
-  const modeOptions = providerModesQuery.data ?? agentDefinition?.modes ?? [];
  const effectiveModel = resolveEffectiveModel(availableModels, formState.model);
  const resolvedModelId = effectiveModel?.id ?? formState.model;
  const availableThinkingOptions = effectiveModel?.thinkingOptions ?? [];
-  const isModelLoading = providerModelsQuery.isLoading || providerModelsQuery.isFetching;
-  const modelError =
-    providerModelsQuery.error instanceof Error ? providerModelsQuery.error.message : null;
+  const isModelLoading = snapshotIsLoading || snapshotIsFetching;
+  const modelError = snapshotError;

  const workingDirIsEmpty = !formState.workingDir.trim();

@@ -776,6 +706,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      providerDefinitions,
      providerDefinitionMap,
      agentDefinition,
+      allProviderEntries,
      modeOptions,
      availableModels: availableModels ?? [],
      allProviderModels,
@@ -806,6 +737,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      providerDefinitions,
      providerDefinitionMap,
      agentDefinition,
+      allProviderEntries,
      modeOptions,
      availableModels,
      allProviderModels,
--- a/packages/app/src/hooks/use-agent-screen-state-machine.test.ts
+++ b/packages/app/src/hooks/use-agent-screen-state-machine.test.ts
@@ -9,7 +9,6 @@ import {

 type ReadyState = Extract<AgentScreenViewState, { tag: "ready" }>;
 type CatchingUpSyncState = Extract<ReadyState["sync"], { status: "catching_up" }>;
-type SyncErrorSyncState = Extract<ReadyState["sync"], { status: "sync_error" }>;

 function createAgent(id: string): Agent {
  const now = new Date("2026-02-19T00:00:00.000Z");
@@ -74,7 +73,6 @@ function createBaseMemory(
  return {
    hasRenderedReady: false,
    lastReadyAgent: null,
-    activeToastLatch: "none",
    hadInitialSyncFailure: false,
    ...overrides,
  };
@@ -96,12 +94,8 @@ function expectCatchingUpSync(state: ReadyState): CatchingUpSyncState {
  return state.sync;
 }

-function expectSyncErrorSync(state: ReadyState): SyncErrorSyncState {
+function expectSyncErrorSync(state: ReadyState): void {
  expect(state.sync.status).toBe("sync_error");
-  if (state.sync.status !== "sync_error") {
-    throw new Error("expected sync_error sync state");
-  }
-  return state.sync;
 }

 describe("deriveAgentScreenViewState", () => {
@@ -165,10 +159,9 @@ describe("deriveAgentScreenViewState", () => {
    const sync = expectCatchingUpSync(ready);

    expect(sync.ui).toBe("overlay");
-    expect(sync.shouldEmitHistoryRefreshToast).toBe(false);
  });

-  it("uses toast catching-up state for already-hydrated agents", () => {
+  it("uses silent catching-up state for already-hydrated agents", () => {
    const memory = createBaseMemory({
      hasRenderedReady: true,
      lastReadyAgent: createAgent("agent-1"),
@@ -183,8 +176,7 @@ describe("deriveAgentScreenViewState", () => {
    const ready = expectReadyState(result.state);
    const sync = expectCatchingUpSync(ready);

-    expect(sync.ui).toBe("toast");
-    expect(sync.shouldEmitHistoryRefreshToast).toBe(true);
+    expect(sync.ui).toBe("silent");
  });

  it("keeps sync errors non-blocking once the screen was ready", () => {
@@ -200,9 +192,7 @@ describe("deriveAgentScreenViewState", () => {

    const result = deriveAgentScreenViewState({ input, memory });
    const ready = expectReadyState(result.state);
-    const sync = expectSyncErrorSync(ready);
-
-    expect(sync.shouldEmitSyncErrorToast).toBe(true);
+    expectSyncErrorSync(ready);
  });

  it("remembers first-load sync failure and keeps catch-up overlay off after error clears", () => {
@@ -221,9 +211,7 @@ describe("deriveAgentScreenViewState", () => {
      memory: initialMemory,
    });
    const errorReady = expectReadyState(errorResult.state);
-    const errorSync = expectSyncErrorSync(errorReady);
-
-    expect(errorSync.shouldEmitSyncErrorToast).toBe(true);
+    expectSyncErrorSync(errorReady);
    expect(errorResult.memory.hadInitialSyncFailure).toBe(true);

    const retryInput: AgentScreenMachineInput = {
@@ -239,7 +227,6 @@ describe("deriveAgentScreenViewState", () => {
    const retrySync = expectCatchingUpSync(retryReady);

    expect(retrySync.ui).toBe("silent");
-    expect(retrySync.shouldEmitHistoryRefreshToast).toBe(false);
    expect(retryResult.memory.hadInitialSyncFailure).toBe(true);
  });

@@ -255,35 +242,10 @@ describe("deriveAgentScreenViewState", () => {

    const result = deriveAgentScreenViewState({ input, memory });
    const ready = expectReadyState(result.state);
-    const sync = expectSyncErrorSync(ready);
+    expectSyncErrorSync(ready);

    expect(ready.source).toBe("stale");
    expect(ready.agent.id).toBe("agent-1");
-    expect(sync.shouldEmitSyncErrorToast).toBe(true);
-  });
-
-  it("emits sync error toast only on transition into sync_error", () => {
-    const memory = createBaseMemory({
-      hasRenderedReady: true,
-      lastReadyAgent: createAgent("agent-1"),
-    });
-    const input: AgentScreenMachineInput = {
-      ...createBaseInput(),
-      missingAgentState: { kind: "error", message: "network timeout" },
-    };
-
-    const first = deriveAgentScreenViewState({ input, memory });
-    const firstReady = expectReadyState(first.state);
-    const firstSync = expectSyncErrorSync(firstReady);
-    expect(firstSync.shouldEmitSyncErrorToast).toBe(true);
-
-    const second = deriveAgentScreenViewState({
-      input,
-      memory: first.memory,
-    });
-    const secondReady = expectReadyState(second.state);
-    const secondSync = expectSyncErrorSync(secondReady);
-    expect(secondSync.shouldEmitSyncErrorToast).toBe(false);
  });

  it("returns blocking error before first paint when refresh fails", () => {
@@ -484,71 +446,6 @@ describe("deriveAgentScreenViewState", () => {
    expect(ready.agent.status).toBe("closed");
  });

-  it("emits history refresh toast only on transition into toast catch-up state", () => {
-    const memory = createBaseMemory({
-      hasRenderedReady: true,
-      lastReadyAgent: createAgent("agent-1"),
-    });
-    const input: AgentScreenMachineInput = {
-      ...createBaseInput(),
-      needsAuthoritativeSync: true,
-      hasHydratedHistoryBefore: true,
-    };
-
-    const first = deriveAgentScreenViewState({ input, memory });
-    const firstReady = expectReadyState(first.state);
-    const firstSync = expectCatchingUpSync(firstReady);
-
-    expect(firstSync.ui).toBe("toast");
-    expect(firstSync.shouldEmitHistoryRefreshToast).toBe(true);
-
-    const second = deriveAgentScreenViewState({
-      input,
-      memory: first.memory,
-    });
-    const secondReady = expectReadyState(second.state);
-    const secondSync = expectCatchingUpSync(secondReady);
-
-    expect(secondSync.ui).toBe("toast");
-    expect(secondSync.shouldEmitHistoryRefreshToast).toBe(false);
-  });
-
-  it("re-arms history refresh toast after leaving and re-entering catch-up", () => {
-    const baseInput: AgentScreenMachineInput = {
-      ...createBaseInput(),
-      hasHydratedHistoryBefore: true,
-    };
-    const initialMemory = createBaseMemory({
-      hasRenderedReady: true,
-      lastReadyAgent: createAgent("agent-1"),
-    });
-
-    const firstCatchingUp = deriveAgentScreenViewState({
-      input: { ...baseInput, needsAuthoritativeSync: true },
-      memory: initialMemory,
-    });
-    const firstCatchingUpReady = expectReadyState(firstCatchingUp.state);
-    const firstCatchingUpSync = expectCatchingUpSync(firstCatchingUpReady);
-    expect(firstCatchingUpSync.ui).toBe("toast");
-    expect(firstCatchingUpSync.shouldEmitHistoryRefreshToast).toBe(true);
-
-    const idle = deriveAgentScreenViewState({
-      input: { ...baseInput, needsAuthoritativeSync: false },
-      memory: firstCatchingUp.memory,
-    });
-    const idleReady = expectReadyState(idle.state);
-    expect(idleReady.sync.status).toBe("idle");
-
-    const secondCatchingUp = deriveAgentScreenViewState({
-      input: { ...baseInput, needsAuthoritativeSync: true },
-      memory: idle.memory,
-    });
-    const secondCatchingUpReady = expectReadyState(secondCatchingUp.state);
-    const secondCatchingUpSync = expectCatchingUpSync(secondCatchingUpReady);
-    expect(secondCatchingUpSync.ui).toBe("toast");
-    expect(secondCatchingUpSync.shouldEmitHistoryRefreshToast).toBe(true);
-  });
-
  it("clears initial sync failure memory after history is hydrated", () => {
    const memory = createBaseMemory({
      hasRenderedReady: true,
@@ -565,7 +462,7 @@ describe("deriveAgentScreenViewState", () => {
    const ready = expectReadyState(result.state);
    const sync = expectCatchingUpSync(ready);

-    expect(sync.ui).toBe("toast");
+    expect(sync.ui).toBe("silent");
    expect(result.memory.hadInitialSyncFailure).toBe(false);
  });
 });
--- a/packages/app/src/hooks/use-agent-screen-state-machine.ts
+++ b/packages/app/src/hooks/use-agent-screen-state-machine.ts
@@ -39,12 +39,9 @@ function shouldBlockInitialAuthoritativeReadyState(input: AgentScreenMachineInpu
  );
 }

-export type AgentScreenToastLatch = "none" | "history_refresh" | "sync_error";
-
 export interface AgentScreenMachineMemory {
  hasRenderedReady: boolean;
  lastReadyAgent: AgentScreenAgent | null;
-  activeToastLatch: AgentScreenToastLatch;
  hadInitialSyncFailure: boolean;
 }

@@ -54,17 +51,8 @@ export type AgentScreenReadySyncState =
  | {
      status: "catching_up";
      ui: "overlay" | "silent";
-      shouldEmitHistoryRefreshToast: false;
    }
-  | {
-      status: "catching_up";
-      ui: "toast";
-      shouldEmitHistoryRefreshToast: boolean;
-    }
-  | {
-      status: "sync_error";
-      shouldEmitSyncErrorToast: boolean;
-    };
+  | { status: "sync_error" };

 export type AgentScreenViewState =
  | {
@@ -98,7 +86,6 @@ export function deriveAgentScreenViewState({
  const nextMemory: AgentScreenMachineMemory = {
    hasRenderedReady: memory.hasRenderedReady,
    lastReadyAgent: memory.lastReadyAgent,
-    activeToastLatch: memory.activeToastLatch,
    hadInitialSyncFailure: memory.hadInitialSyncFailure,
  };

@@ -180,45 +167,23 @@ export function deriveAgentScreenViewState({

  let sync: AgentScreenReadySyncState;
  if (!input.isConnected) {
-    nextMemory.activeToastLatch = "none";
    sync = { status: "reconnecting" };
  } else if (input.missingAgentState.kind === "error") {
-    const shouldEmitSyncErrorToast = memory.activeToastLatch !== "sync_error";
-    nextMemory.activeToastLatch = "sync_error";
-    sync = {
-      status: "sync_error",
-      shouldEmitSyncErrorToast,
-    };
+    sync = { status: "sync_error" };
  } else if (input.needsAuthoritativeSync || input.isHistorySyncing) {
-    let ui: "overlay" | "toast" | "silent";
+    let ui: "overlay" | "silent";
    if (input.shouldUseOptimisticStream) {
      ui = "silent";
    } else if (input.hasHydratedHistoryBefore) {
-      ui = "toast";
+      ui = "silent";
    } else if (nextMemory.hadInitialSyncFailure) {
      ui = "silent";
    } else {
      ui = "overlay";
    }

-    if (ui === "toast") {
-      const shouldEmitHistoryRefreshToast = memory.activeToastLatch !== "history_refresh";
-      nextMemory.activeToastLatch = "history_refresh";
-      sync = {
-        status: "catching_up",
-        ui,
-        shouldEmitHistoryRefreshToast,
-      };
-    } else {
-      nextMemory.activeToastLatch = "none";
-      sync = {
-        status: "catching_up",
-        ui,
-        shouldEmitHistoryRefreshToast: false,
-      };
-    }
+    sync = { status: "catching_up", ui };
  } else {
-    nextMemory.activeToastLatch = "none";
    sync = { status: "idle" };
  }

@@ -245,7 +210,6 @@ export function useAgentScreenStateMachine({
  const memoryRef = useRef<AgentScreenMachineMemory>({
    hasRenderedReady: false,
    lastReadyAgent: null,
-    activeToastLatch: "none",
    hadInitialSyncFailure: false,
  });

@@ -254,7 +218,6 @@ export function useAgentScreenStateMachine({
    memoryRef.current = {
      hasRenderedReady: false,
      lastReadyAgent: null,
-      activeToastLatch: "none",
      hadInitialSyncFailure: false,
    };
  }
--- a/packages/app/src/hooks/use-changes-preferences.test.ts
+++ b/packages/app/src/hooks/use-changes-preferences.test.ts
@@ -0,0 +1,74 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const asyncStorageMock = vi.hoisted(() => ({
+  getItem: vi.fn<(_: string) => Promise<string | null>>(),
+  setItem: vi.fn<(_: string, __: string) => Promise<void>>(),
+}));
+
+vi.mock("@react-native-async-storage/async-storage", () => ({
+  default: asyncStorageMock,
+}));
+
+describe("use-changes-preferences", () => {
+  beforeEach(() => {
+    vi.resetModules();
+    asyncStorageMock.getItem.mockReset();
+    asyncStorageMock.setItem.mockReset();
+  });
+
+  it("defaults to unified layout with visible whitespace", async () => {
+    asyncStorageMock.getItem.mockResolvedValue(null);
+    asyncStorageMock.setItem.mockResolvedValue();
+
+    const mod = await import("./use-changes-preferences");
+    const result = await mod.loadChangesPreferencesFromStorage();
+
+    expect(result).toEqual(mod.DEFAULT_CHANGES_PREFERENCES);
+    expect(asyncStorageMock.setItem).toHaveBeenCalledWith(
+      "@paseo:changes-preferences",
+      JSON.stringify(mod.DEFAULT_CHANGES_PREFERENCES),
+    );
+  });
+
+  it("migrates the legacy wrap-lines toggle into the new preferences object", async () => {
+    asyncStorageMock.getItem.mockImplementation(async (key: string) => {
+      if (key === "diff-wrap-lines") {
+        return "true";
+      }
+      return null;
+    });
+    asyncStorageMock.setItem.mockResolvedValue();
+
+    const mod = await import("./use-changes-preferences");
+    const result = await mod.loadChangesPreferencesFromStorage();
+
+    expect(result).toEqual({
+      layout: "unified",
+      wrapLines: true,
+      hideWhitespace: false,
+    });
+  });
+
+  it("loads persisted layout and whitespace preferences", async () => {
+    asyncStorageMock.getItem.mockImplementation(async (key: string) => {
+      if (key === "@paseo:changes-preferences") {
+        return JSON.stringify({
+          layout: "split",
+          hideWhitespace: true,
+          wrapLines: false,
+        });
+      }
+      return null;
+    });
+
+    const mod = await import("./use-changes-preferences");
+    const result = await mod.loadChangesPreferencesFromStorage();
+
+    expect(result).toEqual({
+      layout: "split",
+      hideWhitespace: true,
+      wrapLines: false,
+    });
+    expect(asyncStorageMock.setItem).not.toHaveBeenCalled();
+  });
+});
--- a/packages/app/src/hooks/use-changes-preferences.ts
+++ b/packages/app/src/hooks/use-changes-preferences.ts
@@ -0,0 +1,89 @@
+import { useCallback } from "react";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { z } from "zod";
+
+const CHANGES_PREFERENCES_STORAGE_KEY = "@paseo:changes-preferences";
+const LEGACY_WRAP_LINES_STORAGE_KEY = "diff-wrap-lines";
+const CHANGES_PREFERENCES_QUERY_KEY = ["changes-preferences"];
+
+const changesPreferencesSchema = z.object({
+  layout: z.enum(["unified", "split"]).optional(),
+  wrapLines: z.boolean().optional(),
+  hideWhitespace: z.boolean().optional(),
+});
+
+export interface ChangesPreferences {
+  layout: "unified" | "split";
+  wrapLines: boolean;
+  hideWhitespace: boolean;
+}
+
+export const DEFAULT_CHANGES_PREFERENCES: ChangesPreferences = {
+  layout: "unified",
+  wrapLines: false,
+  hideWhitespace: false,
+};
+
+async function loadLegacyWrapLinesPreference(): Promise<boolean | null> {
+  const legacyValue = await AsyncStorage.getItem(LEGACY_WRAP_LINES_STORAGE_KEY);
+  if (legacyValue === "true") {
+    return true;
+  }
+  if (legacyValue === "false") {
+    return false;
+  }
+  return null;
+}
+
+export async function loadChangesPreferencesFromStorage(): Promise<ChangesPreferences> {
+  const stored = await AsyncStorage.getItem(CHANGES_PREFERENCES_STORAGE_KEY);
+  if (stored) {
+    const parsed = changesPreferencesSchema.safeParse(JSON.parse(stored));
+    if (parsed.success) {
+      return { ...DEFAULT_CHANGES_PREFERENCES, ...parsed.data };
+    }
+  }
+
+  const legacyWrapLines = await loadLegacyWrapLinesPreference();
+  const next = {
+    ...DEFAULT_CHANGES_PREFERENCES,
+    ...(legacyWrapLines !== null ? { wrapLines: legacyWrapLines } : {}),
+  } satisfies ChangesPreferences;
+  await AsyncStorage.setItem(CHANGES_PREFERENCES_STORAGE_KEY, JSON.stringify(next));
+  return next;
+}
+
+export interface UseChangesPreferencesReturn {
+  preferences: ChangesPreferences;
+  isLoading: boolean;
+  updatePreferences: (updates: Partial<ChangesPreferences>) => Promise<void>;
+}
+
+export function useChangesPreferences(): UseChangesPreferencesReturn {
+  const queryClient = useQueryClient();
+  const { data, isPending } = useQuery({
+    queryKey: CHANGES_PREFERENCES_QUERY_KEY,
+    queryFn: loadChangesPreferencesFromStorage,
+    staleTime: Infinity,
+    gcTime: Infinity,
+  });
+
+  const updatePreferences = useCallback(
+    async (updates: Partial<ChangesPreferences>) => {
+      const prev =
+        queryClient.getQueryData<ChangesPreferences>(CHANGES_PREFERENCES_QUERY_KEY) ??
+        DEFAULT_CHANGES_PREFERENCES;
+      const next = { ...prev, ...updates };
+      queryClient.setQueryData<ChangesPreferences>(CHANGES_PREFERENCES_QUERY_KEY, next);
+      await AsyncStorage.setItem(CHANGES_PREFERENCES_STORAGE_KEY, JSON.stringify(next));
+    },
+    [queryClient],
+  );
+
+  return {
+    preferences: data ?? DEFAULT_CHANGES_PREFERENCES,
+    isLoading: isPending,
+    updatePreferences,
+  };
+}
--- a/packages/app/src/hooks/use-checkout-diff-query.ts
+++ b/packages/app/src/hooks/use-checkout-diff-query.ts
@@ -13,8 +13,9 @@ function checkoutDiffQueryKey(
  cwd: string,
  mode: "uncommitted" | "base",
  baseRef?: string,
+  ignoreWhitespace?: boolean,
 ) {
-  return ["checkoutDiff", serverId, cwd, mode, baseRef ?? ""] as const;
+  return ["checkoutDiff", serverId, cwd, mode, baseRef ?? "", ignoreWhitespace === true] as const;
 }

 interface UseCheckoutDiffQueryOptions {
@@ -22,6 +23,7 @@ interface UseCheckoutDiffQueryOptions {
  cwd: string;
  mode: "uncommitted" | "base";
  baseRef?: string;
+  ignoreWhitespace?: boolean;
  enabled?: boolean;
 }

@@ -35,12 +37,16 @@ export type HighlightToken = NonNullable<DiffLine["tokens"]>[number];
 function normalizeCheckoutDiffCompare(compare: {
  mode: "uncommitted" | "base";
  baseRef?: string;
-}): { mode: "uncommitted" | "base"; baseRef?: string } {
+  ignoreWhitespace?: boolean;
+}): { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean } {
+  const ignoreWhitespace = compare.ignoreWhitespace === true;
  if (compare.mode === "uncommitted") {
-    return { mode: "uncommitted" };
+    return { mode: "uncommitted", ignoreWhitespace };
  }
  const trimmedBaseRef = compare.baseRef?.trim();
-  return trimmedBaseRef ? { mode: "base", baseRef: trimmedBaseRef } : { mode: "base" };
+  return trimmedBaseRef
+    ? { mode: "base", baseRef: trimmedBaseRef, ignoreWhitespace }
+    : { mode: "base", ignoreWhitespace };
 }

 export function useCheckoutDiffQuery({
@@ -48,6 +54,7 @@ export function useCheckoutDiffQuery({
  cwd,
  mode,
  baseRef,
+  ignoreWhitespace,
  enabled = true,
 }: UseCheckoutDiffQueryOptions) {
  const queryClient = useQueryClient();
@@ -60,14 +67,15 @@ export function useCheckoutDiffQuery({
  const isOpen = isMobile ? mobileView === "file-explorer" : desktopFileExplorerOpen;
  const hookInstanceId = useId();
  const normalizedCompare = useMemo(
-    () => normalizeCheckoutDiffCompare({ mode, baseRef }),
-    [mode, baseRef],
+    () => normalizeCheckoutDiffCompare({ mode, baseRef, ignoreWhitespace }),
+    [mode, baseRef, ignoreWhitespace],
  );
  const compareMode = normalizedCompare.mode;
  const compareBaseRef = normalizedCompare.baseRef;
+  const compareIgnoreWhitespace = normalizedCompare.ignoreWhitespace;
  const queryKey = useMemo(
-    () => checkoutDiffQueryKey(serverId, cwd, mode, baseRef),
-    [serverId, cwd, mode, baseRef],
+    () => checkoutDiffQueryKey(serverId, cwd, mode, baseRef, compareIgnoreWhitespace),
+    [serverId, cwd, mode, baseRef, compareIgnoreWhitespace],
  );

  const query = useQuery({
@@ -79,6 +87,7 @@ export function useCheckoutDiffQuery({
      const payload = await client.getCheckoutDiff(cwd, {
        mode: compareMode,
        baseRef: compareBaseRef,
+        ignoreWhitespace: compareIgnoreWhitespace,
      });
      return {
        ...payload,
@@ -104,6 +113,7 @@ export function useCheckoutDiffQuery({
      cwd,
      compareMode,
      compareBaseRef ?? "",
+      compareIgnoreWhitespace ? "ignore-ws" : "keep-ws",
    ].join(":");
    let cancelled = false;

@@ -145,6 +155,7 @@ export function useCheckoutDiffQuery({
        {
          mode: compareMode,
          baseRef: compareBaseRef,
+          ignoreWhitespace: compareIgnoreWhitespace,
        },
        { subscriptionId },
      )
@@ -191,6 +202,7 @@ export function useCheckoutDiffQuery({
    serverId,
    compareMode,
    compareBaseRef,
+    compareIgnoreWhitespace,
    queryKey,
    queryClient,
  ]);
--- a/packages/app/src/hooks/use-delayed-history-refresh-toast.tsx
+++ b/packages/app/src/hooks/use-delayed-history-refresh-toast.tsx
@@ -1,70 +0,0 @@
-import { useEffect, useRef, type ReactNode } from "react";
-import { ActivityIndicator } from "react-native";
-import type { ToastShowOptions } from "@/components/toast-host";
-
-const HISTORY_REFRESH_TOAST_DELAY_MS = 1000;
-const HISTORY_REFRESH_TOAST_DURATION_MS = 2200;
-
-interface UseDelayedHistoryRefreshToastParams {
-  isCatchingUp: boolean;
-  indicatorColor: string;
-  showToast: (content: ReactNode, options?: ToastShowOptions) => void;
-}
-
-export function useDelayedHistoryRefreshToast({
-  isCatchingUp,
-  indicatorColor,
-  showToast,
-}: UseDelayedHistoryRefreshToastParams): void {
-  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const wasCatchingUpRef = useRef(false);
-  const isCatchingUpRef = useRef(false);
-  const showToastRef = useRef(showToast);
-  const indicatorColorRef = useRef(indicatorColor);
-
-  useEffect(() => {
-    showToastRef.current = showToast;
-  }, [showToast]);
-
-  useEffect(() => {
-    indicatorColorRef.current = indicatorColor;
-  }, [indicatorColor]);
-
-  useEffect(() => {
-    isCatchingUpRef.current = isCatchingUp;
-
-    const enteredCatchUp = !wasCatchingUpRef.current && isCatchingUp;
-    const exitedCatchUp = wasCatchingUpRef.current && !isCatchingUp;
-
-    if (enteredCatchUp) {
-      if (timerRef.current) {
-        clearTimeout(timerRef.current);
-      }
-      timerRef.current = setTimeout(() => {
-        timerRef.current = null;
-        if (!isCatchingUpRef.current) {
-          return;
-        }
-        showToastRef.current("Refreshing", {
-          icon: <ActivityIndicator size="small" color={indicatorColorRef.current} />,
-          durationMs: HISTORY_REFRESH_TOAST_DURATION_MS,
-          testID: "agent-history-refresh-toast",
-        });
-      }, HISTORY_REFRESH_TOAST_DELAY_MS);
-    } else if (exitedCatchUp && timerRef.current) {
-      clearTimeout(timerRef.current);
-      timerRef.current = null;
-    }
-
-    wasCatchingUpRef.current = isCatchingUp;
-  }, [isCatchingUp]);
-
-  useEffect(() => {
-    return () => {
-      if (timerRef.current) {
-        clearTimeout(timerRef.current);
-        timerRef.current = null;
-      }
-    };
-  }, []);
-}
--- a/packages/app/src/hooks/use-keyboard-shortcuts.ts
+++ b/packages/app/src/hooks/use-keyboard-shortcuts.ts
@@ -129,6 +129,11 @@ export function useKeyboardShortcuts({
            id: "message-input.focus",
            scope: "message-input",
          });
+        case "send":
+          return keyboardActionDispatcher.dispatch({
+            id: "message-input.send",
+            scope: "message-input",
+          });
        case "dictation-toggle":
          return keyboardActionDispatcher.dispatch({
            id: "message-input.dictation-toggle",
@@ -139,6 +144,11 @@ export function useKeyboardShortcuts({
            id: "message-input.dictation-cancel",
            scope: "message-input",
          });
+        case "dictation-confirm":
+          return keyboardActionDispatcher.dispatch({
+            id: "message-input.dictation-confirm",
+            scope: "message-input",
+          });
        case "voice-toggle":
          return keyboardActionDispatcher.dispatch({
            id: "message-input.voice-toggle",
--- a/packages/app/src/hooks/use-preferred-editor.test.ts
+++ b/packages/app/src/hooks/use-preferred-editor.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from "vitest";
+import { resolvePreferredEditorId } from "./use-preferred-editor";
+
+describe("resolvePreferredEditorId", () => {
+  it("keeps the stored editor when it is still available", () => {
+    expect(resolvePreferredEditorId(["cursor", "vscode"], "vscode")).toBe("vscode");
+  });
+
+  it("falls back to the first available editor when the stored one is missing", () => {
+    expect(resolvePreferredEditorId(["zed", "finder"], "cursor")).toBe("zed");
+  });
+
+  it("falls back when a platform-specific file manager target is unavailable", () => {
+    expect(resolvePreferredEditorId(["explorer", "vscode"], "finder")).toBe("explorer");
+  });
+
+  it("returns null when no editors are available", () => {
+    expect(resolvePreferredEditorId([], "cursor")).toBeNull();
+  });
+});
--- a/packages/app/src/hooks/use-preferred-editor.ts
+++ b/packages/app/src/hooks/use-preferred-editor.ts
@@ -0,0 +1,57 @@
+import { useCallback } from "react";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { EditorTargetIdSchema, type EditorTargetId } from "@server/shared/messages";
+
+const PREFERRED_EDITOR_STORAGE_KEY = "@paseo:preferred-editor";
+const PREFERRED_EDITOR_QUERY_KEY = ["preferred-editor"];
+
+async function loadPreferredEditor(): Promise<EditorTargetId | null> {
+  const stored = await AsyncStorage.getItem(PREFERRED_EDITOR_STORAGE_KEY);
+  if (!stored) {
+    return null;
+  }
+  const parsed = EditorTargetIdSchema.safeParse(stored);
+  return parsed.success ? parsed.data : null;
+}
+
+export function resolvePreferredEditorId(
+  availableEditorIds: readonly EditorTargetId[],
+  storedEditorId: EditorTargetId | null | undefined,
+): EditorTargetId | null {
+  if (
+    storedEditorId &&
+    availableEditorIds.some((availableEditorId) => availableEditorId === storedEditorId)
+  ) {
+    return storedEditorId;
+  }
+  return availableEditorIds[0] ?? null;
+}
+
+export function usePreferredEditor() {
+  const queryClient = useQueryClient();
+  const { data, isPending } = useQuery({
+    queryKey: PREFERRED_EDITOR_QUERY_KEY,
+    queryFn: loadPreferredEditor,
+    staleTime: Infinity,
+    gcTime: Infinity,
+  });
+
+  const updatePreferredEditor = useCallback(
+    async (editorId: EditorTargetId | null) => {
+      queryClient.setQueryData(PREFERRED_EDITOR_QUERY_KEY, editorId);
+      if (editorId) {
+        await AsyncStorage.setItem(PREFERRED_EDITOR_STORAGE_KEY, editorId);
+        return;
+      }
+      await AsyncStorage.removeItem(PREFERRED_EDITOR_STORAGE_KEY);
+    },
+    [queryClient],
+  );
+
+  return {
+    preferredEditorId: data ?? null,
+    isLoading: isPending,
+    updatePreferredEditor,
+  };
+}
--- a/packages/app/src/hooks/use-providers-snapshot.ts
+++ b/packages/app/src/hooks/use-providers-snapshot.ts
@@ -0,0 +1,86 @@
+import { useCallback, useEffect, useMemo } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import type { ProviderSnapshotEntry } from "@server/server/agent/agent-sdk-types";
+import type { DaemonClient } from "@server/client/daemon-client";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { useSessionForServer } from "./use-session-directory";
+import { queryClient as singletonQueryClient } from "@/query/query-client";
+
+export function providersSnapshotQueryKey(serverId: string | null) {
+  return ["providersSnapshot", serverId] as const;
+}
+
+interface UseProvidersSnapshotResult {
+  entries: ProviderSnapshotEntry[] | undefined;
+  isLoading: boolean;
+  isFetching: boolean;
+  error: string | null;
+  supportsSnapshot: boolean;
+  refresh: () => void;
+}
+
+export function useProvidersSnapshot(serverId: string | null): UseProvidersSnapshotResult {
+  const queryClient = useQueryClient();
+  const client = useHostRuntimeClient(serverId ?? "");
+  const isConnected = useHostRuntimeIsConnected(serverId ?? "");
+  const supportsSnapshot = useSessionForServer(
+    serverId,
+    (session) => session?.serverInfo?.features?.providersSnapshot === true,
+  );
+
+  const queryKey = useMemo(() => providersSnapshotQueryKey(serverId), [serverId]);
+
+  const snapshotQuery = useQuery({
+    queryKey,
+    enabled: Boolean(supportsSnapshot && serverId && client && isConnected),
+    staleTime: 60_000,
+    queryFn: async () => {
+      if (!client) {
+        throw new Error("Host is not connected");
+      }
+      return client.getProvidersSnapshot();
+    },
+  });
+
+  useEffect(() => {
+    if (!supportsSnapshot || !client || !isConnected || !serverId) {
+      return;
+    }
+
+    return client.on("providers_snapshot_update", (message) => {
+      if (message.type !== "providers_snapshot_update") {
+        return;
+      }
+      queryClient.setQueryData(queryKey, {
+        entries: message.payload.entries,
+        generatedAt: message.payload.generatedAt,
+        requestId: "providers_snapshot_update",
+      });
+    });
+  }, [client, isConnected, serverId, queryClient, queryKey, supportsSnapshot]);
+
+  const refresh = useCallback(() => {
+    if (!client) {
+      return;
+    }
+    void client.refreshProvidersSnapshot();
+  }, [client]);
+
+  return {
+    entries: snapshotQuery.data?.entries ?? undefined,
+    isLoading: snapshotQuery.isLoading,
+    isFetching: snapshotQuery.isFetching,
+    error: snapshotQuery.error instanceof Error ? snapshotQuery.error.message : null,
+    supportsSnapshot,
+    refresh,
+  };
+}
+
+export function prefetchProvidersSnapshot(serverId: string, client: DaemonClient): void {
+  const queryKey = providersSnapshotQueryKey(serverId);
+  void singletonQueryClient.prefetchQuery({
+    queryKey,
+    staleTime: 60_000,
+    queryFn: () => client.getProvidersSnapshot(),
+  });
+}
--- a/packages/app/src/hooks/use-sidebar-workspaces-list.ts
+++ b/packages/app/src/hooks/use-sidebar-workspaces-list.ts
@@ -1,5 +1,9 @@
 import { useCallback, useEffect, useMemo, useSyncExternalStore } from "react";
-import { normalizeWorkspaceDescriptor, useSessionStore } from "@/stores/session-store";
+import {
+  mergeWorkspaceSnapshotWithExisting,
+  normalizeWorkspaceDescriptor,
+  useSessionStore,
+} from "@/stores/session-store";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useSidebarOrderStore } from "@/stores/sidebar-order-store";
 import type { WorkspaceDescriptor } from "@/stores/session-store";
@@ -356,6 +360,7 @@ export function useSidebarWorkspacesList(options?: {
    }
    void (async () => {
      const next = new Map<string, WorkspaceDescriptor>();
+      const existingWorkspaces = useSessionStore.getState().sessions[serverId]?.workspaces;
      let cursor: string | null = null;
      try {
        while (true) {
@@ -365,7 +370,13 @@ export function useSidebarWorkspacesList(options?: {
          });
          for (const entry of payload.entries) {
            const workspace = toWorkspaceDescriptor(entry);
-            next.set(workspace.id, workspace);
+            next.set(
+              workspace.id,
+              mergeWorkspaceSnapshotWithExisting({
+                incoming: workspace,
+                existing: existingWorkspaces?.get(workspace.id),
+              }),
+            );
          }
          if (!payload.pageInfo.hasMore || !payload.pageInfo.nextCursor) {
            break;
--- a/packages/app/src/keyboard/actions.ts
+++ b/packages/app/src/keyboard/actions.ts
@@ -11,6 +11,7 @@ export type MessageInputKeyboardActionKind =
  | "queue"
  | "dictation-toggle"
  | "dictation-cancel"
+  | "dictation-confirm"
  | "voice-toggle"
  | "voice-mute-toggle";

--- a/packages/app/src/keyboard/keyboard-action-dispatcher.ts
+++ b/packages/app/src/keyboard/keyboard-action-dispatcher.ts
@@ -2,8 +2,10 @@ export type KeyboardActionScope = "global" | "message-input" | "sidebar" | "work

 export type KeyboardActionId =
  | "message-input.focus"
+  | "message-input.send"
  | "message-input.dictation-toggle"
  | "message-input.dictation-cancel"
+  | "message-input.dictation-confirm"
  | "message-input.voice-toggle"
  | "message-input.voice-mute-toggle"
  | "workspace.tab.new"
@@ -27,8 +29,10 @@ export type KeyboardActionId =

 export type KeyboardActionDefinition =
  | { id: "message-input.focus"; scope: KeyboardActionScope }
+  | { id: "message-input.send"; scope: KeyboardActionScope }
  | { id: "message-input.dictation-toggle"; scope: KeyboardActionScope }
  | { id: "message-input.dictation-cancel"; scope: KeyboardActionScope }
+  | { id: "message-input.dictation-confirm"; scope: KeyboardActionScope }
  | { id: "message-input.voice-toggle"; scope: KeyboardActionScope }
  | { id: "message-input.voice-mute-toggle"; scope: KeyboardActionScope }
  | { id: "workspace.tab.new"; scope: KeyboardActionScope }
--- a/packages/app/src/keyboard/keyboard-shortcuts.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.ts
@@ -860,6 +860,14 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
    },
  },

+  {
+    id: "message-input-dictation-confirm-enter",
+    action: "message-input.action",
+    combo: "Enter",
+    when: { commandCenter: false, terminal: false },
+    payload: { type: "message-input", kind: "dictation-confirm" },
+  },
+
  {
    id: "message-input-voice-mute-toggle",
    action: "message-input.action",
--- a/packages/app/src/panels/agent-panel.tsx
+++ b/packages/app/src/panels/agent-panel.tsx
@@ -21,7 +21,6 @@ import {
  type AgentScreenMissingState,
 } from "@/hooks/use-agent-screen-state-machine";
 import { useArchiveAgent } from "@/hooks/use-archive-agent";
-import { useDelayedHistoryRefreshToast } from "@/hooks/use-delayed-history-refresh-toast";
 import { useAgentInputDraft } from "@/hooks/use-agent-input-draft";
 import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
 import { useStableEvent } from "@/hooks/use-stable-event";
@@ -704,27 +703,6 @@ function AgentPanelBody({
    shouldUseOptimisticStream,
  ]);

-  const isHistoryRefreshCatchingUp =
-    viewState.tag === "ready" &&
-    viewState.sync.status === "catching_up" &&
-    viewState.sync.ui === "toast";
-  const shouldEmitSyncErrorToast =
-    viewState.tag === "ready" &&
-    viewState.sync.status === "sync_error" &&
-    viewState.sync.shouldEmitSyncErrorToast;
-
-  useDelayedHistoryRefreshToast({
-    isCatchingUp: isHistoryRefreshCatchingUp,
-    indicatorColor: theme.colors.primary,
-    showToast: panelToast.api.show,
-  });
-
-  useEffect(() => {
-    if (!shouldEmitSyncErrorToast) {
-      return;
-    }
-    panelToast.api.error("Failed to refresh agent. Retrying in background.");
-  }, [panelToast.api, shouldEmitSyncErrorToast]);

  if (viewState.tag === "not_found") {
    return (
--- a/packages/app/src/screens/agent/draft-agent-screen.tsx
+++ b/packages/app/src/screens/agent/draft-agent-screen.tsx
@@ -220,6 +220,7 @@ function DraftAgentScreenContent({
    modeOptions,
    availableModels,
    allProviderModels,
+    allProviderEntries,
    isAllModelsLoading,
    availableThinkingOptions,
    isModelLoading,
--- a/packages/app/src/screens/settings-screen.tsx
+++ b/packages/app/src/screens/settings-screen.tsx
@@ -21,6 +21,7 @@ import {
  Info,
  Shield,
  Puzzle,
+  Blocks,
 } from "lucide-react-native";
 import { useAppSettings, type AppSettings } from "@/hooks/use-settings";
 import type { HostProfile, HostConnection } from "@/types/host-connection";
@@ -61,7 +62,12 @@ import { settingsStyles } from "@/styles/settings";
 import { THINKING_TONE_NATIVE_PCM_BASE64 } from "@/utils/thinking-tone.native-pcm";
 import { useVoiceAudioEngineOptional } from "@/contexts/voice-context";
 import { useIsLocalDaemon } from "@/hooks/use-is-local-daemon";
+import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { isCompactFormFactor } from "@/constants/layout";
+import { AGENT_PROVIDER_DEFINITIONS } from "@server/server/agent/provider-manifest";
+import { getProviderIcon } from "@/components/provider-icons";
+import { ProviderDiagnosticSheet } from "@/components/provider-diagnostic-sheet";
+import { StatusBadge } from "@/components/ui/status-badge";

 // ---------------------------------------------------------------------------
 // Section definitions
@@ -72,6 +78,7 @@ type SettingsSectionId =
  | "appearance"
  | "shortcuts"
  | "integrations"
+  | "providers"
  | "diagnostics"
  | "about"
  | "permissions"
@@ -99,6 +106,7 @@ function getSettingsSections(context: { isDesktopApp: boolean }): SettingsSectio
  }

  sections.push(
+    { id: "providers", label: "Providers", icon: Blocks },
    { id: "diagnostics", label: "Diagnostics", icon: Stethoscope },
    { id: "about", label: "About", icon: Info },
  );
@@ -184,13 +192,10 @@ interface HostsSectionProps {
  routeServerId: string;
  theme: ReturnType<typeof useUnistyles>["theme"];
  handleEditDaemon: (profile: HostProfile) => void;
-  setAddConnectionTargetServerId: (id: string | null) => void;
-  setPendingEditReopenServerId: (id: string | null) => void;
  setIsAddHostMethodVisible: (visible: boolean) => void;
  isAddHostMethodVisible: boolean;
  isDirectHostVisible: boolean;
  isPasteLinkVisible: boolean;
-  addConnectionTargetServerId: string | null;
  closeAddConnectionFlow: () => void;
  goBackToAddConnectionMethods: () => void;
  setIsDirectHostVisible: (visible: boolean) => void;
@@ -210,7 +215,6 @@ interface HostsSectionProps {
  handleSaveEditDaemon: (label: string) => Promise<void>;
  handleRemoveConnection: (serverId: string, connectionId: string) => Promise<void>;
  handleRemoveDaemon: (profile: HostProfile) => void;
-  handleAddConnectionFromModal: () => void;
  restartConfirmationMessage: string;
  waitForCondition: (
    predicate: () => boolean,
@@ -250,8 +254,6 @@ function HostsSection(props: HostsSectionProps) {
          style={styles.addButton}
          textStyle={styles.addButtonText}
          onPress={() => {
-            props.setAddConnectionTargetServerId(null);
-            props.setPendingEditReopenServerId(null);
            props.setIsAddHostMethodVisible(true);
          }}
        >
@@ -271,22 +273,17 @@ function HostsSection(props: HostsSectionProps) {
          props.setIsPasteLinkVisible(true);
        }}
        onScanQr={() => {
-          const targetServerId = props.addConnectionTargetServerId;
-          const source = targetServerId ? "editHost" : "settings";
-          const sourceServerId = props.routeServerId || targetServerId || undefined;
+          const sourceServerId = props.routeServerId || undefined;
          props.closeAddConnectionFlow();
          router.push({
            pathname: "/pair-scan",
-            params: targetServerId
-              ? { source, targetServerId, sourceServerId }
-              : { source, sourceServerId },
+            params: { source: "settings", sourceServerId },
          });
        }}
      />

      <AddHostModal
        visible={props.isDirectHostVisible}
-        targetServerId={props.addConnectionTargetServerId ?? undefined}
        onClose={props.closeAddConnectionFlow}
        onCancel={props.goBackToAddConnectionMethods}
        onSaved={({ serverId, hostname, isNewHost }) => {
@@ -298,7 +295,6 @@ function HostsSection(props: HostsSectionProps) {

      <PairLinkModal
        visible={props.isPasteLinkVisible}
-        targetServerId={props.addConnectionTargetServerId ?? undefined}
        onClose={props.closeAddConnectionFlow}
        onCancel={props.goBackToAddConnectionMethods}
        onSaved={({ serverId, hostname, isNewHost }) => {
@@ -378,7 +374,6 @@ function HostsSection(props: HostsSectionProps) {
        onSave={(label) => void props.handleSaveEditDaemon(label)}
        onRemoveConnection={props.handleRemoveConnection}
        onRemoveHost={props.handleRemoveDaemon}
-        onAddConnection={props.handleAddConnectionFromModal}
        restartConfirmationMessage={props.restartConfirmationMessage}
        waitForCondition={props.waitForCondition}
        isScreenMountedRef={props.isMountedRef}
@@ -431,6 +426,123 @@ function AppearanceSection({ settings, handleThemeChange }: AppearanceSectionPro
 }


+interface ProvidersSectionProps {
+  routeServerId: string;
+}
+
+function ProvidersSection({ routeServerId }: ProvidersSectionProps) {
+  const { theme } = useUnistyles();
+  const isConnected = useHostRuntimeIsConnected(routeServerId);
+  const { entries, isLoading, isFetching, refresh } = useProvidersSnapshot(routeServerId);
+  const [diagnosticProvider, setDiagnosticProvider] = useState<string | null>(null);
+
+  const hasServer = routeServerId.length > 0;
+
+  return (
+    <>
+      <View style={settingsStyles.section}>
+        <View style={settingsStyles.sectionHeader}>
+          <Text style={settingsStyles.sectionHeaderTitle}>Providers</Text>
+          {hasServer && isConnected ? (
+            <Pressable
+              onPress={refresh}
+              disabled={isFetching}
+              style={[
+                settingsStyles.sectionHeaderLink,
+                isFetching ? { opacity: 0.5 } : null,
+              ]}
+            >
+              <Text
+                style={{
+                  color: theme.colors.primary,
+                  fontSize: theme.fontSize.xs,
+                }}
+              >
+                Refresh
+              </Text>
+            </Pressable>
+          ) : null}
+        </View>
+        {!hasServer || !isConnected ? (
+          <View style={[settingsStyles.card, styles.emptyCard]}>
+            <Text style={styles.emptyText}>Connect to a host to see providers</Text>
+          </View>
+        ) : isLoading ? (
+          <View style={[settingsStyles.card, styles.emptyCard]}>
+            <Text style={styles.emptyText}>Loading...</Text>
+          </View>
+        ) : (
+          <View style={[settingsStyles.card, styles.audioCard]}>
+            {AGENT_PROVIDER_DEFINITIONS.map((def) => {
+              const entry = entries?.find((e) => e.provider === def.id);
+              const status = entry?.status ?? "unavailable";
+              const ProviderIcon = getProviderIcon(def.id);
+              const providerError =
+                status === "error" && typeof entry?.error === "string" && entry.error.trim().length > 0
+                  ? entry.error.trim()
+                  : null;
+
+              return (
+                <View key={def.id} style={styles.audioRow}>
+                  <View style={styles.audioRowContent}>
+                    <View
+                      style={{ flexDirection: "row", alignItems: "center", gap: theme.spacing[2] }}
+                    >
+                      <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foreground} />
+                      <Text style={styles.audioRowTitle}>{def.label}</Text>
+                    </View>
+                    {providerError ? (
+                      <Text style={styles.aboutErrorText} numberOfLines={3}>
+                        {providerError}
+                      </Text>
+                    ) : null}
+                  </View>
+                  <View style={styles.providerActions}>
+                    <StatusBadge
+                      label={
+                        status === "ready"
+                          ? "Available"
+                          : status === "error"
+                            ? "Error"
+                            : status === "loading"
+                              ? "Loading..."
+                              : "Not installed"
+                      }
+                      variant={
+                        status === "ready"
+                          ? "success"
+                          : status === "error"
+                            ? "error"
+                            : "muted"
+                      }
+                    />
+                    <Button
+                      variant="secondary"
+                      size="sm"
+                      onPress={() => setDiagnosticProvider(def.id)}
+                    >
+                      Diagnostic
+                    </Button>
+                  </View>
+                </View>
+              );
+            })}
+          </View>
+        )}
+      </View>
+
+      {diagnosticProvider ? (
+        <ProviderDiagnosticSheet
+          provider={diagnosticProvider}
+          visible
+          onClose={() => setDiagnosticProvider(null)}
+          serverId={routeServerId}
+        />
+      ) : null}
+    </>
+  );
+}
+
 interface DiagnosticsSectionProps {
  voiceAudioEngine: ReturnType<typeof useVoiceAudioEngineOptional>;
  isPlaybackTestRunning: boolean;
@@ -499,6 +611,7 @@ interface SettingsSectionContentProps {
  sectionId: SettingsSectionId;
  hostsProps: HostsSectionProps;
  appearanceProps: AppearanceSectionProps;
+  providersProps: ProvidersSectionProps;
  diagnosticsProps: DiagnosticsSectionProps;
  aboutProps: AboutSectionProps;
  appVersion: string | null;
@@ -510,6 +623,7 @@ function SettingsSectionContent({
  sectionId,
  hostsProps,
  appearanceProps,
+  providersProps,
  diagnosticsProps,
  aboutProps,
  appVersion,
@@ -523,6 +637,8 @@ function SettingsSectionContent({
      return <AppearanceSection {...appearanceProps} />;
    case "shortcuts":
      return <KeyboardShortcutsSection />;
+    case "providers":
+      return <ProvidersSection {...providersProps} />;
    case "diagnostics":
      return <DiagnosticsSection {...diagnosticsProps} />;
    case "about":
@@ -580,7 +696,7 @@ function SettingsDesktopLayout({ sections, sectionContentProps }: SettingsLayout
          const isSelected = section.id === selectedSectionId;
          const IconComponent = section.icon;
          const showSeparator =
-            section.id === "integrations" || section.id === "diagnostics";
+            section.id === "integrations" || section.id === "providers";
          return (
            <View key={section.id}>
              {showSeparator ? <View style={desktopStyles.sidebarSeparator} /> : null}
@@ -741,10 +857,6 @@ export default function SettingsScreen() {
  const [isAddHostMethodVisible, setIsAddHostMethodVisible] = useState(false);
  const [isDirectHostVisible, setIsDirectHostVisible] = useState(false);
  const [isPasteLinkVisible, setIsPasteLinkVisible] = useState(false);
-  const [addConnectionTargetServerId, setAddConnectionTargetServerId] = useState<string | null>(
-    null,
-  );
-  const [pendingEditReopenServerId, setPendingEditReopenServerId] = useState<string | null>(null);
  const [pendingNameHost, setPendingNameHost] = useState<{
    serverId: string;
    hostname: string | null;
@@ -823,7 +935,6 @@ export default function SettingsScreen() {
    setIsAddHostMethodVisible(false);
    setIsDirectHostVisible(false);
    setIsPasteLinkVisible(false);
-    setAddConnectionTargetServerId(null);
  }, []);

  const goBackToAddConnectionMethods = useCallback(() => {
@@ -842,24 +953,6 @@ export default function SettingsScreen() {
    handleEditDaemon(profile);
  }, [daemons, handleEditDaemon, params.editHost]);

-  useEffect(() => {
-    if (!pendingEditReopenServerId) return;
-    if (isAddHostMethodVisible || isDirectHostVisible || isPasteLinkVisible) return;
-    const profile = daemons.find((daemon) => daemon.serverId === pendingEditReopenServerId) ?? null;
-    setPendingEditReopenServerId(null);
-    setAddConnectionTargetServerId(null);
-    if (profile) {
-      handleEditDaemon(profile);
-    }
-  }, [
-    daemons,
-    handleEditDaemon,
-    isAddHostMethodVisible,
-    isDirectHostVisible,
-    isPasteLinkVisible,
-    pendingEditReopenServerId,
-  ]);
-
  const handleSaveEditDaemon = useCallback(
    async (nextLabelRaw: string) => {
      if (!editingServerId) return;
@@ -897,15 +990,6 @@ export default function SettingsScreen() {
    setPendingRemoveHost(profile);
  }, []);

-  const handleAddConnectionFromModal = useCallback(() => {
-    if (!editingServerId) return;
-    const serverId = editingServerId;
-    setEditingDaemon(null);
-    setAddConnectionTargetServerId(serverId);
-    setPendingEditReopenServerId(serverId);
-    setIsAddHostMethodVisible(true);
-  }, [editingServerId]);
-
  const handleThemeChange = useCallback(
    (newTheme: AppSettings["theme"]) => {
      void updateSettings({ theme: newTheme });
@@ -951,13 +1035,10 @@ export default function SettingsScreen() {
    routeServerId,
    theme,
    handleEditDaemon,
-    setAddConnectionTargetServerId,
-    setPendingEditReopenServerId,
    setIsAddHostMethodVisible,
    isAddHostMethodVisible,
    isDirectHostVisible,
    isPasteLinkVisible,
-    addConnectionTargetServerId,
    closeAddConnectionFlow,
    goBackToAddConnectionMethods,
    setIsDirectHostVisible,
@@ -977,7 +1058,6 @@ export default function SettingsScreen() {
    handleSaveEditDaemon,
    handleRemoveConnection,
    handleRemoveDaemon,
-    handleAddConnectionFromModal,
    restartConfirmationMessage: "This will restart the daemon. The app will reconnect automatically.",
    waitForCondition,
    isMountedRef,
@@ -1000,9 +1080,14 @@ export default function SettingsScreen() {
    isDesktopApp,
  };

+  const providersProps: ProvidersSectionProps = {
+    routeServerId,
+  };
+
  const sectionContentProps: Omit<SettingsSectionContentProps, "sectionId"> = {
    hostsProps,
    appearanceProps,
+    providersProps,
    diagnosticsProps,
    aboutProps,
    appVersion,
@@ -1042,7 +1127,6 @@ interface HostDetailModalProps {
  onSave: (label: string) => void;
  onRemoveConnection: (serverId: string, connectionId: string) => Promise<void>;
  onRemoveHost: (host: HostProfile) => void;
-  onAddConnection: () => void;
  restartConfirmationMessage: string;
  waitForCondition: (
    predicate: () => boolean,
@@ -1060,7 +1144,6 @@ function HostDetailModal({
  onSave,
  onRemoveConnection,
  onRemoveHost,
-  onAddConnection,
  restartConfirmationMessage,
  waitForCondition,
  isScreenMountedRef,
@@ -1291,15 +1374,6 @@ function HostDetailModal({
                  />
                );
              })}
-              <Button
-                variant="outline"
-                size="md"
-                style={styles.addButton}
-                textStyle={styles.addButtonText}
-                onPress={onAddConnection}
-              >
-                + Add connection
-              </Button>
            </View>
          </View>
        ) : null}
@@ -1821,6 +1895,11 @@ const styles = StyleSheet.create((theme) => ({
    color: theme.colors.foreground,
    fontSize: theme.fontSize.base,
  },
+  providerActions: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
  aboutValue: {
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.sm,
--- a/packages/app/src/screens/workspace/workspace-bulk-close.test.ts
+++ b/packages/app/src/screens/workspace/workspace-bulk-close.test.ts
@@ -73,7 +73,7 @@ describe("workspace bulk close helpers", () => {
    );
  });

-  it("uses one mixed closeItems RPC for agent and terminal tabs, then applies local cleanup", async () => {
+  it("closes all tabs immediately and fires one mixed closeItems RPC in the background", async () => {
    const groups = classifyBulkClosableTabs([
      makeAgentTab("a1"),
      makeTerminalTab("t1"),
@@ -91,7 +91,7 @@ describe("workspace bulk close helpers", () => {
      requestId: "req-1",
    }));

-    const result = await closeBulkWorkspaceTabs({
+    await closeBulkWorkspaceTabs({
      groups,
      client: { closeItems },
      closeTab: async (tabId, action) => {
@@ -109,23 +109,21 @@ describe("workspace bulk close helpers", () => {
      agentIds: ["a1"],
      terminalIds: ["t1", "t2"],
    });
-    expect(result).toEqual({
-      agents: [{ agentId: "a1", archivedAt: "2026-04-01T04:00:00.000Z" }],
-      terminals: [
-        { terminalId: "t1", success: true },
-        { terminalId: "t2", success: false },
-      ],
-      requestId: "req-1",
-    });
-    expect(closedTabIds).toEqual(["agent_a1", "terminal_t1", "file_/repo/README.md"]);
+    expect(closedTabIds).toEqual([
+      "agent_a1",
+      "terminal_t1",
+      "terminal_t2",
+      "file_/repo/README.md",
+    ]);
    expect(cleanupCalls).toEqual([
      { tabId: "agent_a1", target: { kind: "agent", agentId: "a1" } },
      { tabId: "terminal_t1", target: { kind: "terminal", terminalId: "t1" } },
+      { tabId: "terminal_t2", target: { kind: "terminal", terminalId: "t2" } },
      { tabId: "file_/repo/README.md" },
    ]);
  });

-  it("still closes passive tabs when the mixed closeItems RPC fails", async () => {
+  it("still closes all tabs when the mixed closeItems RPC fails", async () => {
    const groups = classifyBulkClosableTabs([
      makeAgentTab("a1"),
      makeTerminalTab("t1"),
@@ -135,7 +133,7 @@ describe("workspace bulk close helpers", () => {
    const cleanupCalls: Array<{ tabId: string; target?: WorkspaceTabDescriptor["target"] }> = [];
    const warn = vi.fn();

-    const result = await closeBulkWorkspaceTabs({
+    await closeBulkWorkspaceTabs({
      groups,
      client: {
        closeItems: async () => {
@@ -153,9 +151,14 @@ describe("workspace bulk close helpers", () => {
      logLabel: "others",
    });

+    await Promise.resolve();
+
    expect(warn).toHaveBeenCalledTimes(1);
-    expect(result).toBeNull();
-    expect(closedTabIds).toEqual(["file_/repo/README.md"]);
-    expect(cleanupCalls).toEqual([{ tabId: "file_/repo/README.md" }]);
+    expect(closedTabIds).toEqual(["agent_a1", "terminal_t1", "file_/repo/README.md"]);
+    expect(cleanupCalls).toEqual([
+      { tabId: "agent_a1", target: { kind: "agent", agentId: "a1" } },
+      { tabId: "terminal_t1", target: { kind: "terminal", terminalId: "t1" } },
+      { tabId: "file_/repo/README.md" },
+    ]);
  });
 });
--- a/packages/app/src/screens/workspace/workspace-bulk-close.ts
+++ b/packages/app/src/screens/workspace/workspace-bulk-close.ts
@@ -7,8 +7,6 @@ export type BulkClosableTabGroups = {
  otherTabs: Array<{ tabId: string }>;
 };

-type CloseItemsPayload = Awaited<ReturnType<DaemonClient["closeItems"]>>;
-
 interface CloseWorkspaceTabWithCleanupInput {
  tabId: string;
  target?: WorkspaceTabDescriptor["target"];
@@ -68,47 +66,27 @@ export function buildBulkCloseConfirmationMessage(input: BulkClosableTabGroups):
  return `This will archive ${agentTabs.length} agent(s).`;
 }

-function toSuccessfulAgentIds(payload: CloseItemsPayload | null): Set<string> {
-  return new Set(payload?.agents.map((agent) => agent.agentId) ?? []);
-}
-
-function toSuccessfulTerminalIds(payload: CloseItemsPayload | null): Set<string> {
-  return new Set(
-    payload?.terminals.filter((terminal) => terminal.success).map((terminal) => terminal.terminalId) ??
-      [],
-  );
-}
-
-export async function closeBulkWorkspaceTabs(
-  input: CloseBulkWorkspaceTabsInput,
-): Promise<CloseItemsPayload | null> {
+export async function closeBulkWorkspaceTabs(input: CloseBulkWorkspaceTabsInput): Promise<void> {
  const { client, groups, closeTab, closeWorkspaceTabWithCleanup, logLabel, warn } = input;
  const hasDestructiveTabs = groups.agentTabs.length > 0 || groups.terminalTabs.length > 0;
-  let payload: CloseItemsPayload | null = null;

  if (hasDestructiveTabs && client) {
-    try {
-      payload = await client.closeItems({
+    void client
+      .closeItems({
        agentIds: groups.agentTabs.map((tab) => tab.agentId),
        terminalIds: groups.terminalTabs.map((tab) => tab.terminalId),
+      })
+      .catch((error) => {
+        warn?.(`[WorkspaceScreen] Failed to bulk close tabs ${logLabel}`, { error });
      });
-    } catch (error) {
-      warn?.(`[WorkspaceScreen] Failed to bulk close tabs ${logLabel}`, { error });
-    }
  } else if (hasDestructiveTabs) {
    warn?.(`[WorkspaceScreen] Failed to bulk close tabs ${logLabel}`, {
      error: new Error("Daemon client not available"),
    });
  }

-  const successfulAgentIds = toSuccessfulAgentIds(payload);
-  const successfulTerminalIds = toSuccessfulTerminalIds(payload);
-
  for (const { tabId, agentId } of groups.agentTabs) {
-    if (!successfulAgentIds.has(agentId)) {
-      continue;
-    }
-    await closeTab(tabId, async () => {
+    void closeTab(tabId, async () => {
      closeWorkspaceTabWithCleanup({
        tabId,
        target: { kind: "agent", agentId },
@@ -117,10 +95,7 @@ export async function closeBulkWorkspaceTabs(
  }

  for (const { tabId, terminalId } of groups.terminalTabs) {
-    if (!successfulTerminalIds.has(terminalId)) {
-      continue;
-    }
-    await closeTab(tabId, async () => {
+    void closeTab(tabId, async () => {
      closeWorkspaceTabWithCleanup({
        tabId,
        target: { kind: "terminal", terminalId },
@@ -129,10 +104,8 @@ export async function closeBulkWorkspaceTabs(
  }

  for (const { tabId } of groups.otherTabs) {
-    await closeTab(tabId, async () => {
+    void closeTab(tabId, async () => {
      closeWorkspaceTabWithCleanup({ tabId });
    });
  }
-
-  return payload;
 }
--- a/packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx
+++ b/packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx
@@ -14,6 +14,7 @@ import {
  ArrowRightToLine,
  Columns2,
  Copy,
+  RotateCw,
  Rows2,
  SquarePen,
  SquareTerminal,
@@ -71,6 +72,7 @@ type WorkspaceDesktopTabsRowProps = {
  onCloseTab: (tabId: string) => Promise<void> | void;
  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
  onCloseTabsToLeft: (tabId: string) => Promise<void> | void;
  onCloseTabsToRight: (tabId: string) => Promise<void> | void;
  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
@@ -291,11 +293,14 @@ function TabChip({
              disabled={entry.disabled}
              destructive={entry.destructive}
              onSelect={entry.onSelect}
+              tooltip={entry.tooltip}
              leading={(() => {
                const iconColor = theme.colors.foregroundMuted;
                switch (entry.icon) {
                  case "copy":
                    return <Copy size={16} color={iconColor} />;
+                  case "rotate-cw":
+                    return <RotateCw size={16} color={iconColor} />;
                  case "arrow-left-to-line":
                    return <ArrowLeftToLine size={16} color={iconColor} />;
                  case "arrow-right-to-line":
@@ -335,6 +340,7 @@ export function WorkspaceDesktopTabsRow({
  onCloseTab,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTabsToLeft,
  onCloseTabsToRight,
  onCloseOtherTabs,
@@ -457,6 +463,7 @@ export function WorkspaceDesktopTabsRow({
                normalizedWorkspaceId={normalizedWorkspaceId}
                onCopyResumeCommand={onCopyResumeCommand}
                onCopyAgentId={onCopyAgentId}
+                onReloadAgent={onReloadAgent}
                onCloseTabsToLeft={onCloseTabsToLeft}
                onCloseTabsToRight={onCloseTabsToRight}
                onCloseOtherTabs={onCloseOtherTabs}
@@ -585,6 +592,7 @@ function ResolvedDesktopTabChip({
  normalizedWorkspaceId,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTabsToLeft,
  onCloseTabsToRight,
  onCloseOtherTabs,
@@ -608,6 +616,7 @@ function ResolvedDesktopTabChip({
  normalizedWorkspaceId: string;
  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
  onCloseTabsToLeft: (tabId: string) => Promise<void> | void;
  onCloseTabsToRight: (tabId: string) => Promise<void> | void;
  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
@@ -630,6 +639,7 @@ function ResolvedDesktopTabChip({
        tabCount,
        onCopyResumeCommand,
        onCopyAgentId,
+        onReloadAgent,
        onCloseTab,
        onCloseTabsToLeft,
        onCloseTabsToRight,
@@ -644,6 +654,7 @@ function ResolvedDesktopTabChip({
      onCloseTabsToRight,
      onCopyAgentId,
      onCopyResumeCommand,
+      onReloadAgent,
      tabCount,
    ],
  );
--- a/packages/app/src/screens/workspace/workspace-draft-agent-tab.tsx
+++ b/packages/app/src/screens/workspace/workspace-draft-agent-tab.tsx
@@ -75,6 +75,7 @@ export function WorkspaceDraftAgentTab({
    modeOptions,
    availableModels,
    allProviderModels,
+    allProviderEntries,
    isAllModelsLoading,
    availableThinkingOptions,
    isModelLoading,
@@ -250,6 +251,60 @@ export function WorkspaceDraftAgentTab({
    addImagesRef.current = addImages;
  }, []);

+  const focusInputRef = useRef<(() => void) | null>(null);
+
+  const handleFocusInputCallback = useCallback((focus: () => void) => {
+    focusInputRef.current = focus;
+  }, []);
+
+  const handleProviderSelectWithFocus = useCallback(
+    (provider: string) => {
+      setProviderFromUser(provider);
+      focusInputRef.current?.();
+    },
+    [setProviderFromUser],
+  );
+
+  const handleModeSelectWithFocus = useCallback(
+    (modeId: string) => {
+      setModeFromUser(modeId);
+      focusInputRef.current?.();
+    },
+    [setModeFromUser],
+  );
+
+  const handleModelSelectWithFocus = useCallback(
+    (modelId: string) => {
+      setModelFromUser(modelId);
+      focusInputRef.current?.();
+    },
+    [setModelFromUser],
+  );
+
+  const handleProviderAndModelSelectWithFocus = useCallback(
+    (provider: string, modelId: string) => {
+      setProviderAndModelFromUser(provider, modelId);
+      focusInputRef.current?.();
+    },
+    [setProviderAndModelFromUser],
+  );
+
+  const handleThinkingOptionSelectWithFocus = useCallback(
+    (optionId: string) => {
+      setThinkingOptionFromUser(optionId);
+      focusInputRef.current?.();
+    },
+    [setThinkingOptionFromUser],
+  );
+
+  const handleSetFeatureWithFocus = useCallback(
+    (featureId: string, value: unknown) => {
+      setDraftFeatureValue(featureId, value);
+      focusInputRef.current?.();
+    },
+    [setDraftFeatureValue],
+  );
+
  return (
    <FileDropZone onFilesDropped={handleFilesDropped}>
      <View style={styles.container}>
@@ -296,26 +351,28 @@ export function WorkspaceDraftAgentTab({
            clearDraft={draftInput.clear}
            autoFocus={shouldAutoFocusWorkspaceDraftComposer({ isPaneFocused, isSubmitting })}
            onAddImages={handleAddImagesCallback}
+            onFocusInput={handleFocusInputCallback}
            commandDraftConfig={draftCommandConfig}
            statusControls={{
              providerDefinitions,
              selectedProvider,
-              onSelectProvider: setProviderFromUser,
+              onSelectProvider: handleProviderSelectWithFocus,
              modeOptions,
              selectedMode,
-              onSelectMode: setModeFromUser,
+              onSelectMode: handleModeSelectWithFocus,
              models: availableModels,
              selectedModel,
-              onSelectModel: setModelFromUser,
+              onSelectModel: handleModelSelectWithFocus,
              isModelLoading,
              allProviderModels,
              isAllModelsLoading,
-              onSelectProviderAndModel: setProviderAndModelFromUser,
+              onSelectProviderAndModel: handleProviderAndModelSelectWithFocus,
              thinkingOptions: availableThinkingOptions,
              selectedThinkingOptionId,
-              onSelectThinkingOption: setThinkingOptionFromUser,
+              onSelectThinkingOption: handleThinkingOptionSelectWithFocus,
              features: draftFeatures,
-              onSetFeature: setDraftFeatureValue,
+              onSetFeature: handleSetFeatureWithFocus,
+              onDropdownClose: () => focusInputRef.current?.(),
              disabled: isSubmitting,
            }}
          />
--- a/packages/app/src/screens/workspace/workspace-open-in-editor-button.tsx
+++ b/packages/app/src/screens/workspace/workspace-open-in-editor-button.tsx
@@ -0,0 +1,246 @@
+import { useCallback, useEffect, useMemo } from "react";
+import { ActivityIndicator, Platform, Pressable, Text, View } from "react-native";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { Check, ChevronDown } from "lucide-react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import type {
+  EditorTargetDescriptorPayload,
+  EditorTargetId,
+} from "@server/shared/messages";
+import { EditorAppIcon } from "@/components/icons/editor-app-icons";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { useToast } from "@/contexts/toast-context";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import {
+  resolvePreferredEditorId,
+  usePreferredEditor,
+} from "@/hooks/use-preferred-editor";
+import { isAbsolutePath } from "@/utils/path";
+
+interface WorkspaceOpenInEditorButtonProps {
+  serverId: string;
+  cwd: string;
+}
+
+export function WorkspaceOpenInEditorButton({
+  serverId,
+  cwd,
+}: WorkspaceOpenInEditorButtonProps) {
+  const { theme } = useUnistyles();
+  const toast = useToast();
+  const client = useHostRuntimeClient(serverId);
+  const isConnected = useHostRuntimeIsConnected(serverId);
+  const { preferredEditorId, updatePreferredEditor } = usePreferredEditor();
+
+  const shouldLoadEditors =
+    Platform.OS === "web" &&
+    Boolean(client && isConnected) &&
+    cwd.trim().length > 0 &&
+    isAbsolutePath(cwd);
+
+  const availableEditorsQuery = useQuery<EditorTargetDescriptorPayload[]>({
+    queryKey: ["available-editors", serverId],
+    enabled: shouldLoadEditors,
+    staleTime: 60_000,
+    retry: false,
+    queryFn: async () => {
+      if (!client) {
+        return [];
+      }
+      try {
+        const payload = await client.listAvailableEditors();
+        return payload.error ? [] : payload.editors;
+      } catch {
+        return [];
+      }
+    },
+  });
+
+  const availableEditors = availableEditorsQuery.data ?? [];
+  const availableEditorIds = useMemo(
+    () => availableEditors.map((editor: EditorTargetDescriptorPayload) => editor.id),
+    [availableEditors],
+  );
+  const effectivePreferredEditorId = useMemo(
+    () => resolvePreferredEditorId(availableEditorIds, preferredEditorId),
+    [availableEditorIds, preferredEditorId],
+  );
+  const primaryOption =
+    availableEditors.find(
+      (editor: EditorTargetDescriptorPayload) => editor.id === effectivePreferredEditorId,
+    ) ?? null;
+
+  useEffect(() => {
+    if (!effectivePreferredEditorId || effectivePreferredEditorId === preferredEditorId) {
+      return;
+    }
+    void updatePreferredEditor(effectivePreferredEditorId).catch(() => undefined);
+  }, [effectivePreferredEditorId, preferredEditorId, updatePreferredEditor]);
+
+  const openMutation = useMutation({
+    mutationFn: async (editorId: EditorTargetId) => {
+      if (!client) {
+        throw new Error("Host is not connected");
+      }
+      const payload = await client.openInEditor(cwd, editorId);
+      if (payload.error) {
+        throw new Error(payload.error);
+      }
+      return editorId;
+    },
+    onError: (error: unknown) => {
+      toast.error(error instanceof Error ? error.message : "Failed to open in editor");
+    },
+  });
+
+  const handleOpenEditor = useCallback(
+    (editorId: EditorTargetId) => {
+      void updatePreferredEditor(editorId).catch(() => undefined);
+      openMutation.mutate(editorId);
+    },
+    [openMutation, updatePreferredEditor],
+  );
+
+  if (!shouldLoadEditors || !primaryOption || availableEditors.length === 0) {
+    return null;
+  }
+
+  return (
+    <View style={styles.row}>
+      <View style={styles.splitButton}>
+        <Pressable
+          testID="workspace-open-in-editor-primary"
+          style={({ hovered, pressed }) => [
+            styles.splitButtonPrimary,
+            (hovered || pressed) && styles.splitButtonPrimaryHovered,
+            openMutation.isPending && styles.splitButtonPrimaryDisabled,
+          ]}
+          onPress={() => handleOpenEditor(primaryOption.id)}
+          disabled={openMutation.isPending}
+          accessibilityRole="button"
+          accessibilityLabel={`Open workspace in ${primaryOption.label}`}
+        >
+          {openMutation.isPending ? (
+            <ActivityIndicator
+              size="small"
+              color={theme.colors.foreground}
+              style={styles.splitButtonSpinnerOnly}
+            />
+          ) : (
+            <View style={styles.splitButtonContent}>
+              <EditorAppIcon
+                editorId={primaryOption.id}
+                size={16}
+                color={theme.colors.foregroundMuted}
+              />
+              <Text style={styles.splitButtonText}>Open</Text>
+            </View>
+          )}
+        </Pressable>
+        {availableEditors.length > 1 ? (
+          <DropdownMenu>
+            <DropdownMenuTrigger
+              testID="workspace-open-in-editor-caret"
+              style={({ hovered, pressed, open }) => [
+                styles.splitButtonCaret,
+                (hovered || pressed || open) && styles.splitButtonCaretHovered,
+              ]}
+              accessibilityRole="button"
+              accessibilityLabel="Choose editor"
+            >
+              <ChevronDown size={16} color={theme.colors.foregroundMuted} />
+            </DropdownMenuTrigger>
+            <DropdownMenuContent
+              align="end"
+              minWidth={148}
+              maxWidth={176}
+              testID="workspace-open-in-editor-menu"
+            >
+              {availableEditors.map((editor: EditorTargetDescriptorPayload) => (
+                <DropdownMenuItem
+                  key={editor.id}
+                  testID={`workspace-open-in-editor-item-${editor.id}`}
+                  leading={
+                    <EditorAppIcon
+                      editorId={editor.id}
+                      size={16}
+                      color={theme.colors.foregroundMuted}
+                    />
+                  }
+                  trailing={
+                    editor.id === effectivePreferredEditorId
+                      ? <Check size={16} color={theme.colors.foregroundMuted} />
+                      : undefined
+                  }
+                  onSelect={() => handleOpenEditor(editor.id)}
+                >
+                  {editor.label}
+                </DropdownMenuItem>
+              ))}
+            </DropdownMenuContent>
+          </DropdownMenu>
+        ) : null}
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  row: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1],
+    flexShrink: 0,
+  },
+  splitButton: {
+    flexDirection: "row",
+    alignItems: "stretch",
+    borderRadius: theme.borderRadius.md,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.borderAccent,
+    overflow: "hidden",
+  },
+  splitButtonPrimary: {
+    paddingLeft: theme.spacing[3],
+    paddingRight: 10,
+    paddingVertical: theme.spacing[1],
+    justifyContent: "center",
+    position: "relative",
+  },
+  splitButtonPrimaryHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+  splitButtonPrimaryDisabled: {
+    opacity: 0.6,
+  },
+  splitButtonText: {
+    fontSize: theme.fontSize.sm,
+    lineHeight: theme.fontSize.sm * 1.5,
+    color: theme.colors.foreground,
+    fontWeight: theme.fontWeight.normal,
+  },
+  splitButtonContent: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing[2],
+  },
+  splitButtonSpinnerOnly: {
+    transform: [{ scale: 0.8 }],
+  },
+  splitButtonCaret: {
+    width: 28,
+    alignItems: "center",
+    justifyContent: "center",
+    borderLeftWidth: theme.borderWidth[1],
+    borderLeftColor: theme.colors.borderAccent,
+  },
+  splitButtonCaretHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+}));
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -21,6 +21,7 @@ import {
  Ellipsis,
  EllipsisVertical,
  PanelRight,
+  RotateCw,
  SquarePen,
  SquareTerminal,
  X,
@@ -47,6 +48,7 @@ import { ExplorerSidebar } from "@/components/explorer-sidebar";
 import { SplitContainer } from "@/components/split-container";
 import { SourceControlPanelIcon } from "@/components/icons/source-control-panel-icon";
 import { WorkspaceGitActions } from "@/screens/workspace/workspace-git-actions";
+import { WorkspaceOpenInEditorButton } from "@/screens/workspace/workspace-open-in-editor-button";
 import { ExplorerSidebarAnimationProvider } from "@/contexts/explorer-sidebar-animation-context";
 import { useToast } from "@/contexts/toast-context";
 import { useExplorerOpenGesture } from "@/hooks/use-explorer-open-gesture";
@@ -77,7 +79,7 @@ import {
 import type { ListTerminalsResponse } from "@server/shared/messages";
 import { upsertTerminalListEntry } from "@/utils/terminal-list";
 import { confirmDialog } from "@/utils/confirm-dialog";
-import { applyArchivedAgentCloseResults, useArchiveAgent } from "@/hooks/use-archive-agent";
+import { useArchiveAgent } from "@/hooks/use-archive-agent";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import { buildProviderCommand } from "@/utils/provider-command-templates";
 import { generateDraftId } from "@/stores/draft-keys";
@@ -182,6 +184,7 @@ type MobileWorkspaceTabSwitcherProps = {
  onSelectSwitcherTab: (key: string) => void;
  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
  onCloseTab: (tabId: string) => Promise<void> | void;
  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
@@ -269,6 +272,7 @@ function MobileWorkspaceTabOption({
  onPress,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTab,
  onCloseTabsAbove,
  onCloseTabsBelow,
@@ -284,6 +288,7 @@ function MobileWorkspaceTabOption({
  onPress: () => void;
  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
  onCloseTab: (tabId: string) => Promise<void> | void;
  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
@@ -299,6 +304,7 @@ function MobileWorkspaceTabOption({
    menuTestIDBase,
    onCopyResumeCommand,
    onCopyAgentId,
+    onReloadAgent,
    onCloseTab,
    onCloseTabsBefore: onCloseTabsAbove,
    onCloseTabsAfter: onCloseTabsBelow,
@@ -342,11 +348,14 @@ function MobileWorkspaceTabOption({
                      disabled={entry.disabled}
                      destructive={entry.destructive}
                      onSelect={entry.onSelect}
+                      tooltip={entry.tooltip}
                      leading={(() => {
                        const iconColor = theme.colors.foregroundMuted;
                        switch (entry.icon) {
                          case "copy":
                            return <Copy size={16} color={iconColor} />;
+                          case "rotate-cw":
+                            return <RotateCw size={16} color={iconColor} />;
                          case "arrow-left-to-line":
                            return <ArrowLeftToLine size={16} color={iconColor} />;
                          case "arrow-right-to-line":
@@ -389,6 +398,7 @@ const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
  onSelectSwitcherTab,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTab,
  onCloseTabsAbove,
  onCloseTabsBelow,
@@ -460,6 +470,7 @@ const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
              onPress={onPress}
              onCopyResumeCommand={onCopyResumeCommand}
              onCopyAgentId={onCopyAgentId}
+              onReloadAgent={onReloadAgent}
              onCloseTab={onCloseTab}
              onCloseTabsAbove={onCloseTabsAbove}
              onCloseTabsBelow={onCloseTabsBelow}
@@ -1203,10 +1214,6 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
          return;
        }

-        await killTerminalAsync(terminalId);
-        setHoveredTabKey((current) => (current === tabId ? null : current));
-        setHoveredCloseTabKey((current) => (current === tabId ? null : current));
-
        queryClient.setQueryData<ListTerminalsPayload>(terminalsQueryKey, (current) => {
          if (!current) {
            return current;
@@ -1216,13 +1223,18 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
            terminals: current.terminals.filter((terminal) => terminal.id !== terminalId),
          };
        });
-
+        setHoveredTabKey((current) => (current === tabId ? null : current));
+        setHoveredCloseTabKey((current) => (current === tabId ? null : current));
        if (persistenceKey) {
          closeWorkspaceTabWithCleanup({
            tabId,
            target: { kind: "terminal", terminalId },
          });
        }
+
+        void killTerminalAsync(terminalId).catch(() => {
+          void queryClient.invalidateQueries({ queryKey: terminalsQueryKey });
+        });
      });
    },
    [
@@ -1243,18 +1255,22 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
          return;
        }

-        const confirmed = await confirmDialog({
-          title: "Archive agent?",
-          message: "This closes the tab and archives the agent.",
-          confirmLabel: "Archive",
-          cancelLabel: "Cancel",
-          destructive: true,
-        });
-        if (!confirmed) {
-          return;
+        const agent =
+          useSessionStore.getState().sessions[normalizedServerId]?.agents?.get(agentId) ?? null;
+
+        if (agent?.status !== "idle") {
+          const confirmed = await confirmDialog({
+            title: "Archive agent?",
+            message: "This closes the tab and archives the agent.",
+            confirmLabel: "Archive",
+            cancelLabel: "Cancel",
+            destructive: true,
+          });
+          if (!confirmed) {
+            return;
+          }
        }

-        await archiveAgent({ serverId: normalizedServerId, agentId });
        setHoveredTabKey((current) => (current === tabId ? null : current));
        setHoveredCloseTabKey((current) => (current === tabId ? null : current));
        if (persistenceKey) {
@@ -1263,6 +1279,8 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
            target: { kind: "agent", agentId },
          });
        }
+
+        void archiveAgent({ serverId: normalizedServerId, agentId });
      });
    },
    [archiveAgent, closeTab, closeWorkspaceTabWithCleanup, normalizedServerId, persistenceKey],
@@ -1298,29 +1316,6 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
    [allTabDescriptorsById, handleCloseAgentTab, handleCloseDraftOrFileTab, handleCloseTerminalTab],
  );

-  const prevCloseTabDeps = useRef({
-    allTabDescriptorsById,
-    handleCloseAgentTab,
-    handleCloseDraftOrFileTab,
-    handleCloseTerminalTab,
-  });
-  useEffect(() => {
-    const prev = prevCloseTabDeps.current;
-    const changed: string[] = [];
-    if (prev.allTabDescriptorsById !== allTabDescriptorsById) changed.push("allTabDescriptorsById");
-    if (prev.handleCloseAgentTab !== handleCloseAgentTab) changed.push("handleCloseAgentTab");
-    if (prev.handleCloseDraftOrFileTab !== handleCloseDraftOrFileTab)
-      changed.push("handleCloseDraftOrFileTab");
-    if (prev.handleCloseTerminalTab !== handleCloseTerminalTab)
-      changed.push("handleCloseTerminalTab");
-    if (changed.length > 0) console.log("[handleCloseTabById] deps changed:", changed.join(", "));
-    prevCloseTabDeps.current = {
-      allTabDescriptorsById,
-      handleCloseAgentTab,
-      handleCloseDraftOrFileTab,
-      handleCloseTerminalTab,
-    };
-  });
  const handleCopyAgentId = useCallback(
    async (agentId: string) => {
      if (!agentId) return;
@@ -1366,6 +1361,23 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
    [normalizedServerId, toast],
  );

+  const handleReloadAgent = useCallback(
+    async (agentId: string) => {
+      if (!client || !isConnected) {
+        toast.error("Host is not connected");
+        return;
+      }
+
+      try {
+        await client.refreshAgent(agentId);
+        toast.show("Reloaded agent", { variant: "success" });
+      } catch (error) {
+        toast.error(error instanceof Error ? error.message : "Failed to reload agent");
+      }
+    },
+    [client, isConnected, toast],
+  );
+
  const handleCopyWorkspacePath = useCallback(async () => {
    if (!isAbsolutePath(normalizedWorkspaceId)) {
      toast.error("Workspace path not available");
@@ -1413,7 +1425,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
        return;
      }

-      const closeItemsPayload = await closeBulkWorkspaceTabs({
+      await closeBulkWorkspaceTabs({
        client,
        groups,
        closeTab,
@@ -1429,31 +1441,6 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
        },
      });

-      if (closeItemsPayload) {
-        for (const terminal of closeItemsPayload.terminals) {
-          if (!terminal.success) {
-            continue;
-          }
-          queryClient.setQueryData<ListTerminalsPayload>(terminalsQueryKey, (current) => {
-            if (!current) {
-              return current;
-            }
-            return {
-              ...current,
-              terminals: current.terminals.filter((entry) => entry.id !== terminal.terminalId),
-            };
-          });
-        }
-
-        if (normalizedServerId) {
-          applyArchivedAgentCloseResults({
-            queryClient,
-            serverId: normalizedServerId,
-            results: closeItemsPayload.agents,
-          });
-        }
-      }
-
      const closedKeys = new Set(tabsToClose.map((tab) => tab.key));
      setHoveredTabKey((current) => (current && closedKeys.has(current) ? null : current));
      setHoveredCloseTabKey((current) => (current && closedKeys.has(current) ? null : current));
@@ -1462,10 +1449,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
      client,
      closeTab,
      closeWorkspaceTabWithCleanup,
-      normalizedServerId,
      persistenceKey,
-      queryClient,
-      terminalsQueryKey,
    ],
  );

@@ -1768,44 +1752,6 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
      retargetWorkspaceTab,
    ],
  );
-  const prevBuildDeps = useRef({
-    handleCloseTabById,
-    handleOpenFileFromChat,
-    focusWorkspacePane,
-    navigateToTabId,
-    normalizedServerId,
-    normalizedWorkspaceId,
-    openWorkspaceTab,
-    persistenceKey,
-    retargetWorkspaceTab,
-  });
-  useEffect(() => {
-    const prev = prevBuildDeps.current;
-    const changed: string[] = [];
-    if (prev.handleCloseTabById !== handleCloseTabById) changed.push("handleCloseTabById");
-    if (prev.handleOpenFileFromChat !== handleOpenFileFromChat)
-      changed.push("handleOpenFileFromChat");
-    if (prev.focusWorkspacePane !== focusWorkspacePane) changed.push("focusWorkspacePane");
-    if (prev.navigateToTabId !== navigateToTabId) changed.push("navigateToTabId");
-    if (prev.normalizedServerId !== normalizedServerId) changed.push("normalizedServerId");
-    if (prev.normalizedWorkspaceId !== normalizedWorkspaceId) changed.push("normalizedWorkspaceId");
-    if (prev.openWorkspaceTab !== openWorkspaceTab) changed.push("openWorkspaceTab");
-    if (prev.persistenceKey !== persistenceKey) changed.push("persistenceKey");
-    if (prev.retargetWorkspaceTab !== retargetWorkspaceTab) changed.push("retargetWorkspaceTab");
-    if (changed.length > 0)
-      console.log("[buildPaneContentModel] deps changed:", changed.join(", "));
-    prevBuildDeps.current = {
-      handleCloseTabById,
-      handleOpenFileFromChat,
-      focusWorkspacePane,
-      navigateToTabId,
-      normalizedServerId,
-      normalizedWorkspaceId,
-      openWorkspaceTab,
-      persistenceKey,
-      retargetWorkspaceTab,
-    };
-  });
  const focusedPaneId = focusedPaneTabState.pane?.id ?? null;
  const focusedPaneTabIds = useMemo(() => tabs.map((tab) => tab.tabId), [tabs]);
  const focusedPaneTabDescriptorMap = useStableTabDescriptorMap(tabs);
@@ -2079,6 +2025,12 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
            }
            right={
              <View style={styles.headerRight}>
+                {!isMobile ? (
+                  <WorkspaceOpenInEditorButton
+                    serverId={normalizedServerId}
+                    cwd={normalizedWorkspaceId}
+                  />
+                ) : null}
                {!isMobile && isGitCheckout ? (
                  <>
                    <WorkspaceGitActions
@@ -2211,6 +2163,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
              onSelectSwitcherTab={handleSelectSwitcherTab}
              onCopyResumeCommand={handleCopyResumeCommand}
              onCopyAgentId={handleCopyAgentId}
+              onReloadAgent={handleReloadAgent}
              onCloseTab={handleCloseTabById}
              onCloseTabsAbove={handleCloseTabsToLeft}
              onCloseTabsBelow={handleCloseTabsToRight}
@@ -2231,6 +2184,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
              onCloseTab={handleCloseTabById}
              onCopyResumeCommand={handleCopyResumeCommand}
              onCopyAgentId={handleCopyAgentId}
+              onReloadAgent={handleReloadAgent}
              onCloseTabsToLeft={handleCloseTabsToLeft}
              onCloseTabsToRight={handleCloseTabsToRight}
              onCloseOtherTabs={handleCloseOtherTabs}
@@ -2267,6 +2221,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
                    onCloseTab={handleCloseTabById}
                    onCopyResumeCommand={handleCopyResumeCommand}
                    onCopyAgentId={handleCopyAgentId}
+                    onReloadAgent={handleReloadAgent}
                    onCloseTabsToLeft={handleCloseTabsToLeftInPane}
                    onCloseTabsToRight={handleCloseTabsToRightInPane}
                    onCloseOtherTabs={handleCloseOtherTabsInPane}
--- a/packages/app/src/screens/workspace/workspace-tab-menu.test.ts
+++ b/packages/app/src/screens/workspace/workspace-tab-menu.test.ts
@@ -15,6 +15,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
  it("uses desktop tab ordering labels for desktop menus", () => {
    const onCopyResumeCommand = vi.fn();
    const onCopyAgentId = vi.fn();
+    const onReloadAgent = vi.fn();
    const onCloseTab = vi.fn();
    const onCloseTabsBefore = vi.fn();
    const onCloseTabsAfter = vi.fn();
@@ -28,6 +29,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
      menuTestIDBase: "workspace-tab-context-agent_123",
      onCopyResumeCommand,
      onCopyAgentId,
+      onReloadAgent,
      onCloseTab,
      onCloseTabsBefore,
      onCloseTabsAfter,
@@ -40,6 +42,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
      "Close to the left",
      "Close to the right",
      "Close other tabs",
+      "Reload agent",
      "Close",
    ]);
  });
@@ -53,6 +56,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
      menuTestIDBase: "workspace-tab-menu-agent_123",
      onCopyResumeCommand: vi.fn(),
      onCopyAgentId: vi.fn(),
+      onReloadAgent: vi.fn(),
      onCloseTab: vi.fn(),
      onCloseTabsBefore: vi.fn(),
      onCloseTabsAfter: vi.fn(),
@@ -65,6 +69,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
      "Close tabs above",
      "Close tabs below",
      "Close other tabs",
+      "Reload agent",
      "Close",
    ]);
  });
@@ -83,6 +88,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
      menuTestIDBase: "workspace-tab-menu-draft_123",
      onCopyResumeCommand: vi.fn(),
      onCopyAgentId: vi.fn(),
+      onReloadAgent: vi.fn(),
      onCloseTab: vi.fn(),
      onCloseTabsBefore: vi.fn(),
      onCloseTabsAfter: vi.fn(),
@@ -92,6 +98,34 @@ describe("buildWorkspaceTabMenuEntries", () => {
    expect(entries.some((entry) => entry.kind === "item" && entry.label === "Copy agent id")).toBe(
      false,
    );
+    expect(entries.some((entry) => entry.kind === "item" && entry.label === "Reload agent")).toBe(
+      false,
+    );
    expect(entries.some((entry) => entry.kind === "separator")).toBe(false);
  });
+
+  it("adds reload tooltip copy for agent tabs", () => {
+    const entries = buildWorkspaceTabMenuEntries({
+      surface: "desktop",
+      tab: createAgentTab(),
+      index: 0,
+      tabCount: 1,
+      menuTestIDBase: "workspace-tab-context-agent_123",
+      onCopyResumeCommand: vi.fn(),
+      onCopyAgentId: vi.fn(),
+      onReloadAgent: vi.fn(),
+      onCloseTab: vi.fn(),
+      onCloseTabsBefore: vi.fn(),
+      onCloseTabsAfter: vi.fn(),
+      onCloseOtherTabs: vi.fn(),
+    });
+
+    expect(entries).toContainEqual(
+      expect.objectContaining({
+        kind: "item",
+        key: "reload-agent",
+        tooltip: "Reload agent to update skills, MCPs or login status.",
+      }),
+    );
+  });
 });
--- a/packages/app/src/screens/workspace/workspace-tab-menu.ts
+++ b/packages/app/src/screens/workspace/workspace-tab-menu.ts
@@ -8,8 +8,15 @@ export type WorkspaceTabMenuEntry =
      kind: "item";
      key: string;
      label: string;
-      icon?: "copy" | "arrow-left-to-line" | "arrow-right-to-line" | "copy-x" | "x";
+      icon?:
+        | "copy"
+        | "rotate-cw"
+        | "arrow-left-to-line"
+        | "arrow-right-to-line"
+        | "copy-x"
+        | "x";
      hint?: string;
+      tooltip?: string;
      disabled?: boolean;
      destructive?: boolean;
      testID: string;
@@ -28,6 +35,7 @@ interface BuildWorkspaceTabMenuEntriesInput {
  menuTestIDBase: string;
  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
  onCloseTab: (tabId: string) => Promise<void> | void;
  onCloseTabsBefore: (tabId: string) => Promise<void> | void;
  onCloseTabsAfter: (tabId: string) => Promise<void> | void;
@@ -40,6 +48,7 @@ interface BuildWorkspaceDesktopTabActionsInput {
  tabCount: number;
  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
  onCloseTab: (tabId: string) => Promise<void> | void;
  onCloseTabsToLeft: (tabId: string) => Promise<void> | void;
  onCloseTabsToRight: (tabId: string) => Promise<void> | void;
@@ -92,6 +101,7 @@ export function buildWorkspaceTabMenuEntries(
    menuTestIDBase,
    onCopyResumeCommand,
    onCopyAgentId,
+    onReloadAgent,
    onCloseTab,
    onCloseTabsBefore,
    onCloseTabsAfter,
@@ -164,6 +174,20 @@ export function buildWorkspaceTabMenuEntries(
      void onCloseOtherTabs(tab.tabId);
    },
  });
+  if (tab.target.kind === "agent") {
+    const { agentId } = tab.target;
+    entries.push({
+      kind: "item",
+      key: "reload-agent",
+      label: "Reload agent",
+      icon: "rotate-cw",
+      tooltip: "Reload agent to update skills, MCPs or login status.",
+      testID: `${menuTestIDBase}-reload-agent`,
+      onSelect: () => {
+        void onReloadAgent(agentId);
+      },
+    });
+  }
  entries.push({
    kind: "item",
    key: "close",
@@ -192,6 +216,7 @@ export function buildWorkspaceDesktopTabActions(
      menuTestIDBase: contextMenuTestId,
      onCopyResumeCommand: input.onCopyResumeCommand,
      onCopyAgentId: input.onCopyAgentId,
+      onReloadAgent: input.onReloadAgent,
      onCloseTab: input.onCloseTab,
      onCloseTabsBefore: input.onCloseTabsToLeft,
      onCloseTabsAfter: input.onCloseTabsToRight,
--- a/packages/app/src/stores/panel-store.ts
+++ b/packages/app/src/stores/panel-store.ts
@@ -66,6 +66,8 @@ interface PanelState {
  // File explorer settings (shared between mobile/desktop)
  explorerTab: ExplorerTab;
  explorerTabByCheckout: Record<string, ExplorerTab>;
+  expandedPathsByWorkspace: Record<string, string[]>;
+  diffExpandedPathsByWorkspace: Record<string, string[]>;
  activeExplorerCheckout: ExplorerCheckoutContext | null;
  sidebarWidth: number;
  explorerWidth: number;
@@ -85,6 +87,8 @@ interface PanelState {
  // File explorer settings actions
  setExplorerTab: (tab: ExplorerTab) => void;
  setExplorerTabForCheckout: (params: ExplorerCheckoutContext & { tab: ExplorerTab }) => void;
+  setExpandedPathsForWorkspace: (workspaceKey: string, paths: string[]) => void;
+  setDiffExpandedPathsForWorkspace: (workspaceKey: string, paths: string[]) => void;
  activateExplorerTabForCheckout: (checkout: ExplorerCheckoutContext) => void;
  setActiveExplorerCheckout: (checkout: ExplorerCheckoutContext | null) => void;
  setSidebarWidth: (width: number) => void;
@@ -142,6 +146,8 @@ export const usePanelStore = create<PanelState>()(
      // File explorer defaults
      explorerTab: "changes",
      explorerTabByCheckout: {},
+      expandedPathsByWorkspace: {},
+      diffExpandedPathsByWorkspace: {},
      activeExplorerCheckout: null,
      sidebarWidth: DEFAULT_SIDEBAR_WIDTH,
      explorerWidth: DEFAULT_EXPLORER_SIDEBAR_WIDTH,
@@ -261,6 +267,17 @@ export const usePanelStore = create<PanelState>()(
          }
          return nextState;
        }),
+      setExpandedPathsForWorkspace: (workspaceKey, paths) =>
+        set((state) => ({
+          expandedPathsByWorkspace: { ...state.expandedPathsByWorkspace, [workspaceKey]: paths },
+        })),
+      setDiffExpandedPathsForWorkspace: (workspaceKey, paths) =>
+        set((state) => ({
+          diffExpandedPathsByWorkspace: {
+            ...state.diffExpandedPathsByWorkspace,
+            [workspaceKey]: paths,
+          },
+        })),
      activateExplorerTabForCheckout: (checkout) =>
        set((state) => ({
          activeExplorerCheckout: checkout,
@@ -295,7 +312,7 @@ export const usePanelStore = create<PanelState>()(
    }),
    {
      name: "panel-state",
-      version: 8,
+      version: 10,
      storage: createJSONStorage(() => AsyncStorage),
      migrate: (persistedState, version) => {
        const state = persistedState as Partial<PanelState> & Record<string, unknown>;
@@ -371,6 +388,22 @@ export const usePanelStore = create<PanelState>()(
          state.sidebarWidth = DEFAULT_SIDEBAR_WIDTH;
        }

+        if (
+          version < 9 ||
+          typeof state.expandedPathsByWorkspace !== "object" ||
+          !state.expandedPathsByWorkspace
+        ) {
+          state.expandedPathsByWorkspace = {};
+        }
+
+        if (
+          version < 10 ||
+          typeof state.diffExpandedPathsByWorkspace !== "object" ||
+          !state.diffExpandedPathsByWorkspace
+        ) {
+          state.diffExpandedPathsByWorkspace = {};
+        }
+
        state.activeExplorerCheckout = null;

        return state as PanelState;
@@ -380,6 +413,8 @@ export const usePanelStore = create<PanelState>()(
        desktop: state.desktop,
        explorerTab: state.explorerTab,
        explorerTabByCheckout: state.explorerTabByCheckout,
+        expandedPathsByWorkspace: state.expandedPathsByWorkspace,
+        diffExpandedPathsByWorkspace: state.diffExpandedPathsByWorkspace,
        sidebarWidth: state.sidebarWidth,
        explorerWidth: state.explorerWidth,
        explorerSortOption: state.explorerSortOption,
--- a/packages/app/src/stores/session-store.test.ts
+++ b/packages/app/src/stores/session-store.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import {
+  mergeWorkspaceSnapshotWithExisting,
+  type WorkspaceDescriptor,
+} from "./session-store";
+
+function createWorkspace(
+  input: Partial<WorkspaceDescriptor> & Pick<WorkspaceDescriptor, "id">,
+): WorkspaceDescriptor {
+  return {
+    id: input.id,
+    projectId: input.projectId ?? "remote:github.com/getpaseo/paseo",
+    projectDisplayName: input.projectDisplayName ?? "getpaseo/paseo",
+    projectRootPath: input.projectRootPath ?? "/tmp/repo",
+    projectKind: input.projectKind ?? "git",
+    workspaceKind: input.workspaceKind ?? "local_checkout",
+    name: input.name ?? "main",
+    status: input.status ?? "done",
+    activityAt: input.activityAt ?? null,
+    diffStat: input.diffStat ?? null,
+  };
+}
+
+describe("mergeWorkspaceSnapshotWithExisting", () => {
+  it("preserves the last known diff stat when a snapshot only has baseline null data", () => {
+    const existing = createWorkspace({
+      id: "/tmp/repo",
+      diffStat: { additions: 4, deletions: 2 },
+    });
+    const incoming = createWorkspace({
+      id: "/tmp/repo",
+      diffStat: null,
+    });
+
+    expect(mergeWorkspaceSnapshotWithExisting({ incoming, existing })).toEqual({
+      ...incoming,
+      diffStat: { additions: 4, deletions: 2 },
+    });
+  });
+
+  it("uses the incoming diff stat when the server provides a known value", () => {
+    const existing = createWorkspace({
+      id: "/tmp/repo",
+      diffStat: { additions: 4, deletions: 2 },
+    });
+    const incoming = createWorkspace({
+      id: "/tmp/repo",
+      diffStat: { additions: 0, deletions: 0 },
+    });
+
+    expect(mergeWorkspaceSnapshotWithExisting({ incoming, existing })).toEqual(incoming);
+  });
+});
--- a/packages/app/src/stores/session-store.ts
+++ b/packages/app/src/stores/session-store.ts
@@ -21,6 +21,7 @@ import type {
 import type {
  FileDownloadTokenResponse,
  GitSetupOptions,
+  ServerInfoStatusPayload,
  ProjectPlacementPayload,
  ServerCapabilities,
  WorkspaceDescriptorPayload,
@@ -141,6 +142,21 @@ export function normalizeWorkspaceDescriptor(
  };
 }

+export function mergeWorkspaceSnapshotWithExisting(input: {
+  incoming: WorkspaceDescriptor;
+  existing?: WorkspaceDescriptor | null;
+}): WorkspaceDescriptor {
+  const { incoming, existing } = input;
+  if (!existing || existing.id !== incoming.id) {
+    return incoming;
+  }
+
+  return {
+    ...incoming,
+    diffStat: incoming.diffStat ?? existing.diffStat,
+  };
+}
+
 export type ExplorerEntryKind = "file" | "directory";
 export type ExplorerFileKind = "text" | "image" | "binary";
 export type ExplorerEncoding = "utf-8" | "base64" | "none";
@@ -190,6 +206,7 @@ export type DaemonServerInfo = {
  hostname: string | null;
  version: string | null;
  capabilities?: ServerCapabilities;
+  features?: ServerInfoStatusPayload["features"];
 };

 export interface AgentTimelineCursorState {
@@ -412,6 +429,13 @@ function areServerCapabilitiesEqual(
  return JSON.stringify(current ?? null) === JSON.stringify(next ?? null);
 }

+function areServerInfoFeaturesEqual(
+  current: ServerInfoStatusPayload["features"] | undefined,
+  next: ServerInfoStatusPayload["features"] | undefined,
+): boolean {
+  return JSON.stringify(current ?? null) === JSON.stringify(next ?? null);
+}
+
 export const useSessionStore = create<SessionStore>()(
  subscribeWithSelector((set, get) => {
    const commitActivityUpdates: AgentLastActivityCommitter = (updates) => {
@@ -527,12 +551,15 @@ export const useSessionStore = create<SessionStore>()(
          const prevVersion = session.serverInfo?.version?.trim() || null;
          const nextCapabilities = info.capabilities;
          const prevCapabilities = session.serverInfo?.capabilities;
+          const nextFeatures = info.features;
+          const prevFeatures = session.serverInfo?.features;

          if (
            session.serverInfo?.serverId === info.serverId &&
            prevHostname === nextHostname &&
            prevVersion === nextVersion &&
-            areServerCapabilitiesEqual(prevCapabilities, nextCapabilities)
+            areServerCapabilitiesEqual(prevCapabilities, nextCapabilities) &&
+            areServerInfoFeaturesEqual(prevFeatures, nextFeatures)
          ) {
            return prev;
          }
@@ -548,6 +575,7 @@ export const useSessionStore = create<SessionStore>()(
                  hostname: nextHostname,
                  version: nextVersion,
                  ...(nextCapabilities ? { capabilities: nextCapabilities } : {}),
+                  ...(nextFeatures ? { features: nextFeatures } : {}),
                },
              },
            },
--- a/packages/app/src/styles/theme.ts
+++ b/packages/app/src/styles/theme.ts
@@ -111,6 +111,7 @@ const lightSemanticColors = {
  surface2: "#f4f4f5", // Elevated: badges, inputs, sheets (was zinc-200, now zinc-100)
  surface3: "#e4e4e7", // Highest elevation (was zinc-300, now zinc-200)
  surface4: "#d4d4d8", // Extra emphasis (was zinc-400, now zinc-300)
+  surfaceDiffEmpty: "#f6f6f6", // Empty side of split diff rows, between surface1 and surface2 and biased toward surface2
  surfaceSidebar: "#f4f4f5", // Sidebar background (darker than main)
  surfaceWorkspace: "#ffffff", // Workspace main background

@@ -185,6 +186,7 @@ const darkSemanticColors = {
  surface2: "#272A29", // Elevated: badges, inputs, sheets
  surface3: "#434645", // Highest elevation
  surface4: "#595B5B", // Extra emphasis
+  surfaceDiffEmpty: "#252827", // Empty side of split diff rows, between surface1 and surface2 and biased toward surface2
  surfaceSidebar: "#141716", // Sidebar background (darker than main)
  surfaceWorkspace: "#1E2120", // Workspace main background (surface1)

@@ -279,6 +281,10 @@ const commonTheme = {
    "4xl": 34,
  },

+  lineHeight: {
+    diff: 22,
+  },
+
  iconSize: {
    xs: 12,
    sm: 14,
--- a/packages/app/src/utils/diff-layout.test.ts
+++ b/packages/app/src/utils/diff-layout.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, it } from "vitest";
+import { buildSplitDiffRows } from "./diff-layout";
+import type { ParsedDiffFile } from "@/hooks/use-checkout-diff-query";
+
+function makeFile(lines: ParsedDiffFile["hunks"][number]["lines"]): ParsedDiffFile {
+  return {
+    path: "example.ts",
+    isNew: false,
+    isDeleted: false,
+    additions: lines.filter((line) => line.type === "add").length,
+    deletions: lines.filter((line) => line.type === "remove").length,
+    status: "ok",
+    hunks: [
+      {
+        oldStart: 10,
+        oldCount: 4,
+        newStart: 10,
+        newCount: 5,
+        lines,
+      },
+    ],
+  };
+}
+
+describe("buildSplitDiffRows", () => {
+  it("pairs replacement runs by index", () => {
+    const rows = buildSplitDiffRows(
+      makeFile([
+        { type: "header", content: "@@ -10,2 +10,2 @@" },
+        { type: "remove", content: "before one" },
+        { type: "remove", content: "before two" },
+        { type: "add", content: "after one" },
+        { type: "add", content: "after two" },
+      ]),
+    );
+
+    expect(rows).toHaveLength(3);
+    expect(rows[1]).toMatchObject({
+      kind: "pair",
+      left: { type: "remove", content: "before one", lineNumber: 10 },
+      right: { type: "add", content: "after one", lineNumber: 10 },
+    });
+    expect(rows[2]).toMatchObject({
+      kind: "pair",
+      left: { type: "remove", content: "before two", lineNumber: 11 },
+      right: { type: "add", content: "after two", lineNumber: 11 },
+    });
+  });
+
+  it("keeps unmatched additions on the right side only", () => {
+    const rows = buildSplitDiffRows(
+      makeFile([
+        { type: "header", content: "@@ -10,1 +10,2 @@" },
+        { type: "remove", content: "before" },
+        { type: "add", content: "after one" },
+        { type: "add", content: "after two" },
+      ]),
+    );
+
+    expect(rows[2]).toMatchObject({
+      kind: "pair",
+      left: null,
+      right: { type: "add", content: "after two", lineNumber: 11 },
+    });
+  });
+
+  it("duplicates context rows on both sides", () => {
+    const rows = buildSplitDiffRows(
+      makeFile([
+        { type: "header", content: "@@ -10,1 +10,1 @@" },
+        { type: "context", content: "same line" },
+      ]),
+    );
+
+    expect(rows[1]).toMatchObject({
+      kind: "pair",
+      left: { type: "context", content: "same line", lineNumber: 10 },
+      right: { type: "context", content: "same line", lineNumber: 10 },
+    });
+  });
+});
--- a/packages/app/src/utils/diff-layout.ts
+++ b/packages/app/src/utils/diff-layout.ts
@@ -0,0 +1,147 @@
+import type { DiffLine, ParsedDiffFile } from "@/hooks/use-checkout-diff-query";
+
+export interface SplitDiffDisplayLine {
+  type: DiffLine["type"];
+  content: string;
+  tokens?: DiffLine["tokens"];
+  lineNumber: number | null;
+}
+
+export type SplitDiffRow =
+  | {
+      kind: "header";
+      content: string;
+    }
+  | {
+      kind: "pair";
+      left: SplitDiffDisplayLine | null;
+      right: SplitDiffDisplayLine | null;
+    };
+
+function toDisplayLine(input: {
+  line: DiffLine;
+  oldLineNumber: number | null;
+  newLineNumber: number | null;
+  side: "left" | "right";
+}): SplitDiffDisplayLine | null {
+  const { line, oldLineNumber, newLineNumber, side } = input;
+  if (line.type === "header") {
+    return null;
+  }
+
+  if (line.type === "remove") {
+    if (side !== "left") {
+      return null;
+    }
+    return {
+      type: "remove",
+      content: line.content,
+      tokens: line.tokens,
+      lineNumber: oldLineNumber,
+    };
+  }
+
+  if (line.type === "add") {
+    if (side !== "right") {
+      return null;
+    }
+    return {
+      type: "add",
+      content: line.content,
+      tokens: line.tokens,
+      lineNumber: newLineNumber,
+    };
+  }
+
+  return {
+    type: "context",
+    content: line.content,
+    tokens: line.tokens,
+    lineNumber: side === "left" ? oldLineNumber : newLineNumber,
+  };
+}
+
+export function buildSplitDiffRows(file: ParsedDiffFile): SplitDiffRow[] {
+  const rows: SplitDiffRow[] = [];
+
+  for (const hunk of file.hunks) {
+    let oldLineNo = hunk.oldStart;
+    let newLineNo = hunk.newStart;
+    rows.push({
+      kind: "header",
+      content: hunk.lines[0]?.type === "header" ? hunk.lines[0].content : "@@",
+    });
+
+    let pendingRemovals: Array<{ line: DiffLine; oldLineNumber: number }> = [];
+    let pendingAdditions: Array<{ line: DiffLine; newLineNumber: number }> = [];
+
+    const flushPendingRows = () => {
+      const pairCount = Math.max(pendingRemovals.length, pendingAdditions.length);
+      for (let index = 0; index < pairCount; index += 1) {
+        const removal = pendingRemovals[index] ?? null;
+        const addition = pendingAdditions[index] ?? null;
+        rows.push({
+          kind: "pair",
+          left: removal
+            ? toDisplayLine({
+                line: removal.line,
+                oldLineNumber: removal.oldLineNumber,
+                newLineNumber: null,
+                side: "left",
+              })
+            : null,
+          right: addition
+            ? toDisplayLine({
+                line: addition.line,
+                oldLineNumber: null,
+                newLineNumber: addition.newLineNumber,
+                side: "right",
+              })
+            : null,
+        });
+      }
+      pendingRemovals = [];
+      pendingAdditions = [];
+    };
+
+    for (const line of hunk.lines.slice(1)) {
+      if (line.type === "remove") {
+        pendingRemovals.push({ line, oldLineNumber: oldLineNo });
+        oldLineNo += 1;
+        continue;
+      }
+
+      if (line.type === "add") {
+        pendingAdditions.push({ line, newLineNumber: newLineNo });
+        newLineNo += 1;
+        continue;
+      }
+
+      flushPendingRows();
+
+      if (line.type === "context") {
+        rows.push({
+          kind: "pair",
+          left: toDisplayLine({
+            line,
+            oldLineNumber: oldLineNo,
+            newLineNumber: newLineNo,
+            side: "left",
+          }),
+          right: toDisplayLine({
+            line,
+            oldLineNumber: oldLineNo,
+            newLineNumber: newLineNo,
+            side: "right",
+          }),
+        });
+        oldLineNo += 1;
+        newLineNo += 1;
+      }
+    }
+
+    flushPendingRows();
+  }
+
+  return rows;
+}
--- a/packages/app/src/voice/audio-engine.native.ts
+++ b/packages/app/src/voice/audio-engine.native.ts
@@ -14,20 +14,6 @@ interface AudioEngineTraceOptions {
  traceLabel?: string;
 }

-let nextAudioEngineInstanceId = 1;
-
-interface BridgeStats {
-  windowStartedAtMs: number;
-  captureEvents: number;
-  captureBytes: number;
-  volumeEvents: number;
-  volumeMax: number;
-  playbackEvents: number;
-  playbackInputBytes: number;
-  playbackResampledBytes: number;
-  playbackDurationMs: number;
-}
-
 function parsePcmSampleRate(mimeType: string): number | null {
  const match = /rate=(\d+)/i.exec(mimeType);
  if (!match) {
@@ -85,48 +71,6 @@ export function createAudioEngine(
  _options?: AudioEngineTraceOptions,
 ): AudioEngine {
  const native = require("@getpaseo/expo-two-way-audio");
-  const instanceId = nextAudioEngineInstanceId++;
-  const bridgeStats: BridgeStats = {
-    windowStartedAtMs: Date.now(),
-    captureEvents: 0,
-    captureBytes: 0,
-    volumeEvents: 0,
-    volumeMax: 0,
-    playbackEvents: 0,
-    playbackInputBytes: 0,
-    playbackResampledBytes: 0,
-    playbackDurationMs: 0,
-  };
-
-  const toHexPreview = (bytes: Uint8Array, count = 12): string =>
-    Array.from(bytes.slice(0, count))
-      .map((value) => value.toString(16).padStart(2, "0"))
-      .join(" ");
-
-  const maybeFlushBridgeStats = (reason: string): void => {
-    const now = Date.now();
-    const elapsedMs = now - bridgeStats.windowStartedAtMs;
-    if (elapsedMs < 1000) {
-      return;
-    }
-    console.log(
-      `[AudioEngine.native#${instanceId}][bridge] ${reason} ` +
-        `capture=${bridgeStats.captureEvents}ev/${bridgeStats.captureBytes}B ` +
-        `volume=${bridgeStats.volumeEvents}ev max=${bridgeStats.volumeMax.toFixed(3)} ` +
-        `play=${bridgeStats.playbackEvents}ev/${bridgeStats.playbackInputBytes}B->${bridgeStats.playbackResampledBytes}B ` +
-        `playMs=${bridgeStats.playbackDurationMs.toFixed(1)} ` +
-        `windowMs=${elapsedMs}`,
-    );
-    bridgeStats.windowStartedAtMs = now;
-    bridgeStats.captureEvents = 0;
-    bridgeStats.captureBytes = 0;
-    bridgeStats.volumeEvents = 0;
-    bridgeStats.volumeMax = 0;
-    bridgeStats.playbackEvents = 0;
-    bridgeStats.playbackInputBytes = 0;
-    bridgeStats.playbackResampledBytes = 0;
-    bridgeStats.playbackDurationMs = 0;
-  };

  const refs: {
    initialized: boolean;
@@ -140,8 +84,6 @@ export function createAudioEngine(
      reject: (error: Error) => void;
      settled: boolean;
    } | null;
-    sawFirstMicChunk: boolean;
-    sawFirstVolumeEvent: boolean;
    destroyed: boolean;
  } = {
    initialized: false,
@@ -151,8 +93,6 @@ export function createAudioEngine(
    processingQueue: false,
    playbackTimeout: null,
    activePlayback: null,
-    sawFirstMicChunk: false,
-    sawFirstVolumeEvent: false,
    destroyed: false,
  };

@@ -163,15 +103,6 @@ export function createAudioEngine(
        return;
      }
      const pcm = event.data as Uint8Array;
-      if (!refs.sawFirstMicChunk) {
-        refs.sawFirstMicChunk = true;
-        console.log(
-          `[AudioEngine.native#${instanceId}] firstMicChunk bytes=${pcm.byteLength} head=${toHexPreview(pcm)}`,
-        );
-      }
-      bridgeStats.captureEvents += 1;
-      bridgeStats.captureBytes += pcm.byteLength;
-      maybeFlushBridgeStats("capture");
      callbacks.onCaptureData(pcm);
    },
  );
@@ -182,26 +113,10 @@ export function createAudioEngine(
        return;
      }
      const level = refs.muted ? 0 : event.data;
-      bridgeStats.volumeEvents += 1;
-      bridgeStats.volumeMax = Math.max(bridgeStats.volumeMax, level);
-      if (!refs.sawFirstVolumeEvent) {
-        refs.sawFirstVolumeEvent = true;
-        console.log(
-          `[AudioEngine.native#${instanceId}] firstInputVolume level=${level.toFixed(3)} muted=${refs.muted}`,
-        );
-      }
-      maybeFlushBridgeStats("volume");
      callbacks.onVolumeLevel(level);
    },
  );

-  const outputVolumeSubscription = native.addExpoTwoWayAudioEventListener(
-    "onOutputVolumeLevelData",
-    (event: any) => {
-      console.log(`[AudioEngine.native#${instanceId}] outputVolume=${event.data}`);
-    },
-  );
-
  async function ensureInitialized(): Promise<void> {
    if (refs.initialized) {
      return;
@@ -210,20 +125,13 @@ export function createAudioEngine(
    if (!success) {
      throw new Error("expo-two-way-audio: native initialize() returned false");
    }
-    console.log(`[AudioEngine.native#${instanceId}] initialized successfully`);
    refs.initialized = true;
  }

  async function ensureMicrophonePermission(): Promise<void> {
    let permission = await native.getMicrophonePermissionsAsync().catch(() => null);
-    console.log(
-      `[AudioEngine.native#${instanceId}] microphonePermission initial=${permission?.status ?? "unknown"} granted=${String(permission?.granted ?? false)}`,
-    );
    if (!permission?.granted) {
      permission = await native.requestMicrophonePermissionsAsync().catch(() => null);
-      console.log(
-        `[AudioEngine.native#${instanceId}] microphonePermission requested=${permission?.status ?? "unknown"} granted=${String(permission?.granted ?? false)}`,
-      );
    }
    if (!permission?.granted) {
      throw new Error(
@@ -253,17 +161,6 @@ export function createAudioEngine(
        // Native AudioEngine expects 16kHz PCM16
        const pcm16k = resamplePcm16(pcm, inputRate, 16000);
        const durationSec = pcm16k.length / 2 / 16000;
-        bridgeStats.playbackEvents += 1;
-        bridgeStats.playbackInputBytes += pcm.length;
-        bridgeStats.playbackResampledBytes += pcm16k.length;
-        bridgeStats.playbackDurationMs += durationSec * 1000;
-
-        console.log(
-          `[AudioEngine.native#${instanceId}] playPCMData: inputRate=${inputRate} inputBytes=${pcm.length} ` +
-            `resampled=${pcm16k.length} durationSec=${durationSec.toFixed(3)} ` +
-            `pcmHead=${toHexPreview(pcm)} resampledHead=${toHexPreview(pcm16k)}`,
-        );
-        maybeFlushBridgeStats("play");

        native.resumePlayback();
        native.playPCMData(pcm16k);
@@ -334,26 +231,18 @@ export function createAudioEngine(
      }
      microphoneSubscription.remove();
      volumeSubscription.remove();
-      outputVolumeSubscription.remove();
    },

    async startCapture() {
      if (refs.captureActive) {
-        console.log(`[AudioEngine.native#${instanceId}] startCapture skipped: already active`);
        return;
      }

      try {
-        console.log(`[AudioEngine.native#${instanceId}] startCapture begin`);
        await ensureMicrophonePermission();
        await ensureInitialized();
-        refs.sawFirstMicChunk = false;
-        refs.sawFirstVolumeEvent = false;
-        const isRecording = native.toggleRecording(true);
+        native.toggleRecording(true);
        refs.captureActive = true;
-        console.log(
-          `[AudioEngine.native#${instanceId}] startCapture toggleRecording(true) => ${String(isRecording)}`,
-        );
      } catch (error) {
        const wrapped = error instanceof Error ? error : new Error(String(error));
        callbacks.onError?.(wrapped);
@@ -363,10 +252,7 @@ export function createAudioEngine(

    async stopCapture() {
      if (refs.captureActive) {
-        const isRecording = native.toggleRecording(false);
-        console.log(
-          `[AudioEngine.native#${instanceId}] stopCapture toggleRecording(false) => ${String(isRecording)}`,
-        );
+        native.toggleRecording(false);
      }
      refs.captureActive = false;
      refs.muted = false;
--- a/packages/app/src/voice/voice-runtime.ts
+++ b/packages/app/src/voice/voice-runtime.ts
@@ -3,7 +3,6 @@ import type { AgentStreamEventPayload, SessionOutboundMessage } from "@server/sh
 import { resolveVoiceUnavailableMessage } from "@/utils/server-info-capabilities";
 import type { DaemonServerInfo } from "@/stores/session-store";
 import type { AudioEngine } from "@/voice/audio-engine-types";
-import { REALTIME_VOICE_VAD_CONFIG } from "@/voice/realtime-voice-config";
 import {
  THINKING_TONE_NATIVE_PCM_BASE64,
  THINKING_TONE_NATIVE_PCM_DURATION_MS,
@@ -82,8 +81,6 @@ interface RuntimeState {
  segmentDurationTimer: ReturnType<typeof setInterval> | null;
  lastDisplayVolumePublishMs: number;
  serverSpeechStartedAt: number | null;
-  lastNoServerSpeechLogMs: number;
-  localAboveThresholdActive: boolean;
 }

 type AudioOutputPayload = Extract<SessionOutboundMessage, { type: "audio_output" }>["payload"];
@@ -120,19 +117,6 @@ interface CueState {
  playing: boolean;
 }

-interface RealtimeBridgeStats {
-  windowStartedAtMs: number;
-  captureEvents: number;
-  captureBytes: number;
-  uplinkEvents: number;
-  uplinkRawBytes: number;
-  uplinkBase64Chars: number;
-  outputEvents: number;
-  outputBytes: number;
-  outputGroups: number;
-  jsLagMaxMs: number;
-}
-
 const INITIAL_SNAPSHOT: VoiceRuntimeSnapshot = {
  phase: "disabled",
  isVoiceMode: false,
@@ -210,8 +194,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
    segmentDurationTimer: null,
    lastDisplayVolumePublishMs: 0,
    serverSpeechStartedAt: null,
-    lastNoServerSpeechLogMs: 0,
-    localAboveThresholdActive: false,
  };
  const playback: RuntimePlaybackState = {
    groups: new Map(),
@@ -220,18 +202,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
    processing: false,
    generation: 0,
  };
-  const bridgeStats: RealtimeBridgeStats = {
-    windowStartedAtMs: Date.now(),
-    captureEvents: 0,
-    captureBytes: 0,
-    uplinkEvents: 0,
-    uplinkRawBytes: 0,
-    uplinkBase64Chars: 0,
-    outputEvents: 0,
-    outputBytes: 0,
-    outputGroups: 0,
-    jsLagMaxMs: 0,
-  };
  const cue: CueState = {
    active: false,
    token: 0,
@@ -246,41 +216,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
      return cuePcm16.buffer.slice(cuePcm16.byteOffset, cuePcm16.byteOffset + cuePcm16.byteLength);
    },
  };
-  let lagProbeLastMs = Date.now();
-  const lagProbe = setInterval(() => {
-    const now = Date.now();
-    const lagMs = Math.max(0, now - lagProbeLastMs - 100);
-    lagProbeLastMs = now;
-    if (lagMs > bridgeStats.jsLagMaxMs) {
-      bridgeStats.jsLagMaxMs = lagMs;
-    }
-  }, 100);
-
-  function flushBridgeStats(reason: string): void {
-    const now = Date.now();
-    const elapsedMs = now - bridgeStats.windowStartedAtMs;
-    if (elapsedMs < 1000) {
-      return;
-    }
-    console.log(
-      `[VoiceRuntime#${instanceId}][bridge] ${reason} ` +
-        `capture=${bridgeStats.captureEvents}ev/${bridgeStats.captureBytes}B ` +
-        `uplink=${bridgeStats.uplinkEvents}ev/${bridgeStats.uplinkRawBytes}B/${bridgeStats.uplinkBase64Chars}c ` +
-        `output=${bridgeStats.outputEvents}ev/${bridgeStats.outputBytes}B groups=${bridgeStats.outputGroups} ` +
-        `jsLagMaxMs=${bridgeStats.jsLagMaxMs} windowMs=${elapsedMs}`,
-    );
-    bridgeStats.windowStartedAtMs = now;
-    bridgeStats.captureEvents = 0;
-    bridgeStats.captureBytes = 0;
-    bridgeStats.uplinkEvents = 0;
-    bridgeStats.uplinkRawBytes = 0;
-    bridgeStats.uplinkBase64Chars = 0;
-    bridgeStats.outputEvents = 0;
-    bridgeStats.outputBytes = 0;
-    bridgeStats.outputGroups = 0;
-    bridgeStats.jsLagMaxMs = 0;
-  }
-
  function emit(): void {
    for (const listener of listeners) {
      listener();
@@ -354,17 +289,11 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
  }

  function resetPlaybackState(): void {
-    const hadGroups = playback.groups.size;
    playback.generation += 1;
    playback.groups.clear();
    playback.orderedGroupIds = [];
    playback.activeGroupId = null;
    playback.processing = false;
-    if (hadGroups > 0) {
-      console.log(
-        `[VoiceRuntime] resetPlaybackState: cleared ${hadGroups} groups, new gen=${playback.generation}`,
-      );
-    }
  }

  function activateNextPlaybackGroup(): void {
@@ -394,15 +323,9 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {

    playback.processing = true;
    const generation = playback.generation;
-    console.log(
-      `[VoiceRuntime] processPlaybackQueue start gen=${generation} activeGroup=${playback.activeGroupId}`,
-    );
    try {
      while (playback.activeGroupId) {
        if (generation !== playback.generation) {
-          console.log(
-            `[VoiceRuntime] processPlaybackQueue abort: generation changed ${generation} -> ${playback.generation}`,
-          );
          return;
        }

@@ -415,9 +338,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
        const nextChunk = group.chunks.get(group.nextChunkToPlay);
        if (!nextChunk) {
          if (group.finalChunkIndex !== null && group.nextChunkToPlay > group.finalChunkIndex) {
-            console.log(
-              `[VoiceRuntime] group=${group.groupId} complete, played=${group.started} chunks=${group.nextChunkToPlay}`,
-            );
            playback.groups.delete(group.groupId);
            if (playback.orderedGroupIds[0] === group.groupId) {
              playback.orderedGroupIds.shift();
@@ -432,9 +352,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
            activateNextPlaybackGroup();
            continue;
          }
-          console.log(
-            `[VoiceRuntime] group=${group.groupId} waiting for chunk=${group.nextChunkToPlay} (finalChunkIndex=${group.finalChunkIndex})`,
-          );
          return;
        }

@@ -442,39 +359,21 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {

        if (group.shouldPlay && !group.started && group.isVoiceMode) {
          group.started = true;
-          console.log(
-            `[VoiceRuntime] group=${group.groupId} first play starting at chunk=${group.nextChunkToPlay}`,
-          );
          api.onAssistantAudioStarted(serverId);
        }

-        const playStart = Date.now();
        try {
          if (group.shouldPlay) {
            await deps.engine.play(nextChunk.source);
-            console.log(
-              `[VoiceRuntime] played chunk=${group.nextChunkToPlay} id=${nextChunk.id} took=${Date.now() - playStart}ms`,
-            );
-          } else {
-            console.log(
-              `[VoiceRuntime] SKIPPED chunk=${group.nextChunkToPlay} id=${nextChunk.id} shouldPlay=false`,
-            );
          }
        } catch (error) {
          if (generation !== playback.generation) {
-            console.log(`[VoiceRuntime] play error + generation changed, aborting`);
            return;
          }
-          console.error(
-            `[VoiceRuntime] play error chunk=${group.nextChunkToPlay} took=${Date.now() - playStart}ms:`,
-            error,
-          );
+          console.error(`[VoiceRuntime] play error chunk=${group.nextChunkToPlay}:`, error);
        }

        if (generation !== playback.generation) {
-          console.log(
-            `[VoiceRuntime] post-play generation changed ${generation} -> ${playback.generation}`,
-          );
          return;
        }

@@ -491,9 +390,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
      if (generation === playback.generation) {
        playback.processing = false;
      }
-      console.log(
-        `[VoiceRuntime] processPlaybackQueue exit gen=${generation} currentGen=${playback.generation}`,
-      );
    }
  }

@@ -606,12 +502,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
      }

      const base64 = Buffer.from(chunk).toString("base64");
-      bridgeStats.captureEvents += 1;
-      bridgeStats.captureBytes += chunk.byteLength;
-      bridgeStats.uplinkEvents += 1;
-      bridgeStats.uplinkRawBytes += chunk.byteLength;
-      bridgeStats.uplinkBase64Chars += base64.length;
-      flushBridgeStats("uplink");

      void activeSession.adapter.sendVoiceAudioChunk(base64, PCM_MIME_TYPE).catch((error) => {
        console.error(`[VoiceRuntime#${instanceId}] Failed to send audio chunk:`, error);
@@ -624,8 +514,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
    state.turnInProgress = false;
    state.serverSpeechDetected = false;
    state.lastDisplayVolumePublishMs = 0;
-    state.lastNoServerSpeechLogMs = 0;
-    state.localAboveThresholdActive = false;
    uploader.reset();
    resetCaptureTelemetry();
    patchSnapshot({ ...INITIAL_SNAPSHOT });
@@ -746,11 +634,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
      if (!state.snapshot.isVoiceMode || state.snapshot.isMuted) {
        return;
      }
-      if (bridgeStats.captureEvents === 0) {
-        console.log(
-          `[VoiceRuntime#${instanceId}] firstCapturePcm bytes=${chunk.byteLength} phase=${state.snapshot.phase} transportReady=${state.transportReady}`,
-        );
-      }
      uploader.pushPcmChunk(chunk);
    },

@@ -767,30 +650,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
        return;
      }

-      const isActive = level > REALTIME_VOICE_VAD_CONFIG.volumeThreshold;
-      if (isActive && !state.localAboveThresholdActive) {
-        state.localAboveThresholdActive = true;
-        console.log(
-          `[VoiceRuntime#${instanceId}] localSpeechActive level=${level.toFixed(3)} threshold=${REALTIME_VOICE_VAD_CONFIG.volumeThreshold.toFixed(3)} phase=${state.snapshot.phase} transportReady=${state.transportReady}`,
-        );
-      }
-      if (!isActive && state.localAboveThresholdActive) {
-        state.localAboveThresholdActive = false;
-        console.log(
-          `[VoiceRuntime#${instanceId}] localSpeechInactive phase=${state.snapshot.phase} serverSpeaking=${state.serverSpeechDetected}`,
-        );
-      }
-      if (
-        isActive &&
-        !state.serverSpeechDetected &&
-        nowMs - state.lastNoServerSpeechLogMs >= 1500
-      ) {
-        state.lastNoServerSpeechLogMs = nowMs;
-        console.log(
-          `[VoiceRuntime#${instanceId}] localSpeechWithoutServerSpeech level=${level.toFixed(3)} phase=${state.snapshot.phase} turnInProgress=${state.turnInProgress} transportReady=${state.transportReady}`,
-        );
-      }
-
      patchTelemetry((prev) => ({
        ...prev,
        isSpeaking: state.serverSpeechDetected,
@@ -805,33 +664,15 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
        !state.snapshot.isVoiceMode ||
        !payload.isVoiceMode
      ) {
-        console.log(
-          `[VoiceRuntime#${instanceId}] audio_output DROPPED: activeServer=${state.snapshot.activeServerId} serverId=${serverId} isVoiceMode=${state.snapshot.isVoiceMode} payloadVoice=${payload.isVoiceMode}`,
-        );
        return;
      }

      const groupId = payload.groupId ?? payload.id;
      const chunkIndex = payload.chunkIndex ?? 0;
      const decoded = decodeAudioChunk(payload.audio);
-      bridgeStats.outputEvents += 1;
-      bridgeStats.outputBytes += decoded.byteLength;
-      bridgeStats.outputGroups += playback.groups.has(groupId) ? 0 : 1;
-      console.log(
-        `[VoiceRuntime#${instanceId}] audio_output groupId=${groupId} chunk=${chunkIndex} isLast=${payload.isLastChunk} ` +
-          `base64Chars=${payload.audio.length} decodedBytes=${decoded.byteLength} format=${payload.format} ` +
-          `head=${Array.from(decoded.slice(0, 12))
-            .map((value) => value.toString(16).padStart(2, "0"))
-            .join(" ")}`,
-      );
-      flushBridgeStats("audio_output");

      let group = playback.groups.get(groupId);
      if (!group) {
-        const shouldPlay = api.shouldPlayVoiceAudio(serverId);
-        console.log(
-          `[VoiceRuntime] new group=${groupId} shouldPlay=${shouldPlay} phase=${state.snapshot.phase} isSpeaking=${state.telemetry.isSpeaking}`,
-        );
        group = {
          groupId,
          isVoiceMode: payload.isVoiceMode,
@@ -965,7 +806,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {

    async destroy() {
      await this.stopVoice().catch(() => undefined);
-      clearInterval(lagProbe);
      await deps.engine.destroy();
      listeners.clear();
      telemetryListeners.clear();
@@ -1054,9 +894,6 @@ export function createVoiceRuntime(deps: VoiceRuntimeDeps): VoiceRuntime {
        return;
      }

-      console.log(
-        `[VoiceRuntime#${instanceId}] onServerSpeechStateChanged isSpeaking=${isSpeaking} phase=${state.snapshot.phase} volume=${state.telemetry.volume}`,
-      );
      state.serverSpeechDetected = isSpeaking;
      state.serverSpeechStartedAt = isSpeaking ? (state.serverSpeechStartedAt ?? Date.now()) : null;
      if (isSpeaking) {
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "description": "Paseo CLI - control your AI coding agents from the command line",
  "type": "module",
  "files": [
@@ -24,8 +24,8 @@
  },
  "dependencies": {
    "@clack/prompts": "^1.0.0",
-    "@getpaseo/relay": "0.1.46",
-    "@getpaseo/server": "0.1.46",
+    "@getpaseo/relay": "0.1.50",
+    "@getpaseo/server": "0.1.50",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "main": "dist/main.js",
@@ -12,8 +12,8 @@
    "typecheck": "tsc --noEmit -p tsconfig.json"
  },
  "dependencies": {
-    "@getpaseo/cli": "0.1.46",
-    "@getpaseo/server": "0.1.46",
+    "@getpaseo/cli": "0.1.50",
+    "@getpaseo/server": "0.1.50",
    "electron-log": "^5.4.3",
    "electron-updater": "^6.6.2",
    "ws": "^8.14.2"
--- a/packages/desktop/src/daemon/runtime-paths.ts
+++ b/packages/desktop/src/daemon/runtime-paths.ts
@@ -223,7 +223,7 @@ function createCliInvocation(args: string[]): NodeEntrypointInvocation {
  const cli = resolveCliEntrypoint();
  return createNodeEntrypointInvocation({
    entrypoint: cli,
-    argvMode: "bare",
+    argvMode: "node-script",
    args,
    baseEnv: process.env,
  });
@@ -304,8 +304,16 @@ export async function runCliJsonCommand(args: string[]): Promise<unknown> {
    throw new Error("CLI command did not produce JSON output.");
  }

+  // The stdout may contain non-JSON preamble (e.g. Node deprecation warnings).
+  // Extract the first valid JSON object or array from the output.
+  const jsonStart = stdout.search(/[{[]/);
+  if (jsonStart < 0) {
+    throw new Error("CLI command output contained no JSON.");
+  }
+  const jsonText = stdout.slice(jsonStart);
+
  try {
-    return JSON.parse(stdout) as unknown;
+    return JSON.parse(jsonText) as unknown;
  } catch (error) {
    throw new Error(
      `CLI command returned invalid JSON: ${error instanceof Error ? error.message : String(error)}`,
--- a/packages/desktop/src/login-shell-env.ts
+++ b/packages/desktop/src/login-shell-env.ts
@@ -0,0 +1,113 @@
+// Shell environment resolution adapted from VS Code
+// https://github.com/microsoft/vscode/blob/main/src/vs/platform/shell/node/shellEnv.ts
+// Licensed under the MIT License.
+
+import { spawnSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { userInfo } from "node:os";
+import { basename } from "node:path";
+
+const RESOLVE_TIMEOUT_MS = 10_000;
+
+function getSystemShell(): string {
+  const shell = process.env.SHELL;
+  if (shell) return shell;
+
+  try {
+    const info = userInfo();
+    if (info.shell && info.shell !== "/bin/false") return info.shell;
+  } catch {}
+
+  return process.platform === "darwin" ? "/bin/zsh" : "/bin/bash";
+}
+
+function resolveShellEnv(): Record<string, string> | undefined {
+  if (process.platform === "win32") return undefined;
+
+  const savedRunAsNode = process.env.ELECTRON_RUN_AS_NODE;
+  const savedNoAttach = process.env.ELECTRON_NO_ATTACH_CONSOLE;
+
+  const mark = randomUUID().replace(/-/g, "").slice(0, 12);
+  const regex = new RegExp(mark + "({.*})" + mark);
+
+  const shell = getSystemShell();
+  const name = basename(shell);
+
+  let command: string;
+  let shellArgs: string[];
+
+  if (/^(?:pwsh|powershell)(?:-preview)?$/.test(name)) {
+    command = `& '${process.execPath}' -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`;
+    shellArgs = ["-Login", "-Command"];
+  } else if (name === "nu") {
+    command = `^'${process.execPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
+    shellArgs = ["-i", "-l", "-c"];
+  } else if (name === "xonsh") {
+    command = `import os, json; print("${mark}", json.dumps(dict(os.environ)), "${mark}")`;
+    shellArgs = ["-i", "-l", "-c"];
+  } else {
+    command = `'${process.execPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
+    if (name === "tcsh" || name === "csh") {
+      shellArgs = ["-ic"];
+    } else {
+      shellArgs = ["-i", "-l", "-c"];
+    }
+  }
+
+  const result = spawnSync(shell, [...shellArgs, command], {
+    encoding: "utf8",
+    timeout: RESOLVE_TIMEOUT_MS,
+    env: {
+      ...process.env,
+      ELECTRON_RUN_AS_NODE: "1",
+      ELECTRON_NO_ATTACH_CONSOLE: "1",
+    },
+  });
+
+  if (result.status !== 0 && result.status !== null) return undefined;
+  if (!result.stdout) return undefined;
+
+  const match = regex.exec(result.stdout);
+  if (!match?.[1]) return undefined;
+
+  try {
+    const env = JSON.parse(match[1]) as Record<string, string>;
+
+    if (savedRunAsNode) {
+      env.ELECTRON_RUN_AS_NODE = savedRunAsNode;
+    } else {
+      delete env.ELECTRON_RUN_AS_NODE;
+    }
+
+    if (savedNoAttach) {
+      env.ELECTRON_NO_ATTACH_CONSOLE = savedNoAttach;
+    } else {
+      delete env.ELECTRON_NO_ATTACH_CONSOLE;
+    }
+
+    delete env.XDG_RUNTIME_DIR;
+
+    return env;
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * On macOS/Linux, Electron inherits a minimal environment when launched from
+ * Finder/Dock. Spawn the user's login shell and capture its full environment
+ * via Node's JSON.stringify(process.env), so the daemon and all child processes
+ * see the same tools and variables as a normal terminal session.
+ *
+ * Approach borrowed from VS Code (src/vs/platform/shell/node/shellEnv.ts).
+ */
+export function inheritLoginShellEnv(): void {
+  try {
+    const env = resolveShellEnv();
+    if (env) {
+      Object.assign(process.env, env);
+    }
+  } catch {
+    // Keep inherited environment if shell lookup fails.
+  }
+}
--- a/packages/desktop/src/main.ts
+++ b/packages/desktop/src/main.ts
@@ -1,6 +1,9 @@
 import log from "electron-log/main";
 log.initialize({ spyRendererConsole: true });

+import { inheritLoginShellEnv } from "./login-shell-env.js";
+inheritLoginShellEnv();
+
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { existsSync } from "node:fs";
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "description": "Native module for two way audio streaming",
  "main": "build/index.js",
  "types": "build/index.d.ts",
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "type": "module",
  "publishConfig": {
    "access": "public"
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "description": "Paseo relay for bridging daemon and client connections",
  "type": "module",
  "publishConfig": {
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.1.46",
+  "version": "0.1.50",
  "description": "Paseo backend server",
  "type": "module",
  "publishConfig": {
@@ -64,8 +64,8 @@
    "@ai-sdk/openai": "2.0.52",
    "@anthropic-ai/claude-agent-sdk": "^0.2.11",
    "@deepgram/sdk": "^3.4.0",
-    "@getpaseo/highlight": "0.1.46",
-    "@getpaseo/relay": "0.1.46",
+    "@getpaseo/highlight": "0.1.50",
+    "@getpaseo/relay": "0.1.50",
    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "^1.20.1",
    "@opencode-ai/sdk": "1.2.6",
@@ -86,7 +86,6 @@
    "pino-pretty": "^13.1.3",
    "qrcode": "^1.5.4",
    "rotating-file-stream": "^3.2.9",
-    "shell-env": "^4.0.3",
    "sherpa-onnx": "1.12.28",
    "sherpa-onnx-node": "1.12.28",
    "strip-ansi": "^7.1.2",
--- a/packages/server/src/client/daemon-client.ts
+++ b/packages/server/src/client/daemon-client.ts
@@ -34,6 +34,8 @@ import type {
  PaseoWorktreeListResponse,
  PaseoWorktreeArchiveResponse,
  ProjectIconResponse,
+  ListAvailableEditorsResponseMessage,
+  OpenInEditorResponseMessage,
  OpenProjectResponseMessage,
  ArchiveWorkspaceResponseMessage,
  ListCommandsResponse,
@@ -43,6 +45,9 @@ import type {
  ListAvailableProvidersResponse,
  ListTerminalsResponse,
  CreateTerminalResponse,
+  GetProvidersSnapshotResponseMessage,
+  ProviderDiagnosticResponseMessage,
+  RefreshProvidersSnapshotResponseMessage,
  SubscribeTerminalResponse,
  TerminalState,
  CloseItemsResponse,
@@ -51,6 +56,7 @@ import type {
  TerminalInput,
  SessionInboundMessage,
  SessionOutboundMessage,
+  EditorTargetId,
 } from "../shared/messages.js";
 import type {
  AgentPermissionRequest,
@@ -147,6 +153,10 @@ export type DaemonEvent =
      requestId: string;
      resolution: AgentPermissionResponse;
    }
+  | {
+      type: "providers_snapshot_update";
+      payload: Extract<SessionOutboundMessage, { type: "providers_snapshot_update" }>["payload"];
+    }
  | { type: "error"; message: string };

 export type DaemonEventHandler = (event: DaemonEvent) => void;
@@ -222,6 +232,9 @@ type ListProviderFeaturesPayload = ListProviderFeaturesResponseMessage["payload"
 type ListProviderModelsPayload = ListProviderModelsResponseMessage["payload"];
 type ListProviderModesPayload = ListProviderModesResponseMessage["payload"];
 type ListAvailableProvidersPayload = ListAvailableProvidersResponse["payload"];
+type GetProvidersSnapshotPayload = GetProvidersSnapshotResponseMessage["payload"];
+type RefreshProvidersSnapshotPayload = RefreshProvidersSnapshotResponseMessage["payload"];
+type ProviderDiagnosticPayload = ProviderDiagnosticResponseMessage["payload"];
 type ListCommandsPayload = ListCommandsResponse["payload"];
 type ListCommandsDraftConfig = Pick<
  AgentSessionConfig,
@@ -462,8 +475,11 @@ export type InspectScheduleOptions = {
  id: string;
  requestId?: string;
 };
+type ListAvailableEditorsPayload = ListAvailableEditorsResponseMessage["payload"];
+type OpenInEditorPayload = OpenInEditorResponseMessage["payload"];
 type OpenProjectPayload = OpenProjectResponseMessage["payload"];
 type ArchiveWorkspacePayload = ArchiveWorkspaceResponseMessage["payload"];
+export type EditorTargetDescriptor = ListAvailableEditorsPayload["editors"][number];

 export type FetchAgentResult = {
  agent: AgentSnapshotPayload;
@@ -601,7 +617,10 @@ export class DaemonClient {
  private connectionState: ConnectionState = { status: "idle" };
  private checkoutDiffSubscriptions = new Map<
    string,
-    { cwd: string; compare: { mode: "uncommitted" | "base"; baseRef?: string } }
+    {
+      cwd: string;
+      compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
+    }
  >();
  private terminalDirectorySubscriptions = new Set<string>();
  private terminalSlots = new Map<string, number>();
@@ -1305,6 +1324,34 @@ export class DaemonClient {
    });
  }

+  async listAvailableEditors(requestId?: string): Promise<ListAvailableEditorsPayload> {
+    return this.sendCorrelatedSessionRequest({
+      requestId,
+      message: {
+        type: "list_available_editors_request",
+      },
+      responseType: "list_available_editors_response",
+      timeout: 10000,
+    });
+  }
+
+  async openInEditor(
+    path: string,
+    editorId: EditorTargetId,
+    requestId?: string,
+  ): Promise<OpenInEditorPayload> {
+    return this.sendCorrelatedSessionRequest({
+      requestId,
+      message: {
+        type: "open_in_editor_request",
+        path,
+        editorId,
+      },
+      responseType: "open_in_editor_response",
+      timeout: 10000,
+    });
+  }
+
  async archiveWorkspace(
    workspaceId: string,
    requestId?: string,
@@ -2136,20 +2183,22 @@ export class DaemonClient {
  private normalizeCheckoutDiffCompare(compare: {
    mode: "uncommitted" | "base";
    baseRef?: string;
-  }): { mode: "uncommitted" | "base"; baseRef?: string } {
+    ignoreWhitespace?: boolean;
+  }): { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean } {
+    const ignoreWhitespace = compare.ignoreWhitespace === true;
    if (compare.mode === "uncommitted") {
-      return { mode: "uncommitted" };
+      return { mode: "uncommitted", ignoreWhitespace };
    }
    const trimmedBaseRef = compare.baseRef?.trim();
    if (!trimmedBaseRef) {
-      return { mode: "base" };
+      return { mode: "base", ignoreWhitespace };
    }
-    return { mode: "base", baseRef: trimmedBaseRef };
+    return { mode: "base", baseRef: trimmedBaseRef, ignoreWhitespace };
  }

  async getCheckoutDiff(
    cwd: string,
-    compare: { mode: "uncommitted" | "base"; baseRef?: string },
+    compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean },
    requestId?: string,
  ): Promise<CheckoutDiffPayload> {
    const oneShotSubscriptionId = `oneshot-checkout-diff:${crypto.randomUUID()}`;
@@ -2175,7 +2224,7 @@ export class DaemonClient {

  async subscribeCheckoutDiff(
    cwd: string,
-    compare: { mode: "uncommitted" | "base"; baseRef?: string },
+    compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean },
    options?: { subscriptionId?: string; requestId?: string },
  ): Promise<SubscribeCheckoutDiffPayload> {
    const subscriptionId = options?.subscriptionId ?? crypto.randomUUID();
@@ -2552,6 +2601,51 @@ export class DaemonClient {
    });
  }

+  async getProvidersSnapshot(options?: {
+    cwd?: string;
+    requestId?: string;
+  }): Promise<GetProvidersSnapshotPayload> {
+    return this.sendCorrelatedSessionRequest({
+      requestId: options?.requestId,
+      message: {
+        type: "get_providers_snapshot_request",
+        cwd: options?.cwd,
+      },
+      responseType: "get_providers_snapshot_response",
+      timeout: 10000,
+    });
+  }
+
+  async refreshProvidersSnapshot(options?: {
+    cwd?: string;
+    requestId?: string;
+  }): Promise<RefreshProvidersSnapshotPayload> {
+    return this.sendCorrelatedSessionRequest({
+      requestId: options?.requestId,
+      message: {
+        type: "refresh_providers_snapshot_request",
+        cwd: options?.cwd,
+      },
+      responseType: "refresh_providers_snapshot_response",
+      timeout: 5000,
+    });
+  }
+
+  async getProviderDiagnostic(
+    provider: AgentProvider,
+    options?: { requestId?: string },
+  ): Promise<ProviderDiagnosticPayload> {
+    return this.sendCorrelatedSessionRequest({
+      requestId: options?.requestId,
+      message: {
+        type: "provider_diagnostic_request",
+        provider,
+      },
+      responseType: "provider_diagnostic_response",
+      timeout: 30000,
+    });
+  }
+
  async listCommands(agentId: string, requestId?: string): Promise<ListCommandsPayload>;
  async listCommands(agentId: string, options?: ListCommandsOptions): Promise<ListCommandsPayload>;
  async listCommands(
@@ -3637,6 +3731,11 @@ export class DaemonClient {
          requestId: msg.payload.requestId,
          resolution: msg.payload.resolution,
        };
+      case "providers_snapshot_update":
+        return {
+          type: "providers_snapshot_update",
+          payload: msg.payload,
+        };
      default:
        return null;
    }
--- a/packages/server/src/server/agent/agent-management-mcp.ts
+++ b/packages/server/src/server/agent/agent-management-mcp.ts
@@ -171,6 +171,9 @@ function sanitizePermissionRequest(
  if (sanitized.suggestions === undefined) {
    delete sanitized.suggestions;
  }
+  if (sanitized.actions === undefined) {
+    delete sanitized.actions;
+  }
  if (sanitized.metadata === undefined) {
    delete sanitized.metadata;
  }
--- a/packages/server/src/server/agent/agent-manager.test.ts
+++ b/packages/server/src/server/agent/agent-manager.test.ts
@@ -2890,6 +2890,213 @@ describe("AgentManager", () => {
    expect(updatedAgent?.currentModeId).toBe("acceptEdits");
  });

+  test("respondToPermission refreshes features and runtime info after provider-managed plan approval", async () => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+    const storagePath = join(workdir, "agents");
+    const storage = new AgentStorage(storagePath, logger);
+
+    class RefreshingPermissionSession extends TestAgentSession {
+      private featureState: AgentFeature[] = [
+        createFeature({ id: "fast_mode", label: "Fast", value: true }),
+        createFeature({ id: "plan_mode", label: "Plan", value: true }),
+      ];
+      private modeId = "auto";
+      private pending = [
+        {
+          id: "perm-plan-1",
+          provider: "codex" as const,
+          name: "CodexPlanApproval",
+          kind: "plan" as const,
+          input: { plan: "- Implement the feature" },
+        },
+      ];
+
+      get features(): AgentFeature[] {
+        return this.featureState;
+      }
+
+      override async getRuntimeInfo() {
+        return {
+          provider: this.provider,
+          sessionId: this.id,
+          model: "gpt-5.4",
+          modeId: this.modeId,
+          extra: { collaborationMode: this.features[1]?.value ? "Plan" : "Code" },
+        };
+      }
+
+      override async getCurrentMode() {
+        return this.modeId;
+      }
+
+      override getPendingPermissions() {
+        return this.pending;
+      }
+
+      override async respondToPermission(): Promise<void> {
+        this.modeId = "auto";
+        this.pending = [];
+        this.featureState = [
+          createFeature({ id: "fast_mode", label: "Fast", value: false }),
+          createFeature({ id: "plan_mode", label: "Plan", value: false }),
+        ];
+      }
+    }
+
+    class RefreshingPermissionClient extends TestAgentClient {
+      override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+        return new RefreshingPermissionSession(config);
+      }
+    }
+
+    const manager = new AgentManager({
+      clients: {
+        codex: new RefreshingPermissionClient(),
+      },
+      registry: storage,
+      logger,
+      idFactory: () => "00000000-0000-4000-8000-000000000133",
+    });
+
+    const snapshot = await manager.createAgent({
+      provider: "codex",
+      cwd: workdir,
+    });
+
+    const agent = manager.getAgent(snapshot.id);
+    if (!agent) {
+      throw new Error("Expected managed agent");
+    }
+    agent.pendingPermissions.set("perm-plan-1", {
+      id: "perm-plan-1",
+      provider: "codex",
+      name: "CodexPlanApproval",
+      kind: "plan",
+      input: { plan: "- Implement the feature" },
+    });
+
+    await manager.respondToPermission(snapshot.id, "perm-plan-1", {
+      behavior: "allow",
+      selectedActionId: "implement",
+    });
+
+    const updated = manager.getAgent(snapshot.id);
+    expect(updated?.pendingPermissions.size).toBe(0);
+    expect(updated?.features).toEqual([
+      createFeature({ id: "fast_mode", label: "Fast", value: false }),
+      createFeature({ id: "plan_mode", label: "Plan", value: false }),
+    ]);
+    expect(updated?.runtimeInfo).toMatchObject({
+      model: "gpt-5.4",
+      extra: { collaborationMode: "Code" },
+    });
+
+    const persisted = await storage.get(snapshot.id);
+    expect(persisted?.features).toEqual([
+      createFeature({ id: "fast_mode", label: "Fast", value: false }),
+      createFeature({ id: "plan_mode", label: "Plan", value: false }),
+    ]);
+  });
+
+  test("respondToPermission emits refreshed state before permission_resolved", async () => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-manager-permission-order-"));
+    const storagePath = join(workdir, "agents");
+    const storage = new AgentStorage(storagePath, logger);
+
+    class OrderedPermissionSession extends TestAgentSession {
+      private featureState: AgentFeature[] = [
+        createFeature({ id: "fast_mode", label: "Fast", value: true }),
+      ];
+      private modeId = "plan";
+      private pending = [
+        {
+          id: "perm-order-1",
+          provider: "codex" as const,
+          name: "ExitPlanMode",
+          kind: "plan" as const,
+          input: { plan: "- Do the work" },
+        },
+      ];
+
+      get features(): AgentFeature[] {
+        return this.featureState;
+      }
+
+      override async getRuntimeInfo() {
+        return {
+          provider: this.provider,
+          sessionId: this.id,
+          model: "gpt-5.4",
+          modeId: this.modeId,
+        };
+      }
+
+      override async getCurrentMode() {
+        return this.modeId;
+      }
+
+      override getPendingPermissions() {
+        return this.pending;
+      }
+
+      override async respondToPermission(): Promise<void> {
+        this.pushEvent({
+          type: "permission_resolved",
+          provider: this.provider,
+          requestId: "perm-order-1",
+          resolution: { behavior: "allow" },
+        });
+        this.modeId = "acceptEdits";
+        this.featureState = [createFeature({ id: "fast_mode", label: "Fast", value: false })];
+        this.pending = [];
+      }
+    }
+
+    class OrderedPermissionClient extends TestAgentClient {
+      override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
+        return new OrderedPermissionSession(config);
+      }
+    }
+
+    const manager = new AgentManager({
+      clients: {
+        codex: new OrderedPermissionClient(),
+      },
+      registry: storage,
+      logger,
+      idFactory: () => "00000000-0000-4000-8000-000000000134",
+    });
+
+    const snapshot = await manager.createAgent({
+      provider: "codex",
+      cwd: workdir,
+    });
+
+    const seen: string[] = [];
+    manager.subscribe((event) => {
+      if ("agentId" in event && event.agentId !== snapshot.id) {
+        return;
+      }
+      if (event.type === "agent_state" && event.agent.id === snapshot.id) {
+        const fastMode = event.agent.features?.find((feature) => feature.id === "fast_mode");
+        seen.push(`state:${event.agent.currentModeId}:${String(fastMode?.type === "toggle" ? fastMode.value : null)}`);
+        return;
+      }
+      if (event.type === "agent_stream" && event.event.type === "permission_resolved") {
+        seen.push(`resolved:${event.event.requestId}`);
+      }
+    });
+
+    await manager.respondToPermission(snapshot.id, "perm-order-1", {
+      behavior: "allow",
+    });
+
+    const refreshedStateIndex = seen.findIndex((entry) => entry === "state:acceptEdits:false");
+    const resolvedIndex = seen.findIndex((entry) => entry === "resolved:perm-order-1");
+    expect(refreshedStateIndex).toBeGreaterThanOrEqual(0);
+    expect(resolvedIndex).toBeGreaterThan(refreshedStateIndex);
+  });
+
  test("close during in-flight stream does not clear persistence sessionId", async () => {
    const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
    const storagePath = join(workdir, "agents");
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -172,6 +172,11 @@ type ManagedAgentBase = {
  features?: AgentFeature[];
  currentModeId: string | null;
  pendingPermissions: Map<string, AgentPermissionRequest>;
+  bufferedPermissionResolutions: Map<
+    string,
+    Extract<AgentStreamEvent, { type: "permission_resolved" }>
+  >;
+  inFlightPermissionResponses: Set<string>;
  pendingReplacement: boolean;
  timeline: AgentTimelineItem[];
  timelineRows: AgentTimelineRow[];
@@ -1437,18 +1442,31 @@ export class AgentManager {
    response: AgentPermissionResponse,
  ): Promise<void> {
    const agent = this.requireAgent(agentId);
-    await agent.session.respondToPermission(requestId, response);
-    agent.pendingPermissions.delete(requestId);
+    agent.inFlightPermissionResponses.add(requestId);

-    // Update currentModeId - the session may have changed mode internally
-    // (e.g., plan approval changes mode from "plan" to "acceptEdits")
    try {
-      agent.currentModeId = await agent.session.getCurrentMode();
-    } catch {
-      // Ignore errors from getCurrentMode - mode tracking is best effort
-    }
+      await agent.session.respondToPermission(requestId, response);
+      agent.pendingPermissions.delete(requestId);

-    this.emitState(agent);
+      try {
+        await this.refreshSessionState(agent);
+      } catch {
+        // Ignore refresh errors - state sync after permission approval is best effort.
+      }
+
+      this.touchUpdatedAt(agent);
+      await this.persistSnapshot(agent);
+      this.emitState(agent);
+
+      const bufferedResolution = agent.bufferedPermissionResolutions.get(requestId);
+      if (bufferedResolution) {
+        agent.bufferedPermissionResolutions.delete(requestId);
+        this.dispatchStream(agent.id, bufferedResolution);
+      }
+    } finally {
+      agent.inFlightPermissionResponses.delete(requestId);
+      agent.bufferedPermissionResolutions.delete(requestId);
+    }
  }

  async cancelAgentRun(agentId: string): Promise<boolean> {
@@ -1799,6 +1817,8 @@ export class AgentManager {
      availableModes: [],
      currentModeId: null,
      pendingPermissions: new Map(),
+      bufferedPermissionResolutions: new Map(),
+      inFlightPermissionResponses: new Set(),
      pendingReplacement: false,
      activeForegroundTurnId: null,
      foregroundTurnWaiters: new Set(),
@@ -2011,6 +2031,7 @@ export class AgentManager {
      agent.pendingPermissions.clear();
    }

+    this.syncFeaturesFromSession(agent);
    await this.refreshRuntimeInfo(agent);
  }

@@ -2087,6 +2108,7 @@ export class AgentManager {
    }

    let timelineRow: AgentTimelineRow | null = null;
+    let shouldDispatchEvent = true;

    switch (event.type) {
      case "thread_started":
@@ -2259,6 +2281,11 @@ export class AgentManager {
        break;
      case "permission_resolved":
        agent.pendingPermissions.delete(event.requestId);
+        if (!options?.fromHistory && agent.inFlightPermissionResponses.has(event.requestId)) {
+          agent.bufferedPermissionResolutions.set(event.requestId, event);
+          shouldDispatchEvent = false;
+          break;
+        }
        this.emitState(agent);
        break;
      default:
@@ -2270,7 +2297,7 @@ export class AgentManager {
    }

    // Skip dispatching individual stream events during history replay.
-    if (!options?.fromHistory) {
+    if (!options?.fromHistory && shouldDispatchEvent) {
      this.dispatchStream(
        agent.id,
        event,
@@ -2365,9 +2392,7 @@ export class AgentManager {
    // Keep attention as an edge-triggered unread signal, not a level signal.
    this.checkAndSetAttention(agent);

-    if (agent.session?.features) {
-      agent.features = agent.session.features;
-    }
+    this.syncFeaturesFromSession(agent);

    this.dispatch({
      type: "agent_state",
@@ -2375,6 +2400,12 @@ export class AgentManager {
    });
  }

+  private syncFeaturesFromSession(agent: ManagedAgent): void {
+    if ("session" in agent && agent.session?.features) {
+      agent.features = agent.session.features;
+    }
+  }
+
  private checkAndSetAttention(agent: ManagedAgent): void {
    const previousStatus = this.previousStatuses.get(agent.id);
    const currentStatus = agent.lifecycle;
--- a/packages/server/src/server/agent/agent-projections.test.ts
+++ b/packages/server/src/server/agent/agent-projections.test.ts
@@ -260,6 +260,34 @@ describe("toAgentPayload", () => {
    expect(permissionA.title).toBe("Run command");
  });

+  it("omits usage when any numeric usage field is NaN", () => {
+    const fields = [
+      "inputTokens",
+      "cachedInputTokens",
+      "outputTokens",
+      "totalCostUsd",
+      "contextWindowMaxTokens",
+      "contextWindowUsedTokens",
+    ] as const;
+
+    for (const field of fields) {
+      const agent = createManagedAgent({
+        lastUsage: {
+          inputTokens: 10,
+          cachedInputTokens: 5,
+          outputTokens: 20,
+          totalCostUsd: 0.5,
+          contextWindowMaxTokens: 200_000,
+          contextWindowUsedTokens: 100_000,
+          [field]: Number.NaN,
+        },
+      });
+
+      const payload = toAgentPayload(agent);
+      expect(payload.lastUsage).toBeUndefined();
+    }
+  });
+
  it("produces null title and current mode even without overrides", () => {
    const agent = createManagedAgent({ currentModeId: null, lastUserMessageAt: null });
    const payload = toAgentPayload(agent);
@@ -303,6 +331,56 @@ describe("toAgentPayload", () => {
    expect(payload).not.toHaveProperty("lastUsage");
  });

+  it("preserves context window usage fields when they are valid numbers", () => {
+    const agent = createManagedAgent({
+      lastUsage: {
+        inputTokens: 10,
+        contextWindowMaxTokens: 200_000,
+        contextWindowUsedTokens: 42_000,
+      },
+    });
+
+    const payload = toAgentPayload(agent);
+
+    expect(payload.lastUsage).toEqual({
+      inputTokens: 10,
+      contextWindowMaxTokens: 200_000,
+      contextWindowUsedTokens: 42_000,
+    });
+  });
+
+  it("omits lastUsage when context window usage fields are invalid", () => {
+    const agent = createManagedAgent({
+      lastUsage: {
+        inputTokens: 10,
+        contextWindowMaxTokens: "200000" as unknown as number,
+        contextWindowUsedTokens: NaN,
+      },
+    });
+
+    const payload = toAgentPayload(agent);
+
+    expect(payload).not.toHaveProperty("lastUsage");
+  });
+
+  it("keeps existing lastUsage behavior when context window fields are absent", () => {
+    const agent = createManagedAgent({
+      lastUsage: {
+        inputTokens: 10,
+        outputTokens: 20,
+        totalCostUsd: 1.25,
+      },
+    });
+
+    const payload = toAgentPayload(agent);
+
+    expect(payload.lastUsage).toEqual({
+      inputTokens: 10,
+      outputTokens: 20,
+      totalCostUsd: 1.25,
+    });
+  });
+
  it("includes features in the snapshot payload", () => {
    const features = [createFeature()];
    const agent = createManagedAgent({ features });
--- a/packages/server/src/server/agent/agent-projections.ts
+++ b/packages/server/src/server/agent/agent-projections.ts
@@ -61,6 +61,7 @@ export function toStoredAgentRecord(
    lastModeId: agent.currentModeId ?? config?.modeId ?? null,
    config: config ?? null,
    runtimeInfo,
+    features: agent.features,
    persistence,
    requiresAttention: agent.attention.requiresAttention,
    attentionReason: agent.attention.requiresAttention ? agent.attention.attentionReason : null,
@@ -166,6 +167,7 @@ function sanitizePendingPermissions(
    ...request,
    input: sanitizeMetadata(request.input),
    suggestions: sanitizeMetadataArray(request.suggestions),
+    actions: request.actions?.map((action) => ({ ...action })),
    metadata: sanitizeMetadata(request.metadata),
  }));
 }
@@ -259,29 +261,41 @@ function sanitizeUsage(value: unknown): AgentUsage | undefined {
  }
  const result: AgentUsage = {};
  const inputTokens = sanitized.inputTokens;
-  if (typeof inputTokens === "number") {
+  if (typeof inputTokens === "number" && Number.isFinite(inputTokens)) {
    result.inputTokens = inputTokens;
  } else if (inputTokens !== undefined && inputTokens !== null) {
    return undefined;
  }
  const cachedInputTokens = sanitized.cachedInputTokens;
-  if (typeof cachedInputTokens === "number") {
+  if (typeof cachedInputTokens === "number" && Number.isFinite(cachedInputTokens)) {
    result.cachedInputTokens = cachedInputTokens;
  } else if (cachedInputTokens !== undefined && cachedInputTokens !== null) {
    return undefined;
  }
  const outputTokens = sanitized.outputTokens;
-  if (typeof outputTokens === "number") {
+  if (typeof outputTokens === "number" && Number.isFinite(outputTokens)) {
    result.outputTokens = outputTokens;
  } else if (outputTokens !== undefined && outputTokens !== null) {
    return undefined;
  }
  const totalCostUsd = sanitized.totalCostUsd;
-  if (typeof totalCostUsd === "number") {
+  if (typeof totalCostUsd === "number" && Number.isFinite(totalCostUsd)) {
    result.totalCostUsd = totalCostUsd;
  } else if (totalCostUsd !== undefined && totalCostUsd !== null) {
    return undefined;
  }
+  const contextWindowMaxTokens = sanitized.contextWindowMaxTokens;
+  if (typeof contextWindowMaxTokens === "number" && Number.isFinite(contextWindowMaxTokens)) {
+    result.contextWindowMaxTokens = contextWindowMaxTokens;
+  } else if (contextWindowMaxTokens !== undefined && contextWindowMaxTokens !== null) {
+    return undefined;
+  }
+  const contextWindowUsedTokens = sanitized.contextWindowUsedTokens;
+  if (typeof contextWindowUsedTokens === "number" && Number.isFinite(contextWindowUsedTokens)) {
+    result.contextWindowUsedTokens = contextWindowUsedTokens;
+  } else if (contextWindowUsedTokens !== undefined && contextWindowUsedTokens !== null) {
+    return undefined;
+  }
  return Object.keys(result).length ? result : undefined;
 }

--- a/packages/server/src/server/agent/agent-sdk-types.ts
+++ b/packages/server/src/server/agent/agent-sdk-types.ts
@@ -45,6 +45,8 @@ export type AgentMode = {
  description?: string;
 };

+export type ProviderStatus = "ready" | "loading" | "error" | "unavailable";
+
 export type AgentModelDefinition = {
  provider: AgentProvider;
  id: string;
@@ -64,6 +66,15 @@ export type AgentSelectOption = {
  metadata?: AgentMetadata;
 };

+export interface ProviderSnapshotEntry {
+  provider: AgentProvider;
+  status: ProviderStatus;
+  error?: string;
+  models?: AgentModelDefinition[];
+  modes?: AgentMode[];
+  fetchedAt?: string;
+}
+
 export type AgentFeatureToggle = {
  type: "toggle";
  id: string;
@@ -121,6 +132,8 @@ export type AgentUsage = {
  cachedInputTokens?: number;
  outputTokens?: number;
  totalCostUsd?: number;
+  contextWindowMaxTokens?: number;
+  contextWindowUsedTokens?: number;
 };

 export const TOOL_CALL_ICON_NAMES = [
@@ -317,6 +330,14 @@ export type AgentPermissionRequestKind = "tool" | "plan" | "question" | "mode" |

 export type AgentPermissionUpdate = AgentMetadata;

+export type AgentPermissionAction = {
+  id: string;
+  label: string;
+  behavior: "allow" | "deny";
+  variant?: "primary" | "secondary" | "danger";
+  intent?: "implement" | "implement_resume" | "dismiss";
+};
+
 export type AgentPermissionRequest = {
  id: string;
  provider: AgentProvider;
@@ -327,17 +348,20 @@ export type AgentPermissionRequest = {
  input?: AgentMetadata;
  detail?: ToolCallDetail;
  suggestions?: AgentPermissionUpdate[];
+  actions?: AgentPermissionAction[];
  metadata?: AgentMetadata;
 };

 export type AgentPermissionResponse =
  | {
      behavior: "allow";
+      selectedActionId?: string;
      updatedInput?: AgentMetadata;
      updatedPermissions?: AgentPermissionUpdate[];
    }
  | {
      behavior: "deny";
+      selectedActionId?: string;
      message?: string;
      interrupt?: boolean;
    };
@@ -468,4 +492,5 @@ export interface AgentClient {
   * Returns true if available, false otherwise.
   */
  isAvailable(): Promise<boolean>;
+  getDiagnostic?(): Promise<{ diagnostic: string }>;
 }
--- a/packages/server/src/server/agent/agent-storage.ts
+++ b/packages/server/src/server/agent/agent-storage.ts
@@ -4,7 +4,7 @@ import path from "node:path";
 import { z } from "zod";
 import type { Logger } from "pino";

-import { AgentStatusSchema } from "../messages.js";
+import { AgentFeatureSchema, AgentStatusSchema } from "../messages.js";
 import { toStoredAgentRecord } from "./agent-projections.js";
 import type { ManagedAgent } from "./agent-manager.js";
 import type { AgentSessionConfig } from "./agent-sdk-types.js";
@@ -56,6 +56,7 @@ const STORED_AGENT_SCHEMA = z.object({
      extra: z.record(z.unknown()).optional(),
    })
    .optional(),
+  features: z.array(AgentFeatureSchema).optional(),
  persistence: PERSISTENCE_HANDLE_SCHEMA,
  requiresAttention: z.boolean().optional(),
  attentionReason: z.enum(["finished", "error", "permission"]).nullable().optional(),
--- a/packages/server/src/server/agent/mcp-server.ts
+++ b/packages/server/src/server/agent/mcp-server.ts
@@ -233,6 +233,9 @@ function sanitizePermissionRequest(
  if (sanitized.suggestions === undefined) {
    delete sanitized.suggestions;
  }
+  if (sanitized.actions === undefined) {
+    delete sanitized.actions;
+  }
  if (sanitized.metadata === undefined) {
    delete sanitized.metadata;
  }
--- a/packages/server/src/server/agent/provider-launch-config.test.ts
+++ b/packages/server/src/server/agent/provider-launch-config.test.ts
@@ -66,7 +66,7 @@ describe("applyProviderEnv", () => {
      },
    };

-    const env = applyProviderEnv(base, runtime, {});
+    const env = applyProviderEnv(base, runtime);

    expect(env.PATH).toBe("/usr/bin");
    expect(env.HOME).toBe("/custom/home");
@@ -74,21 +74,11 @@ describe("applyProviderEnv", () => {
    expect(Object.keys(env).length).toBeGreaterThanOrEqual(3);
  });

-  test("shell env PATH wins over base env PATH", () => {
-    const base = { PATH: "/usr/bin:/bin" };
-    const shellEnv = { PATH: "/usr/local/bin:/usr/bin:/bin:/home/user/.nvm/bin" };
-
-    const env = applyProviderEnv(base, undefined, shellEnv);
-
-    expect(env.PATH).toBe("/usr/local/bin:/usr/bin:/bin:/home/user/.nvm/bin");
-  });
-
-  test("runtimeSettings env wins over shell env", () => {
+  test("runtimeSettings env wins over base env", () => {
    const base = { PATH: "/usr/bin" };
-    const shellEnv = { PATH: "/usr/local/bin:/usr/bin" };
    const runtime: ProviderRuntimeSettings = { env: { PATH: "/custom/path" } };

-    const env = applyProviderEnv(base, runtime, shellEnv);
+    const env = applyProviderEnv(base, runtime);

    expect(env.PATH).toBe("/custom/path");
  });
@@ -103,7 +93,7 @@ describe("applyProviderEnv", () => {
      CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING: "true",
    };

-    const env = applyProviderEnv(base, undefined, {});
+    const env = applyProviderEnv(base);

    expect(env.PATH).toBe("/usr/bin");
    expect(env.CLAUDECODE).toBeUndefined();
--- a/packages/server/src/server/agent/provider-launch-config.ts
+++ b/packages/server/src/server/agent/provider-launch-config.ts
@@ -1,9 +1,6 @@
 import { z } from "zod";

-import {
-  isCommandAvailable,
-  resolveShellEnv,
-} from "../../utils/executable.js";
+import { isCommandAvailable } from "../../utils/executable.js";
 import type { AgentProvider } from "./agent-sdk-types.js";
 import { AgentProviderSchema } from "./provider-manifest.js";

@@ -94,11 +91,9 @@ const PARENT_SESSION_ENV_VARS = [
 export function applyProviderEnv(
  baseEnv: Record<string, string | undefined>,
  runtimeSettings?: ProviderRuntimeSettings,
-  shellEnv?: Record<string, string>,
 ): Record<string, string | undefined> {
  const merged: Record<string, string | undefined> = {
    ...baseEnv,
-    ...(shellEnv ?? resolveShellEnv()),
    ...(runtimeSettings?.env ?? {}),
  };
  for (const key of PARENT_SESSION_ENV_VARS) {
--- a/packages/server/src/server/agent/provider-snapshot-manager.test.ts
+++ b/packages/server/src/server/agent/provider-snapshot-manager.test.ts
@@ -0,0 +1,454 @@
+import { describe, expect, test, vi } from "vitest";
+
+import { createTestLogger } from "../../test-utils/test-logger.js";
+import type {
+  AgentClient,
+  AgentMode,
+  AgentModelDefinition,
+  AgentProvider,
+  ProviderSnapshotEntry,
+} from "./agent-sdk-types.js";
+import type { ProviderDefinition } from "./provider-registry.js";
+import { ProviderSnapshotManager } from "./provider-snapshot-manager.js";
+
+type Deferred<T> = {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+  reject: (reason?: unknown) => void;
+};
+
+type MockProviderOptions = {
+  provider: AgentProvider;
+  isAvailable?: () => Promise<boolean>;
+  fetchModels?: (cwd?: string) => Promise<AgentModelDefinition[]>;
+  fetchModes?: (cwd?: string) => Promise<AgentMode[]>;
+};
+
+type MockProviderHandle = {
+  definition: ProviderDefinition;
+  isAvailable: ReturnType<typeof vi.fn>;
+  fetchModels: ReturnType<typeof vi.fn>;
+  fetchModes: ReturnType<typeof vi.fn>;
+};
+
+const TEST_CAPABILITIES = {
+  supportsStreaming: false,
+  supportsSessionPersistence: false,
+  supportsDynamicModes: false,
+  supportsMcpServers: false,
+  supportsReasoningStream: false,
+  supportsToolInvocations: false,
+} as const;
+
+describe("ProviderSnapshotManager", () => {
+  test("getSnapshot returns all providers in loading state initially and triggers warmUp", async () => {
+    const codexModels = deferred<AgentModelDefinition[]>();
+    const claudeModels = deferred<AgentModelDefinition[]>();
+    const { registry, handles } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async () => codexModels.promise,
+      }),
+      createMockProvider({
+        provider: "claude",
+        fetchModels: async () => claudeModels.promise,
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+
+    const snapshot = manager.getSnapshot("/tmp/project");
+
+    expect(snapshot).toEqual([
+      { provider: "claude", status: "loading" },
+      { provider: "codex", status: "loading" },
+    ]);
+
+    await vi.waitFor(() => {
+      expect(handles.claude?.isAvailable).toHaveBeenCalledTimes(1);
+      expect(handles.codex?.isAvailable).toHaveBeenCalledTimes(1);
+    });
+
+    manager.destroy();
+    codexModels.resolve([]);
+    claudeModels.resolve([]);
+  });
+
+  test("after warmUp completes, getSnapshot returns ready entries with models", async () => {
+    const { registry } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async () => [createModel("codex", "gpt-5.2")],
+        fetchModes: async () => [createMode("auto")],
+      }),
+      createMockProvider({
+        provider: "claude",
+        fetchModels: async () => [createModel("claude", "sonnet")],
+        fetchModes: async () => [createMode("default")],
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+
+    manager.getSnapshot("/tmp/project");
+
+    await vi.waitFor(() => {
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project"), "claude")?.status).toBe("ready");
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project"), "codex")?.status).toBe("ready");
+    });
+
+    const snapshot = manager.getSnapshot("/tmp/project");
+    expect(getProviderEntry(snapshot, "codex")).toMatchObject({
+      provider: "codex",
+      status: "ready",
+      models: [createModel("codex", "gpt-5.2")],
+      modes: [createMode("auto")],
+    });
+    expect(getProviderEntry(snapshot, "claude")).toMatchObject({
+      provider: "claude",
+      status: "ready",
+      models: [createModel("claude", "sonnet")],
+      modes: [createMode("default")],
+    });
+    expect(getProviderEntry(snapshot, "codex")?.fetchedAt).toEqual(expect.any(String));
+
+    manager.destroy();
+  });
+
+  test("provider that fails isAvailable shows as unavailable", async () => {
+    const { registry, handles } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        isAvailable: async () => false,
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+
+    manager.getSnapshot("/tmp/project");
+
+    await vi.waitFor(() => {
+      expect(manager.getSnapshot("/tmp/project")).toEqual([
+        { provider: "codex", status: "unavailable" },
+      ]);
+    });
+
+    expect(handles.codex?.fetchModels).not.toHaveBeenCalled();
+    expect(handles.codex?.fetchModes).not.toHaveBeenCalled();
+
+    manager.destroy();
+  });
+
+  test("provider that fails fetchModels shows as error with error message", async () => {
+    const { registry } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async () => {
+          throw new Error("model lookup failed");
+        },
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+
+    manager.getSnapshot("/tmp/project");
+
+    await vi.waitFor(() => {
+      expect(manager.getSnapshot("/tmp/project")).toEqual([
+        {
+          provider: "codex",
+          status: "error",
+          error: "model lookup failed",
+        },
+      ]);
+    });
+
+    manager.destroy();
+  });
+
+  test("change event fires for each provider as it resolves", async () => {
+    const codexModels = deferred<AgentModelDefinition[]>();
+    const claudeModels = deferred<AgentModelDefinition[]>();
+    const codexModes = deferred<AgentMode[]>();
+    const claudeModes = deferred<AgentMode[]>();
+    const { registry } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async () => codexModels.promise,
+        fetchModes: async () => codexModes.promise,
+      }),
+      createMockProvider({
+        provider: "claude",
+        fetchModels: async () => claudeModels.promise,
+        fetchModes: async () => claudeModes.promise,
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+    const changes: Array<{ cwd: string; entries: ProviderSnapshotEntry[] }> = [];
+    const listener = (entries: ProviderSnapshotEntry[], cwd: string) => {
+      changes.push({ cwd, entries });
+    };
+    manager.on("change", listener);
+
+    manager.getSnapshot("/tmp/project");
+
+    claudeModels.resolve([createModel("claude", "sonnet")]);
+    claudeModes.resolve([createMode("default")]);
+
+    await vi.waitFor(() => {
+      expect(changes).toHaveLength(1);
+    });
+
+    expect(changes[0]?.cwd).toBe("/tmp/project");
+    expect(getProviderEntry(changes[0]?.entries ?? [], "claude")?.status).toBe("ready");
+    expect(getProviderEntry(changes[0]?.entries ?? [], "codex")?.status).toBe("loading");
+
+    codexModels.resolve([createModel("codex", "gpt-5.2")]);
+    codexModes.resolve([createMode("auto")]);
+
+    await vi.waitFor(() => {
+      expect(changes).toHaveLength(2);
+    });
+
+    expect(getProviderEntry(changes[1]?.entries ?? [], "codex")?.status).toBe("ready");
+    expect(getProviderEntry(changes[1]?.entries ?? [], "claude")?.status).toBe("ready");
+
+    manager.off("change", listener);
+    manager.destroy();
+  });
+
+  test("refresh re-fetches and updates entries", async () => {
+    const codexFetchModels = vi
+      .fn<(options?: { cwd?: string }) => Promise<AgentModelDefinition[]>>()
+      .mockResolvedValueOnce([createModel("codex", "gpt-5.1")])
+      .mockResolvedValueOnce([createModel("codex", "gpt-5.2")]);
+    const { registry } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async (cwd) => codexFetchModels({ cwd }),
+        fetchModes: async () => [createMode("auto")],
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+
+    manager.getSnapshot("/tmp/project");
+
+    await vi.waitFor(() => {
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project"), "codex")?.models?.[0]?.id).toBe(
+        "gpt-5.1",
+      );
+    });
+
+    manager.refresh("/tmp/project");
+    expect(manager.getSnapshot("/tmp/project")).toEqual([
+      { provider: "codex", status: "loading" },
+    ]);
+
+    await vi.waitFor(() => {
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project"), "codex")?.models?.[0]?.id).toBe(
+        "gpt-5.2",
+      );
+    });
+
+    expect(codexFetchModels).toHaveBeenCalledTimes(2);
+
+    manager.destroy();
+  });
+
+  test("refresh during an in-flight refresh is a no-op", async () => {
+    const fetchModels = deferred<AgentModelDefinition[]>();
+    const fetchModes = deferred<AgentMode[]>();
+    const { registry, handles } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async () => fetchModels.promise,
+        fetchModes: async () => fetchModes.promise,
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+    const changes: ProviderSnapshotEntry[][] = [];
+    manager.on("change", (entries) => changes.push(entries));
+
+    manager.refresh("/tmp/project");
+
+    expect(manager.getSnapshot("/tmp/project")).toEqual([
+      { provider: "codex", status: "loading" },
+    ]);
+
+    manager.refresh("/tmp/project");
+    manager.refresh("/tmp/project");
+    manager.refresh("/tmp/project");
+
+    expect(changes).toHaveLength(1);
+    expect(handles.codex?.isAvailable).toHaveBeenCalledTimes(1);
+
+    fetchModels.resolve([createModel("codex", "gpt-5.2")]);
+    fetchModes.resolve([createMode("auto")]);
+
+    await vi.waitFor(() => {
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project"), "codex")).toMatchObject({
+        provider: "codex",
+        status: "ready",
+        models: [createModel("codex", "gpt-5.2")],
+        modes: [createMode("auto")],
+      });
+    });
+
+    expect(handles.codex?.fetchModels).toHaveBeenCalledTimes(1);
+    expect(handles.codex?.fetchModes).toHaveBeenCalledTimes(1);
+
+    manager.destroy();
+  });
+
+  test("multiple getSnapshot calls for same cwd do not trigger multiple warmUps", async () => {
+    const codexModels = deferred<AgentModelDefinition[]>();
+    const { registry, handles } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async () => codexModels.promise,
+      }),
+      createMockProvider({
+        provider: "claude",
+        fetchModels: async () => [],
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+
+    manager.getSnapshot("/tmp/project");
+    manager.getSnapshot("/tmp/project");
+    manager.getSnapshot("/tmp/project");
+
+    await vi.waitFor(() => {
+      expect(handles.codex?.isAvailable).toHaveBeenCalledTimes(1);
+      expect(handles.codex?.fetchModels).toHaveBeenCalledTimes(1);
+      expect(handles.claude?.isAvailable).toHaveBeenCalledTimes(1);
+      expect(handles.claude?.fetchModels).toHaveBeenCalledTimes(1);
+    });
+
+    codexModels.resolve([createModel("codex", "gpt-5.2")]);
+
+    await vi.waitFor(() => {
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project"), "codex")?.status).toBe("ready");
+    });
+
+    manager.destroy();
+  });
+
+  test("different cwd keys get independent snapshots", async () => {
+    const seenCwds: string[] = [];
+    const { registry } = createRegistry([
+      createMockProvider({
+        provider: "codex",
+        fetchModels: async (cwd) => {
+          seenCwds.push(cwd ?? "__missing__");
+          return [createModel("codex", `model:${cwd}`)];
+        },
+      }),
+    ]);
+    const manager = new ProviderSnapshotManager(registry, createTestLogger());
+
+    manager.getSnapshot("/tmp/project-a");
+    manager.getSnapshot("/tmp/project-b");
+
+    await vi.waitFor(() => {
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project-a"), "codex")?.status).toBe("ready");
+      expect(getProviderEntry(manager.getSnapshot("/tmp/project-b"), "codex")?.status).toBe("ready");
+    });
+
+    expect(getProviderEntry(manager.getSnapshot("/tmp/project-a"), "codex")?.models?.[0]?.id).toBe(
+      "model:/tmp/project-a",
+    );
+    expect(getProviderEntry(manager.getSnapshot("/tmp/project-b"), "codex")?.models?.[0]?.id).toBe(
+      "model:/tmp/project-b",
+    );
+    expect(seenCwds).toEqual(["/tmp/project-a", "/tmp/project-b"]);
+
+    manager.destroy();
+  });
+});
+
+function deferred<T>(): Deferred<T> {
+  let resolve!: (value: T) => void;
+  let reject!: (reason?: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
+function createRegistry(handles: MockProviderHandle[]): {
+  registry: Record<AgentProvider, ProviderDefinition>;
+  handles: Record<AgentProvider, MockProviderHandle>;
+} {
+  return {
+    registry: Object.fromEntries(
+      handles.map((handle) => [handle.definition.id, handle.definition]),
+    ) as Record<AgentProvider, ProviderDefinition>,
+    handles: Object.fromEntries(
+      handles.map((handle) => [handle.definition.id, handle]),
+    ) as Record<AgentProvider, MockProviderHandle>,
+  };
+}
+
+function createMockProvider(options: MockProviderOptions): MockProviderHandle {
+  const isAvailable = vi.fn(async () => options.isAvailable?.() ?? true);
+  const fetchModels = vi.fn(async (listOptions?: { cwd?: string }) =>
+    options.fetchModels?.(listOptions?.cwd) ?? [createModel(options.provider, `${options.provider}-default`)],
+  );
+  const fetchModes = vi.fn(async (listOptions?: { cwd?: string }) =>
+    options.fetchModes?.(listOptions?.cwd) ?? [createMode(`${options.provider}-mode`)],
+  );
+
+  const definition: ProviderDefinition = {
+    id: options.provider,
+    label: options.provider,
+    description: `${options.provider} test provider`,
+    defaultModeId: null,
+    modes: [],
+    createClient: () =>
+      ({
+        provider: options.provider,
+        capabilities: TEST_CAPABILITIES,
+        async createSession() {
+          throw new Error("not implemented");
+        },
+        async resumeSession() {
+          throw new Error("not implemented");
+        },
+        async listModels() {
+          return [];
+        },
+        async isAvailable() {
+          return isAvailable();
+        },
+      }) satisfies AgentClient,
+    fetchModels,
+    fetchModes,
+  };
+
+  return {
+    definition,
+    isAvailable,
+    fetchModels,
+    fetchModes,
+  };
+}
+
+function createModel(provider: AgentProvider, id: string): AgentModelDefinition {
+  return {
+    provider,
+    id,
+    label: id,
+  };
+}
+
+function createMode(id: string): AgentMode {
+  return {
+    id,
+    label: id,
+  };
+}
+
+function getProviderEntry(
+  entries: ProviderSnapshotEntry[],
+  provider: AgentProvider,
+): ProviderSnapshotEntry | undefined {
+  return entries.find((entry) => entry.provider === provider);
+}
--- a/packages/server/src/server/agent/provider-snapshot-manager.ts
+++ b/packages/server/src/server/agent/provider-snapshot-manager.ts
@@ -0,0 +1,229 @@
+import { EventEmitter } from "node:events";
+import { resolve } from "node:path";
+
+import type { Logger } from "pino";
+
+import type {
+  AgentProvider,
+  ProviderSnapshotEntry,
+} from "./agent-sdk-types.js";
+import type { ProviderDefinition } from "./provider-registry.js";
+import { AGENT_PROVIDER_IDS } from "./provider-manifest.js";
+
+const DEFAULT_CWD_KEY = "__default__";
+
+type ProviderSnapshotChangeListener = (
+  entries: ProviderSnapshotEntry[],
+  cwd?: string,
+) => void;
+
+export class ProviderSnapshotManager {
+  private readonly snapshots = new Map<string, Map<AgentProvider, ProviderSnapshotEntry>>();
+  private readonly warmUps = new Map<string, Promise<void>>();
+  private readonly events = new EventEmitter();
+  private destroyed = false;
+
+  constructor(
+    private readonly providerRegistry: Record<AgentProvider, ProviderDefinition>,
+    private readonly logger: Logger,
+  ) {}
+
+  getSnapshot(cwd?: string): ProviderSnapshotEntry[] {
+    const cwdKey = normalizeCwdKey(cwd);
+    const entries = this.snapshots.get(cwdKey);
+    if (!entries) {
+      const loadingEntries = this.resetSnapshotToLoading(cwdKey);
+      void this.warmUp(cwd);
+      return entriesToArray(loadingEntries);
+    }
+    return entriesToArray(entries);
+  }
+
+  refresh(cwd?: string): void {
+    const cwdKey = normalizeCwdKey(cwd);
+    if (this.warmUps.has(cwdKey)) {
+      return;
+    }
+    this.resetSnapshotToLoading(cwdKey);
+    this.emitChange(cwdKey);
+    void this.warmUp(cwd);
+  }
+
+  on(event: "change", listener: ProviderSnapshotChangeListener): this {
+    this.events.on(event, listener);
+    return this;
+  }
+
+  off(event: "change", listener: ProviderSnapshotChangeListener): this {
+    this.events.off(event, listener);
+    return this;
+  }
+
+  destroy(): void {
+    this.destroyed = true;
+    this.events.removeAllListeners();
+    this.snapshots.clear();
+    this.warmUps.clear();
+  }
+
+  private createLoadingEntries(): Map<AgentProvider, ProviderSnapshotEntry> {
+    const entries = new Map<AgentProvider, ProviderSnapshotEntry>();
+    for (const provider of this.getProviderIds()) {
+      entries.set(provider, {
+        provider,
+        status: "loading",
+      });
+    }
+    return entries;
+  }
+
+  private async warmUp(cwd?: string): Promise<void> {
+    const cwdKey = normalizeCwdKey(cwd);
+    const inFlight = this.warmUps.get(cwdKey);
+    if (inFlight) {
+      return inFlight;
+    }
+
+    const warmUpPromise = Promise.allSettled(
+      this.getProviderIds().map((provider) => this.refreshProvider(cwdKey, provider, cwd)),
+    ).then(() => undefined);
+
+    this.warmUps.set(cwdKey, warmUpPromise);
+
+    try {
+      await warmUpPromise;
+    } finally {
+      if (this.warmUps.get(cwdKey) === warmUpPromise) {
+        this.warmUps.delete(cwdKey);
+      }
+    }
+  }
+
+  private async refreshProvider(
+    cwdKey: string,
+    provider: AgentProvider,
+    cwd?: string,
+  ): Promise<void> {
+    const definition = this.providerRegistry[provider];
+    if (!definition) {
+      return;
+    }
+
+    const snapshot = this.getOrCreateSnapshot(cwdKey);
+    snapshot.set(provider, {
+      provider,
+      status: "loading",
+    });
+
+    try {
+      const client = definition.createClient(this.logger);
+      const available = await client.isAvailable();
+      if (!available) {
+        snapshot.set(provider, {
+          provider,
+          status: "unavailable",
+        });
+        this.emitChange(cwdKey);
+        return;
+      }
+
+      const [models, modes] = await Promise.all([
+        definition.fetchModels({ cwd }),
+        definition.fetchModes({ cwd }),
+      ]);
+
+      snapshot.set(provider, {
+        provider,
+        status: "ready",
+        models,
+        modes,
+        fetchedAt: new Date().toISOString(),
+      });
+      this.emitChange(cwdKey);
+    } catch (error) {
+      snapshot.set(provider, {
+        provider,
+        status: "error",
+        error: toErrorMessage(error),
+      });
+      this.logger.warn({ err: error, provider, cwd: cwdKey }, "Failed to refresh provider snapshot");
+      this.emitChange(cwdKey);
+    }
+  }
+
+  private emitChange(cwdKey: string): void {
+    if (this.destroyed) {
+      return;
+    }
+    const snapshot = this.snapshots.get(cwdKey);
+    if (!snapshot) {
+      return;
+    }
+    this.events.emit("change", entriesToArray(snapshot), denormalizeCwdKey(cwdKey));
+  }
+
+  private getOrCreateSnapshot(cwdKey: string): Map<AgentProvider, ProviderSnapshotEntry> {
+    const existing = this.snapshots.get(cwdKey);
+    if (existing) {
+      return existing;
+    }
+
+    const created = this.createLoadingEntries();
+    this.snapshots.set(cwdKey, created);
+    return created;
+  }
+
+  private resetSnapshotToLoading(cwdKey: string): Map<AgentProvider, ProviderSnapshotEntry> {
+    const snapshot = this.getOrCreateSnapshot(cwdKey);
+    snapshot.clear();
+    for (const [provider, entry] of this.createLoadingEntries()) {
+      snapshot.set(provider, entry);
+    }
+    return snapshot;
+  }
+
+  private getProviderIds(): AgentProvider[] {
+    return AGENT_PROVIDER_IDS.filter((provider) => this.providerRegistry[provider]);
+  }
+}
+
+function normalizeCwdKey(cwd?: string): string {
+  if (!cwd) {
+    return DEFAULT_CWD_KEY;
+  }
+
+  const trimmed = cwd.trim();
+  if (!trimmed) {
+    return DEFAULT_CWD_KEY;
+  }
+
+  return resolve(trimmed);
+}
+
+function denormalizeCwdKey(cwdKey: string): string | undefined {
+  return cwdKey === DEFAULT_CWD_KEY ? undefined : cwdKey;
+}
+
+function entriesToArray(
+  entries: Map<AgentProvider, ProviderSnapshotEntry>,
+): ProviderSnapshotEntry[] {
+  return Array.from(entries.values(), cloneEntry);
+}
+
+function cloneEntry(entry: ProviderSnapshotEntry): ProviderSnapshotEntry {
+  return {
+    ...entry,
+    models: entry.models?.map((model) => ({ ...model })),
+    modes: entry.modes?.map((mode) => ({ ...mode })),
+  };
+}
+
+function toErrorMessage(error: unknown): string {
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  if (typeof error === "string" && error) {
+    return error;
+  }
+  return "Unknown error";
+}
--- a/packages/server/src/server/agent/providers/acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.test.ts
@@ -747,4 +747,55 @@ describe("ACPAgentSession", () => {
    });
    expect((session as any).activeForegroundTurnId).toBeNull();
  });
+
+  test("auto-approves Copilot ACP permissions in autopilot mode without emitting prompt events", async () => {
+    const session = new ACPAgentSession(
+      {
+        provider: "copilot",
+        cwd: "/tmp/paseo-acp-test",
+        modeId: "https://agentclientprotocol.com/protocol/session-modes#autopilot",
+      },
+      {
+        provider: "copilot",
+        logger: createTestLogger(),
+        defaultCommand: ["copilot", "--acp"],
+        defaultModes: [],
+        capabilities: {
+          supportsStreaming: true,
+          supportsSessionPersistence: true,
+          supportsDynamicModes: true,
+          supportsMcpServers: true,
+          supportsReasoningStream: true,
+          supportsToolInvocations: true,
+        },
+      },
+    );
+
+    const events: Array<{ type: string }> = [];
+    session.subscribe((event) => {
+      events.push(event as { type: string });
+    });
+
+    const response = await session.requestPermission({
+      toolCall: {
+        toolCallId: "tool-1",
+        title: "Edit file",
+        kind: "edit",
+        status: "pending",
+      } as any,
+      options: [
+        { optionId: "allow-once", name: "Allow Once", kind: "allow_once" },
+        { optionId: "reject-once", name: "Reject Once", kind: "reject_once" },
+      ],
+    } as any);
+
+    expect(response).toEqual({
+      outcome: {
+        outcome: "selected",
+        optionId: "allow-once",
+      },
+    });
+    expect(session.getPendingPermissions()).toEqual([]);
+    expect(events.find((event) => event.type === "permission_requested")).toBeUndefined();
+  });
 });
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -107,6 +107,9 @@ const ACP_CLIENT_CAPABILITIES: ACPClientCapabilities = {
  terminal: true,
 };

+const COPILOT_AUTOPILOT_MODE =
+  "https://agentclientprotocol.com/protocol/session-modes#autopilot";
+
 type ACPAgentClientOptions = {
  provider: string;
  logger: Logger;
@@ -1084,6 +1087,18 @@ export class ACPAgentSession implements AgentSession, ACPClient {
  async requestPermission(
    params: RequestPermissionRequest,
  ): Promise<RequestPermissionResponse> {
+    if (shouldAutoApprovePermissionRequest(this.provider, this.currentMode)) {
+      const selectedOption = selectPermissionOption(params.options, { behavior: "allow" });
+      return selectedOption
+        ? {
+            outcome: {
+              outcome: "selected",
+              optionId: selectedOption.optionId,
+            },
+          }
+        : { outcome: { outcome: "cancelled" } };
+    }
+
    const requestId = randomUUID();
    let toolSnapshot =
      this.toolCalls.get(params.toolCall.toolCallId) ??
@@ -1939,6 +1954,10 @@ function mapPermissionRequest(
  };
 }

+function shouldAutoApprovePermissionRequest(provider: string, currentMode: string | null): boolean {
+  return provider === "copilot" && currentMode === COPILOT_AUTOPILOT_MODE;
+}
+
 function selectPermissionOption(
  options: PermissionOption[],
  response: AgentPermissionResponse,
--- a/packages/server/src/server/agent/providers/claude-agent.redesign.test.ts
+++ b/packages/server/src/server/agent/providers/claude-agent.redesign.test.ts
@@ -835,6 +835,82 @@ describe("ClaudeAgentSession redesign invariants", () => {
    }
  });

+  test("plan approval exposes a resume-bypass action and can return to bypassPermissions", async () => {
+    const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
+    sdkQueryFactory.mockImplementation(() => queryMock);
+
+    const session = await createSession();
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    try {
+      await session.setMode("bypassPermissions");
+      await session.setMode("plan");
+
+      const internal = session as unknown as {
+        handlePermissionRequest: (
+          toolName: string,
+          input: Record<string, unknown>,
+          options: Record<string, unknown>,
+        ) => Promise<unknown>;
+      };
+
+      const pendingResolution = internal.handlePermissionRequest(
+        "ExitPlanMode",
+        { plan: "- Implement the approved plan" },
+        {},
+      );
+
+      const requestEvent = events.find(
+        (event): event is Extract<AgentStreamEvent, { type: "permission_requested" }> =>
+          event.type === "permission_requested" && event.request.kind === "plan",
+      );
+
+      expect(requestEvent).toBeDefined();
+      expect(requestEvent?.request.actions).toEqual([
+        {
+          id: "reject",
+          label: "Reject",
+          behavior: "deny",
+          variant: "danger",
+          intent: "dismiss",
+        },
+        {
+          id: "implement",
+          label: "Implement",
+          behavior: "allow",
+          variant: "primary",
+          intent: "implement",
+        },
+        {
+          id: "implement_resume",
+          label: "Implement with Bypass",
+          behavior: "allow",
+          variant: "secondary",
+          intent: "implement_resume",
+        },
+      ]);
+
+      if (!requestEvent) {
+        throw new Error("Expected plan permission request");
+      }
+
+      await session.respondToPermission(requestEvent.request.id, {
+        behavior: "allow",
+        selectedActionId: "implement_resume",
+      });
+
+      await expect(pendingResolution).resolves.toMatchObject({
+        behavior: "allow",
+        updatedInput: { plan: "- Implement the approved plan" },
+      });
+      expect(queryMock.setPermissionMode).toHaveBeenLastCalledWith("bypassPermissions");
+      expect(await session.getCurrentMode()).toBe("bypassPermissions");
+    } finally {
+      await session.close();
+    }
+  });
+
  test("reuses one autonomous run for unbound stream_event bursts with no foreground run", async () => {
    const session = await createSession();
    const internal = session as unknown as {
--- a/packages/server/src/server/agent/providers/claude-agent.test.ts
+++ b/packages/server/src/server/agent/providers/claude-agent.test.ts
@@ -112,6 +112,28 @@ describe("convertClaudeHistoryEntry", () => {
    expect(mapBlocks).not.toHaveBeenCalled();
  });

+  test("skips meta user entries from Claude skill loading", () => {
+    const entry = {
+      type: "user",
+      isMeta: true,
+      message: {
+        role: "user",
+        content: [
+          {
+            type: "text",
+            text: "Base directory for this skill: /tmp/skill\n\n# Orchestrate\n\nYou are an end-to-end implementation orchestrator.",
+          },
+        ],
+      },
+    };
+
+    const mapBlocks = vi.fn().mockReturnValue([]);
+    const result = convertClaudeHistoryEntry(entry, mapBlocks);
+
+    expect(result).toEqual([]);
+    expect(mapBlocks).not.toHaveBeenCalled();
+  });
+
  test("skips interrupt placeholder transcript noise", () => {
    const interruptEntry = {
      type: "user",
@@ -261,3 +283,359 @@ describe("ClaudeAgentClient.listModels", () => {
    expect(defaultModel?.id).toBe("claude-opus-4-6");
  });
 });
+
+describe("ClaudeAgentSession context window usage", () => {
+  const logger = createTestLogger();
+
+  async function createSessionForTest(): Promise<any> {
+    const client = new ClaudeAgentClient({ logger });
+    return client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+    });
+  }
+
+  function createQueryFactoryForTurns(turns: Array<Array<Record<string, unknown>>>) {
+    return vi.fn(({ prompt }: { prompt: AsyncIterable<unknown> }) => {
+      const queuedMessages: Array<Record<string, unknown>> = [];
+      const waiters: Array<() => void> = [];
+      let turnIndex = 0;
+      let closed = false;
+
+      function wakeNextWaiter() {
+        const waiter = waiters.shift();
+        waiter?.();
+      }
+
+      function enqueue(message: Record<string, unknown>) {
+        queuedMessages.push(message);
+        wakeNextWaiter();
+      }
+
+      void (async () => {
+        for await (const _prompt of prompt) {
+          const turnMessages = turns[turnIndex] ?? [];
+          turnIndex += 1;
+          for (const message of turnMessages) {
+            enqueue(message);
+          }
+        }
+        closed = true;
+        wakeNextWaiter();
+      })();
+
+      return {
+        next: vi.fn(async () => {
+          while (queuedMessages.length === 0 && !closed) {
+            await new Promise<void>((resolve) => {
+              waiters.push(resolve);
+            });
+          }
+          if (queuedMessages.length === 0) {
+            return { done: true, value: undefined };
+          }
+          return { done: false, value: queuedMessages.shift() };
+        }),
+        interrupt: vi.fn(async () => undefined),
+        return: vi.fn(async () => {
+          closed = true;
+          wakeNextWaiter();
+          return undefined;
+        }),
+        close: vi.fn(() => {
+          closed = true;
+          wakeNextWaiter();
+        }),
+        setPermissionMode: vi.fn(async () => undefined),
+        setModel: vi.fn(async () => undefined),
+        supportedModels: vi.fn(async () => []),
+        supportedCommands: vi.fn(async () => []),
+        rewindFiles: vi.fn(async () => ({ canRewind: true })),
+        [Symbol.asyncIterator]() {
+          return this;
+        },
+      };
+    });
+  }
+
+  test("convertUsage includes contextWindowMaxTokens and derives used tokens from result usage as initial fallback", async () => {
+    const session = await createSessionForTest();
+
+    const usage = session.convertUsage(
+      {
+        type: "result",
+        subtype: "success",
+        usage: {
+          input_tokens: 10,
+          cache_read_input_tokens: 5,
+          output_tokens: 7,
+        },
+        total_cost_usd: 0.12,
+      },
+      {
+        "claude-sonnet-4-6": { contextWindow: 200_000 },
+        "claude-opus-4-6": { contextWindow: 1_000_000 },
+      },
+    );
+
+    expect(usage).toEqual({
+      inputTokens: 10,
+      cachedInputTokens: 5,
+      outputTokens: 7,
+      totalCostUsd: 0.12,
+      contextWindowMaxTokens: 1_000_000,
+      contextWindowUsedTokens: 22,
+    });
+  });
+
+  test("contextWindowUsedTokens falls back to result usage when no task_progress was received", async () => {
+    const session = await createSessionForTest();
+
+    const usage = session.convertUsage({
+      type: "result",
+      subtype: "success",
+      usage: {
+        input_tokens: 10,
+        cache_creation_input_tokens: 3,
+        cache_read_input_tokens: 5,
+        output_tokens: 7,
+      },
+      total_cost_usd: 0.12,
+    });
+
+    expect(usage).toEqual({
+      inputTokens: 10,
+      cachedInputTokens: 5,
+      outputTokens: 7,
+      totalCostUsd: 0.12,
+      contextWindowUsedTokens: 25,
+    });
+  });
+
+  test("contextWindowUsedTokens is populated from task_progress usage data", async () => {
+    const session = await createSessionForTest();
+
+    session.translateMessageToEvents({
+      type: "system",
+      subtype: "task_progress",
+      task_id: "task-1",
+      description: "Processing",
+      usage: {
+        total_tokens: 999,
+        tool_uses: 1,
+        duration_ms: 50,
+        input_tokens: 345,
+        cache_read_input_tokens: 55,
+      },
+      uuid: "task-progress-1",
+      session_id: "session-1",
+    });
+
+    const events = session.translateMessageToEvents({
+      type: "result",
+      subtype: "success",
+      duration_ms: 100,
+      duration_api_ms: 75,
+      is_error: false,
+      num_turns: 1,
+      result: "done",
+      stop_reason: null,
+      total_cost_usd: 0.25,
+      usage: {
+        input_tokens: 10,
+        cache_read_input_tokens: 5,
+        output_tokens: 7,
+      },
+      modelUsage: {
+        "claude-sonnet-4-6": { contextWindow: 200_000 },
+      },
+      permission_denials: [],
+      uuid: "result-1",
+      session_id: "session-1",
+    });
+
+    expect(events).toContainEqual({
+      type: "turn_completed",
+      provider: "claude",
+      usage: {
+        inputTokens: 10,
+        cachedInputTokens: 5,
+        outputTokens: 7,
+        totalCostUsd: 0.25,
+        contextWindowMaxTokens: 200_000,
+        contextWindowUsedTokens: 999,
+      },
+    });
+  });
+
+  test("task_progress usage takes priority over derived result usage", async () => {
+    const session = await createSessionForTest();
+
+    session.translateMessageToEvents({
+      type: "system",
+      subtype: "task_progress",
+      task_id: "task-1",
+      description: "Processing",
+      usage: {
+        total_tokens: 999,
+        tool_uses: 1,
+        duration_ms: 50,
+        input_tokens: 345,
+        cache_read_input_tokens: 55,
+      },
+      uuid: "task-progress-1",
+      session_id: "session-1",
+    });
+
+    const usage = session.convertUsage({
+      type: "result",
+      subtype: "success",
+      usage: {
+        input_tokens: 10,
+        cache_creation_input_tokens: 3,
+        cache_read_input_tokens: 5,
+        output_tokens: 7,
+      },
+      total_cost_usd: 0.12,
+    });
+
+    expect(usage).toEqual({
+      inputTokens: 10,
+      cachedInputTokens: 5,
+      outputTokens: 7,
+      totalCostUsd: 0.12,
+      contextWindowUsedTokens: 999,
+    });
+  });
+
+  test("contextWindowUsedTokens persists across turns from last task_progress", async () => {
+    const queryFactory = createQueryFactoryForTurns([
+      [
+        {
+          type: "system",
+          subtype: "init",
+          session_id: "session-1",
+          permissionMode: "default",
+          model: "claude-sonnet-4-6",
+        },
+        {
+          type: "system",
+          subtype: "task_progress",
+          task_id: "task-1",
+          description: "Processing",
+          usage: {
+            total_tokens: 999,
+            tool_uses: 1,
+            duration_ms: 50,
+            input_tokens: 345,
+            cache_read_input_tokens: 55,
+          },
+          uuid: "task-progress-1",
+          session_id: "session-1",
+        },
+        {
+          type: "result",
+          subtype: "success",
+          duration_ms: 100,
+          duration_api_ms: 75,
+          is_error: false,
+          num_turns: 1,
+          result: "done",
+          stop_reason: null,
+          total_cost_usd: 0.25,
+          usage: {
+            input_tokens: 10,
+            cache_read_input_tokens: 5,
+            output_tokens: 7,
+          },
+          modelUsage: {
+            "claude-sonnet-4-6": { contextWindow: 200_000 },
+          },
+          permission_denials: [],
+          uuid: "result-1",
+          session_id: "session-1",
+        },
+      ],
+      [
+        {
+          type: "result",
+          subtype: "success",
+          duration_ms: 110,
+          duration_api_ms: 80,
+          is_error: false,
+          num_turns: 1,
+          result: "still done",
+          stop_reason: null,
+          total_cost_usd: 0.1,
+          usage: {
+            input_tokens: 11,
+            cache_creation_input_tokens: 3,
+            cache_read_input_tokens: 6,
+            output_tokens: 8,
+          },
+          modelUsage: {
+            "claude-sonnet-4-6": { contextWindow: 200_000 },
+          },
+          permission_denials: [],
+          uuid: "result-2",
+          session_id: "session-1",
+        },
+      ],
+    ]);
+    const client = new ClaudeAgentClient({ logger, queryFactory });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+    });
+
+    try {
+      const firstTurn = await session.run("turn 1");
+      const secondTurn = await session.run("turn 2");
+
+      expect(firstTurn.usage).toEqual({
+        inputTokens: 10,
+        cachedInputTokens: 5,
+        outputTokens: 7,
+        totalCostUsd: 0.25,
+        contextWindowMaxTokens: 200_000,
+        contextWindowUsedTokens: 999,
+      });
+      // Turn 2 has no task_progress, so contextWindowUsedTokens retains the
+      // last known value from turn 1 rather than deriving from accumulated
+      // result.usage (which would be incorrect — those are session-level totals).
+      expect(secondTurn.usage).toEqual({
+        inputTokens: 11,
+        cachedInputTokens: 6,
+        outputTokens: 8,
+        totalCostUsd: 0.1,
+        contextWindowMaxTokens: 200_000,
+        contextWindowUsedTokens: 999,
+      });
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("convertUsage derives used tokens from result usage as fallback when task_progress is missing", async () => {
+    const session = await createSessionForTest();
+
+    const usage = session.convertUsage({
+      type: "result",
+      subtype: "success",
+      usage: {
+        input_tokens: 10,
+        cache_read_input_tokens: 5,
+        output_tokens: 7,
+      },
+      total_cost_usd: 0.12,
+    });
+
+    expect(usage).toEqual({
+      inputTokens: 10,
+      cachedInputTokens: 5,
+      outputTokens: 7,
+      totalCostUsd: 0.12,
+      contextWindowUsedTokens: 22,
+    });
+  });
+});
--- a/packages/server/src/server/agent/providers/claude-agent.ts
+++ b/packages/server/src/server/agent/providers/claude-agent.ts
@@ -1,4 +1,4 @@
-import { spawn } from "node:child_process";
+import { execFileSync, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import { promises } from "node:fs";
@@ -18,6 +18,7 @@ import {
  type SpawnOptions,
  type SDKMessage,
  type SDKPartialAssistantMessage,
+  type SDKTaskProgressMessage,
  type SDKResultMessage,
  type SDKSystemMessage,
  type SDKUserMessage,
@@ -39,8 +40,15 @@ import {
 } from "./claude/claude-models.js";
 import { parsePartialJsonObject } from "./claude/partial-json.js";
 import { ClaudeSidechainTracker } from "./claude/sidechain-tracker.js";
+import {
+  formatDiagnosticStatus,
+  formatProviderDiagnostic,
+  formatProviderDiagnosticError,
+  toDiagnosticErrorMessage,
+} from "./diagnostic-utils.js";

 import type {
+  AgentPermissionAction,
  AgentCapabilityFlags,
  AgentClient,
  AgentLaunchContext,
@@ -663,6 +671,43 @@ function resolvePermissionKind(
  return "tool";
 }

+function getClaudeModeLabel(modeId: PermissionMode): string {
+  return DEFAULT_MODES.find((mode) => mode.id === modeId)?.label ?? modeId;
+}
+
+function buildClaudePlanPermissionActions(
+  resumeMode: PermissionMode | null,
+): AgentPermissionAction[] {
+  const actions: AgentPermissionAction[] = [
+    {
+      id: "reject",
+      label: "Reject",
+      behavior: "deny",
+      variant: "danger",
+      intent: "dismiss",
+    },
+    {
+      id: "implement",
+      label: "Implement",
+      behavior: "allow",
+      variant: "primary",
+      intent: "implement",
+    },
+  ];
+
+  if (resumeMode === "bypassPermissions") {
+    actions.push({
+      id: "implement_resume",
+      label: `Implement with ${getClaudeModeLabel(resumeMode)}`,
+      behavior: "allow",
+      variant: "secondary",
+      intent: "implement_resume",
+    });
+  }
+
+  return actions;
+}
+
 type TimelineFragment = {
  kind: "assistant" | "reasoning";
  text: string;
@@ -961,7 +1006,8 @@ function isSyntheticUserEntry(entry: unknown): boolean {
  if (!entry || typeof entry !== "object") {
    return false;
  }
-  return (entry as { isSynthetic?: unknown }).isSynthetic === true;
+  const candidate = entry as { isSynthetic?: unknown; isMeta?: unknown };
+  return candidate.isSynthetic === true || candidate.isMeta === true;
 }

 export function readEventIdentifiers(message: SDKMessage): EventIdentifiers {
@@ -1086,6 +1132,42 @@ export class ClaudeAgentClient implements AgentClient {
    return true;
  }

+  async getDiagnostic(): Promise<{ diagnostic: string }> {
+    try {
+      const resolvedBinary = findExecutable("claude") ?? "not found";
+      const available = await this.isAvailable();
+      const version = resolveClaudeVersion(this.runtimeSettings);
+      let modelsValue = "Not checked";
+      let status = formatDiagnosticStatus(available);
+
+      if (available) {
+        try {
+          const models = await this.listModels();
+          modelsValue = String(models.length);
+        } catch (error) {
+          modelsValue = `Error - ${toDiagnosticErrorMessage(error)}`;
+          status = formatDiagnosticStatus(available, {
+            source: "model fetch",
+            cause: error,
+          });
+        }
+      }
+
+      return {
+        diagnostic: formatProviderDiagnostic("Claude Code", [
+          { label: "Binary", value: resolvedBinary },
+          ...(version ? [{ label: "Version", value: version }] : []),
+          { label: "Models", value: modelsValue },
+          { label: "Status", value: status },
+        ]),
+      };
+    } catch (error) {
+      return {
+        diagnostic: formatProviderDiagnosticError("Claude Code", error),
+      };
+    }
+  }
+
  private assertConfig(config: AgentSessionConfig): ClaudeAgentConfig {
    if (config.provider !== "claude") {
      throw new Error(`ClaudeAgentClient received config for provider '${config.provider}'`);
@@ -1094,6 +1176,65 @@ export class ClaudeAgentClient implements AgentClient {
  }
 }

+function resolveClaudeVersion(runtimeSettings?: ProviderRuntimeSettings): string | null {
+  const command = runtimeSettings?.command;
+
+  try {
+    if (command?.mode === "replace") {
+      return execFileSync(command.argv[0]!, [...command.argv.slice(1), "--version"], {
+        encoding: "utf8",
+        timeout: 5_000,
+      }).trim() || null;
+    }
+
+    const executable = findExecutable("claude");
+    if (!executable) {
+      return null;
+    }
+
+    return execFileSync(executable, ["--version"], {
+      encoding: "utf8",
+      timeout: 5_000,
+    }).trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+function extractContextWindowSize(modelUsage: unknown): number | undefined {
+  if (!modelUsage || typeof modelUsage !== "object") {
+    return undefined;
+  }
+
+  let maxContextWindow: number | undefined;
+  for (const value of Object.values(modelUsage as Record<string, unknown>)) {
+    if (!value || typeof value !== "object") {
+      continue;
+    }
+    const contextWindow = (value as { contextWindow?: unknown }).contextWindow;
+    if (
+      typeof contextWindow !== "number" ||
+      !Number.isFinite(contextWindow) ||
+      contextWindow <= 0
+    ) {
+      continue;
+    }
+    maxContextWindow = Math.max(maxContextWindow ?? 0, contextWindow);
+  }
+
+  return maxContextWindow;
+}
+
+function readContextWindowUsedTokensFromTaskProgress(
+  message: SDKTaskProgressMessage,
+): number | undefined {
+  const totalTokens = message.usage?.total_tokens;
+  if (typeof totalTokens !== "number" || !Number.isFinite(totalTokens) || totalTokens < 0) {
+    return undefined;
+  }
+  return totalTokens;
+}
+
 class ClaudeAgentSession implements AgentSession {
  readonly provider: "claude" = "claude";
  readonly capabilities = CLAUDE_CAPABILITIES;
@@ -1109,6 +1250,7 @@ class ClaudeAgentSession implements AgentSession {
  private claudeSessionId: string | null;
  private persistence: AgentPersistenceHandle | null;
  private currentMode: PermissionMode;
+  private planResumeMode: PermissionMode | null = null;
  private availableModes: AgentMode[] = DEFAULT_MODES;
  private toolUseCache = new Map<string, ToolUseCacheEntry>();
  private toolUseIndexToId = new Map<number, string>();
@@ -1135,6 +1277,7 @@ class ClaudeAgentSession implements AgentSession {
  private pendingInterruptAbort = false;
  private lastForegroundPromptText: string | null = null;
  private foregroundHasVisibleActivity = false;
+  private lastContextWindowUsedTokens: number | undefined;
  private userMessageIds: string[] = [];
  private recentStderr = "";
  private closed = false;
@@ -1169,6 +1312,9 @@ class ClaudeAgentSession implements AgentSession {
    }

    this.currentMode = isPermissionMode(config.modeId) ? config.modeId : "default";
+    if (this.currentMode !== "plan") {
+      this.planResumeMode = this.currentMode;
+    }
  }

  get id(): string | null {
@@ -1410,8 +1556,16 @@ class ClaudeAgentSession implements AgentSession {
    }

    const normalized = isPermissionMode(modeId) ? modeId : "default";
+    const previousMode = this.currentMode;
    const query = await this.ensureQuery();
    await query.setPermissionMode(normalized);
+    if (normalized === "plan") {
+      if (previousMode !== "plan") {
+        this.planResumeMode = previousMode;
+      }
+    } else {
+      this.planResumeMode = normalized;
+    }
    this.currentMode = normalized;
  }

@@ -1458,13 +1612,22 @@ class ClaudeAgentSession implements AgentSession {

    if (response.behavior === "allow") {
      if (pending.request.kind === "plan") {
-        await this.setMode("acceptEdits");
+        const selectedActionId = response.selectedActionId;
+        const shouldResumePriorMode =
+          selectedActionId === "implement_resume" && this.planResumeMode === "bypassPermissions";
+        const targetMode: PermissionMode = shouldResumePriorMode
+          ? "bypassPermissions"
+          : "acceptEdits";
+        await this.setMode(targetMode);
        this.pushToolCall(
          mapClaudeCompletedToolCall({
            name: "plan_approval",
            callId: pending.request.id,
            input: pending.request.input ?? null,
-            output: { approved: true },
+            output: {
+              approved: true,
+              actionId: selectedActionId ?? "implement",
+            },
          }),
        );
      }
@@ -1781,6 +1944,9 @@ class ClaudeAgentSession implements AgentSession {
      this.input = null;
      this.queryPumpPromise = null;
      this.queryRestartNeeded = false;
+      // Reset session identity for explicit restarts so the new query starts
+      // a fresh session rather than resuming the previous one.
+      this.claudeSessionId = null;
      oldInput?.end();
      oldQuery.close?.();
      try {
@@ -1790,6 +1956,12 @@ class ClaudeAgentSession implements AgentSession {
      }
    }

+    // When the pump died unexpectedly (query became null, e.g. after a session
+    // ID overwrite error), preserve claudeSessionId so buildOptions() passes
+    // resume: sessionId and the new query auto-resumes the previous session.
+    // For explicit restarts above, claudeSessionId was already cleared.
+    this.persistence = null;
+
    const input = createAsyncMessageInput<SDKUserMessage>();
    const options = this.buildOptions();
    this.logger.debug({ options: summarizeClaudeOptionsForLog(options) }, "claude query");
@@ -2500,6 +2672,10 @@ class ClaudeAgentSession implements AgentSession {
              provider: "claude",
            });
          }
+        } else if (message.subtype === "task_progress") {
+          this.lastContextWindowUsedTokens =
+            readContextWindowUsedTokensFromTaskProgress(message) ??
+            this.lastContextWindowUsedTokens;
        }
        break;
      case "user": {
@@ -2577,7 +2753,7 @@ class ClaudeAgentSession implements AgentSession {
        break;
      }
      case "result": {
-        const usage = this.convertUsage(message);
+        const usage = this.convertUsage(message, message.modelUsage);
        if (message.subtype === "success") {
          events.push({ type: "turn_completed", provider: "claude", usage });
        } else {
@@ -2622,11 +2798,16 @@ class ClaudeAgentSession implements AgentSession {
    if (this.claudeSessionId === sessionId) {
      return null;
    }
-    throw new Error(
-      `CRITICAL: Claude session ID overwrite detected! ` +
-        `Existing: ${this.claudeSessionId}, New: ${sessionId}. ` +
-        `This indicates a session identity corruption bug.`,
+    // Session ID changed mid-stream (e.g. a hook caused Claude to restart
+    // with a new session). Accept the new ID and continue — the turn should
+    // not be failed just because the underlying subprocess cycled.
+    this.logger.warn(
+      { existingSessionId: this.claudeSessionId, newSessionId: sessionId },
+      "Claude session ID changed in message; accepting new session",
    );
+    this.claudeSessionId = sessionId;
+    this.persistence = null;
+    return sessionId;
  }

  private handleSystemMessage(message: SDKSystemMessage): string | null {
@@ -2661,14 +2842,20 @@ class ClaudeAgentSession implements AgentSession {
    } else if (existingSessionId === newSessionId) {
      this.logger.debug({ sessionId: newSessionId }, "Claude session ID unchanged (same value)");
    } else {
-      throw new Error(
-        `CRITICAL: Claude session ID overwrite detected! ` +
-          `Existing: ${existingSessionId}, New: ${newSessionId}. ` +
-          `This indicates a session identity corruption bug.`,
+      // Session ID changed in an init message (e.g. a hook restarted Claude
+      // with a new session mid-turn). Accept the new ID and continue.
+      this.logger.warn(
+        { existingSessionId, newSessionId },
+        "Claude session ID changed in init message; accepting new session",
      );
+      this.claudeSessionId = newSessionId;
+      threadStartedSessionId = newSessionId;
    }
    this.availableModes = DEFAULT_MODES;
    this.currentMode = message.permissionMode;
+    if (this.currentMode !== "plan") {
+      this.planResumeMode = this.currentMode;
+    }
    this.persistence = null;
    if (message.model) {
      const normalizedRuntimeModel = normalizeClaudeRuntimeModelId(message.model);
@@ -2710,16 +2897,44 @@ class ClaudeAgentSession implements AgentSession {
    return null;
  }

-  private convertUsage(message: SDKResultMessage): AgentUsage | undefined {
+  private convertUsage(message: SDKResultMessage, modelUsage?: unknown): AgentUsage | undefined {
    if (!message.usage) {
      return undefined;
    }
-    return {
+    const usage: AgentUsage = {
      inputTokens: message.usage.input_tokens,
      cachedInputTokens: message.usage.cache_read_input_tokens,
      outputTokens: message.usage.output_tokens,
      totalCostUsd: message.total_cost_usd,
    };
+    const contextWindowMaxTokens = extractContextWindowSize(
+      modelUsage ?? message.modelUsage,
+    );
+    if (contextWindowMaxTokens !== undefined) {
+      usage.contextWindowMaxTokens = contextWindowMaxTokens;
+    }
+    if (typeof this.lastContextWindowUsedTokens === "number") {
+      // task_progress.total_tokens is the accurate context window fill level.
+      // Prefer it over result.usage which contains accumulated session totals.
+      usage.contextWindowUsedTokens = this.lastContextWindowUsedTokens;
+    } else if (message.usage) {
+      // Fallback: derive from result.usage when no task_progress has been
+      // received yet. These values are accumulated across all API calls, but
+      // for the first turn they equal the per-call values so the estimate is
+      // reasonable. Once a task_progress arrives it takes over permanently.
+      const usageWithCacheCreation = message.usage as typeof message.usage & {
+        cache_creation_input_tokens?: number;
+      };
+      const derived =
+        (message.usage.input_tokens ?? 0) +
+        (usageWithCacheCreation.cache_creation_input_tokens ?? 0) +
+        (message.usage.cache_read_input_tokens ?? 0) +
+        (message.usage.output_tokens ?? 0);
+      if (Number.isFinite(derived) && derived > 0) {
+        usage.contextWindowUsedTokens = derived;
+      }
+    }
+    return usage;
  }

  private handlePermissionRequest: CanUseTool = async (
@@ -2754,6 +2969,8 @@ class ClaudeAgentSession implements AgentSession {
      input,
      detail: toolDetail,
      suggestions: options.suggestions?.map((suggestion) => ({ ...suggestion })),
+      actions:
+        kind === "plan" ? buildClaudePlanPermissionActions(this.planResumeMode) : undefined,
      metadata: Object.keys(metadata).length ? metadata : undefined,
    };

--- a/packages/server/src/server/agent/providers/codex-app-server-agent.e2e.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.e2e.test.ts
@@ -2,11 +2,14 @@ import { describe, expect, test } from "vitest";
 import { execFileSync } from "node:child_process";
 import os from "node:os";
 import path from "node:path";
-import { mkdtempSync } from "node:fs";
+import { createServer } from "node:http";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { once } from "node:events";

 import { CodexAppServerAgentClient } from "./codex-app-server-agent.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import { agentConfigs } from "../../daemon-e2e/agent-configs.js";
+import type { AgentStreamEvent } from "../agent-sdk-types.js";

 const CODEX_TEST_MODEL = agentConfigs.codex.model;
 const CODEX_TEST_THINKING_OPTION_ID = agentConfigs.codex.thinkingOptionId;
@@ -20,6 +23,192 @@ function isCodexInstalled(): boolean {
  }
 }

+function sse(events: unknown[]): string {
+  return events
+    .map((event) => {
+      const type =
+        typeof event === "object" &&
+        event !== null &&
+        "type" in event &&
+        typeof (event as { type?: unknown }).type === "string"
+          ? (event as { type: string }).type
+          : "message";
+      return `event: ${type}\ndata: ${JSON.stringify(event)}\n\n`;
+    })
+    .join("");
+}
+
+function responseCreated(id: string): Record<string, unknown> {
+  return {
+    type: "response.created",
+    response: { id },
+  };
+}
+
+function responseCompleted(id: string): Record<string, unknown> {
+  return {
+    type: "response.completed",
+    response: {
+      id,
+      usage: {
+        input_tokens: 0,
+        input_tokens_details: null,
+        output_tokens: 0,
+        output_tokens_details: null,
+        total_tokens: 0,
+      },
+    },
+  };
+}
+
+function functionCallEvent(callId: string, name: string, argumentsJson: string): Record<string, unknown> {
+  return {
+    type: "response.output_item.done",
+    item: {
+      type: "function_call",
+      call_id: callId,
+      name,
+      arguments: argumentsJson,
+    },
+  };
+}
+
+function assistantMessageEvent(id: string, text: string): Record<string, unknown> {
+  return {
+    type: "response.output_item.done",
+    item: {
+      type: "message",
+      role: "assistant",
+      id,
+      content: [{ type: "output_text", text }],
+    },
+  };
+}
+
+function requestUserInputSse(callId: string): string {
+  return sse([
+    responseCreated("resp-1"),
+    functionCallEvent(
+      callId,
+      "request_user_input",
+      JSON.stringify({
+        questions: [
+          {
+            id: "confirm_path",
+            header: "Confirm",
+            question: "Proceed with the plan?",
+            options: [
+              {
+                label: "Yes (Recommended)",
+                description: "Continue the current plan.",
+              },
+              {
+                label: "No",
+                description: "Stop and revisit the approach.",
+              },
+            ],
+          },
+        ],
+      }),
+    ),
+    responseCompleted("resp-1"),
+  ]);
+}
+
+function assistantMessageSse(text: string): string {
+  return sse([responseCreated("resp-2"), assistantMessageEvent("msg-1", text), responseCompleted("resp-2")]);
+}
+
+async function startMockResponsesServer(sequence: string[]): Promise<{
+  url: string;
+  close: () => Promise<void>;
+  requestBodies: string[];
+}> {
+  const requestBodies: string[] = [];
+  let index = 0;
+  const server = createServer((req, res) => {
+    const chunks: Buffer[] = [];
+    req.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
+    req.on("end", () => {
+      requestBodies.push(Buffer.concat(chunks).toString("utf8"));
+      if (req.method !== "POST" || req.url !== "/v1/responses") {
+        res.statusCode = 404;
+        res.end("not found");
+        return;
+      }
+      const body = sequence[index] ?? assistantMessageSse("done");
+      index += 1;
+      res.statusCode = 200;
+      res.setHeader("content-type", "text/event-stream");
+      res.setHeader("cache-control", "no-cache");
+      res.end(body);
+    });
+  });
+
+  server.listen(0, "127.0.0.1");
+  await once(server, "listening");
+  const address = server.address();
+  if (!address || typeof address === "string") {
+    throw new Error("Expected TCP address for mock responses server");
+  }
+  return {
+    url: `http://127.0.0.1:${address.port}`,
+    requestBodies,
+    close: () =>
+      new Promise<void>((resolve, reject) => {
+        server.close((error) => {
+          if (error) reject(error);
+          else resolve();
+        });
+      }),
+  };
+}
+
+function writeMockCodexConfig(codexHome: string, serverUrl: string): void {
+  writeFileSync(
+    path.join(codexHome, "config.toml"),
+    `
+model = "mock-model"
+approval_policy = "untrusted"
+sandbox_mode = "read-only"
+
+model_provider = "mock_provider"
+
+[model_providers.mock_provider]
+name = "Mock provider for test"
+base_url = "${serverUrl}/v1"
+wire_api = "responses"
+request_max_retries = 0
+stream_max_retries = 0
+`,
+  );
+}
+
+function waitForEvent<TEvent extends AgentStreamEvent>(params: {
+  session: {
+    subscribe(callback: (event: AgentStreamEvent) => void): () => void;
+  };
+  predicate: (event: AgentStreamEvent) => event is TEvent;
+  timeoutMs: number;
+  label: string;
+}): Promise<TEvent> {
+  return new Promise<TEvent>((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      unsubscribe();
+      reject(new Error(`Timed out waiting for ${params.label}`));
+    }, params.timeoutMs);
+
+    const unsubscribe = params.session.subscribe((event) => {
+      if (!params.predicate(event)) {
+        return;
+      }
+      clearTimeout(timeout);
+      unsubscribe();
+      resolve(event);
+    });
+  });
+}
+
 describe("Codex app-server provider (e2e)", () => {
  test.runIf(isCodexInstalled())(
    "lists models and runs a simple prompt",
@@ -43,4 +232,171 @@ describe("Codex app-server provider (e2e)", () => {
    },
    30000,
  );
+
+  test.runIf(isCodexInstalled())(
+    "surfaces request_user_input from the app-server as question permissions and timeline tool calls",
+    async () => {
+      const cwd = mkdtempSync(path.join(os.tmpdir(), "codex-app-server-question-cwd-"));
+      const codexHome = mkdtempSync(path.join(os.tmpdir(), "codex-app-server-question-home-"));
+      const mockServer = await startMockResponsesServer([
+        requestUserInputSse("call1"),
+        assistantMessageSse("done"),
+      ]);
+
+      try {
+        writeMockCodexConfig(codexHome, mockServer.url);
+
+        const client = new CodexAppServerAgentClient(createTestLogger());
+        const session = await client.createSession(
+          {
+            provider: "codex",
+            cwd,
+            modeId: "auto",
+            model: "mock-model",
+            thinkingOptionId: "medium",
+          },
+          {
+            env: {
+              CODEX_HOME: codexHome,
+            },
+          },
+        );
+
+        try {
+          await session.setFeature?.("plan_mode", true);
+
+          const events: AgentStreamEvent[] = [];
+          session.subscribe((event) => {
+            events.push(event);
+          });
+
+          const questionRequested = waitForEvent({
+            session,
+            timeoutMs: 15_000,
+            label: "question permission request",
+            predicate: (
+              event,
+            ): event is Extract<
+              AgentStreamEvent,
+              { type: "permission_requested" }
+            > =>
+              event.type === "permission_requested" &&
+              event.request.provider === "codex" &&
+              event.request.kind === "question" &&
+              event.request.name === "request_user_input",
+          });
+
+          const turnFinished = waitForEvent({
+            session,
+            timeoutMs: 15_000,
+            label: "turn completion",
+            predicate: (
+              event,
+            ): event is Extract<
+              AgentStreamEvent,
+              { type: "turn_completed" | "turn_failed" | "turn_canceled" }
+            > =>
+              event.type === "turn_completed" ||
+              event.type === "turn_failed" ||
+              event.type === "turn_canceled",
+          });
+
+          await session.startTurn("ask something");
+
+          const permissionEvent = await questionRequested;
+          expect(permissionEvent.request.input).toEqual({
+            questions: [
+              {
+                id: "confirm_path",
+                header: "Confirm",
+                question: "Proceed with the plan?",
+                isOther: true,
+                options: [
+                  {
+                    label: "Yes (Recommended)",
+                    description: "Continue the current plan.",
+                  },
+                  {
+                    label: "No",
+                    description: "Stop and revisit the approach.",
+                  },
+                ],
+              },
+            ],
+          });
+
+          const runningQuestionCall = events.find(
+            (event) =>
+              event.type === "timeline" &&
+              event.provider === "codex" &&
+              event.item.type === "tool_call" &&
+              event.item.name === "request_user_input" &&
+              event.item.status === "running",
+          );
+          expect(runningQuestionCall).toBeDefined();
+
+          await session.respondToPermission(permissionEvent.request.id, {
+            behavior: "allow",
+            updatedInput: {
+              answers: {
+                Confirm: "Yes (Recommended)",
+              },
+            },
+          });
+
+          const terminalEvent = await turnFinished;
+          expect(terminalEvent.type).toBe("turn_completed");
+
+          const completedQuestionCall = events.find(
+            (event) =>
+              event.type === "timeline" &&
+              event.provider === "codex" &&
+              event.item.type === "tool_call" &&
+              event.item.name === "request_user_input" &&
+              event.item.status === "completed",
+          );
+          expect(completedQuestionCall).toBeDefined();
+          if (
+            !completedQuestionCall ||
+            completedQuestionCall.type !== "timeline" ||
+            completedQuestionCall.item.type !== "tool_call"
+          ) {
+            throw new Error("Expected completed request_user_input tool call");
+          }
+          expect(completedQuestionCall.item.metadata).toMatchObject({
+            answers: {
+              confirm_path: ["Yes (Recommended)"],
+            },
+          });
+          expect(
+            mockServer.requestBodies.some(
+              (body) =>
+                body.includes('"type":"function_call_output"') &&
+                body.includes('"call_id":"call1"'),
+            ),
+          ).toBe(true);
+
+          const finalAssistantMessage = [...events]
+            .reverse()
+            .find((event) => event.type === "timeline" && event.item.type === "assistant_message");
+          expect(finalAssistantMessage).toBeDefined();
+          if (
+            !finalAssistantMessage ||
+            finalAssistantMessage.type !== "timeline" ||
+            finalAssistantMessage.item.type !== "assistant_message"
+          ) {
+            throw new Error("Expected final assistant message");
+          }
+          expect(finalAssistantMessage.item.text.trim()).toBe("done");
+        } finally {
+          await session.close();
+        }
+      } finally {
+        await mockServer.close();
+        rmSync(cwd, { recursive: true, force: true });
+        rmSync(codexHome, { recursive: true, force: true });
+      }
+    },
+    30_000,
+  );
 });
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { existsSync, rmSync } from "node:fs";

-import type { AgentLaunchContext } from "../agent-sdk-types.js";
+import type { AgentLaunchContext, AgentSession, AgentSessionConfig, AgentStreamEvent } from "../agent-sdk-types.js";
 import {
  __codexAppServerInternals,
  codexAppServerTurnInputFromPrompt,
@@ -10,10 +10,213 @@ import { createTestLogger } from "../../../test-utils/test-logger.js";

 const ONE_BY_ONE_PNG_BASE64 =
  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+X1r0AAAAASUVORK5CYII=";
+const CODEX_PROVIDER = "codex";
+
+function createConfig(overrides: Partial<AgentSessionConfig> = {}): AgentSessionConfig {
+  return {
+    provider: CODEX_PROVIDER,
+    cwd: "/tmp/codex-question-test",
+    modeId: "auto",
+    model: "gpt-5.4",
+    ...overrides,
+  };
+}
+
+function createSession(configOverrides: Partial<AgentSessionConfig> = {}) {
+  const session = new __codexAppServerInternals.CodexAppServerAgentSession(
+    createConfig(configOverrides),
+    null,
+    createTestLogger(),
+    () => {
+      throw new Error("Test session cannot spawn Codex app-server");
+    },
+  ) as unknown as AgentSession & { [key: string]: unknown };
+  session.connected = true;
+  session.currentThreadId = "test-thread";
+  session.activeForegroundTurnId = "test-turn";
+  return session;
+}

 describe("Codex app-server provider", () => {
  const logger = createTestLogger();

+  test("extracts context window usage from snake_case token payloads", () => {
+    expect(
+      __codexAppServerInternals.toAgentUsage({
+        model_context_window: 200000,
+        last: {
+          total_tokens: 50000,
+          inputTokens: 30000,
+          cachedInputTokens: 5000,
+          outputTokens: 15000,
+        },
+      }),
+    ).toEqual({
+      inputTokens: 30000,
+      cachedInputTokens: 5000,
+      outputTokens: 15000,
+      contextWindowMaxTokens: 200000,
+      contextWindowUsedTokens: 50000,
+    });
+  });
+
+  test("extracts context window usage from camelCase token payloads", () => {
+    expect(
+      __codexAppServerInternals.toAgentUsage({
+        modelContextWindow: 200000,
+        last: {
+          totalTokens: 50000,
+          inputTokens: 30000,
+          cachedInputTokens: 5000,
+          outputTokens: 15000,
+        },
+      }),
+    ).toEqual({
+      inputTokens: 30000,
+      cachedInputTokens: 5000,
+      outputTokens: 15000,
+      contextWindowMaxTokens: 200000,
+      contextWindowUsedTokens: 50000,
+    });
+  });
+
+  test("keeps existing usage behavior when context window fields are missing", () => {
+    expect(
+      __codexAppServerInternals.toAgentUsage({
+        last: {
+          inputTokens: 30000,
+          cachedInputTokens: 5000,
+          outputTokens: 15000,
+        },
+      }),
+    ).toEqual({
+      inputTokens: 30000,
+      cachedInputTokens: 5000,
+      outputTokens: 15000,
+    });
+  });
+
+  test("excludes invalid context window values", () => {
+    expect(
+      __codexAppServerInternals.toAgentUsage({
+        model_context_window: Number.NaN,
+        modelContextWindow: "200000",
+        last: {
+          total_tokens: Number.NaN,
+          totalTokens: "50000",
+          inputTokens: 30000,
+          cachedInputTokens: 5000,
+          outputTokens: 15000,
+        },
+      }),
+    ).toEqual({
+      inputTokens: 30000,
+      cachedInputTokens: 5000,
+      outputTokens: 15000,
+    });
+  });
+
+  test("normalizes raw output schemas for Codex structured outputs", () => {
+    const input = {
+      type: "object",
+      properties: {
+        findings: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              severity: { type: "string" },
+              summary: { type: "string" },
+            },
+            required: ["severity"],
+          },
+        },
+        overall: { type: "string" },
+      },
+      required: ["overall"],
+    };
+
+    const normalized = __codexAppServerInternals.normalizeCodexOutputSchema(input);
+
+    expect(normalized).toEqual({
+      type: "object",
+      properties: {
+        findings: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              severity: { type: "string" },
+              summary: { type: "string" },
+            },
+            required: ["severity", "summary"],
+            additionalProperties: false,
+          },
+        },
+        overall: { type: "string" },
+      },
+      required: ["overall", "findings"],
+      additionalProperties: false,
+    });
+    expect(input).toEqual({
+      type: "object",
+      properties: {
+        findings: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              severity: { type: "string" },
+              summary: { type: "string" },
+            },
+            required: ["severity"],
+          },
+        },
+        overall: { type: "string" },
+      },
+      required: ["overall"],
+    });
+  });
+
+  test("passes a normalized output schema to turn/start", async () => {
+    const session = createSession();
+    const request = vi.fn(async (method: string) => {
+      if (method === "thread/loaded/list") {
+        return { data: ["test-thread"] };
+      }
+      if (method === "turn/start") {
+        return {};
+      }
+      throw new Error(`Unexpected request: ${method}`);
+    });
+
+    session.activeForegroundTurnId = null;
+    session.client = { request } as any;
+
+    await session.startTurn("Return JSON", {
+      outputSchema: {
+        type: "object",
+        properties: {
+          summary: { type: "string" },
+        },
+      },
+    });
+
+    const turnStartCall = request.mock.calls.find(([method]) => method === "turn/start");
+    expect(turnStartCall?.[1]).toEqual(
+      expect.objectContaining({
+        outputSchema: {
+          type: "object",
+          properties: {
+            summary: { type: "string" },
+          },
+          required: ["summary"],
+          additionalProperties: false,
+        },
+      }),
+    );
+  });
+
  test("maps image prompt blocks to Codex localImage input", async () => {
    const input = await codexAppServerTurnInputFromPrompt(
      [
@@ -138,4 +341,346 @@ describe("Codex app-server provider", () => {
    expect(env.PASEO_AGENT_ID).toBe(launchContext.env?.PASEO_AGENT_ID);
    expect(env.PASEO_TEST_FLAG).toBe(launchContext.env?.PASEO_TEST_FLAG);
  });
+
+  test("projects request_user_input into a question permission and running timeline tool call", () => {
+    const session = createSession();
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    void (session as any).handleToolApprovalRequest({
+      itemId: "call-question-1",
+      threadId: "thread-1",
+      turnId: "turn-1",
+      questions: [
+        {
+          id: "favorite_drink",
+          header: "Drink",
+          question: "Which drink do you want?",
+          options: [
+            { label: "Coffee", description: "Default" },
+            { label: "Tea" },
+          ],
+        },
+      ],
+    });
+
+    expect(events).toEqual([
+      {
+        type: "timeline",
+        provider: "codex",
+        turnId: "test-turn",
+        item: {
+          type: "tool_call",
+          callId: "call-question-1",
+          name: "request_user_input",
+          status: "running",
+          error: null,
+          detail: {
+            type: "plain_text",
+            text: "Drink: Which drink do you want?\nOptions: Coffee, Tea",
+            icon: "brain",
+          },
+          metadata: {
+            questions: [
+              {
+                id: "favorite_drink",
+                header: "Drink",
+                question: "Which drink do you want?",
+                options: [
+                  { label: "Coffee", description: "Default" },
+                  { label: "Tea" },
+                ],
+              },
+            ],
+          },
+        },
+      },
+      {
+        type: "permission_requested",
+        provider: "codex",
+        turnId: "test-turn",
+        request: {
+          id: "permission-call-question-1",
+          provider: "codex",
+          name: "request_user_input",
+          kind: "question",
+          title: "Question",
+          detail: {
+            type: "plain_text",
+            text: "Drink: Which drink do you want?\nOptions: Coffee, Tea",
+            icon: "brain",
+          },
+          input: {
+            questions: [
+              {
+                id: "favorite_drink",
+                header: "Drink",
+                question: "Which drink do you want?",
+                options: [
+                  { label: "Coffee", description: "Default" },
+                  { label: "Tea" },
+                ],
+              },
+            ],
+          },
+          metadata: {
+            itemId: "call-question-1",
+            threadId: "thread-1",
+            turnId: "turn-1",
+            questions: [
+              {
+                id: "favorite_drink",
+                header: "Drink",
+                question: "Which drink do you want?",
+                options: [
+                  { label: "Coffee", description: "Default" },
+                  { label: "Tea" },
+                ],
+              },
+            ],
+          },
+        },
+      },
+    ]);
+  });
+
+  test("maps question responses from headers back to question ids and completes the tool call", async () => {
+    const session = createSession();
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    const pendingResponse = (session as any).handleToolApprovalRequest({
+      itemId: "call-question-2",
+      threadId: "thread-1",
+      turnId: "turn-1",
+      questions: [
+        {
+          id: "favorite_drink",
+          header: "Drink",
+          question: "Which drink do you want?",
+          options: [{ label: "Coffee" }, { label: "Tea" }],
+        },
+      ],
+    });
+
+    await session.respondToPermission("permission-call-question-2", {
+      behavior: "allow",
+      updatedInput: {
+        answers: {
+          Drink: "Tea",
+        },
+      },
+    });
+
+    await expect(pendingResponse).resolves.toEqual({
+      answers: {
+        favorite_drink: { answers: ["Tea"] },
+      },
+    });
+    expect(events.at(-2)).toEqual({
+      type: "permission_resolved",
+      provider: "codex",
+      turnId: "test-turn",
+      requestId: "permission-call-question-2",
+      resolution: {
+        behavior: "allow",
+        updatedInput: {
+          answers: {
+            Drink: "Tea",
+          },
+        },
+      },
+    });
+    expect(events.at(-1)).toEqual({
+      type: "timeline",
+      provider: "codex",
+      turnId: "test-turn",
+      item: {
+        type: "tool_call",
+        callId: "call-question-2",
+        name: "request_user_input",
+        status: "completed",
+        error: null,
+        detail: {
+          type: "plain_text",
+          text: "Drink: Which drink do you want?\nOptions: Coffee, Tea\n\nAnswers:\n\nfavorite_drink: Tea",
+          icon: "brain",
+        },
+        metadata: {
+          questions: [
+            {
+              id: "favorite_drink",
+              header: "Drink",
+              question: "Which drink do you want?",
+              options: [{ label: "Coffee" }, { label: "Tea" }],
+            },
+          ],
+          answers: {
+            favorite_drink: ["Tea"],
+          },
+        },
+      },
+    });
+  });
+
+  test("emits a synthetic plan approval permission after a successful Codex plan turn", () => {
+    const session = createSession({
+      featureValues: { plan_mode: true, fast_mode: true },
+    });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    (session as any).handleNotification("turn/started", {
+      turn: { id: "turn-plan-1" },
+    });
+    (session as any).handleNotification("turn/plan/updated", {
+      plan: [
+        { step: "Inspect the existing auth flow", status: "completed" },
+        { step: "Implement the button behavior", status: "pending" },
+      ],
+    });
+    (session as any).handleNotification("turn/completed", {
+      turn: { status: "completed", error: null },
+    });
+
+    expect(events.at(-2)).toEqual({
+      type: "permission_requested",
+      provider: "codex",
+      turnId: "test-turn",
+      request: expect.objectContaining({
+        provider: "codex",
+        name: "CodexPlanApproval",
+        kind: "plan",
+        title: "Plan",
+        input: {
+          plan: "- Inspect the existing auth flow\n- Implement the button behavior",
+        },
+        actions: [
+          expect.objectContaining({
+            id: "reject",
+            label: "Reject",
+            behavior: "deny",
+          }),
+          expect.objectContaining({
+            id: "implement",
+            label: "Implement",
+            behavior: "allow",
+          }),
+        ],
+      }),
+    });
+    expect(events.at(-1)).toEqual({
+      type: "turn_completed",
+      provider: "codex",
+      turnId: "test-turn",
+      usage: undefined,
+    });
+  });
+
+  test("approving a synthetic Codex plan permission disables plan and fast mode and starts implementation", async () => {
+    const session = createSession({
+      featureValues: { plan_mode: true, fast_mode: true },
+    });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    const startTurnSpy = vi
+      .spyOn(session, "startTurn")
+      .mockResolvedValue({ turnId: "follow-up-turn" });
+
+    (session as any).handleNotification("turn/started", {
+      turn: { id: "turn-plan-2" },
+    });
+    (session as any).handleNotification("turn/plan/updated", {
+      plan: [{ step: "Implement the new flow", status: "pending" }],
+    });
+    (session as any).handleNotification("turn/completed", {
+      turn: { status: "completed", error: null },
+    });
+
+    const request = events.find(
+      (event): event is Extract<AgentStreamEvent, { type: "permission_requested" }> =>
+        event.type === "permission_requested" && event.request.kind === "plan",
+    );
+    expect(request).toBeDefined();
+    if (!request) {
+      throw new Error("Expected synthetic plan approval permission");
+    }
+
+    await session.respondToPermission(request.request.id, {
+      behavior: "allow",
+      selectedActionId: "implement",
+    });
+
+    expect((session as any).serviceTier).toBeNull();
+    expect((session as any).planModeEnabled).toBe(false);
+    expect((session as any).config.featureValues).toEqual({
+      plan_mode: false,
+      fast_mode: false,
+    });
+    expect(startTurnSpy).toHaveBeenCalledWith(
+      expect.stringContaining("The user approved the plan. Implement it now."),
+    );
+    expect(events.at(-1)).toEqual({
+      type: "permission_resolved",
+      provider: "codex",
+      requestId: request.request.id,
+      resolution: {
+        behavior: "allow",
+        selectedActionId: "implement",
+      },
+    });
+  });
+
+  test("failed synthetic Codex plan implementation keeps the permission pending for retry", async () => {
+    const session = createSession({
+      featureValues: { plan_mode: true, fast_mode: true },
+    });
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+
+    const startTurnSpy = vi
+      .spyOn(session, "startTurn")
+      .mockRejectedValueOnce(new Error("follow-up failed"));
+
+    (session as any).handleNotification("turn/started", {
+      turn: { id: "turn-plan-retry" },
+    });
+    (session as any).handleNotification("turn/plan/updated", {
+      plan: [{ step: "Implement the retriable flow", status: "pending" }],
+    });
+    (session as any).handleNotification("turn/completed", {
+      turn: { status: "completed", error: null },
+    });
+
+    const request = events.find(
+      (event): event is Extract<AgentStreamEvent, { type: "permission_requested" }> =>
+        event.type === "permission_requested" && event.request.kind === "plan",
+    );
+    expect(request).toBeDefined();
+    if (!request) {
+      throw new Error("Expected synthetic plan approval permission");
+    }
+
+    await expect(
+      session.respondToPermission(request.request.id, {
+        behavior: "allow",
+        selectedActionId: "implement",
+      }),
+    ).rejects.toThrow("follow-up failed");
+
+    expect(startTurnSpy).toHaveBeenCalledTimes(1);
+    expect((session as any).planModeEnabled).toBe(true);
+    expect((session as any).config.featureValues).toEqual({
+      plan_mode: true,
+      fast_mode: true,
+    });
+    expect(session.getPendingPermissions()).toEqual([request.request]);
+    expect(
+      events.some(
+        (event) =>
+          event.type === "permission_resolved" && event.requestId === request.request.id,
+      ),
+    ).toBe(false);
+  });
 });
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.ts
@@ -1,4 +1,5 @@
 import type {
+  AgentPermissionAction,
  AgentCapabilityFlags,
  AgentClient,
  AgentFeature,
@@ -52,11 +53,20 @@ import {
 } from "../../../utils/executable.js";
 import { extractCodexTerminalSessionId, nonEmptyString } from "./tool-call-mapper-utils.js";
 import { buildCodexFeatures, codexModelSupportsFastMode } from "./codex-feature-definitions.js";
+import {
+  formatDiagnosticStatus,
+  formatProviderDiagnostic,
+  formatProviderDiagnosticError,
+  resolveBinaryVersion,
+  toDiagnosticErrorMessage,
+} from "./diagnostic-utils.js";

 const DEFAULT_TIMEOUT_MS = 14 * 24 * 60 * 60 * 1000;
 const TURN_START_TIMEOUT_MS = 90 * 1000;
 const CODEX_PROVIDER = "codex" as const;
 const CODEX_IMAGE_ATTACHMENT_DIR = "paseo-attachments";
+const CODEX_PLAN_IMPLEMENTATION_PROMPT_PREFIX =
+  "The user approved the plan. Implement it now. Do not restate or revise the plan unless blocked.";

 const CODEX_APP_SERVER_CAPABILITIES: AgentCapabilityFlags = {
  supportsStreaming: true,
@@ -136,6 +146,73 @@ function normalizeCodexModelLabel(displayName: string): string {
  return displayName.replace(/\bgpt\b/gi, "GPT");
 }

+function isSchemaRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function isObjectSchemaNode(schema: Record<string, unknown>): boolean {
+  const type = schema.type;
+  return (
+    isSchemaRecord(schema.properties) ||
+    type === "object" ||
+    (Array.isArray(type) && type.includes("object"))
+  );
+}
+
+function normalizeCodexOutputSchemaNode(
+  schema: unknown,
+  path: string,
+): unknown {
+  if (Array.isArray(schema)) {
+    return schema.map((entry, index) => normalizeCodexOutputSchemaNode(entry, `${path}[${index}]`));
+  }
+  if (!isSchemaRecord(schema)) {
+    return schema;
+  }
+
+  const normalized: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(schema)) {
+    normalized[key] = normalizeCodexOutputSchemaNode(value, `${path}.${key}`);
+  }
+
+  if (!isObjectSchemaNode(normalized)) {
+    return normalized;
+  }
+
+  if (normalized.additionalProperties === undefined) {
+    normalized.additionalProperties = false;
+  } else if (normalized.additionalProperties !== false) {
+    throw new Error(
+      `Codex structured outputs require ${path} to set additionalProperties to false for object schemas.`,
+    );
+  }
+
+  const properties = isSchemaRecord(normalized.properties) ? normalized.properties : null;
+  if (!properties) {
+    return normalized;
+  }
+
+  const propertyKeys = Object.keys(properties);
+  const existingRequired = Array.isArray(normalized.required)
+    ? normalized.required.filter((entry): entry is string => typeof entry === "string")
+    : [];
+  normalized.required = Array.from(new Set([...existingRequired, ...propertyKeys]));
+  return normalized;
+}
+
+function normalizeCodexOutputSchema(schema: unknown): Record<string, unknown> {
+  if (!isSchemaRecord(schema)) {
+    throw new Error("Codex structured outputs require a JSON object schema.");
+  }
+
+  const normalized = normalizeCodexOutputSchemaNode(schema, "$");
+  if (!isSchemaRecord(normalized) || !isObjectSchemaNode(normalized)) {
+    throw new Error("Codex structured outputs require a root object schema.");
+  }
+
+  return normalized;
+}
+
 type CodexConfiguredDefaults = {
  model?: string;
  thinkingOptionId?: string;
@@ -573,6 +650,17 @@ class CodexAppServerClient {
    this.child.stdin.write(`${JSON.stringify(payload)}\n`);
  }

+  private writeJsonRpcResponse(response: JsonRpcResponse): void {
+    if (this.disposed || this.child.stdin.destroyed || !this.child.stdin.writable) {
+      return;
+    }
+    try {
+      this.child.stdin.write(`${JSON.stringify(response)}\n`);
+    } catch (error) {
+      this.logger.debug({ error }, "Failed to write Codex app-server JSON-RPC response");
+    }
+  }
+
  async dispose(): Promise<void> {
    if (this.disposed) return;
    this.disposed = true;
@@ -617,14 +705,12 @@ class CodexAppServerClient {
        const handler = this.requestHandlers.get(request.method);
        try {
          const result = handler ? await handler(request.params) : {};
-          const response: JsonRpcResponse = { id: request.id, result };
-          this.child.stdin.write(`${JSON.stringify(response)}\n`);
+          this.writeJsonRpcResponse({ id: request.id, result });
        } catch (error) {
-          const response: JsonRpcResponse = {
+          this.writeJsonRpcResponse({
            id: request.id,
            error: { message: error instanceof Error ? error.message : String(error) },
-          };
-          this.child.stdin.write(`${JSON.stringify(response)}\n`);
+          });
        }
        return;
      }
@@ -661,12 +747,42 @@ function terminateChildProcessTree(child: ChildProcessWithoutNullStreams): void
 function toAgentUsage(tokenUsage: unknown): AgentUsage | undefined {
  if (!tokenUsage || typeof tokenUsage !== "object") return undefined;
  const usage = tokenUsage as {
-    last?: { inputTokens?: number; cachedInputTokens?: number; outputTokens?: number };
+    model_context_window?: number;
+    modelContextWindow?: number;
+    last?: {
+      inputTokens?: number;
+      cachedInputTokens?: number;
+      outputTokens?: number;
+      total_tokens?: number;
+      totalTokens?: number;
+    };
  };
+  const contextWindowMaxTokens =
+    typeof usage.model_context_window === "number" &&
+    Number.isFinite(usage.model_context_window) &&
+    usage.model_context_window > 0
+      ? usage.model_context_window
+      : typeof usage.modelContextWindow === "number" &&
+          Number.isFinite(usage.modelContextWindow) &&
+          usage.modelContextWindow > 0
+        ? usage.modelContextWindow
+        : undefined;
+  const contextWindowUsedTokens =
+    typeof usage.last?.total_tokens === "number" &&
+    Number.isFinite(usage.last.total_tokens) &&
+    usage.last.total_tokens > 0
+      ? usage.last.total_tokens
+      : typeof usage.last?.totalTokens === "number" &&
+          Number.isFinite(usage.last.totalTokens) &&
+          usage.last.totalTokens > 0
+        ? usage.last.totalTokens
+        : undefined;
  return {
    inputTokens: usage.last?.inputTokens,
    cachedInputTokens: usage.last?.cachedInputTokens,
    outputTokens: usage.last?.outputTokens,
+    ...(contextWindowMaxTokens !== undefined ? { contextWindowMaxTokens } : {}),
+    ...(contextWindowUsedTokens !== undefined ? { contextWindowUsedTokens } : {}),
  };
 }

@@ -723,6 +839,234 @@ function mapCodexPlanToToolCall(params: { callId: string; text: string }): ToolC
  };
 }

+function buildPlanPermissionActions(
+  options?: { includeResumeAction?: boolean; resumeLabel?: string },
+): AgentPermissionAction[] {
+  const actions: AgentPermissionAction[] = [
+    {
+      id: "reject",
+      label: "Reject",
+      behavior: "deny",
+      variant: "danger",
+      intent: "dismiss",
+    },
+    {
+      id: "implement",
+      label: "Implement",
+      behavior: "allow",
+      variant: "primary",
+      intent: "implement",
+    },
+  ];
+
+  if (options?.includeResumeAction && options.resumeLabel) {
+    actions.push({
+      id: "implement_resume",
+      label: options.resumeLabel,
+      behavior: "allow",
+      variant: "secondary",
+      intent: "implement_resume",
+    });
+  }
+
+  return actions;
+}
+
+function buildCodexPlanImplementationPrompt(planText: string): string {
+  const normalizedPlan = normalizePlanMarkdown(planText);
+  if (!normalizedPlan) {
+    return `${CODEX_PLAN_IMPLEMENTATION_PROMPT_PREFIX} Make the required code changes and verify them.`;
+  }
+
+  return [
+    CODEX_PLAN_IMPLEMENTATION_PROMPT_PREFIX,
+    "Approved plan:",
+    normalizedPlan,
+    "Carry out the work, make the necessary code changes, and verify the result.",
+  ].join("\n\n");
+}
+
+type CodexQuestionOption = {
+  label: string;
+  description?: string;
+};
+
+type CodexQuestionPrompt = {
+  id: string;
+  header: string;
+  question: string;
+  options: CodexQuestionOption[];
+  multiSelect?: boolean;
+  isOther?: boolean;
+  isSecret?: boolean;
+};
+
+function normalizeCodexQuestionPrompts(raw: unknown): CodexQuestionPrompt[] {
+  if (!Array.isArray(raw)) {
+    return [];
+  }
+  const questions: CodexQuestionPrompt[] = [];
+  for (const item of raw) {
+    if (!item || typeof item !== "object") {
+      continue;
+    }
+    const record = item as Record<string, unknown>;
+    const id = nonEmptyString(record.id);
+    const header = nonEmptyString(record.header);
+    const question = nonEmptyString(record.question);
+    if (!id || !header || !question) {
+      continue;
+    }
+    const options = Array.isArray(record.options)
+      ? record.options.flatMap((option): CodexQuestionOption[] => {
+          if (!option || typeof option !== "object") {
+            return [];
+          }
+          const optionRecord = option as Record<string, unknown>;
+          const label = nonEmptyString(optionRecord.label);
+          if (!label) {
+            return [];
+          }
+          return [
+            {
+              label,
+              ...(typeof optionRecord.description === "string" &&
+              optionRecord.description.trim().length > 0
+                ? { description: optionRecord.description }
+                : {}),
+            },
+          ];
+        })
+      : [];
+    questions.push({
+      id,
+      header,
+      question,
+      options,
+      ...(record.multiSelect === true ? { multiSelect: true } : {}),
+      ...(record.isOther === true ? { isOther: true } : {}),
+      ...(record.isSecret === true ? { isSecret: true } : {}),
+    });
+  }
+  return questions;
+}
+
+function formatCodexQuestionPrompts(questions: CodexQuestionPrompt[]): string {
+  return questions
+    .map((question) => {
+      const lines = [`${question.header}: ${question.question}`];
+      if (question.options.length > 0) {
+        lines.push(`Options: ${question.options.map((option) => option.label).join(", ")}`);
+      }
+      return lines.join("\n");
+    })
+    .join("\n\n")
+    .trim();
+}
+
+function mapCodexQuestionRequestToToolCall(params: {
+  callId: string;
+  questions: CodexQuestionPrompt[];
+  status: ToolCallTimelineItem["status"];
+  answers?: Record<string, string[]>;
+  error?: unknown;
+}): ToolCallTimelineItem {
+  const formattedQuestions = formatCodexQuestionPrompts(params.questions);
+  const formattedAnswers =
+    params.answers && Object.keys(params.answers).length > 0
+      ? Object.entries(params.answers)
+          .map(([id, values]) => `${id}: ${values.join(", ")}`)
+          .join("\n")
+      : null;
+  const detailText =
+    params.status === "completed" && formattedAnswers
+      ? [formattedQuestions, "Answers:", formattedAnswers].filter(Boolean).join("\n\n")
+      : formattedQuestions;
+
+  const base = {
+    type: "tool_call" as const,
+    callId: params.callId,
+    name: "request_user_input",
+    detail: {
+      type: "plain_text" as const,
+      text: detailText,
+      icon: "brain" as const,
+    },
+    metadata: {
+      questions: params.questions,
+      ...(params.answers ? { answers: params.answers } : {}),
+    },
+  };
+
+  if (params.status === "failed") {
+    return {
+      ...base,
+      status: "failed",
+      error: params.error ?? { message: "Question dismissed" },
+    };
+  }
+  if (params.status === "canceled") {
+    return {
+      ...base,
+      status: "canceled",
+      error: null,
+    };
+  }
+  if (params.status === "running") {
+    return {
+      ...base,
+      status: "running",
+      error: null,
+    };
+  }
+  return {
+    ...base,
+    status: "completed",
+    error: null,
+  };
+}
+
+function mapCodexQuestionResponseByHeader(params: {
+  questions: CodexQuestionPrompt[];
+  response: AgentPermissionResponse;
+}): Record<string, { answers: string[] }> | null {
+  if (params.response.behavior !== "allow") {
+    return null;
+  }
+  const answersRecord =
+    params.response.updatedInput && typeof params.response.updatedInput === "object"
+      ? ((params.response.updatedInput as Record<string, unknown>).answers as
+          | Record<string, unknown>
+          | undefined)
+      : undefined;
+  if (!answersRecord || typeof answersRecord !== "object") {
+    return null;
+  }
+
+  const answers: Record<string, { answers: string[] }> = {};
+  for (const question of params.questions) {
+    const rawAnswer = answersRecord[question.header];
+    if (typeof rawAnswer !== "string") {
+      continue;
+    }
+    const normalizedAnswer = rawAnswer.trim();
+    if (!normalizedAnswer) {
+      continue;
+    }
+    const values = question.multiSelect
+      ? normalizedAnswer
+          .split(",")
+          .map((entry) => entry.trim())
+          .filter((entry) => entry.length > 0)
+      : [normalizedAnswer];
+    if (values.length > 0) {
+      answers[question.id] = { answers: values };
+    }
+  }
+
+  return Object.keys(answers).length > 0 ? answers : null;
+}
+
 type CodexPatchFileChange = {
  path: string;
  kind?: string;
@@ -2072,8 +2416,9 @@ class CodexAppServerAgentSession implements AgentSession {
    string,
    {
      resolve: (value: unknown) => void;
-      kind: "command" | "file" | "tool";
-      questions?: Array<{ id: string; options?: Array<{ label?: string; value?: string }> }>;
+      kind: "command" | "file" | "question" | "plan";
+      questions?: CodexQuestionPrompt[];
+      planText?: string;
    }
  >();
  private resolvedPermissionRequests = new Set<string>();
@@ -2092,6 +2437,7 @@ class CodexAppServerAgentSession implements AgentSession {
  private warnedInvalidNotificationPayloads = new Set<string>();
  private warnedIncompleteEditToolCallIds = new Set<string>();
  private latestUsage: AgentUsage | undefined;
+  private latestPlanResult: { callId: string; text: string; turnId: string | null } | null = null;
  private connected = false;
  private collaborationModes: Array<{
    name: string;
@@ -2275,6 +2621,79 @@ class CodexAppServerAgentSession implements AgentSession {
    this.resolvedCollaborationMode = this.resolveCollaborationMode();
  }

+  private applyFeatureValue(featureId: "fast_mode" | "plan_mode", value: boolean): void {
+    this.config.featureValues = {
+      ...(this.config.featureValues ?? {}),
+      [featureId]: value,
+    };
+
+    if (featureId === "fast_mode") {
+      this.serviceTier = value ? "fast" : null;
+      this.cachedRuntimeInfo = null;
+      return;
+    }
+
+    this.planModeEnabled = value;
+    this.refreshResolvedCollaborationMode();
+    this.cachedRuntimeInfo = null;
+  }
+
+  private rememberPlanResult(item: ToolCallTimelineItem): void {
+    if (item.detail.type !== "plan") {
+      return;
+    }
+
+    this.latestPlanResult = {
+      callId: item.callId,
+      text: item.detail.text,
+      turnId: this.currentTurnId,
+    };
+  }
+
+  private emitSyntheticPlanApprovalRequest(planText: string): void {
+    const requestId = `permission-${randomUUID()}`;
+    const request: AgentPermissionRequest = {
+      id: requestId,
+      provider: CODEX_PROVIDER,
+      name: "CodexPlanApproval",
+      kind: "plan",
+      title: "Plan",
+      description: "Review the proposed plan before implementation starts.",
+      input: { plan: planText },
+      actions: buildPlanPermissionActions(),
+      metadata: {
+        planText,
+        source: "codex_plan_approval",
+      },
+    };
+
+    this.pendingPermissions.set(requestId, request);
+    this.pendingPermissionHandlers.set(requestId, {
+      resolve: () => undefined,
+      kind: "plan",
+      planText,
+    });
+    this.emitEvent({ type: "permission_requested", provider: CODEX_PROVIDER, request });
+  }
+
+  private async handleApprovedPlanPermission(params: { planText?: unknown }): Promise<void> {
+    const planText =
+      typeof params.planText === "string" ? normalizePlanMarkdown(params.planText) : "";
+    const previousPlanMode = this.planModeEnabled;
+    const previousFastMode = this.serviceTier === "fast";
+
+    this.applyFeatureValue("plan_mode", false);
+    this.applyFeatureValue("fast_mode", false);
+
+    try {
+      await this.startTurn(buildCodexPlanImplementationPrompt(planText));
+    } catch (error) {
+      this.applyFeatureValue("plan_mode", previousPlanMode);
+      this.applyFeatureValue("fast_mode", previousFastMode);
+      throw error;
+    }
+  }
+
  private registerRequestHandlers(): void {
    if (!this.client) return;

@@ -2284,6 +2703,10 @@ class CodexAppServerAgentSession implements AgentSession {
    this.client.setRequestHandler("item/fileChange/requestApproval", (params) =>
      this.handleFileChangeApprovalRequest(params),
    );
+    this.client.setRequestHandler("item/tool/requestUserInput", (params) =>
+      this.handleToolApprovalRequest(params),
+    );
+    // Keep the legacy method name for older Codex builds.
    this.client.setRequestHandler("tool/requestUserInput", (params) =>
      this.handleToolApprovalRequest(params),
    );
@@ -2573,7 +2996,7 @@ class CodexAppServerAgentSession implements AgentSession {
      params.cwd = this.config.cwd;
    }
    if (options?.outputSchema) {
-      params.outputSchema = options.outputSchema;
+      params.outputSchema = normalizeCodexOutputSchema(options.outputSchema);
    }
    if (this.config.systemPrompt?.trim()) {
      params.developerInstructions = this.config.systemPrompt.trim();
@@ -2668,14 +3091,11 @@ class CodexAppServerAgentSession implements AgentSession {

  async setFeature(featureId: string, value: unknown): Promise<void> {
    if (featureId === "fast_mode") {
-      this.serviceTier = value ? "fast" : null;
-      this.cachedRuntimeInfo = null;
+      this.applyFeatureValue("fast_mode", Boolean(value));
      return;
    }
    if (featureId === "plan_mode") {
-      this.planModeEnabled = Boolean(value);
-      this.refreshResolvedCollaborationMode();
-      this.cachedRuntimeInfo = null;
+      this.applyFeatureValue("plan_mode", Boolean(value));
      return;
    }
    throw new Error(`Unknown Codex feature: ${featureId}`);
@@ -2691,6 +3111,26 @@ class CodexAppServerAgentSession implements AgentSession {
      throw new Error(`No pending Codex app-server permission request with id '${requestId}'`);
    }
    const pendingRequest = this.pendingPermissions.get(requestId) ?? null;
+
+    if (pending.kind === "plan") {
+      if (response.behavior === "allow") {
+        await this.handleApprovedPlanPermission({
+          planText: pending.planText ?? pendingRequest?.metadata?.planText,
+        });
+      }
+
+      this.pendingPermissionHandlers.delete(requestId);
+      this.pendingPermissions.delete(requestId);
+      this.resolvedPermissionRequests.add(requestId);
+      this.emitEvent({
+        type: "permission_resolved",
+        provider: CODEX_PROVIDER,
+        requestId,
+        resolution: response,
+      });
+      return;
+    }
+
    this.pendingPermissionHandlers.delete(requestId);
    this.pendingPermissions.delete(requestId);
    this.resolvedPermissionRequests.add(requestId);
@@ -2745,26 +3185,53 @@ class CodexAppServerAgentSession implements AgentSession {
      return;
    }

-    // tool/requestUserInput
-    const answers: Record<string, { answers: string[] }> = {};
    const questions = pending.questions ?? [];
-    const decision =
-      response.behavior === "allow" ? "accept" : response.interrupt ? "cancel" : "decline";
-    for (const question of questions) {
-      let picked = decision;
-      const options = question.options ?? [];
-      if (options.length > 0) {
-        const byLabel = options.find((opt) => (opt.label ?? "").toLowerCase().includes(decision));
-        const byValue = options.find((opt) => (opt.value ?? "").toLowerCase().includes(decision));
-        const option = byLabel ?? byValue ?? options[0]!;
-        picked = option.value ?? option.label ?? decision;
-      }
-      answers[question.id] = { answers: [picked] };
+    const itemId =
+      typeof pendingRequest?.metadata?.itemId === "string" ? pendingRequest.metadata.itemId : requestId;
+    if (response.behavior === "allow") {
+      const mappedAnswers = mapCodexQuestionResponseByHeader({
+        questions,
+        response,
+      });
+      const answers =
+        mappedAnswers ??
+        Object.fromEntries(
+          questions
+            .map((question) => {
+              const fallback = question.options[0]?.label?.trim();
+              return fallback
+                ? [question.id, { answers: [fallback] }]
+                : null;
+            })
+            .filter((entry): entry is [string, { answers: string[] }] => entry !== null),
+        );
+      this.emitEvent({
+        type: "timeline",
+        provider: CODEX_PROVIDER,
+        item: mapCodexQuestionRequestToToolCall({
+          callId: itemId,
+          questions,
+          status: "completed",
+          answers: Object.fromEntries(
+            Object.entries(answers).map(([id, value]) => [id, value.answers]),
+          ),
+        }),
+      });
+      pending.resolve({ answers });
+      return;
    }
-    if (questions.length === 0) {
-      answers["default"] = { answers: [decision] };
-    }
-    pending.resolve({ answers });
+
+    this.emitEvent({
+      type: "timeline",
+      provider: CODEX_PROVIDER,
+      item: mapCodexQuestionRequestToToolCall({
+        callId: itemId,
+        questions,
+        status: response.interrupt ? "canceled" : "failed",
+        error: { message: response.message ?? "Question dismissed" },
+      }),
+    });
+    pending.resolve({ answers: {} });
  }

  describePersistence(): {
@@ -2965,6 +3432,7 @@ class CodexAppServerAgentSession implements AgentSession {

    if (parsed.kind === "turn_started") {
      this.currentTurnId = parsed.turnId;
+      this.latestPlanResult = null;
      this.emittedItemStartedIds.clear();
      this.emittedItemCompletedIds.clear();
      this.emittedExecCommandStartedCallIds.clear();
@@ -2986,6 +3454,9 @@ class CodexAppServerAgentSession implements AgentSession {
      } else if (parsed.status === "interrupted") {
        this.emitEvent({ type: "turn_canceled", provider: CODEX_PROVIDER, reason: "interrupted" });
      } else {
+        if (this.planModeEnabled && this.latestPlanResult?.text) {
+          this.emitSyntheticPlanApprovalRequest(this.latestPlanResult.text);
+        }
        this.emitEvent({
          type: "turn_completed",
          provider: CODEX_PROVIDER,
@@ -2993,6 +3464,7 @@ class CodexAppServerAgentSession implements AgentSession {
        });
      }
      this.activeForegroundTurnId = null;
+      this.latestPlanResult = null;
      this.emittedItemStartedIds.clear();
      this.emittedItemCompletedIds.clear();
      this.emittedExecCommandStartedCallIds.clear();
@@ -3014,6 +3486,7 @@ class CodexAppServerAgentSession implements AgentSession {
        ),
      });
      if (timelineItem) {
+        this.rememberPlanResult(timelineItem);
        this.emitEvent({
          type: "timeline",
          provider: CODEX_PROVIDER,
@@ -3207,6 +3680,9 @@ class CodexAppServerAgentSession implements AgentSession {
          }
        }
        if (timelineItem.type === "tool_call") {
+          if (timelineItem.detail.type === "plan") {
+            this.rememberPlanResult(timelineItem);
+          }
          this.warnOnIncompleteEditToolCall(timelineItem, "item_completed", parsed.item);
        }
        this.emitEvent({ type: "timeline", provider: CODEX_PROVIDER, item: timelineItem });
@@ -3463,34 +3939,43 @@ class CodexAppServerAgentSession implements AgentSession {
  private handleToolApprovalRequest(params: unknown): Promise<unknown> {
    const parsed = params as { itemId: string; threadId: string; turnId: string; questions: any[] };
    const requestId = `permission-${parsed.itemId}`;
+    const questions = normalizeCodexQuestionPrompts(parsed.questions);
    const request: AgentPermissionRequest = {
      id: requestId,
      provider: CODEX_PROVIDER,
-      name: "CodexTool",
-      kind: "tool",
-      title: "Tool action requires approval",
+      name: "request_user_input",
+      kind: "question",
+      title: "Question",
      description: undefined,
      detail: {
-        type: "unknown",
-        input: {
-          questions: Array.isArray(parsed.questions) ? parsed.questions : [],
-        },
-        output: null,
+        type: "plain_text",
+        text: formatCodexQuestionPrompts(questions),
+        icon: "brain",
      },
+      input: { questions },
      metadata: {
        itemId: parsed.itemId,
        threadId: parsed.threadId,
        turnId: parsed.turnId,
-        questions: parsed.questions,
+        questions,
      },
    };
    this.pendingPermissions.set(requestId, request);
+    this.emitEvent({
+      type: "timeline",
+      provider: CODEX_PROVIDER,
+      item: mapCodexQuestionRequestToToolCall({
+        callId: parsed.itemId,
+        questions,
+        status: "running",
+      }),
+    });
    this.emitEvent({ type: "permission_requested", provider: CODEX_PROVIDER, request });
    return new Promise((resolve) => {
      this.pendingPermissionHandlers.set(requestId, {
        resolve,
-        kind: "tool",
-        questions: Array.isArray(parsed.questions) ? parsed.questions : [],
+        kind: "question",
+        questions,
      });
    });
  }
@@ -3717,14 +4202,62 @@ export class CodexAppServerAgentClient implements AgentClient {
    }
    return true;
  }
+
+  async getDiagnostic(): Promise<{ diagnostic: string }> {
+    try {
+      const available = await this.isAvailable();
+      const resolvedBinary = findExecutable("codex");
+      const entries: Array<{ label: string; value: string }> = [
+        {
+          label: "Binary",
+          value: resolvedBinary ?? "not found",
+        },
+        { label: "Version", value: resolvedBinary ? resolveBinaryVersion(resolvedBinary) : "unknown" },
+      ];
+      let status = formatDiagnosticStatus(available);
+
+      if (!available) {
+        entries.push({ label: "Models", value: "Not checked" });
+      } else {
+        try {
+          const models = await this.listModels();
+          entries.push({ label: "Models", value: String(models.length) });
+        } catch (error) {
+          entries.push({
+            label: "Models",
+            value: `Error - ${toDiagnosticErrorMessage(error)}`,
+          });
+          status = formatDiagnosticStatus(available, {
+            source: "model fetch",
+            cause: error,
+          });
+        }
+      }
+
+      entries.push({ label: "Status", value: status });
+
+      return {
+        diagnostic: formatProviderDiagnostic("Codex", entries),
+      };
+    } catch (error) {
+      return {
+        diagnostic: formatProviderDiagnosticError("Codex", error),
+      };
+    }
+  }
 }

 export const __codexAppServerInternals = {
  buildCodexAppServerEnv,
  codexModelSupportsFastMode,
  CodexAppServerAgentSession,
+  formatCodexQuestionPrompts,
+  mapCodexQuestionRequestToToolCall,
  mapCodexPatchNotificationToToolCall,
  planStepsToMarkdown,
  mapCodexPlanToToolCall,
+  normalizeCodexOutputSchema,
+  normalizeCodexQuestionPrompts,
+  toAgentUsage,
  threadItemToTimeline,
 };
--- a/packages/server/src/server/agent/providers/codex/tool-call-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/codex/tool-call-mapper.test.ts
@@ -539,6 +539,26 @@ describe("codex tool-call mapper", () => {
    });
  });

+  it("normalizes codex paseo_voice.speak mcp calls and extracts spoken text", () => {
+    const item = mapCodexToolCallFromThreadItem({
+      type: "mcpToolCall",
+      id: "codex-speak-thread-2",
+      status: "completed",
+      server: "paseo_voice",
+      tool: "speak",
+      arguments: { text: "Voice response from Codex via paseo_voice." },
+      result: { ok: true },
+    });
+
+    expect(item).toBeTruthy();
+    expect(item?.name).toBe("speak");
+    expect(item?.detail).toEqual({
+      type: "unknown",
+      input: "Voice response from Codex via paseo_voice.",
+      output: null,
+    });
+  });
+
  it("normalizes codex paseo speak rollout names and extracts spoken text", () => {
    const item = expectMapped(
      mapCodexRolloutToolCall({
--- a/Show More
+++ b/Show More