chore(release): cut 0.1.48

docs: add 0.1.48 changelog
fix(app): restore input focus for running agents and align mobile model selector
2026-07-29 12:01:31 +00:00 · 2026-04-05 15:40:54 +07:00 · 2026-04-05 15:39:55 +07:00 · 2026-04-05 15:38:22 +07:00 · 2026-04-05 15:32:13 +07:00 · 2026-04-05 15:11:18 +07:00
74 changed files with 3675 additions and 1166 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog

+## 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/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-ZLwOacIYQ6rUT2sYs3vNvOh7wTkwQ92cpOJDm29GLWs=";

  # 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.48",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.1.46",
+      "version": "0.1.48",
      "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.48",
      "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.48",
+        "@getpaseo/highlight": "0.1.48",
+        "@getpaseo/server": "0.1.48",
        "@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.48",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/relay": "0.1.46",
-        "@getpaseo/server": "0.1.46",
+        "@getpaseo/relay": "0.1.48",
+        "@getpaseo/server": "0.1.48",
        "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.48",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
-        "@getpaseo/cli": "0.1.46",
-        "@getpaseo/server": "0.1.46",
+        "@getpaseo/cli": "0.1.48",
+        "@getpaseo/server": "0.1.48",
        "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.48",
      "license": "MIT",
      "devDependencies": {
        "@biomejs/biome": "1.9.4",
@@ -35440,7 +35316,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.1.46",
+      "version": "0.1.48",
      "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.48",
      "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.48",
      "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.48",
+        "@getpaseo/relay": "0.1.48",
        "@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.48",
      "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.48",
  "private": true,
  "workspaces": [
    "packages/expo-two-way-audio",
--- 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.48",
  "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.48",
+    "@getpaseo/highlight": "0.1.48",
+    "@getpaseo/server": "0.1.48",
    "@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/agent-input-area.tsx
+++ b/packages/app/src/components/agent-input-area.tsx
@@ -74,6 +74,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 +105,7 @@ export function AgentInputArea({
  clearDraft,
  autoFocus = false,
  onAddImages,
+  onFocusInput,
  commandDraftConfig,
  onMessageSent,
  onComposerHeightChange,
@@ -208,6 +211,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 +420,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 +462,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",
    ],
@@ -616,7 +640,7 @@ export function AgentInputArea({
    resolveStatusControlMode(statusControls) === "draft" && statusControls ? (
      <DraftAgentStatusBar {...statusControls} />
    ) : (
-      <AgentStatusBar agentId={agentId} serverId={serverId} />
+      <AgentStatusBar agentId={agentId} serverId={serverId} onDropdownClose={focusInput} />
    );

  return (
--- a/packages/app/src/components/agent-status-bar.tsx
+++ b/packages/app/src/components/agent-status-bar.tsx
@@ -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(
@@ -212,6 +215,7 @@ function ControlledStatusBar({
  onToggleFavoriteModel,
  features,
  onSetFeature,
+  onDropdownClose,
 }: ControlledAgentStatusBarProps) {
  const { theme } = useUnistyles();
  const isWeb = Platform.OS === "web";
@@ -331,8 +335,11 @@ function ControlledStatusBar({
  const handleOpenChange = useCallback(
    (selector: StatusSelector) => (nextOpen: boolean) => {
      setOpenSelector(nextOpen ? selector : null);
+      if (!nextOpen) {
+        onDropdownClose?.();
+      }
    },
-    [],
+    [onDropdownClose],
  );

  const handleSelectorPress = useCallback(
@@ -403,6 +410,7 @@ function ControlledStatusBar({
                    onToggleFavorite={onToggleFavoriteModel}
                    isLoading={isModelLoading}
                    disabled={modelDisabled}
+                    onClose={onDropdownClose}
                  />
                </View>
              </TooltipTrigger>
@@ -555,9 +563,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">
@@ -651,6 +657,7 @@ function ControlledStatusBar({
                  onToggleFavorite={onToggleFavoriteModel}
                  isLoading={isModelLoading}
                  disabled={modelDisabled}
+                  onClose={onDropdownClose}
                  renderTrigger={({ selectedModelLabel }) => (
                    <View
                      style={[
@@ -784,9 +791,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 +838,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) => {
@@ -1024,6 +1029,7 @@ export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
        });
      }}
      isModelLoading={isProviderModelsQueryLoading(modelsQuery)}
+      onDropdownClose={onDropdownClose}
      disabled={!client}
    />
  );
@@ -1048,6 +1054,7 @@ export function DraftAgentStatusBar({
  onSelectThinkingOption,
  features,
  onSetFeature,
+  onDropdownClose,
  disabled = false,
 }: DraftAgentStatusBarProps) {
  const isWeb = Platform.OS === "web";
@@ -1092,6 +1099,7 @@ export function DraftAgentStatusBar({
          }}
          isLoading={isAllModelsLoading}
          disabled={disabled}
+          onClose={onDropdownClose}
        />
        <ControlledStatusBar
          provider={selectedProvider}
@@ -1103,6 +1111,7 @@ export function DraftAgentStatusBar({
          onSelectThinkingOption={onSelectThinkingOption}
          features={features}
          onSetFeature={onSetFeature}
+          onDropdownClose={onDropdownClose}
          disabled={disabled}
        />
      </View>
@@ -1115,30 +1124,32 @@ 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)}
+        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
@@ -264,44 +264,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,
--- 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,9 +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";
+const IS_WEB = Platform.OS === "web";
+
+import { Combobox, ComboboxItem } from "@/components/ui/combobox";
 import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
 import { getProviderIcon } from "@/components/provider-icons";
 import type { FavoriteModelRow } from "@/hooks/use-form-preferences";
@@ -29,8 +36,6 @@ import {
  type SelectorModelRow,
 } from "./combined-model-selector.utils";

-const INLINE_MODEL_THRESHOLD = Number.POSITIVE_INFINITY;
-
 type SelectorView =
  | { kind: "all" }
  | { kind: "provider"; providerId: string; providerLabel: string };
@@ -51,6 +56,7 @@ interface CombinedModelSelectorProps {
    disabled: boolean;
    isOpen: boolean;
  }) => React.ReactNode;
+  onClose?: () => void;
  disabled?: boolean;
 }

@@ -67,7 +73,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 +104,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 +147,7 @@ function ModelRow({
  isSelected,
  isFavorite,
  disabled = false,
+  elevated = false,
  onPress,
  onToggleFavorite,
 }: {
@@ -133,6 +155,7 @@ function ModelRow({
  isSelected: boolean;
  isFavorite: boolean;
  disabled?: boolean;
+  elevated?: boolean;
  onPress: () => void;
  onToggleFavorite?: (provider: string, modelId: string) => void;
 }) {
@@ -153,8 +176,9 @@ function ModelRow({
      label={row.modelLabel}
      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
@@ -228,7 +252,7 @@ function FavoritesSection({
  }

  return (
-    <View>
+    <View style={styles.favoritesContainer}>
      <View style={styles.sectionHeading}>
        <Text style={styles.sectionHeadingText}>Favorites</Text>
      </View>
@@ -239,11 +263,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 +282,7 @@ function GroupedProviderRows({
  canSelectProvider,
  onToggleFavorite,
  onDrillDown,
+  viewKind,
 }: {
  providerDefinitions: AgentProviderDefinition[];
  groupedRows: Array<{ providerId: string; providerLabel: string; rows: SelectorModelRow[] }>;
@@ -268,6 +293,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 +302,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 +330,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 +347,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 +400,8 @@ function SelectorContent({
  canSelectProvider,
  onToggleFavorite,
  onDrillDown,
-  onBack,
 }: SelectorContentProps) {
+  const { theme } = useUnistyles();
  const allRows = useMemo(
    () => buildModelRows(providerDefinitions, allProviderModels),
    [allProviderModels, providerDefinitions],
@@ -363,35 +426,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 +468,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 +507,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 +525,7 @@ export function CombinedModelSelector({
  favoriteKeys = new Set<string>(),
  onToggleFavorite,
  renderTrigger,
+  onClose,
  disabled = false,
 }: CombinedModelSelectorProps) {
  const { theme } = useUnistyles();
@@ -465,25 +536,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 +582,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 +658,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 +699,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 +740,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 +770,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 +780,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 +792,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 +805,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,
@@ -734,4 +853,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/message-input.tsx
+++ b/packages/app/src/components/message-input.tsx
@@ -100,7 +100,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.
@@ -242,26 +242,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 +280,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
        } else {
          void startDictationIfAvailable();
        }
+        return true;
      }
+
+      return false;
    },
    getNativeElement: () => {
      if (!IS_WEB) return null;
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -717,13 +717,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);

@@ -1765,9 +1758,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/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/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,8 +196,8 @@ 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,
      ]}
@@ -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,
  },
@@ -876,6 +916,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/contexts/session-context.tsx
+++ b/packages/app/src/contexts/session-context.tsx
@@ -1105,6 +1105,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,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useQuery, useQueries } from "@tanstack/react-query";
+import { useQuery, useQueries, useQueryClient } from "@tanstack/react-query";
 import {
  AGENT_PROVIDER_DEFINITIONS,
  type AgentProviderDefinition,
@@ -8,9 +8,11 @@ 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 { useSessionForServer } from "./use-session-directory";
 import {
  useFormPreferences,
  mergeProviderPreferences,
@@ -84,6 +86,7 @@ type UseAgentFormStateResult = {
  providerDefinitions: AgentProviderDefinition[];
  providerDefinitionMap: Map<AgentProvider, AgentProviderDefinition>;
  agentDefinition?: AgentProviderDefinition;
+  allProviderEntries?: ProviderSnapshotEntry[];
  modeOptions: AgentMode[];
  availableModels: AgentModelDefinition[];
  allProviderModels: Map<string, AgentModelDefinition[]>;
@@ -319,6 +322,10 @@ function combineInitialValues(
  return initialValues;
 }

+function providersSnapshotQueryKey(serverId: string | null, cwd: string | undefined) {
+  return ["providersSnapshot", serverId, cwd ?? ""] as const;
+}
+
 export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAgentFormStateResult {
  const {
    initialServerId = null,
@@ -336,6 +343,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
  } = useFormPreferences();

  const daemons = useHosts();
+  const queryClient = useQueryClient();

  // Build a set of valid server IDs for preference validation
  const validServerIds = useMemo(() => new Set(daemons.map((d) => d.serverId)), [daemons]);
@@ -371,11 +379,138 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
  // Session state for provider model listing
  const client = useHostRuntimeClient(formState.serverId ?? "");
  const isConnected = useHostRuntimeIsConnected(formState.serverId ?? "");
+  const supportsProvidersSnapshot = useSessionForServer(
+    formState.serverId,
+    (session) => session?.serverInfo?.features?.providersSnapshot === true,
+  );

+  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 snapshotQueryKey = useMemo(
+    () => providersSnapshotQueryKey(formState.serverId, debouncedCwd),
+    [debouncedCwd, formState.serverId],
+  );
+
+  const providersSnapshotQuery = useQuery({
+    queryKey: snapshotQueryKey,
+    enabled: Boolean(
+      supportsProvidersSnapshot &&
+        isVisible &&
+        isTargetDaemonReady &&
+        formState.serverId &&
+        client &&
+        isConnected,
+    ),
+    staleTime: 60 * 1000,
+    queryFn: async () => {
+      if (!client) {
+        throw new Error("Host is not connected");
+      }
+      return client.getProvidersSnapshot({ cwd: debouncedCwd });
+    },
+  });
+
+  useEffect(() => {
+    if (
+      !supportsProvidersSnapshot ||
+      !client ||
+      !isConnected ||
+      !isVisible ||
+      !isTargetDaemonReady ||
+      !formState.serverId
+    ) {
+      return;
+    }
+
+    return client.on("providers_snapshot_update", (message) => {
+      if (message.type !== "providers_snapshot_update") {
+        return;
+      }
+      if (message.payload.cwd !== undefined && message.payload.cwd !== debouncedCwd) {
+        return;
+      }
+      queryClient.setQueryData(snapshotQueryKey, {
+        entries: message.payload.entries,
+        generatedAt: message.payload.generatedAt,
+        requestId: "providers_snapshot_update",
+      });
+    });
+  }, [
+    client,
+    debouncedCwd,
+    formState.serverId,
+    isConnected,
+    isTargetDaemonReady,
+    isVisible,
+    queryClient,
+    snapshotQueryKey,
+    supportsProvidersSnapshot,
+  ]);
+
+  const snapshotEntries = providersSnapshotQuery.data?.entries ?? undefined;
+  const allProviderEntries = useMemo(
+    () => (supportsProvidersSnapshot ? snapshotEntries ?? [] : undefined),
+    [snapshotEntries, supportsProvidersSnapshot],
+  );
+  const snapshotProviderDefinitions = useMemo(() => {
+    if (!supportsProvidersSnapshot) {
+      return [];
+    }
+    const snapshotProviders = new Set((snapshotEntries ?? []).map((entry) => entry.provider));
+    return allProviderDefinitions.filter((definition) => snapshotProviders.has(definition.id));
+  }, [snapshotEntries, supportsProvidersSnapshot]);
+  const snapshotProviderDefinitionMap = useMemo(
+    () =>
+      new Map<AgentProvider, AgentProviderDefinition>(
+        snapshotProviderDefinitions.map((definition) => [definition.id, definition]),
+      ),
+    [snapshotProviderDefinitions],
+  );
+  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 (const entry of snapshotEntries ?? []) {
+      map.set(entry.provider, entry.models ?? []);
+    }
+    return map;
+  }, [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 ??
+    [];
+
+  // COMPAT(providersSnapshot): legacy fallback for daemons without snapshot support — remove when all daemons support snapshots
  const availableProvidersQuery = useQuery({
    queryKey: ["availableProviders", formState.serverId],
    enabled: Boolean(
-      isVisible && isTargetDaemonReady && formState.serverId && client && isConnected,
+      !supportsProvidersSnapshot &&
+        isVisible &&
+        isTargetDaemonReady &&
+        formState.serverId &&
+        client &&
+        isConnected,
    ),
    staleTime: 60 * 1000,
    queryFn: async () => {
@@ -389,43 +524,33 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      return payload.providers.filter((entry) => entry.available).map((entry) => entry.provider);
    },
  });
-
-  const providerDefinitions = useMemo(() => {
+  const legacyProviderDefinitions = useMemo(() => {
    const availableProviders = availableProvidersQuery.data;
    if (!availableProviders) {
      return [];
    }
    const available = new Set(availableProviders);
-    return allProviderDefinitions.filter((definition) =>
-      available.has(definition.id as AgentProvider),
-    );
+    return allProviderDefinitions.filter((definition) => available.has(definition.id));
  }, [availableProvidersQuery.data]);
-
-  const providerDefinitionMap = useMemo(
+  const legacyProviderDefinitionMap = useMemo(
    () =>
      new Map<AgentProvider, AgentProviderDefinition>(
-        providerDefinitions.map((definition) => [definition.id as AgentProvider, definition]),
+        legacyProviderDefinitions.map((definition) => [definition.id, definition]),
      ),
-    [providerDefinitions],
+    [legacyProviderDefinitions],
  );

-  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({
+  // COMPAT(providersSnapshot): legacy fallback for daemons without snapshot support — remove when all daemons support snapshots
+  const legacySelectedProviderModelsQuery = useQuery({
    queryKey: ["providerModels", formState.serverId, formState.provider],
    enabled: Boolean(
+      !supportsProvidersSnapshot &&
      isVisible &&
        isTargetDaemonReady &&
        formState.serverId &&
        client &&
        isConnected &&
-        providerDefinitionMap.has(formState.provider),
+        legacyProviderDefinitionMap.has(formState.provider),
    ),
    staleTime: 5 * 60 * 1000,
    queryFn: async () => {
@@ -441,18 +566,19 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      return payload.models ?? [];
    },
  });
+  const legacySelectedProviderModels = legacySelectedProviderModelsQuery.data ?? null;

-  const availableModels = providerModelsQuery.data ?? null;
-
+  // COMPAT(providersSnapshot): legacy fallback for daemons without snapshot support — remove when all daemons support snapshots
  const providerModesQuery = useQuery({
    queryKey: ["providerModes", formState.serverId, formState.provider, debouncedCwd],
    enabled: Boolean(
-      isVisible &&
+      !supportsProvidersSnapshot &&
+        isVisible &&
        isTargetDaemonReady &&
        formState.serverId &&
        client &&
        isConnected &&
-        providerDefinitionMap.has(formState.provider),
+        legacyProviderDefinitionMap.has(formState.provider),
    ),
    staleTime: 5 * 60 * 1000,
    queryFn: async () => {
@@ -469,8 +595,9 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
    },
  });

+  // COMPAT(providersSnapshot): legacy fallback for daemons without snapshot support — remove when all daemons support snapshots
  const allProviderModelQueries = useQueries({
-    queries: providerDefinitions.map((def) => ({
+    queries: (supportsProvidersSnapshot ? [] : legacyProviderDefinitions).map((def) => ({
      queryKey: ["providerModels", formState.serverId, def.id],
      enabled: Boolean(
        isVisible && isTargetDaemonReady && formState.serverId && client && isConnected,
@@ -490,19 +617,40 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      },
    })),
  });
-
-  const allProviderModels = useMemo(() => {
+  const legacyAllProviderModels = useMemo(() => {
    const map = new Map<string, AgentModelDefinition[]>();
-    for (let i = 0; i < providerDefinitions.length; i++) {
+    for (let i = 0; i < legacyProviderDefinitions.length; i++) {
      const query = allProviderModelQueries[i];
      if (query?.data) {
-        map.set(providerDefinitions[i]!.id, query.data);
+        map.set(legacyProviderDefinitions[i]!.id, query.data);
      }
    }
    return map;
-  }, [allProviderModelQueries, providerDefinitions]);
+  }, [allProviderModelQueries, legacyProviderDefinitions]);
+  const legacySelectedProviderModes =
+    providerModesQuery.data ?? legacyProviderDefinitionMap.get(formState.provider)?.modes ?? [];

-  const isAllModelsLoading = allProviderModelQueries.some((q) => q.isLoading);
+  const providerDefinitions = supportsProvidersSnapshot
+    ? snapshotProviderDefinitions
+    : legacyProviderDefinitions;
+  const providerDefinitionMap = supportsProvidersSnapshot
+    ? snapshotProviderDefinitionMap
+    : legacyProviderDefinitionMap;
+  const selectableProviderDefinitionMap = supportsProvidersSnapshot
+    ? snapshotSelectableProviderDefinitionMap
+    : legacyProviderDefinitionMap;
+  const allProviderModels = supportsProvidersSnapshot
+    ? snapshotAllProviderModels
+    : legacyAllProviderModels;
+  const availableModels = supportsProvidersSnapshot
+    ? snapshotSelectedProviderModels
+    : legacySelectedProviderModels;
+  const modeOptions = supportsProvidersSnapshot
+    ? snapshotSelectedProviderModes
+    : legacySelectedProviderModes;
+  const isAllModelsLoading = supportsProvidersSnapshot
+    ? providersSnapshotQuery.isLoading || providersSnapshotQuery.isFetching
+    : allProviderModelQueries.some((q) => q.isLoading);

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

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

  // Auto-select the first online host when:
@@ -592,8 +740,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 +782,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 +815,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 +872,15 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
  }, []);

  const refreshProviderModels = useCallback(() => {
-    void providerModelsQuery.refetch();
-  }, [providerModelsQuery]);
+    if (supportsProvidersSnapshot) {
+      if (!client) {
+        return;
+      }
+      void client.refreshProvidersSnapshot({ cwd: debouncedCwd });
+      return;
+    }
+    void legacySelectedProviderModelsQuery.refetch();
+  }, [client, debouncedCwd, legacySelectedProviderModelsQuery, supportsProvidersSnapshot]);

  const persistFormPreferences = useCallback(async () => {
    const resolvedModel = resolveEffectiveModel(availableModels, formState.model);
@@ -747,13 +913,20 @@ 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 isModelLoading = supportsProvidersSnapshot
+    ? providersSnapshotQuery.isLoading || providersSnapshotQuery.isFetching
+    : legacySelectedProviderModelsQuery.isLoading || legacySelectedProviderModelsQuery.isFetching;
  const modelError =
-    providerModelsQuery.error instanceof Error ? providerModelsQuery.error.message : null;
+    supportsProvidersSnapshot
+      ? providersSnapshotQuery.error instanceof Error
+        ? providersSnapshotQuery.error.message
+        : null
+      : legacySelectedProviderModelsQuery.error instanceof Error
+        ? legacySelectedProviderModelsQuery.error.message
+        : null;

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

@@ -776,6 +949,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
      providerDefinitions,
      providerDefinitionMap,
      agentDefinition,
+      allProviderEntries,
      modeOptions,
      availableModels: availableModels ?? [],
      allProviderModels,
@@ -806,6 +980,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-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/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";
@@ -62,6 +63,11 @@ import { THINKING_TONE_NATIVE_PCM_BASE64 } from "@/utils/thinking-tone.native-pc
 import { useVoiceAudioEngineOptional } from "@/contexts/voice-context";
 import { useIsLocalDaemon } from "@/hooks/use-is-local-daemon";
 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";
+import type { ProviderSnapshotEntry } from "@server/server/agent/agent-sdk-types";

 // ---------------------------------------------------------------------------
 // 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,116 @@ function AppearanceSection({ settings, handleThemeChange }: AppearanceSectionPro
 }


+interface ProvidersSectionProps {
+  routeServerId: string;
+}
+
+function ProvidersSection({ routeServerId }: ProvidersSectionProps) {
+  const { theme } = useUnistyles();
+  const client = useHostRuntimeClient(routeServerId);
+  const isConnected = useHostRuntimeIsConnected(routeServerId);
+  const [entries, setEntries] = useState<ProviderSnapshotEntry[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [diagnosticProvider, setDiagnosticProvider] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (!client || !isConnected) {
+      setEntries([]);
+      return;
+    }
+
+    let cancelled = false;
+    setLoading(true);
+    client
+      .getProvidersSnapshot()
+      .then((result) => {
+        if (!cancelled) setEntries(result.entries);
+      })
+      .catch(() => {
+        if (!cancelled) setEntries([]);
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [client, isConnected]);
+
+  const hasServer = routeServerId.length > 0;
+
+  return (
+    <>
+      <View style={settingsStyles.section}>
+        <Text style={settingsStyles.sectionTitle}>Providers</Text>
+        {!hasServer || !isConnected ? (
+          <View style={[settingsStyles.card, styles.emptyCard]}>
+            <Text style={styles.emptyText}>Connect to a host to see providers</Text>
+          </View>
+        ) : loading ? (
+          <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);
+
+              return (
+                <View key={def.id} style={styles.audioRow}>
+                  <View style={[styles.audioRowContent, { 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>
+                  <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 +604,7 @@ interface SettingsSectionContentProps {
  sectionId: SettingsSectionId;
  hostsProps: HostsSectionProps;
  appearanceProps: AppearanceSectionProps;
+  providersProps: ProvidersSectionProps;
  diagnosticsProps: DiagnosticsSectionProps;
  aboutProps: AboutSectionProps;
  appVersion: string | null;
@@ -510,6 +616,7 @@ function SettingsSectionContent({
  sectionId,
  hostsProps,
  appearanceProps,
+  providersProps,
  diagnosticsProps,
  aboutProps,
  appVersion,
@@ -523,6 +630,8 @@ function SettingsSectionContent({
      return <AppearanceSection {...appearanceProps} />;
    case "shortcuts":
      return <KeyboardShortcutsSection />;
+    case "providers":
+      return <ProvidersSection {...providersProps} />;
    case "diagnostics":
      return <DiagnosticsSection {...diagnosticsProps} />;
    case "about":
@@ -580,7 +689,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 +850,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 +928,6 @@ export default function SettingsScreen() {
    setIsAddHostMethodVisible(false);
    setIsDirectHostVisible(false);
    setIsPasteLinkVisible(false);
-    setAddConnectionTargetServerId(null);
  }, []);

  const goBackToAddConnectionMethods = useCallback(() => {
@@ -842,24 +946,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 +983,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 +1028,10 @@ export default function SettingsScreen() {
    routeServerId,
    theme,
    handleEditDaemon,
-    setAddConnectionTargetServerId,
-    setPendingEditReopenServerId,
    setIsAddHostMethodVisible,
    isAddHostMethodVisible,
    isDirectHostVisible,
    isPasteLinkVisible,
-    addConnectionTargetServerId,
    closeAddConnectionFlow,
    goBackToAddConnectionMethods,
    setIsDirectHostVisible,
@@ -977,7 +1051,6 @@ export default function SettingsScreen() {
    handleSaveEditDaemon,
    handleRemoveConnection,
    handleRemoveDaemon,
-    handleAddConnectionFromModal,
    restartConfirmationMessage: "This will restart the daemon. The app will reconnect automatically.",
    waitForCondition,
    isMountedRef,
@@ -1000,9 +1073,14 @@ export default function SettingsScreen() {
    isDesktopApp,
  };

+  const providersProps: ProvidersSectionProps = {
+    routeServerId,
+  };
+
  const sectionContentProps: Omit<SettingsSectionContentProps, "sectionId"> = {
    hostsProps,
    appearanceProps,
+    providersProps,
    diagnosticsProps,
    aboutProps,
    appVersion,
@@ -1042,7 +1120,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 +1137,6 @@ function HostDetailModal({
  onSave,
  onRemoveConnection,
  onRemoveHost,
-  onAddConnection,
  restartConfirmationMessage,
  waitForCondition,
  isScreenMountedRef,
@@ -1291,15 +1367,6 @@ function HostDetailModal({
                  />
                );
              })}
-              <Button
-                variant="outline"
-                size="md"
-                style={styles.addButton}
-                textStyle={styles.addButtonText}
-                onPress={onAddConnection}
-              >
-                + Add connection
-              </Button>
            </View>
          </View>
        ) : null}
@@ -1821,6 +1888,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-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-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -21,6 +21,7 @@ import {
  Ellipsis,
  EllipsisVertical,
  PanelRight,
+  RotateCw,
  SquarePen,
  SquareTerminal,
  X,
@@ -182,6 +183,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 +271,7 @@ function MobileWorkspaceTabOption({
  onPress,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTab,
  onCloseTabsAbove,
  onCloseTabsBelow,
@@ -284,6 +287,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 +303,7 @@ function MobileWorkspaceTabOption({
    menuTestIDBase,
    onCopyResumeCommand,
    onCopyAgentId,
+    onReloadAgent,
    onCloseTab,
    onCloseTabsBefore: onCloseTabsAbove,
    onCloseTabsAfter: onCloseTabsBelow,
@@ -342,11 +347,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 +397,7 @@ const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
  onSelectSwitcherTab,
  onCopyResumeCommand,
  onCopyAgentId,
+  onReloadAgent,
  onCloseTab,
  onCloseTabsAbove,
  onCloseTabsBelow,
@@ -460,6 +469,7 @@ const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
              onPress={onPress}
              onCopyResumeCommand={onCopyResumeCommand}
              onCopyAgentId={onCopyAgentId}
+              onReloadAgent={onReloadAgent}
              onCloseTab={onCloseTab}
              onCloseTabsAbove={onCloseTabsAbove}
              onCloseTabsBelow={onCloseTabsBelow}
@@ -1298,29 +1308,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 +1353,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");
@@ -1768,44 +1772,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);
@@ -2211,6 +2177,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
              onSelectSwitcherTab={handleSelectSwitcherTab}
              onCopyResumeCommand={handleCopyResumeCommand}
              onCopyAgentId={handleCopyAgentId}
+              onReloadAgent={handleReloadAgent}
              onCloseTab={handleCloseTabById}
              onCloseTabsAbove={handleCloseTabsToLeft}
              onCloseTabsBelow={handleCloseTabsToRight}
@@ -2231,6 +2198,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
              onCloseTab={handleCloseTabById}
              onCopyResumeCommand={handleCopyResumeCommand}
              onCopyAgentId={handleCopyAgentId}
+              onReloadAgent={handleReloadAgent}
              onCloseTabsToLeft={handleCloseTabsToLeft}
              onCloseTabsToRight={handleCloseTabsToRight}
              onCloseOtherTabs={handleCloseOtherTabs}
@@ -2267,6 +2235,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,
@@ -37,6 +39,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
    expect(entries.filter((entry) => entry.kind === "item").map((entry) => entry.label)).toEqual([
      "Copy resume command",
      "Copy agent id",
+      "Reload agent",
      "Close to the left",
      "Close to the right",
      "Close other tabs",
@@ -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(),
@@ -62,6 +66,7 @@ describe("buildWorkspaceTabMenuEntries", () => {
    expect(entries.filter((entry) => entry.kind === "item").map((entry) => entry.label)).toEqual([
      "Copy resume command",
      "Copy agent id",
+      "Reload agent",
      "Close tabs above",
      "Close tabs below",
      "Close other tabs",
@@ -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,
@@ -125,6 +135,17 @@ export function buildWorkspaceTabMenuEntries(
        void onCopyAgentId(agentId);
      },
    });
+    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: "separator",
      key: "copy-separator",
@@ -192,6 +213,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/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,
@@ -190,6 +191,7 @@ export type DaemonServerInfo = {
  hostname: string | null;
  version: string | null;
  capabilities?: ServerCapabilities;
+  features?: ServerInfoStatusPayload["features"];
 };

 export interface AgentTimelineCursorState {
@@ -412,6 +414,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 +536,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 +560,7 @@ export const useSessionStore = create<SessionStore>()(
                  hostname: nextHostname,
                  version: nextVersion,
                  ...(nextCapabilities ? { capabilities: nextCapabilities } : {}),
+                  ...(nextFeatures ? { features: nextFeatures } : {}),
                },
              },
            },
--- 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.48",
  "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.48",
+    "@getpaseo/server": "0.1.48",
    "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.48",
  "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.48",
+    "@getpaseo/server": "0.1.48",
    "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.48",
  "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.48",
  "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.48",
  "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.48",
  "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.48",
+    "@getpaseo/relay": "0.1.48",
    "@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
@@ -43,6 +43,9 @@ import type {
  ListAvailableProvidersResponse,
  ListTerminalsResponse,
  CreateTerminalResponse,
+  GetProvidersSnapshotResponseMessage,
+  ProviderDiagnosticResponseMessage,
+  RefreshProvidersSnapshotResponseMessage,
  SubscribeTerminalResponse,
  TerminalState,
  CloseItemsResponse,
@@ -147,6 +150,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 +229,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,
@@ -2552,6 +2562,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 +3692,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-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;
@@ -468,4 +479,5 @@ export interface AgentClient {
   * Returns true if available, false otherwise.
   */
  isAvailable(): Promise<boolean>;
+  getDiagnostic?(): Promise<{ diagnostic: string }>;
 }
--- 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,409 @@
+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("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,217 @@
+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.createLoadingEntries();
+      this.snapshots.set(cwdKey, loadingEntries);
+      void this.warmUp(cwd);
+      return entriesToArray(loadingEntries);
+    }
+    return entriesToArray(entries);
+  }
+
+  refresh(cwd?: string): void {
+    const cwdKey = normalizeCwdKey(cwd);
+    this.snapshots.set(cwdKey, this.createLoadingEntries());
+    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 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/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";
@@ -39,6 +39,12 @@ 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 {
  AgentCapabilityFlags,
@@ -1086,6 +1092,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 +1136,31 @@ 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;
+  }
+}
+
 class ClaudeAgentSession implements AgentSession {
  readonly provider: "claude" = "claude";
  readonly capabilities = CLAUDE_CAPABILITIES;
--- 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 { 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,6 +10,32 @@ 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();
@@ -138,4 +164,185 @@ 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"],
+          },
+        },
+      },
+    });
+  });
 });
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.ts
@@ -52,6 +52,13 @@ 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;
@@ -573,6 +580,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 +635,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;
      }
@@ -723,6 +739,187 @@ function mapCodexPlanToToolCall(params: { callId: string; text: string }): ToolC
  };
 }

+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 +2269,8 @@ 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";
+      questions?: CodexQuestionPrompt[];
    }
  >();
  private resolvedPermissionRequests = new Set<string>();
@@ -2284,6 +2481,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),
    );
@@ -2745,26 +2946,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(): {
@@ -3463,34 +3691,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 +3954,60 @@ 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,
+  normalizeCodexQuestionPrompts,
  threadItemToTimeline,
 };
--- a/packages/server/src/server/agent/providers/copilot-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/copilot-acp-agent.ts
@@ -2,7 +2,15 @@ import type { Logger } from "pino";

 import type { AgentCapabilityFlags, AgentMode } from "../agent-sdk-types.js";
 import type { ProviderRuntimeSettings } from "../provider-launch-config.js";
+import { findExecutable } from "../../../utils/executable.js";
 import { ACPAgentClient } from "./acp-agent.js";
+import {
+  formatDiagnosticStatus,
+  formatProviderDiagnostic,
+  formatProviderDiagnosticError,
+  resolveBinaryVersion,
+  toDiagnosticErrorMessage,
+} from "./diagnostic-utils.js";

 const COPILOT_CAPABILITIES: AgentCapabilityFlags = {
  supportsStreaming: true,
@@ -51,4 +59,53 @@ export class CopilotACPAgentClient extends ACPAgentClient {
  override async isAvailable(): Promise<boolean> {
    return super.isAvailable();
  }
+
+  async getDiagnostic(): Promise<{ diagnostic: string }> {
+    try {
+      const available = await this.isAvailable();
+      const resolvedBinary = findExecutable("copilot");
+      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,
+          });
+        }
+
+        if (!modelsValue.startsWith("Error -")) {
+          try {
+            await this.listModes();
+          } catch (error) {
+            status = formatDiagnosticStatus(available, {
+              source: "mode fetch",
+              cause: error,
+            });
+          }
+        }
+      }
+
+      return {
+        diagnostic: formatProviderDiagnostic("Copilot", [
+          {
+            label: "Binary",
+            value: resolvedBinary ?? "not found",
+          },
+          { label: "Version", value: resolvedBinary ? resolveBinaryVersion(resolvedBinary) : "unknown" },
+          { label: "Models", value: modelsValue },
+          { label: "Status", value: status },
+        ]),
+      };
+    } catch (error) {
+      return {
+        diagnostic: formatProviderDiagnosticError("Copilot", error),
+      };
+    }
+  }
 }
--- a/packages/server/src/server/agent/providers/diagnostic-utils.ts
+++ b/packages/server/src/server/agent/providers/diagnostic-utils.ts
@@ -0,0 +1,80 @@
+import { execFileSync } from "node:child_process";
+
+import type { ProviderRuntimeSettings } from "../provider-launch-config.js";
+
+type DiagnosticEntry = {
+  label: string;
+  value: string;
+};
+
+export function formatProviderDiagnostic(
+  providerName: string,
+  entries: DiagnosticEntry[],
+): string {
+  return [providerName, ...entries.map((entry) => `  ${entry.label}: ${entry.value}`)].join("\n");
+}
+
+export function formatProviderDiagnosticError(
+  providerName: string,
+  error: unknown,
+): string {
+  return formatProviderDiagnostic(providerName, [
+    {
+      label: "Error",
+      value: error instanceof Error ? error.message : String(error),
+    },
+  ]);
+}
+
+export function formatAvailabilityStatus(available: boolean): string {
+  return available ? "Available" : "Unavailable";
+}
+
+export function formatDiagnosticStatus(
+  available: boolean,
+  error?: { source: string; cause: unknown },
+): string {
+  if (error) {
+    return `Error (${error.source} failed: ${toDiagnosticErrorMessage(error.cause)})`;
+  }
+  return formatAvailabilityStatus(available);
+}
+
+export function toDiagnosticErrorMessage(error: unknown): string {
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  if (typeof error === "string" && error.trim().length > 0) {
+    return error;
+  }
+  return "Unknown error";
+}
+
+export function resolveBinaryVersion(binaryPath: string): string {
+  try {
+    return (
+      execFileSync(binaryPath, ["--version"], {
+        encoding: "utf8",
+        timeout: 5_000,
+      }).trim() || "unknown"
+    );
+  } catch {
+    return "unknown";
+  }
+}
+
+export function formatConfiguredCommand(
+  defaultArgv: readonly string[],
+  runtimeSettings?: ProviderRuntimeSettings,
+): string {
+  const command = runtimeSettings?.command;
+  if (!command || command.mode === "default") {
+    return `${defaultArgv.join(" ")} (default)`;
+  }
+
+  if (command.mode === "append") {
+    return [defaultArgv[0], ...(command.args ?? []), ...defaultArgv.slice(1)].join(" ");
+  }
+
+  return command.argv.join(" ");
+}
--- a/packages/server/src/server/agent/providers/opencode-agent.ts
+++ b/packages/server/src/server/agent/providers/opencode-agent.ts
@@ -43,6 +43,13 @@ import {
  quoteWindowsCommand,
 } from "../../../utils/executable.js";
 import { mapOpencodeToolCall } from "./opencode/tool-call-mapper.js";
+import {
+  formatDiagnosticStatus,
+  formatProviderDiagnostic,
+  formatProviderDiagnosticError,
+  resolveBinaryVersion,
+  toDiagnosticErrorMessage,
+} from "./diagnostic-utils.js";

 const OPENCODE_CAPABILITIES: AgentCapabilityFlags = {
  supportsStreaming: true,
@@ -615,6 +622,63 @@ export class OpenCodeAgentClient implements AgentClient {
    return true;
  }

+  async getDiagnostic(): Promise<{ diagnostic: string }> {
+    try {
+      const available = await this.isAvailable();
+      const resolvedBinary = findExecutable("opencode");
+      let serverStatus = "Not running";
+      let modelsValue = "Not checked";
+      let status = formatDiagnosticStatus(available);
+
+      try {
+        const { url } = await this.serverManager.ensureRunning();
+        serverStatus = `Running (${url})`;
+      } catch (error) {
+        serverStatus = `Unavailable (${normalizeTurnFailureError(error)})`;
+      }
+
+      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,
+          });
+        }
+
+        if (!modelsValue.startsWith("Error -")) {
+          try {
+            await this.listModes();
+          } catch (error) {
+            status = formatDiagnosticStatus(available, {
+              source: "mode fetch",
+              cause: error,
+            });
+          }
+        }
+      }
+
+      return {
+        diagnostic: formatProviderDiagnostic("OpenCode", [
+          {
+            label: "Binary",
+            value: resolvedBinary ?? "not found",
+          },
+          { label: "Version", value: resolvedBinary ? resolveBinaryVersion(resolvedBinary) : "unknown" },
+          { label: "Server", value: serverStatus },
+          { label: "Models", value: modelsValue },
+          { label: "Status", value: status },
+        ]),
+      };
+    } catch (error) {
+      return {
+        diagnostic: formatProviderDiagnosticError("OpenCode", error),
+      };
+    }
+  }
  private assertConfig(config: AgentSessionConfig): OpenCodeAgentConfig {
    if (config.provider !== "opencode") {
      throw new Error(`OpenCodeAgentClient received config for provider '${config.provider}'`);
--- a/packages/server/src/server/agent/providers/pi-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/pi-acp-agent.ts
@@ -29,12 +29,19 @@ import type {
  AgentFeatureSelect,
 } from "../agent-sdk-types.js";
 import type { ProviderRuntimeSettings } from "../provider-launch-config.js";
-import { isCommandAvailable } from "../../../utils/executable.js";
+import { findExecutable, isCommandAvailable } from "../../../utils/executable.js";
 import {
  ACPAgentClient,
  type ACPToolSnapshot,
  type SessionStateResponse,
 } from "./acp-agent.js";
+import {
+  formatDiagnosticStatus,
+  formatProviderDiagnostic,
+  formatProviderDiagnosticError,
+  resolveBinaryVersion,
+  toDiagnosticErrorMessage,
+} from "./diagnostic-utils.js";

 const require = createRequire(import.meta.url);
 const resolvedPiAcpPath = require.resolve("pi-acp");
@@ -329,4 +336,85 @@ export class PiACPAgentClient extends ACPAgentClient {
      existsSync(join(homedir(), ".pi", "agent", "auth.json"))
    );
  }
+
+  async getDiagnostic(): Promise<{ diagnostic: string }> {
+    try {
+      const piCommand = process.env.PI_ACP_PI_COMMAND ?? "pi";
+      const piCliPath = findExecutable(piCommand);
+      const piVersion = piCliPath ? resolveBinaryVersion(piCliPath) : "unknown";
+      const authConfigPath = join(homedir(), ".pi", "agent", "auth.json");
+      const available = await this.isAvailable();
+      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,
+          });
+        }
+
+        if (!modelsValue.startsWith("Error -")) {
+          try {
+            await this.listModes();
+          } catch (error) {
+            status = formatDiagnosticStatus(available, {
+              source: "mode fetch",
+              cause: error,
+            });
+          }
+        }
+      }
+
+      return {
+        diagnostic: formatProviderDiagnostic("Pi", [
+          {
+            label: "pi-acp module",
+            value: existsSync(resolvedPiAcpPath) ? "found" : "not found",
+          },
+          {
+            label: "Binary",
+            value: piCliPath ?? "not found",
+          },
+          {
+            label: "Version",
+            value: piVersion,
+          },
+          {
+            label: "OPENAI_API_KEY",
+            value: process.env.OPENAI_API_KEY ? "set" : "not set",
+          },
+          {
+            label: "ANTHROPIC_API_KEY",
+            value: process.env.ANTHROPIC_API_KEY ? "set" : "not set",
+          },
+          {
+            label: "OPENROUTER_API_KEY",
+            value: process.env.OPENROUTER_API_KEY ? "set" : "not set",
+          },
+          {
+            label: "Auth config (~/.pi/agent/auth.json)",
+            value: existsSync(authConfigPath) ? "found" : "not found",
+          },
+          {
+            label: "Models",
+            value: modelsValue,
+          },
+          {
+            label: "Status",
+            value: status,
+          },
+        ]),
+      };
+    } catch (error) {
+      return {
+        diagnostic: formatProviderDiagnosticError("Pi", error),
+      };
+    }
+  }
 }
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -590,6 +590,7 @@ export async function createPaseoDaemon(
          command: voiceMcpBridgeCommand.command,
          baseArgs: [...voiceMcpBridgeCommand.baseArgs],
          env: {
+            ELECTRON_RUN_AS_NODE: "1",
            PASEO_HOME: config.paseoHome,
          },
        },
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -68,6 +68,7 @@ export type AgentMcpTransportFactory = () => Promise<Transport>;
 import { buildProviderRegistry } from "./agent/provider-registry.js";
 import type { AgentProviderRuntimeSettingsMap } from "./agent/provider-launch-config.js";
 import { AgentManager } from "./agent/agent-manager.js";
+import { ProviderSnapshotManager } from "./agent/provider-snapshot-manager.js";
 import type {
  AgentTimelineCursor,
  AgentTimelineFetchDirection,
@@ -101,6 +102,7 @@ import type {
  AgentStreamEvent,
  AgentProvider,
  AgentPersistenceHandle,
+  ProviderSnapshotEntry,
 } from "./agent/agent-sdk-types.js";
 import { AgentStorage, type StoredAgentRecord } from "./agent/agent-storage.js";
 import { isValidAgentProvider, AGENT_PROVIDER_IDS } from "./agent/provider-manifest.js";
@@ -398,6 +400,7 @@ export type SessionOptions = {
  stt: Resolvable<SpeechToTextProvider | null>;
  tts: Resolvable<TextToSpeechProvider | null>;
  terminalManager: TerminalManager | null;
+  providerSnapshotManager?: ProviderSnapshotManager;
  voice?: {
    voiceAgentMcpStdio?: VoiceMcpStdioConfig | null;
    turnDetection?: Resolvable<TurnDetectionProvider | null>;
@@ -594,6 +597,8 @@ export class Session {
  } | null = null;
  private readonly MOBILE_BACKGROUND_STREAM_GRACE_MS = 60_000;
  private readonly terminalManager: TerminalManager | null;
+  private readonly providerSnapshotManager: ProviderSnapshotManager | null;
+  private unsubscribeProviderSnapshotEvents: (() => void) | null = null;
  private readonly subscribedTerminalDirectories = new Set<string>();
  private unsubscribeTerminalsChanged: (() => void) | null = null;
  private terminalExitSubscriptions: Map<string, () => void> = new Map();
@@ -646,6 +651,7 @@ export class Session {
      stt,
      tts,
      terminalManager,
+      providerSnapshotManager,
      voice,
      voiceBridge,
      dictation,
@@ -671,11 +677,32 @@ export class Session {
    this.checkoutDiffManager = checkoutDiffManager;
    this.createAgentMcpTransport = createAgentMcpTransport;
    this.terminalManager = terminalManager;
+    this.providerSnapshotManager = providerSnapshotManager ?? null;
    if (this.terminalManager) {
      this.unsubscribeTerminalsChanged = this.terminalManager.subscribeTerminalsChanged((event) =>
        this.handleTerminalsChanged(event),
      );
    }
+    if (this.providerSnapshotManager) {
+      const handleProviderSnapshotChange = (entries: ProviderSnapshotEntry[], cwd?: string) => {
+        // COMPAT(providersSnapshot): keep provider visibility gating for older clients.
+        const visibleEntries = entries.filter((entry) =>
+          this.isProviderVisibleToClient(entry.provider),
+        );
+        this.emit({
+          type: "providers_snapshot_update",
+          payload: {
+            cwd,
+            entries: visibleEntries,
+            generatedAt: new Date().toISOString(),
+          },
+        });
+      };
+      this.providerSnapshotManager.on("change", handleProviderSnapshotChange);
+      this.unsubscribeProviderSnapshotEvents = () => {
+        this.providerSnapshotManager?.off("change", handleProviderSnapshotChange);
+      };
+    }
    this.voiceAgentMcpStdio = voice?.voiceAgentMcpStdio ?? null;
    this.resolveVoiceTurnDetection = toResolver(voice?.turnDetection ?? null);
    this.registerVoiceSpeakHandler = voiceBridge?.registerVoiceSpeakHandler;
@@ -1751,6 +1778,18 @@ export class Session {
          await this.handleListAvailableProvidersRequest(msg);
          break;

+        case "get_providers_snapshot_request":
+          await this.handleGetProvidersSnapshotRequest(msg);
+          break;
+
+        case "refresh_providers_snapshot_request":
+          await this.handleRefreshProvidersSnapshotRequest(msg);
+          break;
+
+        case "provider_diagnostic_request":
+          await this.handleProviderDiagnosticRequest(msg);
+          break;
+
        case "clear_agent_attention":
          await this.handleClearAgentAttention(msg.agentId);
          break;
@@ -3250,6 +3289,73 @@ export class Session {
    }
  }

+  private async handleGetProvidersSnapshotRequest(
+    msg: Extract<SessionInboundMessage, { type: "get_providers_snapshot_request" }>,
+  ): Promise<void> {
+    // COMPAT(providersSnapshot): keep legacy provider-list RPCs alongside snapshot flow.
+    const entries = this.providerSnapshotManager
+      ? this.providerSnapshotManager
+          .getSnapshot(msg.cwd ? expandTilde(msg.cwd) : undefined)
+          .filter((entry) => this.isProviderVisibleToClient(entry.provider))
+      : [];
+
+    this.emit({
+      type: "get_providers_snapshot_response",
+      payload: {
+        entries,
+        generatedAt: new Date().toISOString(),
+        requestId: msg.requestId,
+      },
+    });
+  }
+
+  private async handleRefreshProvidersSnapshotRequest(
+    msg: Extract<SessionInboundMessage, { type: "refresh_providers_snapshot_request" }>,
+  ): Promise<void> {
+    this.providerSnapshotManager?.refresh(msg.cwd ? expandTilde(msg.cwd) : undefined);
+    this.emit({
+      type: "refresh_providers_snapshot_response",
+      payload: {
+        acknowledged: true,
+        requestId: msg.requestId,
+      },
+    });
+  }
+
+  private async handleProviderDiagnosticRequest(
+    msg: Extract<SessionInboundMessage, { type: "provider_diagnostic_request" }>,
+  ): Promise<void> {
+    try {
+      const client = this.providerRegistry[msg.provider].createClient(this.sessionLogger);
+      const diagnostic = client.getDiagnostic
+        ? (await client.getDiagnostic()).diagnostic
+        : "No diagnostic available for this provider.";
+      this.emit({
+        type: "provider_diagnostic_response",
+        payload: {
+          provider: msg.provider,
+          diagnostic,
+          requestId: msg.requestId,
+        },
+      });
+    } catch (error) {
+      const err = error instanceof Error ? error : new Error(String(error));
+      this.sessionLogger.error(
+        { err, provider: msg.provider },
+        `Failed to get provider diagnostic for ${msg.provider}`,
+      );
+      this.emit({
+        type: "rpc_error",
+        payload: {
+          requestId: msg.requestId,
+          requestType: msg.type,
+          error: `Failed to get provider diagnostic: ${err.message}`,
+          code: "provider_diagnostic_failed",
+        },
+      });
+    }
+  }
+
  private assertSafeGitRef(ref: string, label: string): void {
    if (!/^[A-Za-z0-9._/-]+$/.test(ref)) {
      throw new Error(`Invalid ${label}: ${ref}`);
@@ -7014,6 +7120,10 @@ export class Session {
      this.unsubscribeAgentEvents();
      this.unsubscribeAgentEvents = null;
    }
+    if (this.unsubscribeProviderSnapshotEvents) {
+      this.unsubscribeProviderSnapshotEvents();
+      this.unsubscribeProviderSnapshotEvents = null;
+    }

    // Abort any ongoing operations
    this.abortController.abort();
--- a/packages/server/src/server/session.voice-mcp-config.test.ts
+++ b/packages/server/src/server/session.voice-mcp-config.test.ts
@@ -13,6 +13,7 @@ describe("voice MCP stdio config", () => {
      baseArgs: ["/tmp/mcp-stdio-socket-bridge-cli.mjs"],
      socketPath: "/tmp/paseo-voice.sock",
      env: {
+        ELECTRON_RUN_AS_NODE: "1",
        PASEO_HOME: "/tmp/paseo-home",
      },
    });
@@ -25,6 +26,7 @@ describe("voice MCP stdio config", () => {
      "/tmp/paseo-voice.sock",
    ]);
    expect(config.env).toEqual({
+      ELECTRON_RUN_AS_NODE: "1",
      PASEO_HOME: "/tmp/paseo-home",
    });
  });
--- a/packages/server/src/server/speech/providers/local/sherpa/sherpa-parakeet-stt.test.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/sherpa-parakeet-stt.test.ts
@@ -0,0 +1,86 @@
+import { describe, expect, it } from "vitest";
+import pino from "pino";
+
+import { SherpaOnnxParakeetSTT } from "./sherpa-parakeet-stt.js";
+import type { TranscriptionResult } from "../../../speech-provider.js";
+
+function createDeferred<T>() {
+  let resolve!: (value: T | PromiseLike<T>) => void;
+  let reject!: (reason?: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
+class TestSherpaOnnxParakeetStt extends SherpaOnnxParakeetSTT {
+  public readonly calls: Array<{ audio: Buffer; format: string }> = [];
+  public readonly pending: Array<ReturnType<typeof createDeferred<TranscriptionResult>>> = [];
+
+  constructor() {
+    super({ engine: { sampleRate: 16000 } as any }, pino({ level: "silent" }));
+  }
+
+  override async transcribeAudio(audioBuffer: Buffer, format: string): Promise<TranscriptionResult> {
+    this.calls.push({ audio: Buffer.from(audioBuffer), format });
+    const deferred = createDeferred<TranscriptionResult>();
+    this.pending.push(deferred);
+    return deferred.promise;
+  }
+}
+
+describe("SherpaOnnxParakeetSTT session", () => {
+  it("snapshots segment ids and buffers before async transcription starts", async () => {
+    const provider = new TestSherpaOnnxParakeetStt();
+    const session = provider.createSession({
+      logger: pino({ level: "silent" }),
+      language: "en",
+    });
+
+    const committed: Array<{ segmentId: string; previousSegmentId: string | null }> = [];
+    const transcripts: Array<{ segmentId: string; transcript: string; isFinal: boolean }> = [];
+
+    session.on("committed", (payload) => {
+      committed.push(payload);
+    });
+    session.on("transcript", (payload) => {
+      transcripts.push(payload);
+    });
+
+    await session.connect();
+
+    session.appendPcm16(Buffer.from([1, 2, 3, 4]));
+    session.commit();
+    session.appendPcm16(Buffer.from([5, 6, 7, 8]));
+    session.commit();
+
+    expect(committed).toHaveLength(2);
+    expect(committed[1]?.segmentId).not.toBe(committed[0]?.segmentId);
+    expect(committed[0]?.previousSegmentId).toBeNull();
+    expect(committed[1]?.previousSegmentId).toBe(committed[0]?.segmentId);
+
+    expect(provider.calls).toEqual([
+      { audio: Buffer.from([1, 2, 3, 4]), format: "audio/pcm;rate=16000" },
+      { audio: Buffer.from([5, 6, 7, 8]), format: "audio/pcm;rate=16000" },
+    ]);
+
+    provider.pending[0]?.resolve({ text: "first", duration: 1 });
+    provider.pending[1]?.resolve({ text: "second", duration: 1 });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(transcripts).toHaveLength(2);
+    expect(transcripts).toEqual([
+      expect.objectContaining({
+        segmentId: committed[0]!.segmentId,
+        transcript: "first",
+        isFinal: true,
+      }),
+      expect.objectContaining({
+        segmentId: committed[1]!.segmentId,
+        transcript: "second",
+        isFinal: true,
+      }),
+    ]);
+  });
+});
--- a/packages/server/src/server/speech/providers/local/sherpa/sherpa-parakeet-stt.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/sherpa-parakeet-stt.ts
@@ -66,11 +66,18 @@ export class SherpaOnnxParakeetSTT implements SpeechToTextProvider {

        const committedId = segmentId;
        const prev = previousSegmentId;
+        const committedPcm16 = pcm16;
+        previousSegmentId = committedId;
+        segmentId = uuidv4();
+        pcm16 = Buffer.alloc(0);
        (emitter as any).emit("committed", { segmentId: committedId, previousSegmentId: prev });

        void (async () => {
          try {
-            const rt = await this.transcribeAudio(pcm16, `audio/pcm;rate=${requiredSampleRate}`);
+            const rt = await this.transcribeAudio(
+              committedPcm16,
+              `audio/pcm;rate=${requiredSampleRate}`,
+            );
            (emitter as any).emit("transcript", {
              segmentId: committedId,
              transcript: rt.text,
@@ -83,10 +90,7 @@ export class SherpaOnnxParakeetSTT implements SpeechToTextProvider {
          } catch (err) {
            (emitter as any).emit("error", err);
          } finally {
-            previousSegmentId = committedId;
-            segmentId = uuidv4();
-            pcm16 = Buffer.alloc(0);
-            logger.debug({ bytes: pcm16.length }, "Parakeet session reset");
+            logger.debug({ bytes: committedPcm16.length }, "Parakeet session reset");
          }
        })();
      },
--- a/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.test.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it, vi, beforeEach } from "vitest";
+import pino from "pino";
+
+const generate = vi.fn();
+const free = vi.fn();
+
+vi.mock("node:fs", () => ({
+  existsSync: vi.fn(() => true),
+}));
+
+vi.mock("./sherpa-onnx-node-loader.js", () => ({
+  loadSherpaOnnxNode: () => ({
+    OfflineTts: class {
+      public readonly sampleRate = 24000;
+
+      constructor(_config: unknown) {}
+
+      generate = generate;
+      free = free;
+    },
+  }),
+}));
+
+describe("SherpaOnnxTTS", () => {
+  beforeEach(() => {
+    generate.mockReset();
+    free.mockReset();
+  });
+
+  it("disables external buffers when calling sherpa generate", async () => {
+    generate.mockReturnValue({
+      samples: Float32Array.from([0, 0.5, -0.5, 0.25]),
+      sampleRate: 24000,
+    });
+
+    const { SherpaOnnxTTS } = await import("./sherpa-tts.js");
+    const tts = new SherpaOnnxTTS(
+      {
+        preset: "kokoro-en-v0_19",
+        modelDir: "/tmp/fake-model",
+      },
+      pino({ level: "silent" }),
+    );
+
+    const result = await tts.synthesizeSpeech("hello");
+
+    expect(generate).toHaveBeenCalledWith({
+      text: "hello",
+      sid: 0,
+      speed: 1,
+      enableExternalBuffer: false,
+    });
+    expect(result.format).toBe("pcm;rate=24000");
+  });
+});
--- a/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.ts
+++ b/packages/server/src/server/speech/providers/local/sherpa/sherpa-tts.ts
@@ -94,13 +94,23 @@ export class SherpaOnnxTTS implements TextToSpeechProvider {
      throw new Error("Cannot synthesize empty text");
    }

-    const audio = this.tts.generate({ text: trimmed, sid: this.speakerId, speed: this.speed });
-    const samples: Float32Array | null =
+    const audio = this.tts.generate({
+      text: trimmed,
+      sid: this.speakerId,
+      speed: this.speed,
+      // Electron rejects native external-backed typed arrays. Request a copied buffer
+      // from sherpa itself instead of trying to clone after generate() returns.
+      enableExternalBuffer: false,
+    });
+    const rawSamples: Float32Array | null =
      audio && audio.samples instanceof Float32Array
        ? audio.samples
        : audio && Array.isArray(audio.samples)
          ? Float32Array.from(audio.samples as number[])
          : null;
+    // Copy to avoid "External buffers are not allowed" when sherpa-onnx
+    // returns a Float32Array backed by native memory.
+    const samples = rawSamples ? Float32Array.from(rawSamples) : null;
    const sampleRate: number =
      audio &&
      typeof audio.sampleRate === "number" &&
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -31,6 +31,8 @@ import { isHostAllowed } from "./allowed-hosts.js";
 import { Session, type SessionLifecycleIntent, type SessionRuntimeMetrics } from "./session.js";
 import type { AgentProvider } from "./agent/agent-sdk-types.js";
 import type { AgentProviderRuntimeSettingsMap } from "./agent/provider-launch-config.js";
+import { ProviderSnapshotManager } from "./agent/provider-snapshot-manager.js";
+import { buildProviderRegistry } from "./agent/provider-registry.js";
 import { PushTokenStore } from "./push/token-store.js";
 import { PushService } from "./push/push-service.js";
 import type { SpeechReadinessSnapshot, SpeechService } from "./speech/speech-runtime.js";
@@ -253,6 +255,7 @@ export class VoiceAssistantWebSocketServer {
  private readonly voiceSpeakHandlers = new Map<string, VoiceSpeakHandler>();
  private readonly voiceCallerContexts = new Map<string, VoiceCallerContext>();
  private readonly agentProviderRuntimeSettings: AgentProviderRuntimeSettingsMap | undefined;
+  private readonly providerSnapshotManager: ProviderSnapshotManager;
  private readonly onLifecycleIntent: ((intent: SessionLifecycleIntent) => void) | null;
  private serverCapabilities: ServerCapabilities | undefined;
  private runtimeWindowStartedAt = Date.now();
@@ -343,6 +346,13 @@ export class VoiceAssistantWebSocketServer {
    this.voice = voice ?? null;
    this.dictation = dictation ?? null;
    this.agentProviderRuntimeSettings = agentProviderRuntimeSettings;
+    const providerSnapshotLogger = this.logger.child({ module: "provider-snapshot-manager" });
+    this.providerSnapshotManager = new ProviderSnapshotManager(
+      buildProviderRegistry(providerSnapshotLogger, {
+        runtimeSettings: this.agentProviderRuntimeSettings,
+      }),
+      providerSnapshotLogger,
+    );
    this.onLifecycleIntent = onLifecycleIntent ?? null;
    this.serverCapabilities = buildServerCapabilities({
      readiness: this.speech?.getReadiness() ?? null,
@@ -496,6 +506,7 @@ export class VoiceAssistantWebSocketServer {
    }

    await Promise.all(cleanupPromises);
+    this.providerSnapshotManager.destroy();
    this.checkoutDiffManager.dispose();
    this.pendingConnections.clear();
    this.sessions.clear();
@@ -646,6 +657,7 @@ export class VoiceAssistantWebSocketServer {
      stt: () => this.speech?.resolveStt() ?? null,
      tts: () => this.speech?.resolveTts() ?? null,
      terminalManager: this.terminalManager,
+      providerSnapshotManager: this.providerSnapshotManager,
      voice: {
        ...(this.voice ?? {}),
        turnDetection: () => this.speech?.resolveTurnDetection() ?? null,
@@ -792,6 +804,10 @@ export class VoiceAssistantWebSocketServer {
      hostname: getHostname(),
      version: this.daemonVersion,
      ...(this.serverCapabilities ? { capabilities: this.serverCapabilities } : {}),
+      features: {
+        // COMPAT(providersSnapshot): keep optional until all clients rely on snapshot flow.
+        providersSnapshot: true,
+      },
    };
  }

--- a/packages/server/src/shared/messages.ts
+++ b/packages/server/src/shared/messages.ts
@@ -54,6 +54,8 @@ import type {
  AgentPermissionRequest,
  AgentPermissionResponse,
  AgentPersistenceHandle,
+  ProviderSnapshotEntry,
+  ProviderStatus,
  AgentRuntimeInfo,
  AgentTimelineItem,
  ToolCallDetail,
@@ -69,6 +71,13 @@ const AgentModeSchema: z.ZodType<AgentMode> = z.object({
  description: z.string().optional(),
 });

+const ProviderStatusSchema: z.ZodType<ProviderStatus> = z.enum([
+  "ready",
+  "loading",
+  "error",
+  "unavailable",
+]);
+
 const AgentSelectOptionSchema = z.object({
  id: z.string(),
  label: z.string(),
@@ -114,6 +123,15 @@ const AgentModelDefinitionSchema: z.ZodType<AgentModelDefinition> = z.object({
  defaultThinkingOptionId: z.string().optional(),
 });

+const ProviderSnapshotEntrySchema: z.ZodType<ProviderSnapshotEntry> = z.object({
+  provider: AgentProviderSchema,
+  status: ProviderStatusSchema,
+  error: z.string().optional(),
+  models: z.array(AgentModelDefinitionSchema).optional(),
+  modes: z.array(AgentModeSchema).optional(),
+  fetchedAt: z.string().optional(),
+});
+
 const AgentCapabilityFlagsSchema: z.ZodType<AgentCapabilityFlags> = z.object({
  supportsStreaming: z.boolean(),
  supportsSessionPersistence: z.boolean(),
@@ -772,6 +790,24 @@ export const ListAvailableProvidersRequestMessageSchema = z.object({
  requestId: z.string(),
 });

+export const GetProvidersSnapshotRequestMessageSchema = z.object({
+  type: z.literal("get_providers_snapshot_request"),
+  cwd: z.string().optional(),
+  requestId: z.string(),
+});
+
+export const RefreshProvidersSnapshotRequestMessageSchema = z.object({
+  type: z.literal("refresh_providers_snapshot_request"),
+  cwd: z.string().optional(),
+  requestId: z.string(),
+});
+
+export const ProviderDiagnosticRequestMessageSchema = z.object({
+  type: z.literal("provider_diagnostic_request"),
+  provider: AgentProviderSchema,
+  requestId: z.string(),
+});
+
 export const ResumeAgentRequestMessageSchema = z.object({
  type: z.literal("resume_agent_request"),
  handle: AgentPersistenceHandleSchema,
@@ -1275,6 +1311,9 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [
  ListProviderModesRequestMessageSchema,
  ListProviderFeaturesRequestMessageSchema,
  ListAvailableProvidersRequestMessageSchema,
+  GetProvidersSnapshotRequestMessageSchema,
+  RefreshProvidersSnapshotRequestMessageSchema,
+  ProviderDiagnosticRequestMessageSchema,
  ResumeAgentRequestMessageSchema,
  RefreshAgentRequestMessageSchema,
  CancelAgentRequestMessageSchema,
@@ -1500,6 +1539,12 @@ export const ServerInfoStatusPayloadSchema = z
    hostname: ServerInfoHostnameSchema.optional(),
    version: ServerInfoVersionSchema.optional(),
    capabilities: ServerCapabilitiesFromUnknownSchema,
+    // COMPAT(providersSnapshot): added in v0.1.48, remove gating when all clients use snapshot
+    features: z
+      .object({
+        providersSnapshot: z.boolean().optional(),
+      })
+      .optional(),
  })
  .passthrough()
  .transform((payload) => ({
@@ -2235,6 +2280,45 @@ export const ListAvailableProvidersResponseSchema = z.object({
  }),
 });

+// COMPAT(providersSnapshot): added in v0.1.48, remove gating when all clients use snapshot
+export const GetProvidersSnapshotResponseMessageSchema = z.object({
+  type: z.literal("get_providers_snapshot_response"),
+  payload: z.object({
+    entries: z.array(ProviderSnapshotEntrySchema),
+    generatedAt: z.string(),
+    requestId: z.string(),
+  }),
+});
+
+// COMPAT(providersSnapshot): added in v0.1.48, remove gating when all clients use snapshot
+export const ProvidersSnapshotUpdateMessageSchema = z.object({
+  type: z.literal("providers_snapshot_update"),
+  payload: z.object({
+    cwd: z.string().optional(),
+    entries: z.array(ProviderSnapshotEntrySchema),
+    generatedAt: z.string(),
+  }),
+});
+
+// COMPAT(providersSnapshot): added in v0.1.48, remove gating when all clients use snapshot
+export const RefreshProvidersSnapshotResponseMessageSchema = z.object({
+  type: z.literal("refresh_providers_snapshot_response"),
+  payload: z.object({
+    requestId: z.string(),
+    acknowledged: z.boolean(),
+  }),
+});
+
+// COMPAT(providersSnapshot): added in v0.1.48, remove gating when all clients use snapshot
+export const ProviderDiagnosticResponseMessageSchema = z.object({
+  type: z.literal("provider_diagnostic_response"),
+  payload: z.object({
+    provider: AgentProviderSchema,
+    diagnostic: z.string(),
+    requestId: z.string(),
+  }),
+});
+
 const AgentSlashCommandSchema = z.object({
  name: z.string(),
  description: z.string(),
@@ -2428,6 +2512,10 @@ export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [
  ListProviderModesResponseMessageSchema,
  ListProviderFeaturesResponseMessageSchema,
  ListAvailableProvidersResponseSchema,
+  GetProvidersSnapshotResponseMessageSchema,
+  ProvidersSnapshotUpdateMessageSchema,
+  RefreshProvidersSnapshotResponseMessageSchema,
+  ProviderDiagnosticResponseMessageSchema,
  ListCommandsResponseSchema,
  ListTerminalsResponseSchema,
  TerminalsChangedSchema,
@@ -2507,6 +2595,16 @@ export type ListProviderFeaturesResponseMessage = z.infer<
  typeof ListProviderFeaturesResponseMessageSchema
 >;
 export type ListAvailableProvidersResponse = z.infer<typeof ListAvailableProvidersResponseSchema>;
+export type GetProvidersSnapshotResponseMessage = z.infer<
+  typeof GetProvidersSnapshotResponseMessageSchema
+>;
+export type ProvidersSnapshotUpdateMessage = z.infer<typeof ProvidersSnapshotUpdateMessageSchema>;
+export type RefreshProvidersSnapshotResponseMessage = z.infer<
+  typeof RefreshProvidersSnapshotResponseMessageSchema
+>;
+export type ProviderDiagnosticResponseMessage = z.infer<
+  typeof ProviderDiagnosticResponseMessageSchema
+>;
 export type ChatCreateResponse = z.infer<typeof ChatCreateResponseSchema>;
 export type ChatListResponse = z.infer<typeof ChatListResponseSchema>;
 export type ChatInspectResponse = z.infer<typeof ChatInspectResponseSchema>;
@@ -2554,6 +2652,15 @@ export type ListProviderFeaturesRequestMessage = z.infer<
 export type ListAvailableProvidersRequestMessage = z.infer<
  typeof ListAvailableProvidersRequestMessageSchema
 >;
+export type GetProvidersSnapshotRequestMessage = z.infer<
+  typeof GetProvidersSnapshotRequestMessageSchema
+>;
+export type RefreshProvidersSnapshotRequestMessage = z.infer<
+  typeof RefreshProvidersSnapshotRequestMessageSchema
+>;
+export type ProviderDiagnosticRequestMessage = z.infer<
+  typeof ProviderDiagnosticRequestMessageSchema
+>;
 export type ChatCreateRequest = z.infer<typeof ChatCreateRequestSchema>;
 export type ChatListRequest = z.infer<typeof ChatListRequestSchema>;
 export type ChatInspectRequest = z.infer<typeof ChatInspectRequestSchema>;
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -6,7 +6,7 @@ import { open as openFile, stat as statFile } from "fs/promises";
 import { TTLCache } from "@isaacs/ttlcache";
 import type { ParsedDiffFile } from "../server/utils/diff-highlighter.js";
 import { parseAndHighlightDiff } from "../server/utils/diff-highlighter.js";
-import { findExecutable, resolveShellEnv } from "./executable.js";
+import { findExecutable } from "./executable.js";
 import { isPaseoOwnedWorktreeCwd } from "./worktree.js";
 import { requirePaseoWorktreeBaseRefName } from "./worktree-metadata.js";

@@ -1845,7 +1845,7 @@ export async function createPullRequest(

  await execAsync(`git push -u origin ${head}`, { cwd });

-  const ghEnv = { ...resolveShellEnv(), GIT_TERMINAL_PROMPT: "0" };
+  const ghEnv: NodeJS.ProcessEnv = { ...process.env, GIT_TERMINAL_PROMPT: "0" };
  const args = ["api", "-X", "POST", `repos/${repo}/pulls`, "-f", `title=${options.title}`];
  args.push("-f", `head=${head}`);
  args.push("-f", `base=${normalizedBase}`);
@@ -1912,7 +1912,7 @@ async function getPullRequestStatusUncached(cwd: string): Promise<PullRequestSta
        "--json",
        "url,title,state,baseRefName,headRefName,mergedAt",
      ],
-      { cwd, env: { ...resolveShellEnv(), GIT_TERMINAL_PROMPT: "0" } },
+      { cwd, env: { ...process.env, GIT_TERMINAL_PROMPT: "0" } },
    );
    const pr = JSON.parse(stdout.trim());
    if (!pr || typeof pr !== "object" || !pr.url || !pr.title) {
--- a/packages/server/src/utils/executable.test.ts
+++ b/packages/server/src/utils/executable.test.ts
@@ -11,10 +11,8 @@ type FindExecutableDependencies = NonNullable<Parameters<typeof findExecutable>[
 function createFindExecutableDependencies(): FindExecutableDependencies {
  return {
    execFileSync: vi.fn(),
-    execSync: vi.fn(),
    existsSync: vi.fn(),
    platform: vi.fn(() => "darwin"),
-    shell: undefined,
  };
 }

@@ -77,25 +75,25 @@ describe("findExecutable", () => {
    expect(findExecutable("codex", findExecutableDependencies)).toBe("C:\\nvm4w\\nodejs\\codex");
  });

-  test("uses the last line from login-shell which output", () => {
-    findExecutableDependencies.shell = "/bin/zsh";
-    findExecutableDependencies.execSync.mockReturnValue(
-      "echo from profile\n/usr/local/bin/codex\n",
+  test("on Unix, uses the last line from which output", () => {
+    findExecutableDependencies.execFileSync.mockReturnValue(
+      "/usr/local/bin/codex\n",
    );

    expect(findExecutable("codex", findExecutableDependencies)).toBe("/usr/local/bin/codex");
-    expect(findExecutableDependencies.execSync).toHaveBeenCalledOnce();
-    expect(findExecutableDependencies.execFileSync).not.toHaveBeenCalled();
+    expect(findExecutableDependencies.execFileSync).toHaveBeenCalledWith(
+      "which",
+      ["codex"],
+      { encoding: "utf8" },
+    );
  });

  test("warns and returns null when the final which line is not an absolute path", () => {
-    findExecutableDependencies.shell = "/bin/zsh";
-    findExecutableDependencies.execSync.mockReturnValue("profile noise\ncodex\n");
    findExecutableDependencies.execFileSync.mockReturnValue("codex\n");
    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});

    expect(findExecutable("codex", findExecutableDependencies)).toBeNull();
-    expect(warnSpy).toHaveBeenCalledTimes(2);
+    expect(warnSpy).toHaveBeenCalledOnce();

    warnSpy.mockRestore();
  });
--- a/packages/server/src/utils/executable.ts
+++ b/packages/server/src/utils/executable.ts
@@ -1,15 +1,11 @@
-import { execFileSync, execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { platform } from "node:os";
 import path from "node:path";
-import { shellEnvSync } from "shell-env";
-
 export interface FindExecutableDependencies {
-  execSync: typeof execSync;
  execFileSync: typeof execFileSync;
  existsSync: typeof existsSync;
  platform: typeof platform;
-  shell: string | undefined;
 }

 function resolveWindowsPathEntries(deps: FindExecutableDependencies): string[] {
@@ -42,7 +38,7 @@ function resolveWindowsPathEntries(deps: FindExecutableDependencies): string[] {
 function resolveExecutableFromWhichOutput(
  name: string,
  output: string,
-  source: "login-shell" | "which",
+  source: "which",
 ): string | null {
  const lines = output
    .split(/\r?\n/)
@@ -65,10 +61,8 @@ function resolveExecutableFromWhichOutput(
 }

 /**
- * On Unix we first try `$SHELL -lic "which <name>"` so that rc-file PATH
- * additions (asdf, nvm, homebrew, nix, etc.) are visible — exactly as if the
- * user opened a terminal and typed the command.  If that fails (e.g. the login
- * shell itself errors) we fall back to a plain `which`.
+ * On Unix we use plain `which` — the daemon's process.env.PATH is enriched
+ * with the login shell environment at Electron desktop startup.
 *
 * On Windows we augment the daemon PATH with machine/user registry PATH values
 * and return the first `where.exe` match. Launch-time execution decides whether
@@ -85,11 +79,9 @@ export function findExecutable(
  }

  const deps: FindExecutableDependencies = {
-    execSync,
    execFileSync,
    existsSync,
    platform,
-    shell: process.env["SHELL"],
    ...dependencies,
  };

@@ -125,25 +117,6 @@ export function findExecutable(
    }
  }

-  // Unix: try the user's login shell so rc-file PATH entries are visible.
-  const shell = deps.shell;
-  if (shell) {
-    try {
-      const out = deps
-        .execSync(`${shell} -lic "which ${trimmed}"`, {
-          encoding: "utf8",
-          timeout: 5000,
-        })
-        .trim();
-      const resolved = resolveExecutableFromWhichOutput(trimmed, out, "login-shell");
-      if (resolved) {
-        return resolved;
-      }
-    } catch {
-      // Login shell failed (broken rc, etc.) — fall through to plain which.
-    }
-  }
-
  try {
    return resolveExecutableFromWhichOutput(
      trimmed,
@@ -184,14 +157,3 @@ export function quoteWindowsArgument(argument: string): string {
  return `"${argument}"`;
 }

-let cachedShellEnv: Record<string, string> | null = null;
-
-export function resolveShellEnv(): Record<string, string> {
-  if (cachedShellEnv) return cachedShellEnv;
-  try {
-    cachedShellEnv = shellEnvSync();
-  } catch {
-    cachedShellEnv = { ...process.env } as Record<string, string>;
-  }
-  return cachedShellEnv;
-}
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/website",
-  "version": "0.1.46",
+  "version": "0.1.48",
  "private": true,
  "type": "module",
  "scripts": {
Author	SHA1	Message	Date
Mohamed Boudra	c4cccf5bd2	chore(release): cut 0.1.48	2026-04-05 15:40:54 +07:00
Mohamed Boudra	0130a637c8	docs: add 0.1.48 changelog	2026-04-05 15:39:55 +07:00
Mohamed Boudra	8c2ea33da8	fix(app): restore input focus for running agents and align mobile model selector - Add onDropdownClose callback to AgentStatusBar and wire through ControlledStatusBar to CombinedModelSelector so running agents focus input after any dropdown closes - Fix mobile misalignment in model selector by adding marginHorizontal: spacing[1] to sectionHeading, drillDownRow, backButton, and providerSearchContainer to match ComboboxItem's mobile margins	2026-04-05 15:38:22 +07:00
Mohamed Boudra	0d88ce2270	feat(app): provider system overhaul with model selector, diagnostics, and UX polish - Add CombinedModelSelector with two-level drill-down (providers → models), favorites section, search, and single-provider auto-drill mode - Add provider snapshot system (ProviderSnapshotManager) for cached provider/model state - Add provider diagnostics with resolved binary paths and versions across all providers - Add StatusBadge shared component for consistent status visual language - Add ProviderDiagnosticSheet for detailed provider health inspection - Add desktop auto-focus on input after any status bar interaction (model, mode, thinking, features) using focusWithRetries - Fix Combobox flicker on height change by switching to bottom-based CSS positioning once initial floating-ui position resolves - Add dynamic dropdown height: Level 1 fits content, Level 2 calculates from model count - Remove "Other providers" section from model selector (only show available providers)	2026-04-05 15:32:13 +07:00
Mohamed Boudra	6907f6e71d	fix(desktop): resolve login shell environment at Electron startup On macOS, apps launched from Finder/Dock inherit a minimal environment (PATH is just /usr/bin:/bin:/usr/sbin:/sbin). This caused two problems: 1. Agent binaries like codex were not detected (findExecutable failed) 2. Terminals spawned by Paseo had no access to user-installed tools (node, bun, direnv — all "command not found") Fix: at Electron startup, spawn the user's login shell and capture its full environment via JSON.stringify(process.env) using UUID markers. This is the same battle-tested approach VS Code uses. The resolved environment is merged into process.env before the daemon starts, so all child processes — agents, terminals, git operations — inherit the correct environment automatically. This replaces the previous approach of invoking resolveShellEnv() (via the shell-env npm package) at multiple scattered call sites. Now there is a single source of truth: process.env is enriched once at startup. Changes: - New: packages/desktop/src/login-shell-env.ts (VS Code approach) - Removed: resolveShellEnv(), shell-env dependency, $SHELL -lic probes - Simplified: applyProviderEnv() and findExecutable() now trust process.env	2026-04-05 15:11:18 +07:00
Mohamed Boudra	84638ecd9c	feat(app): submit question card answer on Enter key press	2026-04-05 14:54:03 +07:00
Mohamed Boudra	809e5fbbdc	feat(app): Enter key confirms and sends dictation When dictating and focused on an agent, pressing Enter now confirms the dictation and sends the message, matching the behavior of clicking the submit button.	2026-04-05 14:53:10 +07:00
Mohamed Boudra	a264058a30	Remove noisy agent toasts and debug logging Remove the "Refreshing" and "Failed to refresh agent" toasts from the agent panel — they fire frequently but are meaningless since sync recovers transparently. The "Reconnecting..." toast for host disconnect is preserved. Strip debug console.log calls across the app: render tracking in message/stream views, dependency change tracking in workspace screen, terminal tab slot logging, and verbose audio engine/voice runtime bridge stats logging. Legitimate console.error/warn in catch blocks are kept.	2026-04-05 11:10:49 +07:00
Mohamed Boudra	702e2e7db9	Handle Codex request_user_input app-server questions Fixes #195	2026-04-05 09:21:45 +07:00
Mohamed Boudra	c32bc847bf	feat(app): restore reload action for agent tabs	2026-04-05 09:21:45 +07:00
github-actions[bot]	7a2d976081	fix: update lockfile signatures and Nix hash	2026-04-04 17:59:55 +00:00
Mohamed Boudra	2d9ca6983a	chore(release): cut 0.1.47	2026-04-05 00:58:22 +07:00
Mohamed Boudra	e44e495481	Update CHANGELOG.md for 0.1.47 stable release	2026-04-05 00:57:03 +07:00
Mohamed Boudra	bedf792616	fix(voice): harden Electron speak TTS path	2026-04-05 00:53:50 +07:00
Mohamed Boudra	5db9942125	fix(desktop): restore daemon QR pairing output	2026-04-05 00:53:46 +07:00
Mohamed Boudra	a889dbcc28	Merge branch 'main' of github.com:getpaseo/paseo	2026-04-05 00:14:41 +07:00
Mohamed Boudra	5c1e869bc5	fix: copy sherpa TTS samples to avoid external buffer crash Same fix as the Silero VAD — sherpa-onnx returns Float32Arrays backed by native memory which Node.js rejects as "External buffers are not allowed". Copy into JS-managed memory before passing to audio pipeline.	2026-04-04 23:45:28 +07:00
Mohamed Boudra	a693ff560c	fix: remove per-host "Add connection" button that blocked multi-host setups Users connecting multiple daemons (e.g. local + remote via Tailscale) hit a "belongs to X, not Y" error because the edit-host modal's Add Connection button scoped new connections to the current host's server ID. Remove that button and its supporting state so all connections go through the top-level flow which has no server ID constraint.	2026-04-04 23:45:03 +07:00
github-actions[bot]	89baf7ff38	fix: update lockfile signatures and Nix hash	2026-04-04 16:00:01 +00:00