fix: always use V2 lazy diff RPCs in new clients

Back-compat is old clients talking to new daemons, not the other way around. New clients should always use the V2 lazy diff path — there's no need to fall back to V1 based on a feature flag. - Remove useLazyDiff feature gate from git-diff-pane - Always use useCheckoutDiffMetadataQuery (V2) - Remove useCheckoutDiffQuery (V1) usage from the component - Remove supportsLazyDiffRpcs utility (no longer needed client-side) - Server still advertises the flag and serves V1 for old clients
feat: lazy-load diff RPCs for mobile performance
2026-10-27 11:42:52 +00:00 · 2026-04-14 09:36:38 +07:00 · 2026-04-14 08:59:36 +07:00
171 changed files with 4935 additions and 8241 deletions
@@ -99,22 +99,7 @@ jobs:

      - name: Run Windows-critical server tests
        working-directory: packages/server
-        run: >
-          npx vitest run
-          src/utils/executable.test.ts
-          src/utils/spawn.launch-regression.test.ts
-          src/utils/spawn.test.ts
-          src/utils/run-git-command.test.ts
-          src/utils/checkout-git-rev-parse.test.ts
-          src/server/agent/provider-registry.test.ts
-          src/server/agent/provider-launch-config.test.ts
-          src/server/agent/provider-snapshot-manager.test.ts
-          src/server/agent/providers/claude-agent.spawn.test.ts
-          src/server/agent/providers/provider-windows-launch.test.ts
-          src/server/agent/providers/provider-availability.test.ts
-          src/server/workspace-registry-model.test.ts
-          src/server/persisted-config.test.ts
-          src/server/bootstrap-provider-availability.test.ts
+        run: npx vitest run src/utils/executable.test.ts src/utils/spawn.test.ts src/utils/run-git-command.test.ts src/server/agent/provider-registry.test.ts src/server/agent/provider-launch-config.test.ts src/server/agent/provider-snapshot-manager.test.ts src/server/persisted-config.test.ts

  app-tests:
    runs-on: ubuntu-latest
@@ -1,67 +1,5 @@
 # Changelog

-## 0.1.59 - 2026-04-16
-
-### Added
- Opus 4.7 in the Claude model picker, with a 1M-context variant.
- Extra High reasoning effort for Opus 4.7, between High and Max.
-
-## 0.1.58 - 2026-04-16
-
-### Added
- Markdown files render as formatted markdown in the file pane. ([#427](https://github.com/getpaseo/paseo/pull/427) by [@aaronflorey](https://github.com/aaronflorey))
- Cmd+L (Ctrl+L on Windows/Linux) focuses the agent message input.
- Provider models refresh on a freshness TTL; Settings shows last-updated time and any fetch errors. ([#426](https://github.com/getpaseo/paseo/pull/426))
- `disallowedTools` option in provider config to block specific tools from an agent.
-
-### Improved
- Windows: agents launch reliably from npm `.cmd` shims, paths with spaces, and JSON config args — fixes `spawn EINVAL` startup errors. ([#454](https://github.com/getpaseo/paseo/pull/454))
- OpenCode permission prompts include the requesting tool's context. ([#398](https://github.com/getpaseo/paseo/pull/398) by [@aaronflorey](https://github.com/aaronflorey))
- OpenCode todo and compaction events render in the timeline. ([#429](https://github.com/getpaseo/paseo/pull/429) by [@aaronflorey](https://github.com/aaronflorey))
- OpenCode sessions archive cleanly when closed. ([#408](https://github.com/getpaseo/paseo/pull/408) by [@aaronflorey](https://github.com/aaronflorey))
- OpenCode slash commands recover from SSE timeouts. ([#407](https://github.com/getpaseo/paseo/pull/407) by [@aaronflorey](https://github.com/aaronflorey))
- Paseo MCP tools work against archived agents, matching the CLI. ([#423](https://github.com/getpaseo/paseo/pull/423))
- Native scrollbars match the active theme across all web views. ([#399](https://github.com/getpaseo/paseo/pull/399) by [@ethersh](https://github.com/ethersh))
-
-### Fixed
- Code file previews can be selected and copied on iOS. ([#447](https://github.com/getpaseo/paseo/pull/447) by [@muzhi1991](https://github.com/muzhi1991))
- File preview no longer shows stale content when reopening the same file. ([#411](https://github.com/getpaseo/paseo/pull/411) by [@muzhi1991](https://github.com/muzhi1991))
- File explorer reinitialises when the client reconnects after a page refresh. ([#442](https://github.com/getpaseo/paseo/pull/442) by [@1996fanrui](https://github.com/1996fanrui))
- Generic ACP providers no longer receive duplicated command arguments. ([#444](https://github.com/getpaseo/paseo/pull/444) by [@edvardchen](https://github.com/edvardchen))
- Workspace headers no longer show a branch icon for non-git workspaces.
- Branch switcher layout is stable on mobile.
- Model names no longer truncate mid-word in the picker rows.
- Messages appear in the correct order after reconnecting on mobile.
- Clearing agent attention no longer throws on timeout.
-
-## 0.1.56 - 2026-04-14
-
-### Fixed
- Projects with empty git repositories (no commits yet) no longer crash the app on startup.
- A single problematic project can no longer prevent the rest of your workspaces from loading.
-
-## 0.1.55 - 2026-04-14
-
-### Added
- Provider profiles — define custom providers in your Paseo config that appear alongside built-ins. Override a built-in's binary, env, or models, or create entirely new providers. See the [configuration guide](https://github.com/getpaseo/paseo/blob/main/docs/CUSTOM-PROVIDERS.md).
- ACP agent support — add any ACP-compatible agent to Paseo with `extends: "acp"` in your provider config. No code changes needed.
- Choose provider and model when creating scheduled agents.
- Max reasoning effort option for Opus 4.6 models.
- Cmd+, (Ctrl+, on Windows/Linux) opens settings.
-
-### Improved
- Git operations are dramatically faster — workspace status, PR checks, and branch data all use a shared cached snapshot service instead of shelling out to git on every request. Running 20+ workspaces simultaneously is now smooth.
- Windows support — the daemon and CLI run natively on Windows with proper shell quoting, executable resolution, and path handling.
- iPad and tablet layouts work correctly across all screen sizes.
- IME composition (Chinese, Japanese, Korean input) no longer submits prematurely when pressing Enter.
-
-### Fixed
- Creating a worktree no longer briefly flashes it as a standalone project before placing it under the correct repository.
- Worktree creation spinner stays visible throughout the process instead of disappearing on mouse-out.
- Workspace navigation updates correctly when switching between workspaces in the same project.
- Desktop workspace header alignment and model selector no longer overflow on narrow windows.
- Loading indicators are visible in light mode.
-
 ## 0.1.54 - 2026-04-12

 ### Added
@@ -0,0 +1,19 @@
+# CI Test Status
+
+Tracking progress toward all-green CI.
+
+## CI Jobs
+
+| Job | Status | Notes |
+|-----|--------|-------|
+| format | unknown | `npx biome format .` |
+| typecheck | unknown | `npm run typecheck` |
+| server-tests | unknown | unit + integration (vitest) |
+| app-tests | unknown | unit tests (vitest) |
+| playwright | unknown | E2E tests (playwright) |
+| relay-tests | unknown | unit tests (vitest) |
+| cli-tests | unknown | local tests |
+
+## Log
+
+- 2026-04-10: Branch created, automated agents begin iterating
@@ -24,7 +24,6 @@ This is an npm workspace monorepo:
 | [docs/TESTING.md](docs/TESTING.md) | TDD workflow, determinism, real dependencies over mocks, test organization |
 | [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md) | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP |
 | [docs/RELEASE.md](docs/RELEASE.md) | Release playbook, draft releases, completion checklist |
-| [docs/CUSTOM-PROVIDERS.md](docs/CUSTOM-PROVIDERS.md) | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries |
 | [docs/ANDROID.md](docs/ANDROID.md) | App variants, local/cloud builds, EAS workflows |
 | [docs/DESIGN.md](docs/DESIGN.md) | How to design features before implementation |
 | [SECURITY.md](SECURITY.md) | Relay threat model, E2E encryption, DNS rebinding, agent auth |
@@ -47,12 +46,6 @@ See [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md) for full setup, build sync requir
 - **NEVER restart the main Paseo daemon on port 6767 without permission** — it manages all running agents. If you're an agent, restarting it kills your own process.
 - **NEVER assume a timeout means the service needs restarting** — timeouts can be transient.
 - **NEVER add auth checks to tests** — agent providers handle their own auth.
- **NEVER run the full test suite locally.** The test suites are heavy and will freeze the machine, especially if multiple agents run them in parallel. Rules:
-  - Run only the specific test file you changed: `npx vitest run <file> --bail=1`
-  - Never run `npm run test` for an entire workspace unless explicitly asked.
-  - If you must run a broad suite, pipe output to a file and read it afterward: `npx vitest run <file> --bail=1 > /tmp/test-output.txt 2>&1` then read the file.
-  - Never re-run a test suite that another agent already ran and reported green — trust the result.
-  - For full suite verification, push to CI and check GitHub Actions instead.
 - **Always run typecheck after every change.**
 - **Run `npm run format` before committing.** This repo uses Biome for formatting. Do not manually fix formatting — let the formatter handle it.
 - **NEVER make breaking changes to WebSocket or message schemas.** The primary compatibility path is old mobile app clients talking to newly updated daemons. Users update desktop and daemon first, then keep running the old app for a while. Every schema change MUST be backward-compatible for old clients against new daemons:
@@ -55,7 +55,7 @@ Host header validation and CORS origin checks are defense-in-depth controls for

 CORS is not a complete security boundary. It controls which browser origins can make requests, but does not prevent a malicious website from resolving its domain to your local machine (DNS rebinding).

-Paseo validates the `Host` header on incoming requests against configured hostnames. Requests with unrecognized hosts are rejected.
+Paseo uses a host allowlist to validate the `Host` header on incoming requests. Requests with unrecognized hosts are rejected.

 ## Agent authentication

@@ -23,7 +23,7 @@ const daemon = await createPaseoDaemon(
    listen: "127.0.0.1:0", // OS picks a free port
    paseoHome,
    corsAllowedOrigins: [],
-    hostnames: true,
+    allowedHosts: true,
    mcpEnabled: false,
    staticDir,
    mcpDebug: false,
@@ -1,548 +0,0 @@
-# Custom Provider Configuration
-
-Paseo supports configuring custom agent providers through `config.json` (located at `$PASEO_HOME/config.json`, typically `~/.paseo/config.json`). You can extend built-in providers with different API backends, add ACP-compatible agents, set custom binaries, disable providers, and create multiple profiles for the same underlying provider.
-
-All provider configuration lives under `agents.providers` in config.json:
-
-```json
-{
-  "version": 1,
-  "agents": {
-    "providers": {
-      "provider-id": { ... }
-    }
-  }
-}
-```
-
-Provider IDs must be lowercase alphanumeric with hyphens (`/^[a-z][a-z0-9-]*$/`).
-
---
-
-## Table of Contents
-
- [Extending a built-in provider](#extending-a-built-in-provider)
- [Z.AI (Zhipu) coding plan](#zai-zhipu-coding-plan)
- [Alibaba Cloud (Qwen) coding plan](#alibaba-cloud-qwen-coding-plan)
- [Multiple profiles for the same provider](#multiple-profiles-for-the-same-provider)
- [Custom binary for a provider](#custom-binary-for-a-provider)
- [Disabling a provider](#disabling-a-provider)
- [ACP providers](#acp-providers)
- [Provider override reference](#provider-override-reference)
-
---
-
-## Extending a built-in provider
-
-Use `extends` to create a new provider entry that inherits from a built-in provider (claude, codex, copilot, opencode, pi). The new provider gets its own entry in the provider list, with its own label, environment, and model definitions.
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-claude": {
-        "extends": "claude",
-        "label": "My Claude",
-        "description": "Claude with custom API endpoint",
-        "env": {
-          "ANTHROPIC_API_KEY": "sk-ant-...",
-          "ANTHROPIC_BASE_URL": "https://my-proxy.example.com/v1"
-        }
-      }
-    }
-  }
-}
-```
-
-Required fields for custom providers:
- `extends` — which built-in provider to inherit from (or `"acp"`)
- `label` — display name in the UI
-
---
-
-## Z.AI (Zhipu) coding plan
-
-[Z.AI](https://z.ai) is a Chinese AI company (Zhipu AI) that offers an Anthropic-compatible API endpoint. Their GLM Coding Plan provides flat-rate access to GLM models through Claude Code's Anthropic API protocol. These are **not** Anthropic Claude models — they are Zhipu's own GLM models exposed through an Anthropic-compatible API.
-
-### Setup
-
-1. Register at [z.ai](https://z.ai) and subscribe to a coding plan
-2. Create an API key from the Z.AI dashboard
-3. Add a provider entry in config.json:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "zai": {
-        "extends": "claude",
-        "label": "ZAI",
-        "env": {
-          "ANTHROPIC_AUTH_TOKEN": "<your-zai-api-key>",
-          "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
-          "API_TIMEOUT_MS": "3000000"
-        },
-        "models": [
-          { "id": "glm-4.5-air", "label": "GLM 4.5 Air" },
-          { "id": "glm-5-turbo", "label": "GLM 5 Turbo", "isDefault": true },
-          { "id": "glm-5.1", "label": "GLM 5.1" }
-        ]
-      }
-    }
-  }
-}
-```
-
-### Available models
-
-| Model | Tier |
-|---|---|
-| `glm-5.1` | Advanced (flagship) |
-| `glm-5-turbo` | Advanced |
-| `glm-4.7` | Standard |
-| `glm-4.5-air` | Lightweight |
-
-### Notes
-
- `ANTHROPIC_AUTH_TOKEN` is used instead of `ANTHROPIC_API_KEY` — this is the z.ai API key
- The `API_TIMEOUT_MS` env var extends the request timeout (z.ai can be slower than direct Anthropic)
- If you get auth errors, run `/logout` inside Claude Code before switching to the z.ai provider
- Web search (`WebSearch` tool) is an Anthropic-only server-side feature — third-party endpoints don't support it. Add `"disallowedTools": ["WebSearch"]` to avoid errors.
- Automated setup is also available: `npx @z_ai/coding-helper`
- Official docs: [docs.z.ai/devpack/tool/claude](https://docs.z.ai/devpack/tool/claude)
-
---
-
-## Alibaba Cloud (Qwen) coding plan
-
-[Alibaba Cloud Model Studio](https://www.alibabacloud.com/en/campaign/ai-scene-coding) offers a coding plan that routes Claude Code requests to Qwen models through an Anthropic-compatible API. Like z.ai, these are **not** Anthropic Claude models.
-
-### Setup
-
-1. Go to the [Coding Plan page](https://modelstudio.console.alibabacloud.com/ap-southeast-1/?tab=globalset#/efm/coding_plan) on Alibaba Cloud Model Studio (Singapore region)
-2. Subscribe to the Pro plan ($50/month)
-3. Obtain your plan-specific API key (format: `sk-sp-xxxxx`) — this is different from a standard Model Studio key
-4. Add a provider entry in config.json:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "qwen": {
-        "extends": "claude",
-        "label": "Qwen (Alibaba)",
-        "env": {
-          "ANTHROPIC_AUTH_TOKEN": "sk-sp-<your-coding-plan-key>",
-          "ANTHROPIC_BASE_URL": "https://coding-intl.dashscope.aliyuncs.com/apps/anthropic"
-        },
-        "models": [
-          { "id": "qwen3.5-plus", "label": "Qwen 3.5 Plus", "isDefault": true },
-          { "id": "qwen3-coder-next", "label": "Qwen 3 Coder Next" },
-          { "id": "kimi-k2.5", "label": "Kimi K2.5" }
-        ]
-      }
-    }
-  }
-}
-```
-
-### API endpoints
-
-| Mode | Base URL |
-|---|---|
-| Coding plan (subscription) | `https://coding-intl.dashscope.aliyuncs.com/apps/anthropic` |
-| Pay-as-you-go (no subscription) | `https://dashscope-intl.aliyuncs.com/apps/anthropic` |
-
-For pay-as-you-go, use `ANTHROPIC_API_KEY` with a standard Model Studio key (`sk-xxxxx`) instead of `ANTHROPIC_AUTH_TOKEN`.
-
-### Available models
-
-**Recommended for coding plan:**
-
-| Model | Notes |
-|---|---|
-| `qwen3.5-plus` | Vision capable, recommended |
-| `qwen3-coder-next` | Optimized for coding |
-| `kimi-k2.5` | Vision capable |
-| `glm-5` | Zhipu GLM |
-| `MiniMax-M2.5` | MiniMax |
-
-**Additional models (pay-as-you-go):**
-`qwen3-max`, `qwen3.5-flash`, `qwen3-coder-plus`, `qwen3-coder-flash`, `qwen3-vl-plus`, `qwen3-vl-flash`
-
-### Notes
-
- API keys must be created in the **Singapore region**
- The coding plan is for personal use only in interactive coding tools
- Web search (`WebSearch` tool) is an Anthropic-only server-side feature — third-party endpoints don't support it. Add `"disallowedTools": ["WebSearch"]` to avoid errors.
- Official docs: [alibabacloud.com/help/en/model-studio/claude-code-coding-plan](https://www.alibabacloud.com/help/en/model-studio/claude-code-coding-plan)
-
---
-
-## Multiple profiles for the same provider
-
-You can create multiple entries that extend the same built-in provider. Each gets its own entry in the provider list with independent credentials, models, and environment.
-
-Example: two different Anthropic accounts as separate profiles:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "claude-work": {
-        "extends": "claude",
-        "label": "Claude (Work)",
-        "description": "Work Anthropic account",
-        "env": {
-          "ANTHROPIC_API_KEY": "sk-ant-work-..."
-        }
-      },
-      "claude-personal": {
-        "extends": "claude",
-        "label": "Claude (Personal)",
-        "description": "Personal Anthropic account",
-        "env": {
-          "ANTHROPIC_API_KEY": "sk-ant-personal-..."
-        }
-      }
-    }
-  }
-}
-```
-
-Each profile appears as a separate provider in the Paseo app. You can select which one to use when launching an agent.
-
-You can also combine profiles with model overrides to pin specific models per profile:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "claude-fast": {
-        "extends": "claude",
-        "label": "Claude (Fast)",
-        "models": [
-          { "id": "claude-sonnet-4-6", "label": "Sonnet 4.6", "isDefault": true }
-        ]
-      },
-      "claude-smart": {
-        "extends": "claude",
-        "label": "Claude (Smart)",
-        "models": [
-          { "id": "claude-opus-4-6", "label": "Opus 4.6", "isDefault": true }
-        ]
-      }
-    }
-  }
-}
-```
-
---
-
-## Custom binary for a provider
-
-Override the command used to launch any provider with the `command` field. This is an array where the first element is the binary and the rest are arguments.
-
-### Override a built-in provider's binary
-
-```json
-{
-  "agents": {
-    "providers": {
-      "claude": {
-        "command": ["/opt/claude-nightly/claude"]
-      }
-    }
-  }
-}
-```
-
-### Use a custom wrapper script
-
-```json
-{
-  "agents": {
-    "providers": {
-      "claude": {
-        "command": ["/usr/local/bin/my-claude-wrapper", "--verbose"]
-      }
-    }
-  }
-}
-```
-
-### Custom binary on a derived provider
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-codex": {
-        "extends": "codex",
-        "label": "Codex (Custom Build)",
-        "command": ["/home/user/codex-dev/target/release/codex"]
-      }
-    }
-  }
-}
-```
-
-The `command` array completely replaces the default command for that provider. The binary must exist on the system — Paseo checks for its availability and will mark the provider as unavailable if not found.
-
---
-
-## Disabling a provider
-
-Set `enabled: false` to hide a provider from the provider list. The provider will not appear in the app or CLI.
-
-```json
-{
-  "agents": {
-    "providers": {
-      "copilot": { "enabled": false },
-      "codex": { "enabled": false }
-    }
-  }
-}
-```
-
-This works for both built-in and custom providers. To re-enable, set `enabled: true` or remove the `enabled` field entirely (providers are enabled by default).
-
---
-
-## ACP providers
-
-The [Agent Client Protocol (ACP)](https://agentclientprotocol.com) is an open standard for communication between editors and AI coding agents — think LSP but for AI agents. Any agent that supports ACP can be added to Paseo as a custom provider.
-
-ACP agents communicate over JSON-RPC 2.0 on stdio. Paseo spawns the agent process and talks to it through stdin/stdout.
-
-### Adding a generic ACP provider
-
-Set `extends: "acp"` and provide a `command`:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-agent": {
-        "extends": "acp",
-        "label": "My Agent",
-        "command": ["my-agent-binary", "--acp"],
-        "env": {
-          "MY_API_KEY": "..."
-        }
-      }
-    }
-  }
-}
-```
-
-Required fields for ACP providers:
- `extends: "acp"`
- `label`
- `command` — the command to spawn the agent process (must support ACP over stdio)
-
-### Example: Google Gemini CLI
-
-[Gemini CLI](https://github.com/google-gemini/gemini-cli) supports ACP via the `--acp` flag.
-
-1. Install: `npm install -g @anthropic-ai/gemini-cli` or see [Gemini CLI docs](https://github.com/google-gemini/gemini-cli)
-2. Authenticate with Google (Gemini CLI handles its own auth)
-3. Add to config.json:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "gemini": {
-        "extends": "acp",
-        "label": "Google Gemini",
-        "command": ["gemini", "--acp"]
-      }
-    }
-  }
-}
-```
-
-Ref: [Gemini CLI ACP mode docs](https://github.com/google-gemini/gemini-cli/blob/main/docs/cli/acp-mode.md)
-
-### Example: Hermes (Nous Research)
-
-[Hermes](https://github.com/NousResearch/hermes-agent) is an open-source coding agent by Nous Research with persistent memory and multi-provider LLM support. It supports ACP via the `acp` subcommand.
-
-1. Install: `curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash`
-2. Install ACP support: `pip install -e '.[acp]'`
-3. Configure Hermes credentials in `~/.hermes/`
-4. Add to config.json:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "hermes": {
-        "extends": "acp",
-        "label": "Hermes",
-        "description": "Nous Research self-improving AI agent",
-        "command": ["hermes", "acp"]
-      }
-    }
-  }
-}
-```
-
-Ref: [Hermes ACP docs](https://hermes-agent.nousresearch.com/docs/user-guide/features/acp)
-
-### How ACP providers work in Paseo
-
-When you launch an agent with an ACP provider:
-
-1. Paseo spawns the process using the configured `command`
-2. Sends an `initialize` JSON-RPC request over stdin
-3. The agent responds with its capabilities, available modes, and models
-4. Paseo creates a session and sends prompts through the ACP protocol
-5. The agent streams responses, tool calls, and permission requests back over stdout
-
-Models and modes are discovered dynamically at runtime from the agent process. If you want to override the model list (e.g., to curate which models appear in the UI), use the `models` field:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-agent": {
-        "extends": "acp",
-        "label": "My Agent",
-        "command": ["my-agent", "--acp"],
-        "models": [
-          { "id": "fast-model", "label": "Fast", "isDefault": true },
-          { "id": "smart-model", "label": "Smart" }
-        ]
-      }
-    }
-  }
-}
-```
-
-Profile models (defined in config.json) completely replace runtime-discovered models when present.
-
---
-
-## Provider override reference
-
-Every entry under `agents.providers` accepts these fields:
-
-| Field | Type | Required | Description |
-|---|---|---|---|
-| `extends` | `string` | Yes (custom only) | Built-in provider ID to inherit from, or `"acp"` |
-| `label` | `string` | Yes (custom only) | Display name in the UI |
-| `description` | `string` | No | Short description shown in the UI |
-| `command` | `string[]` | Yes (ACP only) | Command to spawn the agent process |
-| `env` | `Record<string, string>` | No | Environment variables to set for the agent process |
-| `models` | `ProviderProfileModel[]` | No | Static model list (overrides runtime discovery) |
-| `disallowedTools` | `string[]` | No | Tool names to disable for this provider (e.g. `["WebSearch"]`) |
-| `enabled` | `boolean` | No | Set to `false` to hide the provider (default: `true`) |
-| `order` | `number` | No | Sort order in the provider list |
-
-### Model definition
-
-Each entry in the `models` array:
-
-| Field | Type | Required | Description |
-|---|---|---|---|
-| `id` | `string` | Yes | Model identifier sent to the provider |
-| `label` | `string` | Yes | Display name in the UI |
-| `description` | `string` | No | Short description |
-| `isDefault` | `boolean` | No | Mark as the default model selection |
-| `thinkingOptions` | `ThinkingOption[]` | No | Available thinking/reasoning levels |
-
-### Thinking option
-
-| Field | Type | Required | Description |
-|---|---|---|---|
-| `id` | `string` | Yes | Thinking option identifier |
-| `label` | `string` | Yes | Display name |
-| `description` | `string` | No | Short description |
-| `isDefault` | `boolean` | No | Mark as the default thinking option |
-
-### Gotcha: `extends: "claude"` with third-party endpoints
-
-When a custom provider extends `"claude"` but points `ANTHROPIC_BASE_URL` at a non-Anthropic API (Z.AI, Alibaba/Qwen, proxies), the Claude Agent SDK may try to use Anthropic-only server-side tools like `WebSearch`. Third-party APIs don't support these tools, causing errors.
-
-Use `disallowedTools` to disable unsupported tools:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-proxy": {
-        "extends": "claude",
-        "label": "My Proxy",
-        "env": {
-          "ANTHROPIC_BASE_URL": "https://my-proxy.example.com/v1"
-        },
-        "disallowedTools": ["WebSearch"]
-      }
-    }
-  }
-}
-```
-
-### Valid `extends` values
-
-Built-in providers: `claude`, `codex`, `copilot`, `opencode`, `pi`
-
-Special value: `acp` — creates a generic ACP provider (requires `command`)
-
-### Full example
-
-A config.json with multiple custom providers:
-
-```json
-{
-  "version": 1,
-  "agents": {
-    "providers": {
-      "copilot": { "enabled": false },
-
-      "zai": {
-        "extends": "claude",
-        "label": "ZAI",
-        "env": {
-          "ANTHROPIC_AUTH_TOKEN": "<zai-api-key>",
-          "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
-          "API_TIMEOUT_MS": "3000000"
-        },
-        "models": [
-          { "id": "glm-4.5-air", "label": "GLM 4.5 Air" },
-          { "id": "glm-5-turbo", "label": "GLM 5 Turbo", "isDefault": true },
-          { "id": "glm-5.1", "label": "GLM 5.1" }
-        ]
-      },
-
-      "qwen": {
-        "extends": "claude",
-        "label": "Qwen (Alibaba)",
-        "env": {
-          "ANTHROPIC_AUTH_TOKEN": "sk-sp-<coding-plan-key>",
-          "ANTHROPIC_BASE_URL": "https://coding-intl.dashscope.aliyuncs.com/apps/anthropic"
-        },
-        "models": [
-          { "id": "qwen3.5-plus", "label": "Qwen 3.5 Plus", "isDefault": true },
-          { "id": "qwen3-coder-next", "label": "Qwen 3 Coder Next" }
-        ]
-      },
-
-      "gemini": {
-        "extends": "acp",
-        "label": "Google Gemini",
-        "command": ["gemini", "--acp"]
-      },
-
-      "hermes": {
-        "extends": "acp",
-        "label": "Hermes",
-        "command": ["hermes", "acp"]
-      }
-    }
-  }
-}
-```
@@ -130,7 +130,7 @@ Single file, validated with `PersistedConfigSchema`.
  version: 1,
  daemon: {
    listen: "127.0.0.1:6767",
-    hostnames: true | string[],
+    allowedHosts: true | string[],
    mcp: { enabled: boolean },
    cors: { allowedOrigins: string[] },
    relay: { enabled: boolean, endpoint: string, publicEndpoint: string }
@@ -139,43 +139,6 @@ The changelog is shown on the Paseo homepage. Write it for **end users**, not de
 - **Only list changes relative to the previous stable release.** The diff is `v(previous)..HEAD`. If something was introduced and fixed between those two tags, it never shipped — don't mention the fix.
 - **Cut low-signal entries.** "Toolbar buttons have consistent sizing" is too granular. Combine small polish items or drop them.

-## Changelog conciseness
-
-Every bullet must be scannable at a glance. The changelog is not release documentation — it's a list.
-
- **One line per bullet.** If a bullet wraps to three lines in a narrow column, it's too long.
- **Split bullets that pack multiple distinct changes.** If a bullet uses "and", "plus", a comma list, or an em-dash to chain several independent improvements, break them into separate bullets — even when they share a theme or author. One bullet = one user-facing change.
- **Trim qualifying clauses.** Drop "with a hint shown when…", "matching the CLI's behaviour", "across common install shapes". If the detail doesn't change whether a user cares, cut it.
- **Lead with the outcome.** "Windows: agents launch reliably from npm `.cmd` shims…" is better than "Windows: agents launch reliably across common install shapes. Claude, Codex, and OpenCode now start correctly…".
- **Attribution follows the split.** When you split a dense bullet, move each PR/author to the bullet it belongs to. Never duplicate the same PR across multiple bullets.
-
-## Changelog attribution
-
-Every changelog bullet must credit contributors and link to the PR(s) that delivered the change. This is not one-PR-per-line — a single bullet describes a user-facing change and may reference multiple PRs.
-
-Format: append `([#123](https://github.com/getpaseo/paseo/pull/123) by [@user](https://github.com/user))` at the end of each bullet. For changes spanning multiple PRs or contributors:
-
-```markdown
- Voice mode now works on tablets with proper microphone permissions. ([#210](https://github.com/getpaseo/paseo/pull/210), [#215](https://github.com/getpaseo/paseo/pull/215) by [@alice](https://github.com/alice), [@bob](https://github.com/bob))
-```
-
-Rules:
-
- **Always link the PR number** as `[#N](https://github.com/getpaseo/paseo/pull/N)`.
- **Always link the contributor's GitHub profile** as `[@user](https://github.com/user)`.
- **One bullet = one user-facing change**, regardless of how many PRs went into it. Group related PRs on the same bullet.
- **De-duplicate contributors.** If the same person authored multiple PRs in one bullet, list them once.
- **Only credit external contributors.** Skip attribution for [@boudra](https://github.com/boudra). The changelog credits community contributions — core team work is the default.
- **Use `git log` to find PR numbers and authors.** PR numbers are typically in the commit message as `(#N)`. Use `gh pr view N --json author` if the commit doesn't include the GitHub username.
-
-## Changelog ordering
-
-Entries within each section (Added, Improved, Fixed) are ordered by user impact:
-
-1. **User-facing features and changes first** — things users will notice, want to try, or that change their workflow.
-2. **Quality-of-life improvements** — polish, performance, smoother interactions.
-3. **Internal/infra changes last** — only include if they have a tangible user benefit (e.g. "faster startup" is user-facing even if the fix was internal).
-
 ## Pre-release sanity check

 Before cutting any release (RC or stable), run a Codex review of the diff as a last line of defence against shipping bugs.
@@ -9,10 +9,6 @@ let
  cfg = config.services.paseo;
 in
 {
-  imports = [
-    (lib.mkRenamedOptionModule [ "services" "paseo" "allowedHosts" ] [ "services" "paseo" "hostnames" ])
-  ];
-
  options.services.paseo = {
    enable = lib.mkEnableOption "Paseo, a self-hosted daemon for AI coding agents";

@@ -62,12 +58,12 @@ in
      description = "Whether to open the firewall for the Paseo daemon port.";
    };

-    hostnames = lib.mkOption {
+    allowedHosts = lib.mkOption {
      type = lib.types.either (lib.types.enum [ true ]) (lib.types.listOf lib.types.str);
      default = [ ];
      example = [ ".example.com" "myhost.local" ];
      description = ''
-        Hostnames the Paseo daemon accepts in the Host header (DNS rebinding protection).
+        Hosts allowed to connect to the Paseo daemon (DNS rebinding protection).
        Localhost and IP addresses are always allowed by default.

        Use a leading dot to match a domain and all its subdomains
@@ -145,10 +141,10 @@ in
          "/run/wrappers/bin"
          "/nix/var/nix/profiles/default/bin"
        ]);
-      } // lib.optionalAttrs (cfg.hostnames == true) {
-        PASEO_HOSTNAMES = "true";
-      } // lib.optionalAttrs (lib.isList cfg.hostnames && cfg.hostnames != [ ]) {
-        PASEO_HOSTNAMES = lib.concatStringsSep "," cfg.hostnames;
+      } // lib.optionalAttrs (cfg.allowedHosts == true) {
+        PASEO_ALLOWED_HOSTS = "true";
+      } // lib.optionalAttrs (lib.isList cfg.allowedHosts && cfg.allowedHosts != [ ]) {
+        PASEO_ALLOWED_HOSTS = lib.concatStringsSep "," cfg.allowedHosts;
      } // cfg.environment;

      serviceConfig = {
@@ -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-rpXng5y99bDt7a3f6vI+EWrVahlXINdHzCf7ml+ZnFs=";
+  npmDepsHash = "sha256-sVWb8lj3cgxgVcRvBmS5f0AyPT6uS46KfBEWgG6s8ww=";

  # 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).
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
@@ -34906,16 +34906,16 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "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.59",
-        "@getpaseo/highlight": "0.1.59",
-        "@getpaseo/server": "0.1.59",
+        "@getpaseo/expo-two-way-audio": "0.1.55-rc.1",
+        "@getpaseo/highlight": "0.1.55-rc.1",
+        "@getpaseo/server": "0.1.55-rc.1",
        "@gorhom/bottom-sheet": "^5.2.6",
        "@gorhom/portal": "^1.0.14",
        "@react-native-async-storage/async-storage": "2.2.0",
@@ -35056,11 +35056,11 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/relay": "0.1.59",
-        "@getpaseo/server": "0.1.59",
+        "@getpaseo/relay": "0.1.55-rc.1",
+        "@getpaseo/server": "0.1.55-rc.1",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -35101,11 +35101,11 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
-        "@getpaseo/cli": "0.1.59",
-        "@getpaseo/server": "0.1.59",
+        "@getpaseo/cli": "0.1.55-rc.1",
+        "@getpaseo/server": "0.1.55-rc.1",
        "electron-log": "^5.4.3",
        "electron-updater": "^6.6.2",
        "ws": "^8.14.2"
@@ -35139,7 +35139,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "license": "MIT",
      "devDependencies": {
        "@biomejs/biome": "1.9.4",
@@ -35340,7 +35340,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "dependencies": {
        "@lezer/common": "^1.5.0",
        "@lezer/cpp": "^1.1.5",
@@ -35366,7 +35366,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -35382,14 +35382,14 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "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.59",
-        "@getpaseo/relay": "0.1.59",
+        "@getpaseo/highlight": "0.1.55-rc.1",
+        "@getpaseo/relay": "0.1.55-rc.1",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "^1.20.1",
        "@opencode-ai/sdk": "1.2.6",
@@ -35417,7 +35417,6 @@
        "strip-ansi": "^7.1.2",
        "tiny-invariant": "^1.3.3",
        "uuid": "^9.0.1",
-        "which": "^5.0.0",
        "ws": "^8.14.2",
        "zod": "^3.23.8",
        "zod-to-json-schema": "^3.25.1"
@@ -35641,15 +35640,6 @@
        "node": ">= 0.8"
      }
    },
-    "packages/server/node_modules/isexe": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
-      "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==",
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=18"
-      }
-    },
    "packages/server/node_modules/media-typer": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
@@ -35804,21 +35794,6 @@
        "node": ">= 0.6"
      }
    },
-    "packages/server/node_modules/which": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
-      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
    "packages/server/node_modules/yocto-queue": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz",
@@ -35842,7 +35817,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.1.59",
+      "version": "0.1.55-rc.1",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.20.3",
        "@cloudflare/workers-types": "^4.20260114.0",
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "private": true,
  "workspaces": [
    "packages/expo-two-way-audio",
@@ -14,7 +14,6 @@
  ],
  "scripts": {
    "dev": "./scripts/dev.sh",
-    "dev:win": "powershell ./scripts/dev.ps1",
    "dev:server": "npm run dev --workspace=@getpaseo/server",
    "dev:app": "npm run start --workspace=@getpaseo/app",
    "dev:website": "npm run dev --workspace=@getpaseo/website",
@@ -37,7 +36,6 @@
    "ios": "npm run ios --workspace=@getpaseo/app",
    "web": "npm run web --workspace=@getpaseo/app",
    "dev:desktop": "npm run dev --workspace=@getpaseo/desktop",
-    "dev:win:desktop": "npm run dev:win --workspace=@getpaseo/desktop",
    "build:desktop": "npm run version:sync-internal && npm run build:web --workspace=@getpaseo/app && npm run build --workspace=@getpaseo/desktop",
    "cli": "npx tsx packages/cli/src/index.js",
    "version": "npm run version:sync-internal && npm run release:prepare && git add -A",
@@ -1,4 +1,4 @@
-import { spawn, type ChildProcess, execFileSync, execSync } from "node:child_process";
+import { spawn, type ChildProcess, execSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -224,51 +224,6 @@ function decodeOfferFromFragmentUrl(url: string): OfferPayload {
  return offer as OfferPayload;
 }

-function loadPairingOfferFromCli(repoRoot: string, paseoHomePath: string): OfferPayload {
-  const stdout = execFileSync(
-    process.execPath,
-    ["--import", "tsx", "packages/cli/src/index.ts", "daemon", "pair", "--json"],
-    {
-      cwd: repoRoot,
-      env: {
-        ...process.env,
-        PASEO_HOME: paseoHomePath,
-      },
-      encoding: "utf8",
-    },
-  );
-  const payload = JSON.parse(stdout) as { relayEnabled?: boolean; url?: string | null };
-  if (payload.relayEnabled !== true || typeof payload.url !== "string") {
-    throw new Error(`Unexpected daemon pair response: ${stdout}`);
-  }
-  return decodeOfferFromFragmentUrl(payload.url);
-}
-
-async function waitForPairingOfferFromCli(args: {
-  repoRoot: string;
-  paseoHome: string;
-  timeoutMs?: number;
-}): Promise<OfferPayload> {
-  const timeoutMs = args.timeoutMs ?? 15000;
-  const start = Date.now();
-  let lastError: unknown = null;
-
-  while (Date.now() - start < timeoutMs) {
-    try {
-      return loadPairingOfferFromCli(args.repoRoot, args.paseoHome);
-    } catch (error) {
-      lastError = error;
-      await sleep(100);
-    }
-  }
-
-  throw new Error(
-    `Timed out waiting for \`paseo daemon pair --json\` to produce a pairing offer: ${
-      lastError instanceof Error ? lastError.message : String(lastError)
-    }`,
-  );
-}
-
 export default async function globalSetup() {
  const repoRoot = path.resolve(__dirname, "../../..");
  ensureRelayBuildArtifact(repoRoot);
@@ -478,6 +433,12 @@ export default async function globalSetup() {
    const serverDir = path.resolve(__dirname, "../../..", "packages/server");
    const tsxBin = execSync("which tsx").toString().trim();

+    let offerPayload: OfferPayload | null = null;
+    let offerResolve: (() => void) | null = null;
+    const offerPromise = new Promise<void>((resolve) => {
+      offerResolve = resolve;
+    });
+
    daemonProcess = spawn(tsxBin, ["src/server/index.ts"], {
      cwd: serverDir,
      env: {
@@ -512,6 +473,26 @@ export default async function globalSetup() {
        const trimmed = line.trim();
        if (!trimmed) continue;
        daemonLineBuffer.add(`[stdout] ${trimmed}`);
+        if (!offerPayload) {
+          const clean = stripAnsi(trimmed);
+          try {
+            const obj = JSON.parse(clean) as { msg?: string; url?: string };
+            if (obj.msg === "pairing_offer" && typeof obj.url === "string") {
+              offerPayload = decodeOfferFromFragmentUrl(obj.url);
+              offerResolve?.();
+            }
+          } catch {
+            const match = clean.match(/https?:\/\/[^\s"]+#offer=[A-Za-z0-9_-]+/);
+            if (match && clean.includes("pairing_offer")) {
+              try {
+                offerPayload = decodeOfferFromFragmentUrl(match[0]);
+                offerResolve?.();
+              } catch {
+                // ignore parsing failures
+              }
+            }
+          }
+        }
        console.log(`[daemon] ${trimmed}`);
      }
    });
@@ -542,10 +523,17 @@ export default async function globalSetup() {
      }),
    ]);

-    const offer = await waitForPairingOfferFromCli({
-      repoRoot,
-      paseoHome,
-    });
+    // Wait for daemon to emit a pairing offer (includes relay session ID).
+    await Promise.race([
+      offerPromise,
+      new Promise((_, reject) =>
+        setTimeout(() => reject(new Error("Timed out waiting for pairing_offer log")), 15000),
+      ),
+    ]);
+    if (!offerPayload) {
+      throw new Error("pairing_offer was not parsed from daemon logs");
+    }
+    const offer = offerPayload as OfferPayload;

    process.env.E2E_DAEMON_PORT = String(port);
    process.env.E2E_RELAY_PORT = String(relayPort);
@@ -1,7 +1,7 @@
 {
  "name": "@getpaseo/app",
  "main": "index.ts",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "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.59",
-    "@getpaseo/highlight": "0.1.59",
-    "@getpaseo/server": "0.1.59",
+    "@getpaseo/expo-two-way-audio": "0.1.55-rc.1",
+    "@getpaseo/highlight": "0.1.55-rc.1",
+    "@getpaseo/server": "0.1.55-rc.1",
    "@gorhom/bottom-sheet": "^5.2.6",
    "@gorhom/portal": "^1.0.14",
    "@react-native-async-storage/async-storage": "2.2.0",
@@ -51,17 +51,6 @@
      [contenteditable='true'] {
        -webkit-app-region: no-drag !important;
      }
-
-      /* Suppress the browser's default focus outline — it appears on mouse
-         clicks and looks out of place against our themed surfaces. Keep a
-         themed ring for keyboard users via :focus-visible. */
-      *:focus {
-        outline: none;
-      }
-      *:focus-visible {
-        outline: 2px solid #20744A;
-        outline-offset: 2px;
-      }
    </style>
  </head>
  <body>
@@ -16,35 +16,6 @@ import {
 import { X } from "lucide-react-native";
 import { isWeb } from "@/constants/platform";

-type EscHandler = () => void;
-const escStack: EscHandler[] = [];
-let escListenerAttached = false;
-
-function handleEscKeyDown(event: KeyboardEvent) {
-  if (event.key !== "Escape") return;
-  const top = escStack[escStack.length - 1];
-  if (!top) return;
-  event.stopPropagation();
-  event.preventDefault();
-  top();
-}
-
-function pushEscHandler(handler: EscHandler): () => void {
-  escStack.push(handler);
-  if (!escListenerAttached && typeof window !== "undefined") {
-    window.addEventListener("keydown", handleEscKeyDown, true);
-    escListenerAttached = true;
-  }
-  return () => {
-    const index = escStack.lastIndexOf(handler);
-    if (index !== -1) escStack.splice(index, 1);
-    if (escStack.length === 0 && escListenerAttached && typeof window !== "undefined") {
-      window.removeEventListener("keydown", handleEscKeyDown, true);
-      escListenerAttached = false;
-    }
-  };
-}
-
 const styles = StyleSheet.create((theme) => ({
  desktopOverlay: {
    ...StyleSheet.absoluteFillObject,
@@ -77,18 +48,10 @@ const styles = StyleSheet.create((theme) => ({
    borderBottomColor: theme.colors.surface2,
  },
  title: {
-    flex: 1,
    color: theme.colors.foreground,
    fontSize: theme.fontSize.lg,
    fontWeight: theme.fontWeight.medium,
  },
-  headerActions: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    marginLeft: theme.spacing[3],
-    marginRight: theme.spacing[2],
-  },
  closeButton: {
    padding: theme.spacing[2],
    borderRadius: theme.borderRadius.lg,
@@ -120,18 +83,6 @@ const styles = StyleSheet.create((theme) => ({
    padding: theme.spacing[6],
    gap: theme.spacing[4],
  },
-  bottomSheetStaticContent: {
-    flex: 1,
-    padding: theme.spacing[6],
-    gap: theme.spacing[4],
-    minHeight: 0,
-  },
-  desktopStaticContent: {
-    flexShrink: 1,
-    minHeight: 0,
-    padding: theme.spacing[6],
-    gap: theme.spacing[4],
-  },
 }));

 function SheetBackground({ style }: BottomSheetBackgroundProps) {
@@ -155,11 +106,9 @@ export interface AdaptiveModalSheetProps {
  visible: boolean;
  onClose: () => void;
  children: ReactNode;
-  headerActions?: ReactNode;
  snapPoints?: string[];
  stackBehavior?: "push" | "switch" | "replace";
  testID?: string;
-  scrollable?: boolean;
 }

 export function AdaptiveModalSheet({
@@ -167,11 +116,9 @@ export function AdaptiveModalSheet({
  visible,
  onClose,
  children,
-  headerActions,
  snapPoints,
  stackBehavior,
  testID,
-  scrollable = true,
 }: AdaptiveModalSheetProps) {
  const { theme } = useUnistyles();
  const isMobile = useIsCompactFormFactor();
@@ -210,11 +157,6 @@ export function AdaptiveModalSheet({
    [],
  );

-  useEffect(() => {
-    if (!isWeb || isMobile || !visible) return;
-    return pushEscHandler(onClose);
-  }, [visible, isMobile, onClose]);
-
  if (isMobile) {
    return (
      <BottomSheetModal
@@ -232,25 +174,18 @@ export function AdaptiveModalSheet({
        keyboardBlurBehavior="restore"
      >
        <View style={styles.bottomSheetHeader}>
-          <Text style={styles.title} numberOfLines={1}>
-            {title}
-          </Text>
-          {headerActions ? <View style={styles.headerActions}>{headerActions}</View> : null}
+          <Text style={styles.title}>{title}</Text>
          <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
            <X size={16} color={theme.colors.foregroundMuted} />
          </Pressable>
        </View>
-        {scrollable ? (
-          <BottomSheetScrollView
-            contentContainerStyle={styles.bottomSheetContent}
-            keyboardShouldPersistTaps="handled"
-            showsVerticalScrollIndicator={false}
-          >
-            {children}
-          </BottomSheetScrollView>
-        ) : (
-          <View style={styles.bottomSheetStaticContent}>{children}</View>
-        )}
+        <BottomSheetScrollView
+          contentContainerStyle={styles.bottomSheetContent}
+          keyboardShouldPersistTaps="handled"
+          showsVerticalScrollIndicator={false}
+        >
+          {children}
+        </BottomSheetScrollView>
      </BottomSheetModal>
    );
  }
@@ -264,26 +199,19 @@ export function AdaptiveModalSheet({
      />
      <View style={styles.desktopCard}>
        <View style={styles.header}>
-          <Text style={styles.title} numberOfLines={1}>
-            {title}
-          </Text>
-          {headerActions ? <View style={styles.headerActions}>{headerActions}</View> : null}
+          <Text style={styles.title}>{title}</Text>
          <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
            <X size={16} color={theme.colors.foregroundMuted} />
          </Pressable>
        </View>
-        {scrollable ? (
-          <ScrollView
-            style={styles.desktopScroll}
-            contentContainerStyle={styles.desktopContent}
-            keyboardShouldPersistTaps="handled"
-            showsVerticalScrollIndicator={false}
-          >
-            {children}
-          </ScrollView>
-        ) : (
-          <View style={styles.desktopStaticContent}>{children}</View>
-        )}
+        <ScrollView
+          style={styles.desktopScroll}
+          contentContainerStyle={styles.desktopContent}
+          keyboardShouldPersistTaps="handled"
+          showsVerticalScrollIndicator={false}
+        >
+          {children}
+        </ScrollView>
      </View>
    </View>
  );
@@ -63,7 +63,7 @@ type ImageListUpdater = ImageAttachment[] | ((prev: ImageAttachment[]) => ImageA
 interface AgentInputAreaProps {
  agentId: string;
  serverId: string;
-  isPaneFocused: boolean;
+  isInputActive: boolean;
  onSubmitMessage?: (payload: MessagePayload) => Promise<void>;
  /** Externally controlled loading state. When true, disables the submit button. */
  isSubmitLoading?: boolean;
@@ -98,7 +98,7 @@ const MOBILE_MESSAGE_PLACEHOLDER = "Message, @files, /commands";
 export function AgentInputArea({
  agentId,
  serverId,
-  isPaneFocused,
+  isInputActive,
  onSubmitMessage,
  isSubmitLoading = false,
  blurOnSubmit = false,
@@ -421,7 +421,7 @@ export function AgentInputArea({

  const handleKeyboardAction = useCallback(
    (action: KeyboardActionDefinition): boolean => {
-      if (!isPaneFocused) {
+      if (!isInputActive) {
        return false;
      }

@@ -461,7 +461,7 @@ export function AgentInputArea({
          return false;
      }
    },
-    [isPaneFocused],
+    [isInputActive],
  );

  useKeyboardActionHandler({
@@ -475,9 +475,9 @@ export function AgentInputArea({
      "message-input.voice-toggle",
      "message-input.voice-mute-toggle",
    ],
-    enabled: isPaneFocused,
+    enabled: isInputActive,
    priority: isMessageInputFocused ? 200 : 100,
-    isActive: () => isPaneFocused,
+    isActive: () => isInputActive,
    handle: handleKeyboardAction,
  });

@@ -736,7 +736,7 @@ export function AgentInputArea({
              autoFocus={autoFocus && isDesktopWebBreakpoint}
              autoFocusKey={`${serverId}:${agentId}`}
              disabled={isSubmitLoading}
-              isPaneFocused={isPaneFocused}
+              isInputActive={isInputActive}
              leftContent={leftContent}
              beforeVoiceContent={beforeVoiceContent}
              rightContent={rightContent}
@@ -1225,8 +1225,6 @@ const styles = StyleSheet.create((theme) => ({
  },
  prefsButton: {
    height: 28,
-    minWidth: 0,
-    flexShrink: 1,
    flexDirection: "row",
    alignItems: "center",
    gap: theme.spacing[1],
@@ -2,7 +2,6 @@ import { View, Text, ScrollView, Pressable, Modal } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { StyleSheet } from "react-native-unistyles";
 import { Fonts } from "@/constants/theme";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";

 export interface Artifact {
  id: string;
@@ -148,8 +147,6 @@ const styles = StyleSheet.create((theme) => ({
 }));

 export function ArtifactDrawer({ artifact, onClose }: ArtifactDrawerProps) {
-  const webScrollbarStyle = useWebScrollbarStyle();
-
  if (!artifact) {
    return null;
  }
@@ -193,7 +190,7 @@ export function ArtifactDrawer({ artifact, onClose }: ArtifactDrawerProps) {
        </View>
        {/* Content */}
        <ScrollView
-          style={[styles.contentScroll, webScrollbarStyle]}
+          style={styles.contentScroll}
          contentContainerStyle={styles.contentScrollContainer}
        >
          {artifact.type === "image" ? (
@@ -203,11 +200,7 @@ export function ArtifactDrawer({ artifact, onClose }: ArtifactDrawerProps) {
            </View>
          ) : (
            <View style={styles.codeContainer}>
-              <ScrollView
-                horizontal
-                showsHorizontalScrollIndicator={true}
-                style={webScrollbarStyle}
-              >
+              <ScrollView horizontal showsHorizontalScrollIndicator={true}>
                <Text style={styles.codeText}>{content}</Text>
              </ScrollView>
            </View>
@@ -4,7 +4,6 @@ import { useQueryClient } from "@tanstack/react-query";
 import { ChevronDown, GitBranch } from "lucide-react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
-import { useIsCompactFormFactor } from "@/constants/layout";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useToast } from "@/contexts/toast-context";
 import { useBranchSwitcher } from "@/hooks/use-branch-switcher";
@@ -25,7 +24,6 @@ export function BranchSwitcher({
  isGitCheckout,
 }: BranchSwitcherProps) {
  const { theme } = useUnistyles();
-  const isCompact = useIsCompactFormFactor();
  const anchorRef = useRef<View>(null);
  const client = useHostRuntimeClient(serverId);
  const isConnected = useHostRuntimeIsConnected(serverId);
@@ -43,17 +41,12 @@ export function BranchSwitcher({
    queryClient,
  });

-  const titleContent = (
-    <>
-      {isGitCheckout ? <GitBranch size={14} color={theme.colors.foregroundMuted} /> : null}
+  if (!currentBranchName) {
+    return (
      <Text testID="workspace-header-title" style={styles.headerTitle} numberOfLines={1}>
        {title}
      </Text>
-    </>
-  );
-
-  if (!currentBranchName) {
-    return <View style={styles.branchSwitcherTrigger}>{titleContent}</View>;
+    );
  }

  return (
@@ -68,8 +61,11 @@ export function BranchSwitcher({
        accessibilityRole="button"
        accessibilityLabel={`Current branch: ${currentBranchName}. Press to switch branch.`}
      >
-        {titleContent}
-        {!isCompact ? <ChevronDown size={12} color={theme.colors.foregroundMuted} /> : null}
+        <GitBranch size={14} color={theme.colors.foregroundMuted} />
+        <Text testID="workspace-header-title" style={styles.headerTitle} numberOfLines={1}>
+          {title}
+        </Text>
+        <ChevronDown size={12} color={theme.colors.foregroundMuted} />
      </Pressable>
      <Combobox
        options={branchOptions}
@@ -115,14 +111,7 @@ const styles = StyleSheet.create((theme) => ({
    flexDirection: "row",
    alignItems: "center",
    gap: theme.spacing[1],
-    marginLeft: {
-      xs: -theme.spacing[2],
-      md: 0,
-    },
-    paddingVertical: {
-      xs: 0,
-      md: theme.spacing[1],
-    },
+    paddingVertical: theme.spacing[1],
    paddingHorizontal: theme.spacing[2],
    borderRadius: theme.borderRadius.md,
    flexShrink: 1,
@@ -634,9 +634,7 @@ export function CombinedModelSelector({
        ) : (
          <>
            <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-            <Text style={styles.triggerText} numberOfLines={1} ellipsizeMode="tail">
-              {triggerLabel}
-            </Text>
+            <Text style={styles.triggerText}>{triggerLabel}</Text>
            <ChevronDown size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
          </>
        )}
@@ -706,8 +704,6 @@ export function CombinedModelSelector({
 const styles = StyleSheet.create((theme) => ({
  trigger: {
    height: 28,
-    minWidth: 0,
-    flexShrink: 1,
    flexDirection: "row",
    alignItems: "center",
    backgroundColor: "transparent",
@@ -725,8 +721,6 @@ const styles = StyleSheet.create((theme) => ({
    opacity: 0.5,
  },
  triggerText: {
-    minWidth: 0,
-    flexShrink: 1,
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.sm,
    fontWeight: theme.fontWeight.normal,
@@ -1,5 +1,4 @@
 import { ScrollView, type LayoutChangeEvent, type StyleProp, type ViewStyle } from "react-native";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";

 interface DiffScrollProps {
  children: React.ReactNode;
@@ -15,14 +14,12 @@ export function DiffScroll({
  style,
  contentContainerStyle,
 }: DiffScrollProps) {
-  const webScrollbarStyle = useWebScrollbarStyle();
-
  return (
    <ScrollView
      horizontal
      nestedScrollEnabled
      showsHorizontalScrollIndicator
-      style={[style, webScrollbarStyle]}
+      style={style}
      contentContainerStyle={contentContainerStyle}
      onLayout={(e: LayoutChangeEvent) => onScrollViewWidthChange(e.nativeEvent.layout.width)}
    >
@@ -4,7 +4,6 @@ import { ScrollView as GHScrollView } from "react-native-gesture-handler";
 import { StyleSheet } from "react-native-unistyles";
 import { Fonts } from "@/constants/theme";
 import type { DiffLine, DiffSegment } from "@/utils/tool-call-parsers";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
 import { getCodeInsets } from "./code-insets";
 import { isWeb } from "@/constants/platform";

@@ -24,7 +23,6 @@ export function DiffViewer({
  fillAvailableHeight = false,
 }: DiffViewerProps) {
  const [scrollViewWidth, setScrollViewWidth] = React.useState(0);
-  const webScrollbarStyle = useWebScrollbarStyle();

  if (!diffLines.length) {
    return (
@@ -40,7 +38,6 @@ export function DiffViewer({
        styles.verticalScroll,
        maxHeight !== undefined && { maxHeight },
        fillAvailableHeight && styles.fillHeight,
-        webScrollbarStyle,
      ]}
      contentContainerStyle={styles.verticalContent}
      nestedScrollEnabled
@@ -50,7 +47,6 @@ export function DiffViewer({
        horizontal
        nestedScrollEnabled
        showsHorizontalScrollIndicator
-        style={webScrollbarStyle}
        contentContainerStyle={styles.horizontalContent}
        onLayout={(e) => setScrollViewWidth(e.nativeEvent.layout.width)}
      >
@@ -167,32 +167,23 @@ export function FileExplorerPane({
    if (hasInitializedRef.current) {
      return;
    }
-    // Mark initialized eagerly so concurrent effect re-runs don't double-fetch.
-    // If the root listing fails (e.g. client not yet connected), we reset the
-    // flag so the next time requestDirectoryListing is recreated (when client
-    // becomes available) this effect retries automatically.
    hasInitializedRef.current = true;
    void requestDirectoryListing(".", {
      recordHistory: false,
      setCurrentPath: false,
-    }).then((succeeded) => {
-      if (!succeeded) {
-        hasInitializedRef.current = false;
-        return;
-      }
-      const persistedPaths =
-        usePanelStore.getState().expandedPathsByWorkspace[workspaceStateKey ?? ""];
-      if (persistedPaths) {
-        for (const path of persistedPaths) {
-          if (path !== ".") {
-            void requestDirectoryListing(path, {
-              recordHistory: false,
-              setCurrentPath: false,
-            });
-          }
+    });
+    const persistedPaths =
+      usePanelStore.getState().expandedPathsByWorkspace[workspaceStateKey ?? ""];
+    if (persistedPaths) {
+      for (const path of persistedPaths) {
+        if (path !== ".") {
+          void requestDirectoryListing(path, {
+            recordHistory: false,
+            setCurrentPath: false,
+          });
        }
      }
-    });
+    }
  }, [hasWorkspaceScope, requestDirectoryListing, workspaceStateKey]);

  // Expand ancestor directories when a file is selected (e.g., from an inline path click)
@@ -1,23 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
-
-describe("isRenderedMarkdownFile", () => {
-  it("detects .md files", () => {
-    expect(isRenderedMarkdownFile("README.md")).toBe(true);
-    expect(isRenderedMarkdownFile("docs/guide.MD")).toBe(true);
-  });
-
-  it("detects .markdown files", () => {
-    expect(isRenderedMarkdownFile("notes.markdown")).toBe(true);
-    expect(isRenderedMarkdownFile("docs/CHANGELOG.MARKDOWN")).toBe(true);
-  });
-
-  it("does not treat .mdx files as rendered markdown", () => {
-    expect(isRenderedMarkdownFile("page.mdx")).toBe(false);
-  });
-
-  it("does not treat other text files as rendered markdown", () => {
-    expect(isRenderedMarkdownFile("src/index.ts")).toBe(false);
-    expect(isRenderedMarkdownFile("README.md.txt")).toBe(false);
-  });
-});
@@ -1,4 +0,0 @@
-export function isRenderedMarkdownFile(filePath: string): boolean {
-  const normalizedPath = filePath.trim().toLowerCase();
-  return normalizedPath.endsWith(".md") || normalizedPath.endsWith(".markdown");
-}
@@ -1,6 +1,5 @@
 import React, { useMemo, useRef } from "react";
 import { useQuery } from "@tanstack/react-query";
-import Markdown, { MarkdownIt } from "react-native-markdown-display";
 import {
  ActivityIndicator,
  Image as RNImage,
@@ -13,7 +12,6 @@ import { useIsCompactFormFactor } from "@/constants/layout";
 import { Fonts } from "@/constants/theme";
 import { useSessionStore, type ExplorerFile } from "@/stores/session-store";
 import { useWebScrollViewScrollbar } from "@/components/use-web-scrollbar";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
 import {
  highlightCode,
  darkHighlightColors,
@@ -22,9 +20,7 @@ import {
  type HighlightStyle,
 } from "@getpaseo/highlight";
 import { lineNumberGutterWidth } from "@/components/code-insets";
-import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
 import { isWeb } from "@/constants/platform";
-import { createMarkdownStyles } from "@/styles/markdown-styles";

 interface CodeLineProps {
  tokens: HighlightToken[];
@@ -72,7 +68,7 @@ const CodeLine = React.memo(function CodeLine({
      <View style={[codeLineStyles.gutter, { width: gutterWidth }]}>
        <Text style={[codeLineStyles.gutterText, { color: baseColor }]}>{String(lineNumber)}</Text>
      </View>
-      <Text selectable style={codeLineStyles.lineText}>
+      <Text style={codeLineStyles.lineText}>
        {tokens.map((token, index) => (
          <Text
            key={index}
@@ -121,23 +117,19 @@ function FilePreviewBody({
  const isDark = theme.colorScheme === "dark";
  const colorMap = isDark ? darkHighlightColors : lightHighlightColors;
  const baseColor = isDark ? "#c9d1d9" : "#24292f";
-  const markdownStyles = useMemo(() => createMarkdownStyles(theme), [theme]);
-  const markdownParser = useMemo(() => MarkdownIt({ typographer: true, linkify: true }), []);
-  const isMarkdownFile = preview?.kind === "text" && isRenderedMarkdownFile(filePath);

  const previewScrollRef = useRef<RNScrollView>(null);
-  const webScrollbarStyle = useWebScrollbarStyle();
  const scrollbar = useWebScrollViewScrollbar(previewScrollRef, {
    enabled: showDesktopWebScrollbar,
  });

  const highlightedLines = useMemo(() => {
-    if (!preview || preview.kind !== "text" || isMarkdownFile) {
+    if (!preview || preview.kind !== "text") {
      return null;
    }

    return highlightCode(preview.content ?? "", filePath);
-  }, [isMarkdownFile, preview?.kind, preview?.content, filePath]);
+  }, [preview?.kind, preview?.content, filePath]);

  const gutterWidth = useMemo(() => {
    if (!highlightedLines) return 0;
@@ -162,28 +154,6 @@ function FilePreviewBody({
  }

  if (preview.kind === "text") {
-    if (isMarkdownFile) {
-      return (
-        <View style={styles.previewScrollContainer}>
-          <RNScrollView
-            ref={previewScrollRef}
-            style={styles.previewContent}
-            contentContainerStyle={styles.previewMarkdownScrollContent}
-            onLayout={scrollbar.onLayout}
-            onScroll={scrollbar.onScroll}
-            onContentSizeChange={scrollbar.onContentSizeChange}
-            scrollEventThrottle={16}
-            showsVerticalScrollIndicator={!showDesktopWebScrollbar}
-          >
-            <Markdown style={markdownStyles} markdownit={markdownParser}>
-              {preview.content ?? ""}
-            </Markdown>
-          </RNScrollView>
-          {scrollbar.overlay}
-        </View>
-      );
-    }
-
    const lines = highlightedLines ?? [[{ text: preview.content ?? "", style: null }]];
    const codeLines = (
      <View>
@@ -218,7 +188,6 @@ function FilePreviewBody({
              horizontal
              nestedScrollEnabled
              showsHorizontalScrollIndicator
-              style={webScrollbarStyle}
              contentContainerStyle={styles.previewCodeScrollContent}
            >
              {codeLines}
@@ -295,7 +264,6 @@ export function FilePane({
      return { file: payload.file ?? null, error: payload.error ?? null };
    },
    staleTime: 5_000,
-    refetchOnMount: true,
  });

  return (
@@ -360,9 +328,6 @@ const styles = StyleSheet.create((theme) => ({
  previewCodeScrollContent: {
    padding: theme.spacing[4],
  },
-  previewMarkdownScrollContent: {
-    padding: theme.spacing[4],
-  },
  previewImageScrollContent: {
    flexGrow: 1,
    padding: theme.spacing[4],
@@ -32,11 +32,15 @@ import {
 } from "lucide-react-native";
 import { useCheckoutGitActionsStore } from "@/stores/checkout-git-actions-store";
 import {
-  useCheckoutDiffQuery,
  type ParsedDiffFile,
  type DiffLine,
  type HighlightToken,
 } from "@/hooks/use-checkout-diff-query";
+import {
+  useCheckoutDiffMetadataQuery,
+  type DiffFileMetadata,
+} from "@/hooks/use-checkout-diff-metadata-query";
+import { useFileHunks } from "@/hooks/use-file-hunks";
 import { useCheckoutStatusQuery } from "@/hooks/use-checkout-status-query";
 import { useCheckoutPrStatusQuery } from "@/hooks/use-checkout-pr-status-query";
 import { useChangesPreferences } from "@/hooks/use-changes-preferences";
@@ -130,8 +134,16 @@ function HighlightedText({ tokens, wrapLines = false }: HighlightedTextProps) {
  );
 }

+interface DiffFileHeaderFields {
+  path: string;
+  isNew: boolean;
+  isDeleted: boolean;
+  additions: number;
+  deletions: number;
+}
+
 interface DiffFileSectionProps {
-  file: ParsedDiffFile;
+  file: DiffFileHeaderFields;
  isExpanded: boolean;
  onToggle: (path: string) => void;
  onHeaderHeightChange?: (path: string, height: number) => void;
@@ -617,6 +629,109 @@ function DiffFileBody({
  );
 }

+interface LazyDiffFileBodyProps {
+  file: DiffFileMetadata;
+  serverId: string;
+  cwd: string;
+  mode: "uncommitted" | "base";
+  baseRef?: string;
+  ignoreWhitespace?: boolean;
+  layout: "unified" | "split";
+  wrapLines: boolean;
+  onBodyHeightChange?: (path: string, height: number) => void;
+  testID?: string;
+}
+
+function LazyDiffFileBody({
+  file,
+  serverId,
+  cwd,
+  mode,
+  baseRef,
+  ignoreWhitespace,
+  layout,
+  wrapLines,
+  onBodyHeightChange,
+  testID,
+}: LazyDiffFileBodyProps) {
+  const {
+    file: resolvedFile,
+    isLoading,
+    isError,
+    error,
+  } = useFileHunks({
+    serverId,
+    cwd,
+    mode,
+    baseRef,
+    ignoreWhitespace,
+    file,
+    enabled: true,
+  });
+
+  if (file.status === "binary" || file.status === "too_large") {
+    return (
+      <View
+        style={[styles.fileSectionBodyContainer, styles.fileSectionBorder]}
+        onLayout={(event) => {
+          onBodyHeightChange?.(file.path, event.nativeEvent.layout.height);
+        }}
+        testID={testID}
+      >
+        <View style={styles.statusMessageContainer}>
+          <Text style={styles.statusMessageText}>
+            {file.status === "binary" ? "Binary file" : "Diff too large to display"}
+          </Text>
+        </View>
+      </View>
+    );
+  }
+
+  if (isLoading) {
+    return (
+      <View
+        style={[styles.fileSectionBodyContainer, styles.fileSectionBorder]}
+        onLayout={(event) => {
+          onBodyHeightChange?.(file.path, event.nativeEvent.layout.height);
+        }}
+        testID={testID}
+      >
+        <View style={styles.statusMessageContainer}>
+          <ActivityIndicator size="small" />
+        </View>
+      </View>
+    );
+  }
+
+  if (isError || !resolvedFile) {
+    return (
+      <View
+        style={[styles.fileSectionBodyContainer, styles.fileSectionBorder]}
+        onLayout={(event) => {
+          onBodyHeightChange?.(file.path, event.nativeEvent.layout.height);
+        }}
+        testID={testID}
+      >
+        <View style={styles.statusMessageContainer}>
+          <Text style={styles.statusMessageText}>
+            {error instanceof Error ? error.message : "Failed to load diff"}
+          </Text>
+        </View>
+      </View>
+    );
+  }
+
+  return (
+    <DiffFileBody
+      file={resolvedFile}
+      layout={layout}
+      wrapLines={wrapLines}
+      onBodyHeightChange={onBodyHeightChange}
+      testID={testID}
+    />
+  );
+}
+
 interface GitDiffPaneProps {
  serverId: string;
  workspaceId?: string | null;
@@ -625,8 +740,8 @@ interface GitDiffPaneProps {
 }

 type DiffFlatItem =
-  | { type: "header"; file: ParsedDiffFile; fileIndex: number; isExpanded: boolean }
-  | { type: "body"; file: ParsedDiffFile; fileIndex: number };
+  | { type: "header"; file: DiffFileHeaderFields; fileIndex: number; isExpanded: boolean }
+  | { type: "lazy-body"; file: DiffFileMetadata; fileIndex: number };

 export function GitDiffPane({ serverId, workspaceId, cwd, hideHeaderRow }: GitDiffPaneProps) {
  const { theme } = useUnistyles();
@@ -687,7 +802,7 @@ export function GitDiffPane({ serverId, workspaceId, cwd, hideHeaderRow }: GitDi
    isError: isDiffError,
    error: diffError,
    refresh: refreshDiff,
-  } = useCheckoutDiffQuery({
+  } = useCheckoutDiffMetadataQuery({
    serverId,
    cwd,
    mode: diffMode,
@@ -788,7 +903,7 @@ export function GitDiffPane({ serverId, workspaceId, cwd, hideHeaderRow }: GitDi
        stickyIndices.push(items.length - 1);
      }
      if (isExpanded) {
-        items.push({ type: "body", file, fileIndex: i });
+        items.push({ type: "lazy-body", file: file as DiffFileMetadata, fileIndex: i });
      }
    }
    return { flatItems: items, stickyHeaderIndices: stickyIndices };
@@ -1068,8 +1183,13 @@ export function GitDiffPane({ serverId, workspaceId, cwd, hideHeaderRow }: GitDi
        );
      }
      return (
-        <DiffFileBody
+        <LazyDiffFileBody
          file={item.file}
+          serverId={serverId}
+          cwd={cwd}
+          mode={diffMode}
+          baseRef={baseRef}
+          ignoreWhitespace={changesPreferences.hideWhitespace}
          layout={effectiveLayout}
          wrapLines={wrapLines}
          onBodyHeightChange={handleBodyHeightChange}
@@ -1078,10 +1198,15 @@ export function GitDiffPane({ serverId, workspaceId, cwd, hideHeaderRow }: GitDi
      );
    },
    [
+      baseRef,
+      changesPreferences.hideWhitespace,
+      cwd,
+      diffMode,
      effectiveLayout,
      handleBodyHeightChange,
      handleHeaderHeightChange,
      handleToggleExpanded,
+      serverId,
      wrapLines,
    ],
  );
@@ -42,10 +42,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
 import { Shortcut } from "@/components/ui/shortcut";
 import { useWebElementScrollbar } from "@/components/use-web-scrollbar";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
-import { formatShortcut } from "@/utils/format-shortcut";
-import { getShortcutOs } from "@/utils/shortcut-platform";
 import type { MessageInputKeyboardActionKind } from "@/keyboard/actions";
-import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
 import {
  markScrollInvestigationEvent,
  markScrollInvestigationRender,
@@ -78,8 +75,8 @@ export interface MessageInputProps {
  autoFocus?: boolean;
  autoFocusKey?: string;
  disabled?: boolean;
-  /** True when this composer's pane is focused. Used to gate global hotkeys and stop dictation when hidden. */
-  isPaneFocused?: boolean;
+  /** True when this input is the active composer. Used to gate global hotkeys and stop dictation when hidden. */
+  isInputActive?: boolean;
  /** Content to render on the left side of the button row (e.g., AgentStatusBar) */
  leftContent?: React.ReactNode;
  /** Content to render on the right side before the voice button (e.g., context window meter) */
@@ -209,7 +206,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
    autoFocus = false,
    autoFocusKey,
    disabled = false,
-    isPaneFocused = true,
+    isInputActive = true,
    leftContent,
    beforeVoiceContent,
    rightContent,
@@ -236,9 +233,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
  const voiceMuteToggleKeys = useShortcutKeys("voice-mute-toggle");
  const dictationToggleKeys = useShortcutKeys("dictation-toggle");
  const queueKeys = useShortcutKeys("message-input-queue");
-  const focusInputKeys = useShortcutKeys("focus-message-input");
  const [inputHeight, setInputHeight] = useState(MIN_INPUT_HEIGHT);
-  const [isInputFocused, setIsInputFocused] = useState(false);
  const rootRef = useRef<View | null>(null);
  const inputWrapperRef = useRef<View | null>(null);
  const textInputRef = useRef<TextInput | (TextInput & { getNativeRef?: () => unknown }) | null>(
@@ -432,7 +427,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
    onError: handleDictationError,
    canStart: canStartDictation,
    canConfirm: canConfirmDictation,
-    autoStopWhenHidden: { isVisible: isPaneFocused },
+    autoStopWhenHidden: { isVisible: isInputActive },
    enableDuration: true,
  });

@@ -896,7 +891,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
    // IME composition in progress (e.g. CJK input) — all key events belong to the
    // IME, not the app. keyCode 229 is a Chromium fallback for when isComposing is
    // cleared before the keydown fires.
-    if (isImeComposingKeyboardEvent(event.nativeEvent)) return;
+    if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) return;

    // Allow parent to intercept key events (e.g., for autocomplete navigation)
    if (onKeyPressCallback) {
@@ -1002,12 +997,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
            accessibilityLabel="Message agent..."
            onFocus={() => {
              isInputFocusedRef.current = true;
-              setIsInputFocused(true);
              onFocusChange?.(true);
            }}
            onBlur={() => {
              isInputFocusedRef.current = false;
-              setIsInputFocused(false);
              onFocusChange?.(false);
            }}
            style={[
@@ -1032,11 +1025,6 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(funct
            autoFocus={isWeb && autoFocus}
          />
          {inputScrollbar}
-          {isWeb && isPaneFocused && !isInputFocused && !value && focusInputKeys ? (
-            <Text style={styles.focusHintText} pointerEvents="none">
-              {formatShortcut(focusInputKeys[0], getShortcutOs())} to focus
-            </Text>
-          ) : null}
        </View>

        {/* Button row */}
@@ -1282,14 +1270,6 @@ const styles = StyleSheet.create(((theme: any) => ({
  textInputScrollWrapper: {
    position: "relative",
  },
-  focusHintText: {
-    position: "absolute",
-    top: 0,
-    right: 0,
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foregroundMuted,
-    opacity: 0.5,
-  },
  textInput: {
    width: "100%",
    color: theme.colors.foreground,
@@ -1310,15 +1290,11 @@ const styles = StyleSheet.create(((theme: any) => ({
    justifyContent: "space-between",
  },
  leftButtonGroup: {
-    minWidth: 0,
-    flexShrink: 1,
-    flexGrow: 1,
    flexDirection: "row",
    alignItems: "flex-end",
    gap: theme.spacing[1],
  },
  rightButtonGroup: {
-    flexShrink: 0,
    flexDirection: "row",
    alignItems: "center",
    gap: isWeb ? theme.spacing[2] : theme.spacing[1],
@@ -1,16 +1,11 @@
-import { AlertCircle, Search } from "lucide-react-native";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { ActivityIndicator, Pressable, ScrollView, Text, View } from "react-native";
+import { useCallback, useEffect, useState } from "react";
+import { View, Text, ActivityIndicator, ScrollView } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { AdaptiveModalSheet, AdaptiveTextInput } from "@/components/adaptive-modal-sheet";
-import { SpinningRefreshIcon } from "@/components/spinning-refresh-icon";
-import { isWeb } from "@/constants/platform";
-import { Fonts } from "@/constants/theme";
+import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { useHostRuntimeClient } from "@/runtime/host-runtime";
 import { resolveProviderLabel } from "@/utils/provider-definitions";
-import { formatTimeAgo } from "@/utils/time";
-import type { AgentModelDefinition, AgentProvider } from "@server/server/agent/agent-sdk-types";
+import type { AgentProvider } from "@server/server/agent/agent-sdk-types";

 interface ProviderDiagnosticSheetProps {
  provider: string;
@@ -27,333 +22,83 @@ export function ProviderDiagnosticSheet({
 }: ProviderDiagnosticSheetProps) {
  const { theme } = useUnistyles();
  const client = useHostRuntimeClient(serverId);
-  const { entries: snapshotEntries, refresh, isRefreshing } = useProvidersSnapshot(serverId);
+  const { entries: snapshotEntries } = useProvidersSnapshot(serverId);
  const [diagnostic, setDiagnostic] = useState<string | null>(null);
  const [loading, setLoading] = useState(false);
-  const [query, setQuery] = useState("");

  const providerLabel = resolveProviderLabel(provider, snapshotEntries);
-  const providerEntry = useMemo(
-    () => snapshotEntries?.find((entry) => entry.provider === provider),
-    [snapshotEntries, provider],
-  );
-  const models = providerEntry?.models ?? [];
-  const providerSnapshotRefreshing = providerEntry?.status === "loading";
-  const providerErrorMessage =
-    providerEntry?.status === "error" ? (providerEntry.error ?? "Unknown error") : null;
-  const refreshInFlight = isRefreshing || providerSnapshotRefreshing || loading;

-  const [clockTick, setClockTick] = useState(0);
-  useEffect(() => {
-    if (!visible) return;
-    const id = setInterval(() => setClockTick((t) => t + 1), 10_000);
-    return () => clearInterval(id);
-  }, [visible]);
-  const fetchedAtLabel = useMemo(() => {
-    if (!providerEntry?.fetchedAt) return null;
-    return formatTimeAgo(new Date(providerEntry.fetchedAt));
-    // clockTick triggers re-computation on timer
-  }, [providerEntry?.fetchedAt, clockTick]);
+  const fetchDiagnostic = useCallback(async () => {
+    if (!client || !provider) return;

-  const q = query.trim().toLowerCase();
-  const filteredModels = q
-    ? models.filter((m) => m.label.toLowerCase().includes(q) || m.id.toLowerCase().includes(q))
-    : models;
+    setLoading(true);
+    setDiagnostic(null);

-  const fetchDiagnostic = useCallback(
-    async (options?: { keepCurrent?: boolean }) => {
-      if (!client || !provider) return;
-
-      setLoading(true);
-      if (!options?.keepCurrent) {
-        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],
-  );
-
-  const handleRefresh = useCallback(() => {
-    void refresh([provider as AgentProvider]);
-    void fetchDiagnostic({ keepCurrent: true });
-  }, [fetchDiagnostic, provider, refresh]);
+    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);
-      setQuery("");
    }
  }, [visible, fetchDiagnostic]);

-  function renderModelsBody() {
-    if (models.length === 0 && providerSnapshotRefreshing) {
-      return (
-        <View style={sheetStyles.emptyState}>
-          <ActivityIndicator size="small" color={theme.colors.foregroundMuted} />
-          <Text style={sheetStyles.mutedText}>Loading models…</Text>
-        </View>
-      );
-    }
-    if (models.length === 0 && providerErrorMessage) {
-      return (
-        <View style={sheetStyles.emptyState}>
-          <AlertCircle size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-          <Text style={sheetStyles.mutedText}>{providerErrorMessage}</Text>
-        </View>
-      );
-    }
-    if (models.length === 0) {
-      return (
-        <View style={sheetStyles.emptyState}>
-          <Text style={sheetStyles.mutedText}>No models detected.</Text>
-        </View>
-      );
-    }
-    if (filteredModels.length === 0) {
-      return (
-        <View style={sheetStyles.emptyState}>
-          <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-          <Text style={sheetStyles.mutedText}>No models match your search</Text>
-        </View>
-      );
-    }
-    return filteredModels.map((model: AgentModelDefinition, index) => (
-      <View key={model.id} style={[sheetStyles.modelRow, index > 0 && sheetStyles.modelRowBorder]}>
-        <Text style={sheetStyles.modelLabel} numberOfLines={1}>
-          {model.label}
-        </Text>
-        <Text style={sheetStyles.modelId} numberOfLines={1} selectable>
-          {model.id}
-        </Text>
-      </View>
-    ));
-  }
-
  return (
    <AdaptiveModalSheet
      title={providerLabel}
      visible={visible}
      onClose={onClose}
      snapPoints={["50%", "85%"]}
-      scrollable={false}
-      headerActions={
-        <Pressable
-          onPress={handleRefresh}
-          disabled={refreshInFlight}
-          hitSlop={8}
-          style={({ hovered, pressed }) => [
-            sheetStyles.iconButton,
-            (hovered || pressed) && sheetStyles.iconButtonHovered,
-            refreshInFlight ? sheetStyles.disabled : null,
-          ]}
-          accessibilityRole="button"
-          accessibilityLabel={`Refresh ${providerLabel}`}
-        >
-          <SpinningRefreshIcon
-            spinning={refreshInFlight}
-            size={theme.iconSize.sm}
-            color={theme.colors.foregroundMuted}
-          />
-        </Pressable>
-      }
    >
-      <View style={sheetStyles.section}>
-        <Text style={sheetStyles.sectionTitle}>Diagnostic</Text>
-        <View style={sheetStyles.codeBlock}>
-          {loading && !diagnostic ? (
-            <View style={sheetStyles.codeBlockLoading}>
-              <ActivityIndicator size="small" color={theme.colors.foregroundMuted} />
-              <Text style={sheetStyles.mutedText}>Running diagnostic…</Text>
-            </View>
-          ) : diagnostic ? (
-            <ScrollView
-              style={sheetStyles.codeScroll}
-              contentContainerStyle={sheetStyles.codeContent}
-              showsVerticalScrollIndicator={false}
-            >
-              <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-                <Text style={sheetStyles.codeText} selectable>
-                  {diagnostic}
-                </Text>
-              </ScrollView>
-            </ScrollView>
-          ) : (
-            <View style={sheetStyles.codeBlockLoading}>
-              <Text style={sheetStyles.mutedText}>No diagnostic available.</Text>
-            </View>
-          )}
+      {loading ? (
+        <View style={sheetStyles.loadingContainer}>
+          <ActivityIndicator size="small" color={theme.colors.foregroundMuted} />
+          <Text style={sheetStyles.loadingText}>Fetching diagnostic…</Text>
        </View>
-      </View>
-
-      <View style={sheetStyles.modelsSection}>
-        <View style={sheetStyles.modelsHeader}>
-          <Text style={sheetStyles.sectionTitle}>Models</Text>
-          <View style={sheetStyles.modelsHeaderMeta}>
-            <Text style={sheetStyles.countText}>{models.length}</Text>
-            {fetchedAtLabel ? (
-              <>
-                <Text style={sheetStyles.metaDot}>·</Text>
-                <Text style={sheetStyles.countText}>Updated {fetchedAtLabel}</Text>
-              </>
-            ) : null}
-          </View>
-        </View>
-        {models.length > 0 ? (
-          <View style={sheetStyles.searchContainer}>
-            <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-            <AdaptiveTextInput
-              value={query}
-              onChangeText={setQuery}
-              placeholder="Search models"
-              placeholderTextColor={theme.colors.foregroundMuted}
-              autoCapitalize="none"
-              autoCorrect={false}
-              // @ts-expect-error - outlineStyle is web-only
-              style={[sheetStyles.searchInput, isWeb && { outlineStyle: "none" }]}
-            />
-          </View>
-        ) : null}
+      ) : diagnostic ? (
        <ScrollView
-          style={sheetStyles.modelsScroll}
-          contentContainerStyle={sheetStyles.modelsScrollContent}
-          keyboardShouldPersistTaps="handled"
-          showsVerticalScrollIndicator={false}
+          horizontal
+          style={sheetStyles.scrollContainer}
+          contentContainerStyle={sheetStyles.scrollContent}
        >
-          {renderModelsBody()}
+          <Text style={sheetStyles.diagnosticText} selectable>
+            {diagnostic}
+          </Text>
        </ScrollView>
-      </View>
+      ) : null}
    </AdaptiveModalSheet>
  );
 }

 const sheetStyles = StyleSheet.create((theme) => ({
-  section: {
-    gap: theme.spacing[2],
-  },
-  sectionTitle: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.xs,
-    fontWeight: theme.fontWeight.normal,
-  },
-  mutedText: {
-    fontSize: theme.fontSize.sm,
-    color: theme.colors.foregroundMuted,
-  },
-  iconButton: {
-    width: 30,
-    height: 30,
-    borderRadius: theme.borderRadius.full,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  iconButtonHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  disabled: {
-    opacity: 0.5,
-  },
-  codeBlock: {
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    borderRadius: theme.borderRadius.base,
-    backgroundColor: theme.colors.surface2,
-    overflow: "hidden",
-    maxHeight: 180,
-  },
-  codeScroll: {
-    maxHeight: 180,
-  },
-  codeContent: {
-    paddingVertical: theme.spacing[3],
-    paddingHorizontal: theme.spacing[3],
-  },
-  codeText: {
-    fontFamily: Fonts.mono,
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foreground,
-    lineHeight: 18,
-  },
-  codeBlockLoading: {
-    paddingVertical: theme.spacing[4],
-    paddingHorizontal: theme.spacing[3],
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-  },
-  modelsSection: {
-    flex: 1,
-    minHeight: 0,
-    gap: theme.spacing[2],
-  },
-  modelsHeader: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-  },
-  modelsHeaderMeta: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
-  metaDot: {
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foregroundMuted,
-  },
-  countText: {
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foregroundMuted,
-  },
-  searchContainer: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    backgroundColor: theme.colors.surface2,
-    borderRadius: theme.borderRadius.md,
-    paddingHorizontal: theme.spacing[3],
-  },
-  searchInput: {
-    flex: 1,
-    paddingVertical: theme.spacing[2],
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-  },
-  modelsScroll: {
-    flex: 1,
-    minHeight: 0,
-  },
-  modelsScrollContent: {
-    paddingBottom: theme.spacing[2],
-  },
-  modelRow: {
-    paddingVertical: theme.spacing[3],
-  },
-  modelRowBorder: {
-    borderTopWidth: 1,
-    borderTopColor: theme.colors.border,
-  },
-  modelLabel: {
-    fontSize: theme.fontSize.sm,
-    color: theme.colors.foreground,
-  },
-  modelId: {
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foregroundMuted,
-    fontFamily: Fonts.mono,
-    marginTop: 2,
-  },
-  emptyState: {
+  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,
+  },
 }));
@@ -236,14 +236,7 @@ function WorkspaceStatusIndicator({
  if (shouldShowSyncedLoader) {
    return (
      <View style={styles.workspaceStatusDot}>
-        <SyncedLoader
-          size={11}
-          color={
-            theme.colorScheme === "light"
-              ? theme.colors.palette.amber[700]
-              : theme.colors.palette.amber[500]
-          }
-        />
+        <SyncedLoader size={11} color={theme.colors.palette.amber[500]} />
      </View>
    );
  }
@@ -347,14 +340,7 @@ function ProjectLeadingVisual({
  if (shouldShowSyncedLoader) {
    return (
      <View style={styles.projectLeadingVisualSlot}>
-        <SyncedLoader
-          size={11}
-          color={
-            theme.colorScheme === "light"
-              ? theme.colors.palette.amber[700]
-              : theme.colors.palette.amber[500]
-          }
-        />
+        <SyncedLoader size={11} color={theme.colors.palette.amber[500]} />
      </View>
    );
  }
@@ -808,12 +794,7 @@ function ProjectHeaderRow({
          <NewWorktreeButton
            displayName={displayName}
            onPress={() => createWorktreeMutation.mutate()}
-            visible={
-              isHovered ||
-              platformIsNative ||
-              isMobileBreakpoint ||
-              createWorktreeMutation.isPending
-            }
+            visible={isHovered || platformIsNative || isMobileBreakpoint}
            loading={createWorktreeMutation.isPending}
            showShortcutHint={isProjectActive}
            testID={`sidebar-project-new-worktree-${project.projectKey}`}
@@ -1,67 +0,0 @@
-import { useEffect } from "react";
-import { RefreshCw } from "lucide-react-native";
-import Animated, {
-  cancelAnimation,
-  Easing,
-  useAnimatedStyle,
-  useSharedValue,
-  withRepeat,
-  withTiming,
-} from "react-native-reanimated";
-
-interface SpinningRefreshIconProps {
-  spinning: boolean;
-  size: number;
-  color: string;
-}
-
-export function SpinningRefreshIcon({ spinning, size, color }: SpinningRefreshIconProps) {
-  const rotation = useSharedValue(0);
-
-  useEffect(() => {
-    if (spinning) {
-      rotation.value = 0;
-      rotation.value = withRepeat(
-        withTiming(360, {
-          duration: 1000,
-          easing: Easing.linear,
-        }),
-        -1,
-        false,
-      );
-      return;
-    }
-
-    cancelAnimation(rotation);
-    const remainder = rotation.value % 360;
-    if (Math.abs(remainder) < 0.001) {
-      rotation.value = 0;
-      return;
-    }
-
-    rotation.value = withTiming(360, {
-      duration: Math.max(80, Math.round(((360 - remainder) / 360) * 1000)),
-      easing: Easing.linear,
-    });
-  }, [rotation, spinning]);
-
-  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{ rotate: `${rotation.value}deg` }],
-  }));
-
-  return (
-    <Animated.View
-      style={[
-        {
-          width: size,
-          height: size,
-          alignItems: "center",
-          justifyContent: "center",
-        },
-        animatedStyle,
-      ]}
-    >
-      <RefreshCw size={size} color={color} />
-    </Animated.View>
-  );
-}
@@ -16,7 +16,7 @@ const DOT_COUNT = DOT_SEQUENCE.length;
 const GRID_ROWS = 3;
 const GRID_COLUMNS = 2;
 const SNAKE_SEGMENT_OFFSETS = [0, -1, -2, -3, -4] as const;
-const SNAKE_OPACITIES = [1, 0.78, 0.56, 0.34, 0] as const;
+const SNAKE_OPACITIES = [1, 0.72, 0.46, 0.22, 0] as const;
 const sharedStepProgress = makeMutable(0);
 let sharedLoopStarted = false;

@@ -6,7 +6,6 @@ import { Fonts } from "@/constants/theme";
 import type { ToolCallDetail } from "@server/server/agent/agent-sdk-types";
 import { buildLineDiff, parseUnifiedDiff } from "@/utils/tool-call-parsers";
 import { hasMeaningfulToolCallDetail } from "@/utils/tool-call-detail-state";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
 import { DiffViewer } from "./diff-viewer";
 import { getCodeInsets } from "./code-insets";
 import { isWeb } from "@/constants/platform";
@@ -31,7 +30,6 @@ export function ToolCallDetailsContent({
  showLoadingSkeleton = false,
 }: ToolCallDetailsContentProps) {
  const resolvedMaxHeight = fillAvailableHeight ? undefined : (maxHeight ?? 300);
-  const webScrollbarStyle = useWebScrollbarStyle();

  // Compute diff lines for edit type
  const diffLines = useMemo(() => {
@@ -67,7 +65,6 @@ export function ToolCallDetailsContent({
              styles.codeVerticalScroll,
              resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
              shouldFill && styles.fillHeight,
-              webScrollbarStyle,
            ]}
            contentContainerStyle={styles.codeVerticalContent}
            nestedScrollEnabled
@@ -77,7 +74,6 @@ export function ToolCallDetailsContent({
              horizontal
              nestedScrollEnabled
              showsHorizontalScrollIndicator
-              style={webScrollbarStyle}
              contentContainerStyle={styles.codeHorizontalContent}
            >
              <View style={styles.codeLine}>
@@ -103,7 +99,6 @@ export function ToolCallDetailsContent({
              styles.codeVerticalScroll,
              resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
              shouldFill && styles.fillHeight,
-              webScrollbarStyle,
            ]}
            contentContainerStyle={styles.codeVerticalContent}
            nestedScrollEnabled
@@ -113,7 +108,6 @@ export function ToolCallDetailsContent({
              horizontal
              nestedScrollEnabled
              showsHorizontalScrollIndicator
-              style={webScrollbarStyle}
              contentContainerStyle={styles.codeHorizontalContent}
            >
              <View style={styles.codeLine}>
@@ -143,7 +137,6 @@ export function ToolCallDetailsContent({
              styles.codeVerticalScroll,
              resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
              shouldFill && styles.fillHeight,
-              webScrollbarStyle,
            ]}
            contentContainerStyle={styles.codeVerticalContent}
            nestedScrollEnabled
@@ -153,7 +146,6 @@ export function ToolCallDetailsContent({
              horizontal
              nestedScrollEnabled
              showsHorizontalScrollIndicator
-              style={webScrollbarStyle}
              contentContainerStyle={styles.codeHorizontalContent}
            >
              <View style={styles.codeLine}>
@@ -189,18 +181,12 @@ export function ToolCallDetailsContent({
              styles.scrollArea,
              resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
              shouldFill && styles.fillHeight,
-              webScrollbarStyle,
            ]}
            contentContainerStyle={styles.scrollContent}
            nestedScrollEnabled
            showsVerticalScrollIndicator={true}
          >
-            <ScrollView
-              horizontal
-              nestedScrollEnabled
-              showsHorizontalScrollIndicator={true}
-              style={webScrollbarStyle}
-            >
+            <ScrollView horizontal nestedScrollEnabled showsHorizontalScrollIndicator={true}>
              <Text selectable style={styles.scrollText}>
                {detail.content}
              </Text>
@@ -218,18 +204,12 @@ export function ToolCallDetailsContent({
              styles.scrollArea,
              resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
              shouldFill && styles.fillHeight,
-              webScrollbarStyle,
            ]}
            contentContainerStyle={styles.scrollContent}
            nestedScrollEnabled
            showsVerticalScrollIndicator={true}
          >
-            <ScrollView
-              horizontal
-              nestedScrollEnabled
-              showsHorizontalScrollIndicator={true}
-              style={webScrollbarStyle}
-            >
+            <ScrollView horizontal nestedScrollEnabled showsHorizontalScrollIndicator={true}>
              <Text selectable style={styles.scrollText}>
                {detail.content}
              </Text>
@@ -256,18 +236,12 @@ export function ToolCallDetailsContent({
            style={[
              styles.scrollArea,
              resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
-              webScrollbarStyle,
            ]}
            contentContainerStyle={styles.scrollContent}
            nestedScrollEnabled
            showsVerticalScrollIndicator
          >
-            <ScrollView
-              horizontal
-              nestedScrollEnabled
-              showsHorizontalScrollIndicator
-              style={webScrollbarStyle}
-            >
+            <ScrollView horizontal nestedScrollEnabled showsHorizontalScrollIndicator>
              <Text selectable style={styles.scrollText}>
                {detail.content}
              </Text>
@@ -312,18 +286,12 @@ export function ToolCallDetailsContent({
            styles.scrollArea,
            resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
            shouldFill && styles.fillHeight,
-            webScrollbarStyle,
          ]}
          contentContainerStyle={styles.scrollContent}
          nestedScrollEnabled
          showsVerticalScrollIndicator
        >
-          <ScrollView
-            horizontal
-            nestedScrollEnabled
-            showsHorizontalScrollIndicator
-            style={webScrollbarStyle}
-          >
+          <ScrollView horizontal nestedScrollEnabled showsHorizontalScrollIndicator>
            <Text selectable style={styles.scrollText}>
              {detail.result ? `${detail.url}\n\n${detail.result}` : detail.url}
            </Text>
@@ -388,7 +356,7 @@ export function ToolCallDetailsContent({
            <ScrollView
              horizontal
              nestedScrollEnabled
-              style={[styles.jsonScroll, webScrollbarStyle]}
+              style={styles.jsonScroll}
              contentContainerStyle={styles.jsonContent}
              showsHorizontalScrollIndicator={true}
            >
@@ -410,7 +378,7 @@ export function ToolCallDetailsContent({
        <ScrollView
          horizontal
          nestedScrollEnabled
-          style={[styles.jsonScroll, styles.jsonScrollError, webScrollbarStyle]}
+          style={[styles.jsonScroll, styles.jsonScrollError]}
          contentContainerStyle={styles.jsonContent}
          showsHorizontalScrollIndicator={true}
        >
@@ -890,7 +890,6 @@ const styles = StyleSheet.create((theme) => ({
  comboboxItemLabel: {
    fontSize: theme.fontSize.sm,
    color: theme.colors.foreground,
-    flexShrink: 0,
  },
  comboboxItemDescription: {
    fontSize: theme.fontSize.xs,
@@ -33,7 +33,6 @@ import { Check, CheckCircle } from "lucide-react-native";
 import { BottomSheetBackdrop, BottomSheetModal, BottomSheetScrollView } from "@gorhom/bottom-sheet";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { isWeb, isNative } from "@/constants/platform";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";

 // Keep parity with dropdown-menu action statuses.
 export type ActionStatus = "idle" | "pending" | "success";
@@ -349,7 +348,6 @@ export function ContextMenuContent({
  testID?: string;
 }>): ReactElement | null {
  const context = useContextMenuContext("ContextMenuContent");
-  const webScrollbarStyle = useWebScrollbarStyle();
  const isMobile = useIsCompactFormFactor();
  const useMobileSheet = isMobile && mobileMode === "sheet";
  const { open, setOpen, triggerRef, anchorRect } = context;
@@ -539,7 +537,6 @@ export function ContextMenuContent({
          <ScrollView
            bounces={false}
            showsVerticalScrollIndicator
-            style={webScrollbarStyle}
            contentContainerStyle={{ flexGrow: 1 }}
          >
            {children}
@@ -28,7 +28,6 @@ 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";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";

 // Action status for menu items with loading/success feedback
 export type ActionStatus = "idle" | "pending" | "success";
@@ -268,7 +267,6 @@ export function DropdownMenuContent({
 }>): ReactElement | null {
  const { open, setOpen, triggerRef } = useDropdownMenuContext("DropdownMenuContent");
  const [modalVisible, setModalVisible] = useState(false);
-  const webScrollbarStyle = useWebScrollbarStyle();
  const [closing, setClosing] = useState(false);
  const [triggerRect, setTriggerRect] = useState<Rect | null>(null);
  const [contentSize, setContentSize] = useState<{ width: number; height: number } | null>(null);
@@ -413,7 +411,6 @@ export function DropdownMenuContent({
            <ScrollView
              bounces={false}
              showsVerticalScrollIndicator
-              style={webScrollbarStyle}
              contentContainerStyle={{ flexGrow: 1 }}
            >
              {children}
@@ -1156,11 +1156,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
        removeWorkspace(serverId, message.payload.id);
        return;
      }
-      const workspace = normalizeWorkspaceDescriptor(message.payload.workspace);
-      const existingWorkspace = useSessionStore
-        .getState()
-        .sessions[serverId]?.workspaces.get(workspace.id);
-      mergeWorkspaces(serverId, [workspace]);
+      mergeWorkspaces(serverId, [normalizeWorkspaceDescriptor(message.payload.workspace)]);
    });

    const unsubStatus = client.on("status", (message) => {
@@ -1,12 +1,7 @@
 import type { AgentStreamEventPayload } from "@server/shared/messages";
 import type { AgentLifecycleStatus } from "@server/shared/agent-lifecycle";
 import type { StreamItem } from "@/types/stream";
-import {
-  applyStreamEvent,
-  flushHeadToTail,
-  hydrateStreamState,
-  reduceStreamUpdate,
-} from "@/types/stream";
+import { applyStreamEvent, hydrateStreamState, reduceStreamUpdate } from "@/types/stream";
 import {
  classifySessionTimelineSeq,
  type SessionTimelineSeqDecision,
@@ -219,24 +214,12 @@ export function processTimelineResponse(
    }

    if (acceptedUnits.length > 0) {
-      // Flush head to tail before appending canonical entries so that
-      // chronological ordering is preserved.  This matters on mobile where
-      // the server drops live events for backgrounded/unfocused agents:
-      // when the client catches up, the head may still hold stale live
-      // items from before the gap that must be committed ahead of the
-      // canonical gap-fill entries.
-      const baseTail =
-        currentHead.length > 0 ? flushHeadToTail(currentTail, currentHead) : currentTail;
-      if (currentHead.length > 0) {
-        nextHead = [];
-      }
-
      nextTail = acceptedUnits.reduce<StreamItem[]>(
        (state, { event, timestamp }) =>
          reduceStreamUpdate(state, event, timestamp, {
            source: "canonical",
          }),
-        baseTail,
+        currentTail,
      );
    }

@@ -1,6 +1,6 @@
-import type { SubscribeCheckoutDiffResponse } from "@server/shared/messages";
-
-type ParsedDiffFile = SubscribeCheckoutDiffResponse["payload"]["files"][number];
+interface DiffFileWithPath {
+  path: string;
+}

 export function compareCheckoutDiffPaths(left: string, right: string): number {
  if (left === right) {
@@ -9,7 +9,7 @@ export function compareCheckoutDiffPaths(left: string, right: string): number {
  return left < right ? -1 : 1;
 }

-export function orderCheckoutDiffFiles(files: ParsedDiffFile[]): ParsedDiffFile[] {
+export function orderCheckoutDiffFiles<T extends DiffFileWithPath>(files: T[]): T[] {
  if (files.length < 2) {
    return files;
  }
@@ -59,7 +59,7 @@ export function useAgentAttentionClear({
        return;
      }
      deferredFocusEntryClearRef.current = false;
-      client.clearAgentAttention(resolvedAgentId).catch(() => {});
+      client.clearAgentAttention(resolvedAgentId);
    },
    [agentId, attentionReason, client, isConnected, requiresAttention],
  );
@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+import type { DiffFileMetadata } from "./use-checkout-diff-metadata-query";
+import { orderCheckoutDiffFiles } from "./checkout-diff-order";
+
+function createMetadata(path: string, fingerprint = "fp1"): DiffFileMetadata {
+  return {
+    path,
+    isNew: false,
+    isDeleted: false,
+    additions: 1,
+    deletions: 0,
+    fingerprint,
+  };
+}
+
+describe("useCheckoutDiffMetadataQuery — cache replacement behavior", () => {
+  it("orderCheckoutDiffFiles works with DiffFileMetadata arrays", () => {
+    const files: DiffFileMetadata[] = [
+      createMetadata("zeta.ts"),
+      createMetadata("alpha.ts"),
+      createMetadata("beta.ts"),
+    ];
+    const ordered = orderCheckoutDiffFiles(files);
+    expect(ordered.map((f) => f.path)).toEqual(["alpha.ts", "beta.ts", "zeta.ts"]);
+  });
+
+  it("replaces full list on snapshot — does not merge with previous", () => {
+    const initial: DiffFileMetadata[] = [
+      createMetadata("a.ts", "fp1"),
+      createMetadata("b.ts", "fp2"),
+      createMetadata("c.ts", "fp3"),
+    ];
+    // Simulate a new snapshot that removes b.ts and changes c.ts fingerprint
+    const updated: DiffFileMetadata[] = [
+      createMetadata("a.ts", "fp1"),
+      createMetadata("c.ts", "fp4"),
+    ];
+
+    // Full replacement: the result is exactly the updated list, not a merge
+    const result = orderCheckoutDiffFiles(updated);
+    expect(result).toHaveLength(2);
+    expect(result.map((f) => f.path)).toEqual(["a.ts", "c.ts"]);
+    expect(result.find((f) => f.path === "c.ts")?.fingerprint).toBe("fp4");
+    // b.ts is gone — no remnant from initial
+    expect(result.find((f) => f.path === "b.ts")).toBeUndefined();
+
+    // Initial is unchanged (no mutation)
+    expect(initial).toHaveLength(3);
+  });
+
+  it("preserves fingerprint and status on metadata items", () => {
+    const file: DiffFileMetadata = {
+      path: "large.bin",
+      isNew: false,
+      isDeleted: false,
+      additions: 0,
+      deletions: 0,
+      status: "binary",
+      fingerprint: "abc123",
+    };
+    const ordered = orderCheckoutDiffFiles([file]);
+    expect(ordered[0].fingerprint).toBe("abc123");
+    expect(ordered[0].status).toBe("binary");
+  });
+});
@@ -0,0 +1,214 @@
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useCallback, useEffect, useId, useMemo } from "react";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { usePanelStore } from "@/stores/panel-store";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import type { CheckoutDiffSnapshot } from "@server/shared/messages";
+import { orderCheckoutDiffFiles } from "./checkout-diff-order";
+
+const CHECKOUT_DIFF_METADATA_STALE_TIME = 30_000;
+
+export type DiffFileMetadata = CheckoutDiffSnapshot["payload"]["files"][number];
+
+type CheckoutDiffMetadataPayload = Omit<CheckoutDiffSnapshot["payload"], "subscriptionId">;
+
+function checkoutDiffMetadataQueryKey(
+  serverId: string,
+  cwd: string,
+  mode: "uncommitted" | "base",
+  baseRef?: string,
+  ignoreWhitespace?: boolean,
+) {
+  return [
+    "checkoutDiffMetadata",
+    serverId,
+    cwd,
+    mode,
+    baseRef ?? "",
+    ignoreWhitespace === true,
+  ] as const;
+}
+
+interface UseCheckoutDiffMetadataQueryOptions {
+  serverId: string;
+  cwd: string;
+  mode: "uncommitted" | "base";
+  baseRef?: string;
+  ignoreWhitespace?: boolean;
+  enabled?: boolean;
+}
+
+function normalizeCheckoutDiffCompare(compare: {
+  mode: "uncommitted" | "base";
+  baseRef?: string;
+  ignoreWhitespace?: boolean;
+}): { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean } {
+  const ignoreWhitespace = compare.ignoreWhitespace === true;
+  if (compare.mode === "uncommitted") {
+    return { mode: "uncommitted", ignoreWhitespace };
+  }
+  const trimmedBaseRef = compare.baseRef?.trim();
+  return trimmedBaseRef
+    ? { mode: "base", baseRef: trimmedBaseRef, ignoreWhitespace }
+    : { mode: "base", ignoreWhitespace };
+}
+
+export function useCheckoutDiffMetadataQuery({
+  serverId,
+  cwd,
+  mode,
+  baseRef,
+  ignoreWhitespace,
+  enabled = true,
+}: UseCheckoutDiffMetadataQueryOptions) {
+  const queryClient = useQueryClient();
+  const client = useHostRuntimeClient(serverId);
+  const isConnected = useHostRuntimeIsConnected(serverId);
+  const isMobile = useIsCompactFormFactor();
+  const mobileView = usePanelStore((state) => state.mobileView);
+  const desktopFileExplorerOpen = usePanelStore((state) => state.desktop.fileExplorerOpen);
+  const explorerTab = usePanelStore((state) => state.explorerTab);
+  const isOpen = isMobile ? mobileView === "file-explorer" : desktopFileExplorerOpen;
+  const hookInstanceId = useId();
+  const normalizedCompare = useMemo(
+    () => normalizeCheckoutDiffCompare({ mode, baseRef, ignoreWhitespace }),
+    [mode, baseRef, ignoreWhitespace],
+  );
+  const compareMode = normalizedCompare.mode;
+  const compareBaseRef = normalizedCompare.baseRef;
+  const compareIgnoreWhitespace = normalizedCompare.ignoreWhitespace;
+  const queryKey = useMemo(
+    () => checkoutDiffMetadataQueryKey(serverId, cwd, mode, baseRef, compareIgnoreWhitespace),
+    [serverId, cwd, mode, baseRef, compareIgnoreWhitespace],
+  );
+
+  const query = useQuery({
+    queryKey,
+    queryFn: async () => {
+      if (!client) {
+        throw new Error("Daemon client not available");
+      }
+      const payload = await client.getCheckoutDiffMetadata(cwd, {
+        mode: compareMode,
+        baseRef: compareBaseRef,
+        ignoreWhitespace: compareIgnoreWhitespace,
+      });
+      return {
+        cwd: payload.cwd,
+        files: orderCheckoutDiffFiles(payload.files),
+        error: payload.error,
+        requestId: payload.requestId,
+      };
+    },
+    enabled: !!client && isConnected && !!cwd && enabled,
+    staleTime: CHECKOUT_DIFF_METADATA_STALE_TIME,
+  });
+
+  useEffect(() => {
+    if (!client || !isConnected || !cwd || !enabled) {
+      return;
+    }
+    if (!isOpen || explorerTab !== "changes") {
+      return;
+    }
+
+    const subscriptionId = [
+      "checkoutDiffMetadata",
+      hookInstanceId,
+      serverId,
+      cwd,
+      compareMode,
+      compareBaseRef ?? "",
+      compareIgnoreWhitespace ? "ignore-ws" : "keep-ws",
+    ].join(":");
+    let cancelled = false;
+
+    const unsubscribeSnapshot = client.on("checkout/diff_snapshot", (message) => {
+      if (message.type !== "checkout/diff_snapshot") {
+        return;
+      }
+      if (message.payload.subscriptionId !== subscriptionId) {
+        return;
+      }
+      queryClient.setQueryData<CheckoutDiffMetadataPayload>(queryKey, {
+        cwd: message.payload.cwd,
+        files: orderCheckoutDiffFiles(message.payload.files),
+        error: message.payload.error,
+        requestId: message.payload.requestId,
+      });
+    });
+
+    void client
+      .subscribeCheckoutDiffLazy(
+        cwd,
+        {
+          mode: compareMode,
+          baseRef: compareBaseRef,
+          ignoreWhitespace: compareIgnoreWhitespace,
+        },
+        { subscriptionId },
+      )
+      .then((payload) => {
+        if (cancelled) {
+          return;
+        }
+        queryClient.setQueryData<CheckoutDiffMetadataPayload>(queryKey, {
+          cwd: payload.cwd,
+          files: orderCheckoutDiffFiles(payload.files),
+          error: payload.error,
+          requestId: payload.requestId,
+        });
+      })
+      .catch((error) => {
+        if (cancelled) {
+          return;
+        }
+        console.error("[useCheckoutDiffMetadataQuery] subscribeCheckoutDiffLazy failed", {
+          serverId,
+          cwd,
+          error,
+        });
+      });
+
+    return () => {
+      cancelled = true;
+      unsubscribeSnapshot();
+      try {
+        client.unsubscribeCheckoutDiffLazy(subscriptionId);
+      } catch {
+        // Ignore disconnect race during effect cleanup.
+      }
+    };
+  }, [
+    client,
+    isConnected,
+    cwd,
+    enabled,
+    isOpen,
+    explorerTab,
+    hookInstanceId,
+    serverId,
+    compareMode,
+    compareBaseRef,
+    compareIgnoreWhitespace,
+    queryKey,
+    queryClient,
+  ]);
+
+  const refresh = useCallback(() => {
+    return query.refetch();
+  }, [query]);
+
+  const payload = query.data ?? null;
+  const payloadError = payload?.error ?? null;
+
+  return {
+    files: payload?.files ?? [],
+    payloadError,
+    isLoading: query.isLoading,
+    isFetching: query.isFetching,
+    isError: query.isError || Boolean(payloadError),
+    error: query.error,
+    refresh,
+  };
+}
@@ -82,12 +82,9 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
  );

  const requestDirectoryListing = useCallback(
-    async (
-      path: string,
-      options?: { recordHistory?: boolean; setCurrentPath?: boolean },
-    ): Promise<boolean> => {
+    async (path: string, options?: { recordHistory?: boolean; setCurrentPath?: boolean }) => {
      if (!workspaceStateKey) {
-        return false;
+        return;
      }
      const normalizedPath = path && path.length > 0 ? path : ".";
      const shouldSetCurrentPath = options?.setCurrentPath ?? true;
@@ -116,7 +113,7 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
          lastError: "Workspace is unavailable",
          pendingRequest: null,
        }));
-        return false;
+        return;
      }

      if (!client) {
@@ -126,7 +123,7 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
          lastError: "Host is not connected",
          pendingRequest: null,
        }));
-        return false;
+        return;
      }

      try {
@@ -153,7 +150,6 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor

          return nextState;
        });
-        return true;
      } catch (error) {
        updateExplorerState((state) => ({
          ...state,
@@ -161,7 +157,6 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
          lastError: error instanceof Error ? error.message : "Failed to list directory",
          pendingRequest: null,
        }));
-        return false;
      }
    },
    [client, normalizedWorkspaceRoot, updateExplorerState, workspaceStateKey],
@@ -0,0 +1,93 @@
+import { describe, expect, it } from "vitest";
+import type { DiffFileMetadata } from "./use-checkout-diff-metadata-query";
+
+/**
+ * Tests for use-file-hunks hook logic.
+ *
+ * The hook itself is a thin React Query wrapper, so we test the key properties:
+ * 1. Query key includes fingerprint — fingerprint change = automatic refetch
+ * 2. Metadata fields are passed through to the merged result
+ */
+
+function fileHunksQueryKey(
+  serverId: string,
+  cwd: string,
+  mode: "uncommitted" | "base",
+  baseRef: string | undefined,
+  ignoreWhitespace: boolean | undefined,
+  path: string,
+  fingerprint: string,
+) {
+  return [
+    "checkoutFileHunks",
+    serverId,
+    cwd,
+    mode,
+    baseRef ?? "",
+    ignoreWhitespace === true,
+    path,
+    fingerprint,
+  ] as const;
+}
+
+describe("use-file-hunks query key", () => {
+  it("includes fingerprint in query key", () => {
+    const key = fileHunksQueryKey("s1", "/repo", "base", "main", false, "foo.ts", "fp-abc");
+    expect(key).toContain("fp-abc");
+    expect(key).toContain("foo.ts");
+  });
+
+  it("different fingerprints produce different query keys", () => {
+    const key1 = fileHunksQueryKey("s1", "/repo", "base", "main", false, "foo.ts", "fp-1");
+    const key2 = fileHunksQueryKey("s1", "/repo", "base", "main", false, "foo.ts", "fp-2");
+    expect(key1).not.toEqual(key2);
+    // Only the fingerprint element differs
+    expect(key1.slice(0, -1)).toEqual(key2.slice(0, -1));
+  });
+
+  it("same fingerprint + same params produces identical key", () => {
+    const key1 = fileHunksQueryKey("s1", "/repo", "uncommitted", undefined, true, "bar.ts", "fp-x");
+    const key2 = fileHunksQueryKey("s1", "/repo", "uncommitted", undefined, true, "bar.ts", "fp-x");
+    expect(key1).toEqual(key2);
+  });
+
+  it("normalizes missing baseRef to empty string", () => {
+    const key = fileHunksQueryKey("s1", "/repo", "uncommitted", undefined, false, "a.ts", "fp");
+    expect(key[4]).toBe("");
+  });
+
+  it("normalizes ignoreWhitespace to boolean", () => {
+    const key = fileHunksQueryKey("s1", "/repo", "base", "main", undefined, "a.ts", "fp");
+    expect(key[5]).toBe(false);
+  });
+});
+
+describe("use-file-hunks metadata merge", () => {
+  it("metadata fields carry through to merged ParsedDiffFile shape", () => {
+    const meta: DiffFileMetadata = {
+      path: "src/index.ts",
+      isNew: true,
+      isDeleted: false,
+      additions: 10,
+      deletions: 2,
+      status: "ok",
+      fingerprint: "abc",
+    };
+
+    // Simulates merging metadata with fetched hunks
+    const merged = {
+      path: meta.path,
+      isNew: meta.isNew,
+      isDeleted: meta.isDeleted,
+      additions: meta.additions,
+      deletions: meta.deletions,
+      status: meta.status,
+      hunks: [],
+    };
+
+    expect(merged.path).toBe("src/index.ts");
+    expect(merged.isNew).toBe(true);
+    expect(merged.additions).toBe(10);
+    expect(merged.hunks).toEqual([]);
+  });
+});
@@ -0,0 +1,99 @@
+import { useQuery } from "@tanstack/react-query";
+import { useMemo } from "react";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import type { ParsedDiffFile } from "@/hooks/use-checkout-diff-query";
+import type { DiffFileMetadata } from "@/hooks/use-checkout-diff-metadata-query";
+
+function fileHunksQueryKey(
+  serverId: string,
+  cwd: string,
+  mode: "uncommitted" | "base",
+  baseRef: string | undefined,
+  ignoreWhitespace: boolean | undefined,
+  path: string,
+  fingerprint: string,
+) {
+  return [
+    "checkoutFileHunks",
+    serverId,
+    cwd,
+    mode,
+    baseRef ?? "",
+    ignoreWhitespace === true,
+    path,
+    fingerprint,
+  ] as const;
+}
+
+interface UseFileHunksOptions {
+  serverId: string;
+  cwd: string;
+  mode: "uncommitted" | "base";
+  baseRef?: string;
+  ignoreWhitespace?: boolean;
+  file: DiffFileMetadata;
+  enabled?: boolean;
+}
+
+export function useFileHunks({
+  serverId,
+  cwd,
+  mode,
+  baseRef,
+  ignoreWhitespace,
+  file,
+  enabled = true,
+}: UseFileHunksOptions) {
+  const client = useHostRuntimeClient(serverId);
+  const isConnected = useHostRuntimeIsConnected(serverId);
+
+  const queryKey = useMemo(
+    () =>
+      fileHunksQueryKey(
+        serverId,
+        cwd,
+        mode,
+        baseRef,
+        ignoreWhitespace,
+        file.path,
+        file.fingerprint,
+      ),
+    [serverId, cwd, mode, baseRef, ignoreWhitespace, file.path, file.fingerprint],
+  );
+
+  const query = useQuery({
+    queryKey,
+    queryFn: async (): Promise<ParsedDiffFile> => {
+      if (!client) {
+        throw new Error("Daemon client not available");
+      }
+      const payload = await client.getCheckoutFileHunks(
+        cwd,
+        { mode, baseRef, ignoreWhitespace },
+        file.path,
+      );
+      if (payload.error) {
+        throw new Error(payload.error.message);
+      }
+      return {
+        path: file.path,
+        isNew: file.isNew,
+        isDeleted: file.isDeleted,
+        additions: file.additions,
+        deletions: file.deletions,
+        status: file.status,
+        hunks: payload.hunks,
+      };
+    },
+    enabled: !!client && isConnected && enabled,
+    staleTime: 60_000,
+  });
+
+  return {
+    file: query.data ?? null,
+    isLoading: query.isLoading,
+    isFetching: query.isFetching,
+    isError: query.isError,
+    error: query.error,
+  };
+}
@@ -27,7 +27,6 @@ import { getShortcutOs } from "@/utils/shortcut-platform";
 import { useOpenProjectPicker } from "@/hooks/use-open-project-picker";
 import { useKeyboardShortcutOverrides } from "@/hooks/use-keyboard-shortcut-overrides";
 import { isNative } from "@/constants/platform";
-import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";

 export function useKeyboardShortcuts({
  enabled,
@@ -324,12 +323,6 @@ export function useKeyboardShortcuts({
        return;
      }

-      // During IME composition, Enter confirms the candidate selection and must
-      // not route through global shortcuts like message send.
-      if (isImeComposingKeyboardEvent(event)) {
-        return;
-      }
-
      const store = useKeyboardShortcutsStore.getState();
      if (store.capturingShortcut) {
        return;
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo } from "react";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import type { AgentProvider, ProviderSnapshotEntry } from "@server/server/agent/agent-sdk-types";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import type { ProviderSnapshotEntry } from "@server/server/agent/agent-sdk-types";
 import type { DaemonClient } from "@server/client/daemon-client";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useSessionForServer } from "./use-session-directory";
@@ -14,10 +14,9 @@ interface UseProvidersSnapshotResult {
  entries: ProviderSnapshotEntry[] | undefined;
  isLoading: boolean;
  isFetching: boolean;
-  isRefreshing: boolean;
  error: string | null;
  supportsSnapshot: boolean;
-  refresh: (providers?: AgentProvider[]) => Promise<void>;
+  refresh: () => void;
  invalidate: () => void;
 }

@@ -44,16 +43,6 @@ export function useProvidersSnapshot(serverId: string | null): UseProvidersSnaps
    },
  });

-  const refreshMutation = useMutation({
-    mutationFn: async (providers?: AgentProvider[]) => {
-      if (!client) {
-        return;
-      }
-      await client.refreshProvidersSnapshot({ providers });
-    },
-  });
-  const { mutateAsync: refreshSnapshot, isPending: isRefreshing } = refreshMutation;
-
  useEffect(() => {
    if (!supportsSnapshot || !client || !isConnected || !serverId) {
      return;
@@ -71,12 +60,12 @@ export function useProvidersSnapshot(serverId: string | null): UseProvidersSnaps
    });
  }, [client, isConnected, serverId, queryClient, queryKey, supportsSnapshot]);

-  const refresh = useCallback(
-    async (providers?: AgentProvider[]) => {
-      await refreshSnapshot(providers);
-    },
-    [refreshSnapshot],
-  );
+  const refresh = useCallback(() => {
+    if (!client) {
+      return;
+    }
+    void client.refreshProvidersSnapshot();
+  }, [client]);

  const invalidate = useCallback(() => {
    void queryClient.invalidateQueries({ queryKey });
@@ -86,7 +75,6 @@ export function useProvidersSnapshot(serverId: string | null): UseProvidersSnaps
    entries: snapshotQuery.data?.entries ?? undefined,
    isLoading: snapshotQuery.isLoading,
    isFetching: snapshotQuery.isFetching,
-    isRefreshing,
    error: snapshotQuery.error instanceof Error ? snapshotQuery.error.message : null,
    supportsSnapshot,
    refresh,
@@ -284,12 +284,6 @@ export function useSidebarWorkspacesList(options?: {
    });
  }, [persistedProjectOrder, persistedWorkspaceOrderByScope, serverId, sessionWorkspaces]);

-  useEffect(() => {
-    if (!serverId) {
-      return;
-    }
-  }, [connectionStatus, hasHydratedWorkspaces, projects, serverId, sessionWorkspaces]);
-
  useEffect(() => {
    if (!serverId || projects.length === 0) {
      return;
@@ -355,12 +349,7 @@ export function useSidebarWorkspacesList(options?: {
        const store = useSessionStore.getState();
        store.setWorkspaces(serverId, next);
        store.setHasHydratedWorkspaces(serverId, true);
-      } catch (error) {
-        console.error("[WorkspaceFetch][sidebar-refresh] failed", {
-          serverId,
-          cursor,
-          error,
-        });
+      } catch {
        // ignore explicit refresh failures; hook keeps existing data
      }
    })();
@@ -1 +0,0 @@
-export * from "./use-web-scrollbar-style.web";
@@ -1,5 +0,0 @@
-import type { ViewStyle } from "react-native";
-
-export function useWebScrollbarStyle(): ViewStyle | undefined {
-  return undefined;
-}
@@ -1,21 +0,0 @@
-import { useMemo } from "react";
-import type { ViewStyle } from "react-native";
-import { useUnistyles } from "react-native-unistyles";
-
-// CSS scrollbar properties are supported by React Native Web at runtime
-// but are not included in React Native's ViewStyle type definition.
-interface WebScrollbarStyle extends ViewStyle {
-  scrollbarColor: string;
-  scrollbarWidth: string;
-}
-
-export function useWebScrollbarStyle(): WebScrollbarStyle {
-  const { theme } = useUnistyles();
-  return useMemo(
-    (): WebScrollbarStyle => ({
-      scrollbarColor: `${theme.colors.scrollbarHandle} transparent`,
-      scrollbarWidth: "thin",
-    }),
-    [theme.colors.scrollbarHandle],
-  );
-}
@@ -791,32 +791,6 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
  },

  // --- Message input ---
-  {
-    id: "message-input-focus-cmd-l-mac",
-    action: "message-input.action",
-    combo: "Cmd+L",
-    when: { mac: true, commandCenter: false },
-    payload: { type: "message-input", kind: "focus" },
-    help: {
-      id: "focus-message-input",
-      section: "agent-input",
-      label: "Focus message input",
-      keys: ["mod", "L"],
-    },
-  },
-  {
-    id: "message-input-focus-ctrl-l-non-mac",
-    action: "message-input.action",
-    combo: "Ctrl+L",
-    when: { mac: false, commandCenter: false, terminal: false },
-    payload: { type: "message-input", kind: "focus" },
-    help: {
-      id: "focus-message-input",
-      section: "agent-input",
-      label: "Focus message input",
-      keys: ["mod", "L"],
-    },
-  },
  {
    id: "message-input-voice-toggle-cmd-shift-d-mac",
    action: "message-input.action",
@@ -762,7 +762,7 @@ function AgentPanelBody({
            <AgentInputArea
              agentId={agentId}
              serverId={serverId}
-              isPaneFocused={isPaneFocused}
+              isInputActive={isPaneFocused}
              value={agentInputDraft.text}
              onChangeText={agentInputDraft.setText}
              images={agentInputDraft.images}
@@ -1232,7 +1232,7 @@ function DraftAgentScreenContent({
            <AgentInputArea
              agentId={draftAgentIdRef.current}
              serverId={selectedServerId ?? ""}
-              isPaneFocused={isFocused}
+              isInputActive={isFocused}
              onSubmitMessage={handleCreateFromInput}
              isSubmitLoading={isSubmitting}
              blurOnSubmit={true}
@@ -70,7 +70,6 @@ import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { getProviderIcon } from "@/components/provider-icons";
 import { ProviderDiagnosticSheet } from "@/components/provider-diagnostic-sheet";
-import { SpinningRefreshIcon } from "@/components/spinning-refresh-icon";
 import { StatusBadge } from "@/components/ui/status-badge";
 import { buildProviderDefinitions } from "@/utils/provider-definitions";
 import { isWeb } from "@/constants/platform";
@@ -522,11 +521,9 @@ interface ProvidersSectionProps {
 function ProvidersSection({ routeServerId }: ProvidersSectionProps) {
  const { theme } = useUnistyles();
  const isConnected = useHostRuntimeIsConnected(routeServerId);
-  const { entries, isLoading, isRefreshing, refresh } = useProvidersSnapshot(routeServerId);
+  const { entries, isLoading, isFetching, refresh } = useProvidersSnapshot(routeServerId);
  const [diagnosticProvider, setDiagnosticProvider] = useState<string | null>(null);
  const providerDefinitions = buildProviderDefinitions(entries);
-  const providerRefreshInFlight =
-    isRefreshing || (entries?.some((entry) => entry.status === "loading") ?? false);

  const hasServer = routeServerId.length > 0;

@@ -537,25 +534,18 @@ function ProvidersSection({ routeServerId }: ProvidersSectionProps) {
          <Text style={settingsStyles.sectionHeaderTitle}>Providers</Text>
          {hasServer && isConnected ? (
            <Pressable
-              onPress={() => {
-                void refresh();
-              }}
-              disabled={providerRefreshInFlight}
-              hitSlop={8}
-              style={({ hovered, pressed }) => [
-                settingsStyles.sectionHeaderLink,
-                styles.providerRefreshButton,
-                (hovered || pressed) && styles.providerRefreshButtonHovered,
-                providerRefreshInFlight ? styles.providerRefreshButtonDisabled : null,
-              ]}
-              accessibilityRole="button"
-              accessibilityLabel="Refresh providers"
+              onPress={refresh}
+              disabled={isFetching}
+              style={[settingsStyles.sectionHeaderLink, isFetching ? { opacity: 0.5 } : null]}
            >
-              <SpinningRefreshIcon
-                spinning={providerRefreshInFlight}
-                size={theme.iconSize.sm}
-                color={theme.colors.foregroundMuted}
-              />
+              <Text
+                style={{
+                  color: theme.colors.primary,
+                  fontSize: theme.fontSize.xs,
+                }}
+              >
+                Refresh
+              </Text>
            </Pressable>
          ) : null}
        </View>
@@ -580,15 +570,8 @@ function ProvidersSection({ routeServerId }: ProvidersSectionProps) {
                  ? entry.error.trim()
                  : null;

-              const modelCount = entry?.models?.length ?? 0;
-
              return (
-                <Pressable
-                  key={def.id}
-                  style={styles.audioRow}
-                  onPress={() => setDiagnosticProvider(def.id)}
-                  accessibilityRole="button"
-                >
+                <View key={def.id} style={styles.audioRow}>
                  <View style={styles.audioRowContent}>
                    <View
                      style={{ flexDirection: "row", alignItems: "center", gap: theme.spacing[2] }}
@@ -601,27 +584,31 @@ function ProvidersSection({ routeServerId }: ProvidersSectionProps) {
                        {providerError}
                      </Text>
                    ) : null}
-                    {status === "ready" && modelCount > 0 ? (
-                      <Text style={styles.audioRowSubtitle}>
-                        {modelCount === 1 ? "1 model" : `${modelCount} models`}
-                      </Text>
-                    ) : null}
                  </View>
-                  <StatusBadge
-                    label={
-                      status === "ready"
-                        ? "Available"
-                        : status === "error"
-                          ? "Error"
-                          : status === "loading"
-                            ? "Loading..."
-                            : "Not installed"
-                    }
-                    variant={
-                      status === "ready" ? "success" : status === "error" ? "error" : "muted"
-                    }
-                  />
-                </Pressable>
+                  <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>
@@ -1965,18 +1952,6 @@ const styles = StyleSheet.create((theme) => ({
  formButtonPrimaryText: {
    color: theme.colors.palette.white,
  },
-  providerRefreshButton: {
-    width: 30,
-    height: 30,
-    borderRadius: theme.borderRadius.full,
-    justifyContent: "center",
-  },
-  providerRefreshButtonHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  providerRefreshButtonDisabled: {
-    opacity: 0.5,
-  },
  // Audio settings card
  audioCard: {
    overflow: "hidden",
@@ -2005,6 +1980,11 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.sm,
    marginTop: theme.spacing[1],
  },
+  providerActions: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
  aboutValue: {
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.sm,
@@ -10,7 +10,6 @@ import { Fonts } from "@/constants/theme";
 import { getDesktopDaemonLogs, type DesktopDaemonLogs } from "@/desktop/daemon/desktop-daemon";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
 import { isWeb } from "@/constants/platform";
-import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";

 type StartupSplashScreenProps = {
  bootstrapState?: {
@@ -162,7 +161,6 @@ const styles = StyleSheet.create((theme) => ({

 export function StartupSplashScreen({ bootstrapState }: StartupSplashScreenProps) {
  const { theme } = useUnistyles();
-  const webScrollbarStyle = useWebScrollbarStyle();
  const [daemonLogs, setDaemonLogs] = useState<DesktopDaemonLogs | null>(null);
  const [logsError, setLogsError] = useState<string | null>(null);
  const [isLoadingLogs, setIsLoadingLogs] = useState(false);
@@ -284,7 +282,7 @@ export function StartupSplashScreen({ bootstrapState }: StartupSplashScreenProps
    <View style={styles.errorScreen}>
      <TitlebarDragRegion />
      <ScrollView
-        style={[styles.errorScrollView, webScrollbarStyle]}
+        style={styles.errorScrollView}
        contentContainerStyle={styles.errorScrollContent}
        showsVerticalScrollIndicator
      >
@@ -305,7 +303,7 @@ export function StartupSplashScreen({ bootstrapState }: StartupSplashScreenProps

          <View style={styles.logsContainer}>
            <ScrollView
-              style={[styles.logsScroll, webScrollbarStyle]}
+              style={styles.logsScroll}
              contentContainerStyle={styles.logsContent}
              showsVerticalScrollIndicator
            >
@@ -342,7 +342,7 @@ export function WorkspaceDraftAgentTab({
          <AgentInputArea
            agentId={tabId}
            serverId={serverId}
-            isPaneFocused={isPaneFocused}
+            isInputActive={isPaneFocused}
            onSubmitMessage={handleCreateFromInput}
            isSubmitLoading={isSubmitting}
            blurOnSubmit={true}
@@ -141,18 +141,6 @@ function decodeSegment(value: string): string {
  }
 }

-function areHeaderLabelsEquivalent(
-  a: string | null | undefined,
-  b: string | null | undefined,
-): boolean {
-  const normalizedA = trimNonEmpty(a)?.toLocaleLowerCase();
-  const normalizedB = trimNonEmpty(b)?.toLocaleLowerCase();
-  if (!normalizedA || !normalizedB) {
-    return false;
-  }
-  return normalizedA === normalizedB;
-}
-
 function getFallbackTabOptionLabel(tab: WorkspaceTabDescriptor): string {
  if (tab.target.kind === "draft") {
    return "New Agent";
@@ -731,13 +719,12 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
    };
  }, [client, isConnected, normalizedWorkspaceId, queryClient, terminalsQueryKey]);

-  const isCheckoutQueryEnabled =
-    Boolean(client && isConnected) &&
-    normalizedWorkspaceId.length > 0 &&
-    isAbsolutePath(normalizedWorkspaceId);
  const checkoutQuery = useQuery({
    queryKey: checkoutStatusQueryKey(normalizedServerId, normalizedWorkspaceId),
-    enabled: isCheckoutQueryEnabled,
+    enabled:
+      Boolean(client && isConnected) &&
+      normalizedWorkspaceId.length > 0 &&
+      isAbsolutePath(normalizedWorkspaceId),
    queryFn: async () => {
      if (!client) {
        throw new Error("Host is not connected");
@@ -746,8 +733,6 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
    },
    staleTime: 15_000,
  });
-  const isCheckoutStatusLoading =
-    isCheckoutQueryEnabled && checkoutQuery.data === undefined && !checkoutQuery.isError;

  const workspaceDescriptor = useSessionStore(
    (state) => state.sessions[normalizedServerId]?.workspaces.get(normalizedWorkspaceId) ?? null,
@@ -761,13 +746,7 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
  const workspaceHeader = workspaceDescriptor
    ? resolveWorkspaceHeader({ workspace: workspaceDescriptor })
    : null;
-  const isWorkspaceHeaderLoading = workspaceHeader === null || isCheckoutStatusLoading;
-  const workspaceHeaderTitle = workspaceHeader?.title ?? "";
-  const workspaceHeaderSubtitle = workspaceHeader?.subtitle ?? "";
-  const shouldShowWorkspaceHeaderSubtitle = !areHeaderLabelsEquivalent(
-    workspaceHeaderTitle,
-    workspaceHeaderSubtitle,
-  );
+  const isWorkspaceHeaderLoading = workspaceHeader === null;

  const isGitCheckout = checkoutQuery.data?.isGit ?? false;
  const currentBranchName =
@@ -1970,29 +1949,27 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
                  <SidebarMenuToggle />
                  <View style={styles.headerTitleContainer}>
                    {isWorkspaceHeaderLoading ? (
-                      <View style={styles.headerTitleTextGroup}>
+                      <>
                        <View style={styles.headerTitleSkeleton} />
                        <View style={styles.headerProjectTitleSkeleton} />
-                      </View>
+                      </>
                    ) : (
-                      <View style={styles.headerTitleTextGroup}>
+                      <>
                        <BranchSwitcher
                          currentBranchName={currentBranchName}
-                          title={workspaceHeaderTitle}
+                          title={workspaceHeader.title}
                          serverId={normalizedServerId}
                          workspaceId={normalizedWorkspaceId}
                          isGitCheckout={isGitCheckout}
                        />
-                        {shouldShowWorkspaceHeaderSubtitle ? (
-                          <Text
-                            testID="workspace-header-subtitle"
-                            style={styles.headerProjectTitle}
-                            numberOfLines={1}
-                          >
-                            {workspaceHeaderSubtitle}
-                          </Text>
-                        ) : null}
-                      </View>
+                        <Text
+                          testID="workspace-header-subtitle"
+                          style={styles.headerProjectTitle}
+                          numberOfLines={1}
+                        >
+                          {workspaceHeader.subtitle}
+                        </Text>
+                      </>
                    )}
                    <DropdownMenu>
                      <DropdownMenuTrigger
@@ -2314,40 +2291,15 @@ const styles = StyleSheet.create((theme) => ({
    flexShrink: 1,
  },
  headerTitleContainer: {
-    flex: 1,
    flexShrink: 1,
    minWidth: 0,
    flexDirection: "row",
    alignItems: "center",
    gap: theme.spacing[2],
  },
-  headerTitleTextGroup: {
-    minWidth: 0,
-    flexShrink: 1,
-    flexGrow: {
-      xs: 1,
-      md: 0,
-    },
-    flexDirection: {
-      xs: "column",
-      md: "row",
-    },
-    alignItems: {
-      xs: "flex-start",
-      md: "center",
-    },
-    justifyContent: "flex-start",
-    gap: {
-      xs: 0,
-      md: theme.spacing[2],
-    },
-  },
  headerProjectTitle: {
    color: theme.colors.foregroundMuted,
-    fontSize: {
-      xs: theme.fontSize.sm,
-      md: theme.fontSize.base,
-    },
+    fontSize: theme.fontSize.base,
    flexShrink: 1,
  },
  headerTitleSkeleton: {
@@ -134,14 +134,7 @@ export function WorkspaceTabIcon({
  if (shouldShowLoader) {
    return (
      <View style={[styles.agentIconWrapper, { width: size, height: size }]}>
-        <SyncedLoader
-          size={size - 1}
-          color={
-            theme.colorScheme === "light"
-              ? theme.colors.palette.amber[700]
-              : theme.colors.palette.amber[500]
-          }
-        />
+        <SyncedLoader size={size - 1} color={theme.colors.palette.amber[500]} />
      </View>
    );
  }
@@ -83,7 +83,6 @@ export const baseColors = {
  // Amber scale
  amber: {
    500: "#f59e0b",
-    700: "#b45309",
  },

  // Yellow scale
@@ -729,7 +729,7 @@ function finalizeHeadItems(head: StreamItem[]): StreamItem[] {
 /**
 * Flush head items to tail, avoiding duplicates.
 */
-export function flushHeadToTail(tail: StreamItem[], head: StreamItem[]): StreamItem[] {
+function flushHeadToTail(tail: StreamItem[], head: StreamItem[]): StreamItem[] {
  if (head.length === 0) {
    return tail;
  }
@@ -1,31 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { isImeComposingKeyboardEvent } from "./keyboard-ime";
-
-describe("isImeComposingKeyboardEvent", () => {
-  it("ignores events while IME composition is active", () => {
-    expect(
-      isImeComposingKeyboardEvent({
-        isComposing: true,
-        keyCode: 13,
-      } as KeyboardEvent),
-    ).toBe(true);
-  });
-
-  it("ignores Chromium IME fallback events with keyCode 229", () => {
-    expect(
-      isImeComposingKeyboardEvent({
-        isComposing: false,
-        keyCode: 229,
-      } as KeyboardEvent),
-    ).toBe(true);
-  });
-
-  it("keeps regular keyboard events eligible for shortcuts", () => {
-    expect(
-      isImeComposingKeyboardEvent({
-        isComposing: false,
-        keyCode: 13,
-      } as KeyboardEvent),
-    ).toBe(false);
-  });
-});
@@ -1,6 +0,0 @@
-export function isImeComposingKeyboardEvent(event: {
-  isComposing?: boolean;
-  keyCode?: number;
-}): boolean {
-  return Boolean(event.isComposing) || event.keyCode === 229;
-}
@@ -1,104 +0,0 @@
-type WorkspaceLike = {
-  id: string;
-  projectId: string;
-  projectDisplayName?: string;
-  name: string;
-  status: string;
-  workspaceKind: string;
-};
-
-type SidebarWorkspaceLike = {
-  workspaceId: string;
-  name: string;
-  statusBucket: string;
-  workspaceKind: string;
-};
-
-type SidebarProjectLike = {
-  projectKey: string;
-  projectName: string;
-  statusBucket: string;
-  activeCount: number;
-  totalWorkspaces: number;
-  workspaces: SidebarWorkspaceLike[];
-};
-
-function countByValue(values: Iterable<string>): Record<string, number> {
-  const counts = new Map<string, number>();
-  for (const value of values) {
-    counts.set(value, (counts.get(value) ?? 0) + 1);
-  }
-  return Object.fromEntries(counts);
-}
-
-export function summarizeWorkspaceCollection(
-  workspaces: Iterable<WorkspaceLike> | null | undefined,
-): {
-  count: number;
-  projectIds: string[];
-  statusCounts: Record<string, number>;
-  workspaces: Array<{
-    id: string;
-    projectId: string;
-    projectDisplayName: string | null;
-    name: string;
-    status: string;
-    workspaceKind: string;
-  }>;
-} {
-  const entries = Array.from(workspaces ?? [], (workspace) => ({
-    id: workspace.id,
-    projectId: workspace.projectId,
-    projectDisplayName: workspace.projectDisplayName?.trim() || null,
-    name: workspace.name,
-    status: workspace.status,
-    workspaceKind: workspace.workspaceKind,
-  }));
-
-  return {
-    count: entries.length,
-    projectIds: [...new Set(entries.map((workspace) => workspace.projectId))],
-    statusCounts: countByValue(entries.map((workspace) => workspace.status)),
-    workspaces: entries,
-  };
-}
-
-export function summarizeSidebarProjects(
-  projects: Iterable<SidebarProjectLike> | null | undefined,
-): {
-  count: number;
-  projectKeys: string[];
-  projects: Array<{
-    projectKey: string;
-    projectName: string;
-    statusBucket: string;
-    activeCount: number;
-    totalWorkspaces: number;
-    workspaces: Array<{
-      workspaceId: string;
-      name: string;
-      statusBucket: string;
-      workspaceKind: string;
-    }>;
-  }>;
-} {
-  const entries = Array.from(projects ?? [], (project) => ({
-    projectKey: project.projectKey,
-    projectName: project.projectName,
-    statusBucket: project.statusBucket,
-    activeCount: project.activeCount,
-    totalWorkspaces: project.totalWorkspaces,
-    workspaces: project.workspaces.map((workspace) => ({
-      workspaceId: workspace.workspaceId,
-      name: workspace.name,
-      statusBucket: workspace.statusBucket,
-      workspaceKind: workspace.workspaceKind,
-    })),
-  }));
-
-  return {
-    count: entries.length,
-    projectKeys: entries.map((project) => project.projectKey),
-    projects: entries,
-  };
-}
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "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.59",
-    "@getpaseo/server": "0.1.59",
+    "@getpaseo/relay": "0.1.55-rc.1",
+    "@getpaseo/server": "0.1.55-rc.1",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -1,4 +1,4 @@
-import { Command, Option } from "commander";
+import { Command } from "commander";
 import { createRequire } from "node:module";
 import { createAgentCommand } from "./commands/agent/index.js";
 import { createDaemonCommand } from "./commands/daemon/index.js";
@@ -124,27 +124,10 @@ export function createCli(): Command {
    .option("--no-relay", "Disable relay on restarted daemon")
    .option("--no-mcp", "Disable Agent MCP on restarted daemon")
    .option(
-      "--hostnames <hosts>",
-      'Daemon hostnames (comma-separated, e.g. "myhost,.example.com" or "true" for any)',
+      "--allowed-hosts <hosts>",
+      'Comma-separated Host allowlist values (example: "localhost,.example.com" or "true")',
    )
-    .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
-    .action(
-      withOutput((...args) => {
-        const [options, command] = args.slice(-2) as [(typeof args)[number], Command];
-        return runDaemonRestartCommand(
-          {
-            ...options,
-            hostnames:
-              typeof options.hostnames === "string"
-                ? options.hostnames
-                : typeof options.allowedHosts === "string"
-                  ? options.allowedHosts
-                  : undefined,
-          },
-          command,
-        );
-      }),
-    );
+    .action(withOutput(runDaemonRestartCommand));

  // Advanced agent commands (less common operations)
  program.addCommand(createAgentCommand());
@@ -16,7 +16,6 @@ import { resolve } from "node:path";
 import { lookup } from "mime-types";
 import { parseDuration } from "../../utils/duration.js";
 import { collectMultiple } from "../../utils/command-options.js";
-import { resolveProviderAndModel } from "../../utils/provider-model.js";

 export function addRunOptions(cmd: Command): Command {
  return cmd
@@ -99,6 +98,11 @@ export interface AgentRunOptions extends CommandOptions {
  outputSchema?: string;
 }

+interface ResolvedProviderModel {
+  provider: string;
+  model: string | undefined;
+}
+
 function toRunResult(
  agent: AgentSnapshotPayload,
  statusOverride?: AgentRunResult["status"],
@@ -218,6 +222,54 @@ function structuredRunSchema(output: Record<string, unknown>): OutputSchema<Agen
  };
 }

+export function resolveProviderAndModel(
+  options: Pick<AgentRunOptions, "provider" | "model">,
+): ResolvedProviderModel {
+  const providerInput = options.provider?.trim() || "claude";
+  const modelInput = options.model?.trim();
+
+  if (options.model !== undefined && !modelInput) {
+    const error: CommandError = {
+      code: "INVALID_MODEL",
+      message: "--model cannot be empty",
+    };
+    throw error;
+  }
+
+  const slashIndex = providerInput.indexOf("/");
+  if (slashIndex === -1) {
+    return {
+      provider: providerInput,
+      model: modelInput,
+    };
+  }
+
+  const provider = providerInput.slice(0, slashIndex).trim();
+  const modelFromProvider = providerInput.slice(slashIndex + 1).trim();
+  if (!provider || !modelFromProvider) {
+    const error: CommandError = {
+      code: "INVALID_PROVIDER",
+      message: "Invalid --provider value",
+      details: "Use --provider <provider> or --provider <provider>/<model>",
+    };
+    throw error;
+  }
+
+  if (modelInput && modelInput !== modelFromProvider) {
+    const error: CommandError = {
+      code: "CONFLICTING_MODEL_OPTIONS",
+      message: "Conflicting model values provided",
+      details: `--provider specifies model ${modelFromProvider}, but --model specifies ${modelInput}`,
+    };
+    throw error;
+  }
+
+  return {
+    provider,
+    model: modelInput ?? modelFromProvider,
+  };
+}
+
 export async function runRunCommand(
  prompt: string,
  options: AgentRunOptions,
@@ -1,4 +1,4 @@
-import { Command, Option } from "commander";
+import { Command } from "commander";
 import { startCommand } from "./start.js";
 import { runStatusCommand } from "./status.js";
 import { runStopCommand } from "./stop.js";
@@ -36,27 +36,10 @@ export function createDaemonCommand(): Command {
    .option("--no-mcp", "Disable Agent MCP on restarted daemon")
    .option("--no-inject-mcp", "Disable auto-injecting the Paseo MCP into created agents")
    .option(
-      "--hostnames <hosts>",
-      'Daemon hostnames (comma-separated, e.g. "myhost,.example.com" or "true" for any)',
+      "--allowed-hosts <hosts>",
+      'Comma-separated Host allowlist values (example: "localhost,.example.com" or "true")',
    )
-    .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
-    .action(
-      withOutput((...args) => {
-        const [options, command] = args.slice(-2) as [(typeof args)[number], Command];
-        return runRestartCommand(
-          {
-            ...options,
-            hostnames:
-              typeof options.hostnames === "string"
-                ? options.hostnames
-                : typeof options.allowedHosts === "string"
-                  ? options.allowedHosts
-                  : undefined,
-          },
-          command,
-        );
-      }),
-    );
+    .action(withOutput(runRestartCommand));

  return daemon;
 }
@@ -13,7 +13,7 @@ export interface DaemonStartOptions {
  relay?: boolean;
  mcp?: boolean;
  injectMcp?: boolean;
-  hostnames?: string;
+  allowedHosts?: string;
 }

 export interface LocalDaemonPidInfo {
@@ -113,8 +113,8 @@ function buildChildEnv(options: DaemonStartOptions): NodeJS.ProcessEnv {
  } else if (options.port) {
    childEnv.PASEO_LISTEN = `127.0.0.1:${options.port}`;
  }
-  if (options.hostnames) {
-    childEnv.PASEO_HOSTNAMES = options.hostnames;
+  if (options.allowedHosts) {
+    childEnv.PASEO_ALLOWED_HOSTS = options.allowedHosts;
  }
  return childEnv;
 }
@@ -322,7 +322,6 @@ export function resolveLocalDaemonState(options: { home?: string } = {}): LocalD
    ...envWithHome(options.home),
    // Status should reflect local persisted config + pid file, not inherited daemon env overrides.
    PASEO_LISTEN: undefined,
-    PASEO_HOSTNAMES: undefined,
    PASEO_ALLOWED_HOSTS: undefined,
  };
  const home = resolvePaseoHome(env);
@@ -61,7 +61,7 @@ function toStartOptions(options: CommandOptions): DaemonStartOptions {
    relay: typeof options.relay === "boolean" ? options.relay : undefined,
    mcp: typeof options.mcp === "boolean" ? options.mcp : undefined,
    injectMcp: typeof options.injectMcp === "boolean" ? options.injectMcp : undefined,
-    hostnames: typeof options.hostnames === "string" ? options.hostnames : undefined,
+    allowedHosts: typeof options.allowedHosts === "string" ? options.allowedHosts : undefined,
  };

  if (startOptions.listen && startOptions.port) {
@@ -1,4 +1,4 @@
-import { Command, Option } from "commander";
+import { Command } from "commander";
 import chalk from "chalk";
 import {
  startLocalDaemonForeground,
@@ -9,10 +9,6 @@ import { getErrorMessage } from "../../utils/errors.js";

 export type { DaemonStartOptions as StartOptions } from "./local-daemon.js";

-type RawStartCommandOptions = StartOptions & {
-  allowedHosts?: string;
-};
-
 export function startCommand(): Command {
  return new Command("start")
    .description("Start the local Paseo daemon")
@@ -24,15 +20,11 @@ export function startCommand(): Command {
    .option("--no-mcp", "Disable the Agent MCP HTTP endpoint")
    .option("--no-inject-mcp", "Disable auto-injecting the Paseo MCP into created agents")
    .option(
-      "--hostnames <hosts>",
-      'Daemon hostnames (comma-separated, e.g. "myhost,.example.com" or "true" for any)',
+      "--allowed-hosts <hosts>",
+      'Comma-separated Host allowlist values (example: "localhost,.example.com" or "true")',
    )
-    .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
-    .action(async (options: RawStartCommandOptions) => {
-      await runStart({
-        ...options,
-        hostnames: options.hostnames ?? options.allowedHosts,
-      });
+    .action(async (options: StartOptions) => {
+      await runStart(options);
    });
 }

@@ -1,5 +1,5 @@
 import { cancel, confirm, intro, isCancel, log, note, outro, spinner } from "@clack/prompts";
-import { Command, Option } from "commander";
+import { Command } from "commander";
 import { writeFileSync } from "node:fs";
 import path from "node:path";
 import {
@@ -24,10 +24,6 @@ interface OnboardOptions extends DaemonStartOptions {
  voice?: "ask" | "enable" | "disable";
 }

-type RawOnboardOptions = OnboardOptions & {
-  allowedHosts?: string;
-};
-
 type OnboardPersistedConfig = PersistedConfig & {
  features?: PersistedConfig["features"] & {
    dictation?: PersistedConfig["features"] extends { dictation?: infer T }
@@ -68,7 +64,7 @@ function parseTimeoutMs(raw: string | undefined): number {
  return Math.ceil(seconds * 1000);
 }

-function toCliOverrides(options: OnboardOptions): CliConfigOverrides {
+function toCliOverrides(options: DaemonStartOptions): CliConfigOverrides {
  const cliOverrides: CliConfigOverrides = {};

  if (options.listen) {
@@ -81,9 +77,9 @@ function toCliOverrides(options: OnboardOptions): CliConfigOverrides {
    cliOverrides.relayEnabled = false;
  }

-  if (options.hostnames) {
-    const raw = options.hostnames.trim();
-    cliOverrides.hostnames =
+  if (options.allowedHosts) {
+    const raw = options.allowedHosts.trim();
+    cliOverrides.allowedHosts =
      raw.toLowerCase() === "true"
        ? true
        : raw
@@ -301,17 +297,13 @@ export function onboardCommand(): Command {
    .option("--no-relay", "Disable relay connection")
    .option("--no-mcp", "Disable the Agent MCP HTTP endpoint")
    .option(
-      "--hostnames <hosts>",
-      'Daemon hostnames (comma-separated, e.g. "myhost,.example.com" or "true" for any)',
+      "--allowed-hosts <hosts>",
+      'Comma-separated Host allowlist values (example: "localhost,.example.com" or "true")',
    )
-    .addOption(new Option("--allowed-hosts <hosts>").hideHelp())
    .option("--timeout <seconds>", "Max time to wait for daemon readiness (default: 600)")
    .option("--voice <mode>", "Voice setup mode: ask, enable, disable", "ask")
-    .action(async (options: RawOnboardOptions) => {
-      await runOnboard({
-        ...options,
-        hostnames: options.hostnames ?? options.allowedHosts,
-      });
+    .action(async (options: OnboardOptions) => {
+      await runOnboard(options);
    });
 }

@@ -15,7 +15,6 @@ export interface ScheduleCreateOptions extends ScheduleCommandOptions {
  cron?: string;
  name?: string;
  target?: string;
-  provider?: string;
  maxRuns?: string;
  expiresIn?: string;
 }
@@ -31,7 +30,6 @@ export async function runCreateCommand(
    cron: options.cron,
    name: options.name,
    target: options.target,
-    provider: options.provider,
    maxRuns: options.maxRuns,
    expiresIn: options.expiresIn,
  });
@@ -21,10 +21,6 @@ export function createScheduleCommand(): Command {
      .option("--cron <expr>", "Cron cadence expression")
      .option("--name <name>", "Optional schedule name")
      .option("--target <self|new-agent|agent-id>", "Run target")
-      .option(
-        "--provider <provider>",
-        "Agent provider, or provider/model (e.g. codex or codex/gpt-5.4)",
-      )
      .option("--max-runs <n>", "Maximum number of runs")
      .option("--expires-in <duration>", "Time to live for the schedule"),
  ).action(withOutput(runCreateCommand));
@@ -9,7 +9,6 @@ import type {
  ScheduleTarget,
 } from "./types.js";
 import { parseDuration } from "../../utils/duration.js";
-import { resolveProviderAndModel } from "../../utils/provider-model.js";

 export interface ScheduleCommandOptions extends CommandOptions {
  host?: string;
@@ -59,8 +58,7 @@ export function formatTarget(target: ScheduleTarget | ScheduleListItem["target"]
  if (target.type === "agent") {
    return `agent:${target.agentId.slice(0, 7)}`;
  }
-  const modelSuffix = target.config.model ? `/${target.config.model}` : "";
-  return `new-agent:${target.config.provider}${modelSuffix}`;
+  return `new-agent:${target.config.provider}`;
 }

 export function formatDurationMs(durationMs: number): string {
@@ -89,7 +87,6 @@ export function parseScheduleCreateInput(options: {
  cron?: string;
  name?: string;
  target?: string;
-  provider?: string;
  maxRuns?: string;
  expiresIn?: string;
 }): CreateScheduleInput {
@@ -114,53 +111,29 @@ export function parseScheduleCreateInput(options: {
    : { type: "cron", expression: options.cron!.trim() };

  const targetValue = options.target?.trim();
-  const hasExplicitProviderSelection = options.provider !== undefined;
-  const resolvedProviderModel = resolveProviderAndModel({
-    provider: options.provider,
-    defaultProvider: "claude",
-  });
-  const newAgentTarget: ScheduleTarget = {
-    type: "new-agent",
-    config: {
-      provider: resolvedProviderModel.provider,
-      cwd: process.cwd(),
-      ...(resolvedProviderModel.model ? { model: resolvedProviderModel.model } : {}),
-    },
-  };
  let target: ScheduleTarget;
-  if (!targetValue) {
+  if (!targetValue || targetValue === "self") {
    const currentAgentId = process.env.PASEO_AGENT_ID?.trim();
-    if (currentAgentId && !hasExplicitProviderSelection) {
+    if (currentAgentId) {
      target = { type: "self", agentId: currentAgentId };
    } else {
-      target = newAgentTarget;
+      target = {
+        type: "new-agent",
+        config: {
+          provider: "claude",
+          cwd: process.cwd(),
+        },
+      };
    }
-  } else if (targetValue === "self") {
-    if (hasExplicitProviderSelection) {
-      throw {
-        code: "INVALID_TARGET",
-        message: "--provider can only be used with a new-agent target",
-        details: "Use --target new-agent or omit --target to create a new agent schedule",
-      } satisfies CommandError;
-    }
-    const currentAgentId = process.env.PASEO_AGENT_ID?.trim();
-    if (!currentAgentId) {
-      throw {
-        code: "INVALID_TARGET",
-        message: "--target self requires running inside a Paseo agent",
-      } satisfies CommandError;
-    }
-    target = { type: "self", agentId: currentAgentId };
  } else if (targetValue === "new-agent") {
-    target = newAgentTarget;
+    target = {
+      type: "new-agent",
+      config: {
+        provider: "claude",
+        cwd: process.cwd(),
+      },
+    };
  } else {
-    if (hasExplicitProviderSelection) {
-      throw {
-        code: "INVALID_TARGET",
-        message: "--provider can only be used with a new-agent target",
-        details: "Use --target new-agent or omit --target to create a new agent schedule",
-      } satisfies CommandError;
-    }
    target = {
      type: "agent",
      agentId: targetValue,
@@ -1,60 +0,0 @@
-import type { CommandError } from "../output/index.js";
-
-export interface ResolveProviderAndModelOptions {
-  provider?: string;
-  model?: string;
-  defaultProvider?: string;
-}
-
-export interface ResolvedProviderModel {
-  provider: string;
-  model: string | undefined;
-}
-
-export function resolveProviderAndModel(
-  options: ResolveProviderAndModelOptions,
-): ResolvedProviderModel {
-  const providerInput = options.provider?.trim() || options.defaultProvider || "claude";
-  const modelInput = options.model?.trim();
-
-  if (options.model !== undefined && !modelInput) {
-    const error: CommandError = {
-      code: "INVALID_MODEL",
-      message: "--model cannot be empty",
-    };
-    throw error;
-  }
-
-  const slashIndex = providerInput.indexOf("/");
-  if (slashIndex === -1) {
-    return {
-      provider: providerInput,
-      model: modelInput,
-    };
-  }
-
-  const provider = providerInput.slice(0, slashIndex).trim();
-  const modelFromProvider = providerInput.slice(slashIndex + 1).trim();
-  if (!provider || !modelFromProvider) {
-    const error: CommandError = {
-      code: "INVALID_PROVIDER",
-      message: "Invalid --provider value",
-      details: "Use --provider <provider> or --provider <provider>/<model>",
-    };
-    throw error;
-  }
-
-  if (modelInput && modelInput !== modelFromProvider) {
-    const error: CommandError = {
-      code: "CONFLICTING_MODEL_OPTIONS",
-      message: "Conflicting model values provided",
-      details: `--provider specifies model ${modelFromProvider}, but --model specifies ${modelInput}`,
-    };
-    throw error;
-  }
-
-  return {
-    provider,
-    model: modelInput ?? modelFromProvider,
-  };
-}
@@ -31,16 +31,6 @@ type ProviderModel = {
 };

 const EXPECTED_CLAUDE_MODELS = [
-  {
-    id: "claude-opus-4-7[1m]",
-    model: "Opus 4.7 1M",
-    descriptionFragment: "1M context window",
-  },
-  {
-    id: "claude-opus-4-7",
-    model: "Opus 4.7",
-    descriptionFragment: "Latest release",
-  },
  {
    id: "claude-opus-4-6[1m]",
    model: "Opus 4.6 1M",
@@ -2,10 +2,10 @@

 import assert from "node:assert";
 import {
+  resolveProviderAndModel,
  resolveStructuredResponseMessage,
  type StructuredResponseTimelineClient,
 } from "../src/commands/agent/run.ts";
-import { resolveProviderAndModel } from "../src/utils/provider-model.ts";

 type TimelineEntry = {
  item: {
@@ -23,11 +23,6 @@ try {
    const createdJson = JSON.parse(created.stdout);
    assert.strictEqual(createdJson.name, "review-prs");
    assert.strictEqual(createdJson.cadence, "every:5m");
-    assert(
-      typeof createdJson.target === "string" &&
-        (createdJson.target.startsWith("agent:") || createdJson.target === "new-agent:claude"),
-      created.stdout,
-    );

    const listed = await ctx.paseo(["schedule", "ls", "--json"]);
    assert.strictEqual(listed.exitCode, 0, listed.stderr);
@@ -58,61 +53,6 @@ try {
    console.log("schedule commands work\n");
  }

-  {
-    console.log("Test 1b: schedule create accepts provider/model syntax for new-agent runs");
-    const created = await ctx.paseo(
-      [
-        "schedule",
-        "create",
-        "Refactor the API layer",
-        "--every",
-        "10m",
-        "--provider",
-        "codex/gpt-5.4",
-        "--json",
-      ],
-      { timeout: 30000 },
-    );
-    assert.strictEqual(created.exitCode, 0, created.stderr);
-    const createdJson = JSON.parse(created.stdout);
-    assert.strictEqual(createdJson.target, "new-agent:codex/gpt-5.4");
-
-    const inspected = await ctx.paseo(["schedule", "inspect", createdJson.id, "--json"]);
-    assert.strictEqual(inspected.exitCode, 0, inspected.stderr);
-    const inspectedJson = JSON.parse(inspected.stdout);
-    assert.strictEqual(inspectedJson.target.config.provider, "codex");
-    assert.strictEqual(inspectedJson.target.config.model, "gpt-5.4");
-
-    const deleted = await ctx.paseo(["schedule", "delete", createdJson.id, "--json"]);
-    assert.strictEqual(deleted.exitCode, 0, deleted.stderr);
-    console.log("schedule provider/model syntax works\n");
-  }
-
-  {
-    console.log("Test 1c: schedule create rejects provider with self target");
-    const result = await ctx.paseo(
-      [
-        "schedule",
-        "create",
-        "Conflicting schedule",
-        "--every",
-        "5m",
-        "--target",
-        "self",
-        "--provider",
-        "codex/gpt-5.4",
-      ],
-      { timeout: 30000 },
-    );
-    assert.notStrictEqual(result.exitCode, 0, "should fail for self target with provider");
-    const output = result.stdout + result.stderr;
-    assert(
-      output.includes("--provider can only be used with a new-agent target"),
-      "should explain provider target mismatch",
-    );
-    console.log("schedule rejects provider with self target\n");
-  }
-
  {
    console.log("Test 2: loop run/ls/inspect/logs/stop work");
    const run = await ctx.paseo(
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "main": "dist/main.js",
@@ -8,13 +8,12 @@
    "build": "npm --prefix ../.. run build:daemon && npm run build:main && electron-builder --config electron-builder.yml",
    "build:main": "tsc -p tsconfig.json",
    "dev": "./scripts/dev.sh",
-    "dev:win": "powershell ./scripts/dev.ps1",
    "test": "vitest run",
    "typecheck": "tsc --noEmit -p tsconfig.json"
  },
  "dependencies": {
-    "@getpaseo/cli": "0.1.59",
-    "@getpaseo/server": "0.1.59",
+    "@getpaseo/cli": "0.1.55-rc.1",
+    "@getpaseo/server": "0.1.55-rc.1",
    "electron-log": "^5.4.3",
    "electron-updater": "^6.6.2",
    "ws": "^8.14.2"
@@ -1,36 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-$DesktopDir = (Resolve-Path "$ScriptDir\..").Path
-$AppDir = (Resolve-Path "$DesktopDir\..\app").Path
-$RootDir = (Resolve-Path "$DesktopDir\..\..").Path
-
-# Build the Electron main process
-npm run build:main
-
-# Get a random available port for Metro
-$env:EXPO_PORT = (npx get-port-cli).Trim()
-
-# Set EXPO_DEV_URL in the environment so Electron inherits it
-$env:EXPO_DEV_URL = "http://localhost:$($env:EXPO_PORT)"
-
-# Allow any origin in dev so Electron on random ports works.
-# SECURITY: wildcard CORS is unsafe in production — only acceptable here because
-# the daemon binds to localhost and this script is never used for production.
-$env:PASEO_CORS_ORIGINS = "*"
-
-Write-Host @"
-======================================================
-  Paseo Desktop Dev (Windows)
-======================================================
-  Metro:     http://localhost:$($env:EXPO_PORT)
-======================================================
-"@
-
-# Launch Metro + Electron together, kill both on exit
-& "$RootDir\node_modules\.bin\concurrently" `
-    --kill-others `
-    --names "metro,electron" `
-    --prefix-colors "magenta,cyan" `
-    "cd `"$AppDir`" && npx expo start --port $($env:EXPO_PORT)" `
-    "npx wait-on tcp:$($env:EXPO_PORT) && npx electron `"$DesktopDir`""
@@ -13,11 +13,6 @@ npm run build:main
 EXPO_PORT=$("$ROOT_DIR/node_modules/.bin/get-port")
 export EXPO_PORT

-# Allow any origin in dev so Electron on random localhost ports can reach
-# the daemon websocket. Safe here because this script is development-only
-# and the daemon still binds to localhost.
-export PASEO_CORS_ORIGINS="*"
-
 echo "══════════════════════════════════════════════════════"
 echo "  Paseo Desktop Dev"
 echo "══════════════════════════════════════════════════════"
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "description": "Native module for two way audio streaming",
  "main": "build/index.js",
  "types": "build/index.d.ts",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "type": "module",
  "publishConfig": {
    "access": "public"
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "description": "Paseo relay for bridging daemon and client connections",
  "type": "module",
  "publishConfig": {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.1.59",
+  "version": "0.1.55-rc.1",
  "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.59",
-    "@getpaseo/relay": "0.1.59",
+    "@getpaseo/highlight": "0.1.55-rc.1",
+    "@getpaseo/relay": "0.1.55-rc.1",
    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "^1.20.1",
    "@opencode-ai/sdk": "1.2.6",
@@ -93,7 +93,6 @@
    "strip-ansi": "^7.1.2",
    "tiny-invariant": "^1.3.3",
    "uuid": "^9.0.1",
-    "which": "^5.0.0",
    "ws": "^8.14.2",
    "zod": "^3.23.8",
    "zod-to-json-schema": "^3.25.1"
@@ -516,6 +516,70 @@ describe("DaemonClient", () => {
    });
  });

+  test("subscribes to lazy checkout diff updates via RPC handshake", async () => {
+    const logger = createMockLogger();
+    const mock = createMockTransport();
+
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger,
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    const promise = client.subscribeCheckoutDiffLazy(
+      "/tmp/project",
+      { mode: "uncommitted" },
+      { subscriptionId: "checkout-lazy-sub-1" },
+    );
+
+    expect(mock.sent).toHaveLength(1);
+    const request = JSON.parse(mock.sent[0]) as {
+      type: "session";
+      message: {
+        type: "checkout/subscribe_diff";
+        subscriptionId: string;
+        cwd: string;
+        compare: { mode: "uncommitted" | "base"; baseRef?: string };
+        requestId: string;
+      };
+    };
+    expect(request.message.type).toBe("checkout/subscribe_diff");
+    expect(request.message.subscriptionId).toBe("checkout-lazy-sub-1");
+    expect(request.message.cwd).toBe("/tmp/project");
+    expect(request.message.compare).toEqual({ mode: "uncommitted", ignoreWhitespace: false });
+
+    mock.triggerMessage(
+      JSON.stringify({
+        type: "session",
+        message: {
+          type: "checkout/diff_snapshot",
+          payload: {
+            subscriptionId: "checkout-lazy-sub-1",
+            cwd: "/tmp/project",
+            files: [],
+            error: null,
+            requestId: request.message.requestId,
+          },
+        },
+      }),
+    );
+
+    await expect(promise).resolves.toEqual({
+      subscriptionId: "checkout-lazy-sub-1",
+      cwd: "/tmp/project",
+      files: [],
+      error: null,
+      requestId: request.message.requestId,
+    });
+  });
+
  test("getCheckoutDiff uses one-shot subscription protocol", async () => {
    const logger = createMockLogger();
    const mock = createMockTransport();
@@ -589,6 +653,105 @@ describe("DaemonClient", () => {
    expect(unsubscribeRequest.message.subscriptionId).toBe(subscribeRequest.message.subscriptionId);
  });

+  test("getCheckoutFileHunks requests hunks via RPC", async () => {
+    const logger = createMockLogger();
+    const mock = createMockTransport();
+
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger,
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    const promise = client.getCheckoutFileHunks(
+      "/tmp/project",
+      { mode: "base", baseRef: "main" },
+      "src/app.ts",
+    );
+
+    expect(mock.sent).toHaveLength(1);
+    const request = JSON.parse(mock.sent[0]) as {
+      type: "session";
+      message: {
+        type: "checkout/get_file_hunks";
+        cwd: string;
+        compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
+        path: string;
+        requestId: string;
+      };
+    };
+    expect(request.message.type).toBe("checkout/get_file_hunks");
+    expect(request.message.cwd).toBe("/tmp/project");
+    expect(request.message.compare).toEqual({
+      mode: "base",
+      baseRef: "main",
+      ignoreWhitespace: false,
+    });
+    expect(request.message.path).toBe("src/app.ts");
+
+    mock.triggerMessage(
+      JSON.stringify({
+        type: "session",
+        message: {
+          type: "checkout/file_hunks_response",
+          payload: {
+            requestId: request.message.requestId,
+            path: "src/app.ts",
+            hunks: [],
+            error: null,
+          },
+        },
+      }),
+    );
+
+    await expect(promise).resolves.toEqual({
+      requestId: request.message.requestId,
+      path: "src/app.ts",
+      hunks: [],
+      error: null,
+    });
+  });
+
+  test("unsubscribeCheckoutDiffLazy sends unsubscribe request", async () => {
+    const logger = createMockLogger();
+    const mock = createMockTransport();
+
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger,
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    client.unsubscribeCheckoutDiffLazy("checkout-lazy-sub-1");
+
+    expect(mock.sent).toHaveLength(1);
+    const request = JSON.parse(mock.sent[0]) as {
+      type: "session";
+      message: {
+        type: "checkout/unsubscribe_diff";
+        subscriptionId: string;
+      };
+    };
+    expect(request.message).toEqual({
+      type: "checkout/unsubscribe_diff",
+      subscriptionId: "checkout-lazy-sub-1",
+    });
+  });
+
  test("requests branch suggestions via RPC", async () => {
    const logger = createMockLogger();
    const mock = createMockTransport();
@@ -886,6 +1049,60 @@ describe("DaemonClient", () => {
    expect(request.message.requestId.length).toBeGreaterThan(0);
  });

+  test("resubscribes lazy checkout diff streams after reconnect", async () => {
+    const logger = createMockLogger();
+    const mock = createMockTransport();
+
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger,
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const internal = client as unknown as {
+      checkoutDiffLazySubscriptions: Map<
+        string,
+        {
+          cwd: string;
+          compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
+        }
+      >;
+    };
+    internal.checkoutDiffLazySubscriptions.set("checkout-lazy-sub-1", {
+      cwd: "/tmp/project",
+      compare: { mode: "base", baseRef: "main", ignoreWhitespace: false },
+    });
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    expect(mock.sent).toHaveLength(1);
+    const request = JSON.parse(mock.sent[0]) as {
+      type: "session";
+      message: {
+        type: "checkout/subscribe_diff";
+        subscriptionId: string;
+        cwd: string;
+        compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
+        requestId: string;
+      };
+    };
+    expect(request.message.type).toBe("checkout/subscribe_diff");
+    expect(request.message.subscriptionId).toBe("checkout-lazy-sub-1");
+    expect(request.message.cwd).toBe("/tmp/project");
+    expect(request.message.compare).toEqual({
+      mode: "base",
+      baseRef: "main",
+      ignoreWhitespace: false,
+    });
+    expect(typeof request.message.requestId).toBe("string");
+    expect(request.message.requestId.length).toBeGreaterThan(0);
+  });
+
  test("fetches agents via RPC with filters, sort, and pagination", async () => {
    const logger = createMockLogger();
    const mock = createMockTransport();
@@ -216,6 +216,14 @@ type SubscribeCheckoutDiffPayload = Extract<
  { type: "subscribe_checkout_diff_response" }
 >["payload"];
 type CheckoutDiffPayload = Omit<SubscribeCheckoutDiffPayload, "subscriptionId">;
+type CheckoutDiffMetadataSnapshotPayload = Extract<
+  SessionOutboundMessage,
+  { type: "checkout/diff_snapshot" }
+>["payload"];
+type CheckoutFileHunksPayload = Extract<
+  SessionOutboundMessage,
+  { type: "checkout/file_hunks_response" }
+>["payload"];
 type CheckoutCommitPayload = CheckoutCommitResponse["payload"];
 type CheckoutMergePayload = CheckoutMergeResponse["payload"];
 type CheckoutMergeFromBasePayload = CheckoutMergeFromBaseResponse["payload"];
@@ -500,8 +508,13 @@ type SetDaemonConfigResponse = Extract<
  SessionOutboundMessage,
  { type: "set_daemon_config_response" }
 >;
+type CheckoutDiffSnapshotResponse = Extract<
+  SessionOutboundMessage,
+  { type: "checkout/diff_snapshot" }
+>;
 type CorrelatedResponseMessage =
  | Extract<SessionOutboundMessage, { payload: { requestId: string } }>
+  | CheckoutDiffSnapshotResponse
  | GetDaemonConfigResponse
  | SetDaemonConfigResponse;
 type CorrelatedResponseType = CorrelatedResponseMessage["type"];
@@ -616,6 +629,13 @@ export class DaemonClient {
      compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
    }
  >();
+  private checkoutDiffLazySubscriptions = new Map<
+    string,
+    {
+      cwd: string;
+      compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
+    }
+  >();
  private terminalDirectorySubscriptions = new Set<string>();
  private terminalSlots = new Map<string, number>();
  private slotTerminals = new Map<number, string>();
@@ -1187,28 +1207,8 @@ export class DaemonClient {
    }
  }

-  async clearAgentAttention(agentId: string | string[]): Promise<void> {
-    const requestId = this.createRequestId();
-    const message = SessionInboundMessageSchema.parse({
-      type: "clear_agent_attention",
-      agentId,
-      requestId,
-    });
-    await this.sendRequest({
-      requestId,
-      message,
-      timeout: 15000,
-      options: { skipQueue: true },
-      select: (msg) => {
-        if (msg.type !== "clear_agent_attention_response") {
-          return null;
-        }
-        if (msg.payload.requestId !== requestId) {
-          return null;
-        }
-        return msg.payload;
-      },
-    });
+  clearAgentAttention(agentId: string | string[]): void {
+    this.sendSessionMessage({ type: "clear_agent_attention", agentId });
  }

  sendHeartbeat(params: {
@@ -1428,6 +1428,22 @@ export class DaemonClient {
    }
  }

+  private resubscribeCheckoutDiffLazySubscriptions(): void {
+    if (this.checkoutDiffLazySubscriptions.size === 0) {
+      return;
+    }
+    for (const [subscriptionId, subscription] of this.checkoutDiffLazySubscriptions) {
+      const message = SessionInboundMessageSchema.parse({
+        type: "checkout/subscribe_diff",
+        subscriptionId,
+        cwd: subscription.cwd,
+        compare: subscription.compare,
+        requestId: this.createRequestId(),
+      });
+      this.sendSessionMessage(message);
+    }
+  }
+
  private resubscribeTerminalDirectorySubscriptions(): void {
    if (this.terminalDirectorySubscriptions.size === 0) {
      return;
@@ -1712,27 +1728,7 @@ export class DaemonClient {
  }

  async cancelAgent(agentId: string): Promise<void> {
-    const requestId = this.createRequestId();
-    const message = SessionInboundMessageSchema.parse({
-      type: "cancel_agent_request",
-      agentId,
-      requestId,
-    });
-    await this.sendRequest({
-      requestId,
-      message,
-      timeout: 15000,
-      options: { skipQueue: true },
-      select: (msg) => {
-        if (msg.type !== "cancel_agent_response") {
-          return null;
-        }
-        if (msg.payload.requestId !== requestId) {
-          return null;
-        }
-        return msg.payload;
-      },
-    });
+    this.sendSessionMessage({ type: "cancel_agent_request", agentId });
  }

  async setAgentMode(agentId: string, modeId: string): Promise<void> {
@@ -2310,6 +2306,105 @@ export class DaemonClient {
    });
  }

+  async getCheckoutDiffMetadata(
+    cwd: string,
+    compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean },
+    requestId?: string,
+  ): Promise<Omit<CheckoutDiffMetadataSnapshotPayload, "subscriptionId">> {
+    const oneShotSubscriptionId = `oneshot-checkout-diff-lazy:${crypto.randomUUID()}`;
+    try {
+      const payload = await this.subscribeCheckoutDiffLazy(cwd, compare, {
+        subscriptionId: oneShotSubscriptionId,
+        requestId,
+      });
+      return {
+        cwd: payload.cwd,
+        files: payload.files,
+        error: payload.error,
+        requestId: payload.requestId,
+      };
+    } finally {
+      try {
+        this.unsubscribeCheckoutDiffLazy(oneShotSubscriptionId);
+      } catch {
+        // Ignore disconnect races during one-shot cleanup.
+      }
+    }
+  }
+
+  async subscribeCheckoutDiffLazy(
+    cwd: string,
+    compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean },
+    options?: { subscriptionId?: string; requestId?: string },
+  ): Promise<CheckoutDiffMetadataSnapshotPayload> {
+    const subscriptionId = options?.subscriptionId ?? crypto.randomUUID();
+    const normalizedCompare = this.normalizeCheckoutDiffCompare(compare);
+    const previousSubscription = this.checkoutDiffLazySubscriptions.get(subscriptionId) ?? null;
+    this.checkoutDiffLazySubscriptions.set(subscriptionId, {
+      cwd,
+      compare: normalizedCompare,
+    });
+
+    const resolvedRequestId = this.createRequestId(options?.requestId);
+    const message = SessionInboundMessageSchema.parse({
+      type: "checkout/subscribe_diff",
+      subscriptionId,
+      cwd,
+      compare: normalizedCompare,
+      requestId: resolvedRequestId,
+    });
+
+    try {
+      return await this.sendCorrelatedRequest({
+        requestId: resolvedRequestId,
+        message,
+        responseType: "checkout/diff_snapshot",
+        timeout: 60000,
+        options: { skipQueue: true },
+        selectPayload: (payload) => {
+          if (payload.subscriptionId !== subscriptionId) {
+            return null;
+          }
+          return payload;
+        },
+      });
+    } catch (error) {
+      if (previousSubscription) {
+        this.checkoutDiffLazySubscriptions.set(subscriptionId, previousSubscription);
+      } else {
+        this.checkoutDiffLazySubscriptions.delete(subscriptionId);
+      }
+      throw error;
+    }
+  }
+
+  unsubscribeCheckoutDiffLazy(subscriptionId: string): void {
+    this.checkoutDiffLazySubscriptions.delete(subscriptionId);
+    this.sendSessionMessage({
+      type: "checkout/unsubscribe_diff",
+      subscriptionId,
+    });
+  }
+
+  async getCheckoutFileHunks(
+    cwd: string,
+    compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean },
+    path: string,
+    requestId?: string,
+  ): Promise<CheckoutFileHunksPayload> {
+    return this.sendCorrelatedSessionRequest({
+      requestId,
+      message: {
+        type: "checkout/get_file_hunks",
+        cwd,
+        compare: this.normalizeCheckoutDiffCompare(compare),
+        path,
+      },
+      responseType: "checkout/file_hunks_response",
+      timeout: 60000,
+    });
+  }
+
  async checkoutCommit(
    cwd: string,
    input: { message?: string; addAll?: boolean },
@@ -2756,7 +2851,6 @@ export class DaemonClient {

  async refreshProvidersSnapshot(options?: {
    cwd?: string;
-    providers?: AgentProvider[];
    requestId?: string;
  }): Promise<RefreshProvidersSnapshotPayload> {
    return this.sendCorrelatedSessionRequest({
@@ -2764,10 +2858,9 @@ export class DaemonClient {
      message: {
        type: "refresh_providers_snapshot_request",
        cwd: options?.cwd,
-        providers: options?.providers,
      },
      responseType: "refresh_providers_snapshot_response",
-      timeout: 60000,
+      timeout: 5000,
    });
  }

@@ -3765,6 +3858,7 @@ export class DaemonClient {
          this.reconnectAttempt = 0;
          this.updateConnectionState({ status: "connected" }, { event: "HELLO_SERVER_INFO" });
          this.resubscribeCheckoutDiffSubscriptions();
+          this.resubscribeCheckoutDiffLazySubscriptions();
          this.resubscribeTerminalDirectorySubscriptions();
          this.flushPendingSendQueue();
          this.resolveConnect();
@@ -1,80 +0,0 @@
-import type { Logger } from "pino";
-
-import type { AgentProvider } from "./agent-sdk-types.js";
-import type { AgentManager, ManagedAgent } from "./agent-manager.js";
-import type { AgentStorage } from "./agent-storage.js";
-import {
-  buildConfigOverrides,
-  buildSessionConfig,
-  extractTimestamps,
-  toAgentPersistenceHandle,
-} from "../persistence-hooks.js";
-
-const pendingAgentInitializations = new Map<string, Promise<ManagedAgent>>();
-
-export interface EnsureAgentLoadedDeps {
-  agentManager: AgentManager;
-  agentStorage: AgentStorage;
-  validProviders?: Iterable<AgentProvider>;
-  logger: Logger;
-}
-
-export async function ensureAgentLoaded(
-  agentId: string,
-  deps: EnsureAgentLoadedDeps,
-): Promise<ManagedAgent> {
-  const existing = deps.agentManager.getAgent(agentId);
-  if (existing) {
-    return existing;
-  }
-
-  const inflight = pendingAgentInitializations.get(agentId);
-  if (inflight) {
-    return inflight;
-  }
-
-  const initPromise = (async () => {
-    const record = await deps.agentStorage.get(agentId);
-    if (!record) {
-      throw new Error(`Agent not found: ${agentId}`);
-    }
-
-    const validProviders = deps.validProviders ?? deps.agentManager.getRegisteredProviderIds();
-    const handle = toAgentPersistenceHandle(deps.logger, validProviders, record.persistence);
-
-    let snapshot: ManagedAgent;
-    if (handle) {
-      snapshot = await deps.agentManager.resumeAgentFromPersistence(
-        handle,
-        buildConfigOverrides(record),
-        agentId,
-        extractTimestamps(record),
-      );
-      deps.logger.info({ agentId, provider: record.provider }, "Agent resumed from persistence");
-    } else {
-      const config = buildSessionConfig(record, {
-        validProviders,
-        logger: deps.logger,
-      });
-      if (!config) {
-        throw new Error(`Agent ${agentId} references unavailable provider '${record.provider}'`);
-      }
-      snapshot = await deps.agentManager.createAgent(config, agentId, { labels: record.labels });
-      deps.logger.info({ agentId, provider: record.provider }, "Agent created from stored config");
-    }
-
-    await deps.agentManager.hydrateTimelineFromProvider(agentId);
-    return deps.agentManager.getAgent(agentId) ?? snapshot;
-  })();
-
-  pendingAgentInitializations.set(agentId, initPromise);
-
-  try {
-    return await initPromise;
-  } finally {
-    const current = pendingAgentInitializations.get(agentId);
-    if (current === initPromise) {
-      pendingAgentInitializations.delete(agentId);
-    }
-  }
-}
@@ -800,12 +800,6 @@ export class AgentManager {
        : overrides;
    const launchContext = this.buildLaunchContext(resolvedAgentId);
    const client = this.requireClient(handle.provider);
-    const available = await client.isAvailable();
-    if (!available) {
-      throw new Error(
-        `Provider '${handle.provider}' is not available. Please ensure the CLI is installed.`,
-      );
-    }
    const session = await client.resumeSession(handle, resumeOverrides, launchContext);
    return this.registerSession(session, normalizedConfig, resolvedAgentId, options);
  }
@@ -119,7 +119,7 @@ describe("agent MCP end-to-end (offline)", () => {
      listen: `127.0.0.1:${port}`,
      paseoHome,
      corsAllowedOrigins: [],
-      hostnames: true,
+      allowedHosts: true,
      mcpEnabled: true,
      staticDir,
      mcpDebug: false,
@@ -192,7 +192,7 @@ describe("agent MCP end-to-end (offline)", () => {
      listen: `127.0.0.1:${port}`,
      paseoHome,
      corsAllowedOrigins: [],
-      hostnames: true,
+      allowedHosts: true,
      mcpEnabled: true,
      staticDir,
      mcpDebug: false,
@@ -216,7 +216,7 @@ describe("agent MCP end-to-end (offline)", () => {
      listen: `127.0.0.1:${disabledPort}`,
      paseoHome: disabledPaseoHome,
      corsAllowedOrigins: [],
-      hostnames: true,
+      allowedHosts: true,
      mcpEnabled: true,
      mcpInjectIntoAgents: false,
      staticDir: disabledStaticDir,
@@ -307,7 +307,7 @@ describe("agent MCP end-to-end (offline)", () => {
      listen: `127.0.0.1:${port}`,
      paseoHome,
      corsAllowedOrigins: [],
-      hostnames: true,
+      allowedHosts: true,
      mcpEnabled: true,
      staticDir,
      mcpDebug: false,
@@ -13,9 +13,6 @@ import type {
 } from "./agent-sdk-types.js";
 import type { ManagedAgent } from "./agent-manager.js";
 import type { JsonValue } from "../json-utils.js";
-import type { Logger } from "pino";
-import { buildProviderRegistry } from "./provider-registry.js";
-import { coerceAgentProvider, toAgentPersistenceHandle } from "../persistence-hooks.js";

 export type { ManagedAgent };

@@ -94,7 +91,7 @@ export function toAgentPayload(
    model: agent.config.model ?? null,
    thinkingOptionId,
    effectiveThinkingOptionId,
-    ...(runtimeInfo ? { runtimeInfo } : {}),
+    runtimeInfo,
    createdAt: agent.createdAt.toISOString(),
    updatedAt: agent.updatedAt.toISOString(),
    lastUserMessageAt: agent.lastUserMessageAt ? agent.lastUserMessageAt.toISOString() : null,
@@ -131,93 +128,6 @@ export function toAgentPayload(
  return payload;
 }

-export function buildStoredAgentPayload(
-  record: StoredAgentRecord,
-  providerRegistry: ReturnType<typeof buildProviderRegistry>,
-  logger: Logger,
-): AgentSnapshotPayload {
-  const defaultCapabilities = {
-    supportsStreaming: false,
-    supportsSessionPersistence: true,
-    supportsDynamicModes: false,
-    supportsMcpServers: false,
-    supportsReasoningStream: false,
-    supportsToolInvocations: true,
-  } as const;
-
-  const createdAt = new Date(record.createdAt);
-  const updatedAt = new Date(resolveStoredAgentPayloadUpdatedAt(record));
-  const lastUserMessageAt = record.lastUserMessageAt ? new Date(record.lastUserMessageAt) : null;
-
-  const provider = coerceAgentProvider(logger, providerRegistry, record.provider, record.id);
-  const runtimeInfo = record.runtimeInfo
-    ? {
-        provider: coerceAgentProvider(
-          logger,
-          providerRegistry,
-          record.runtimeInfo.provider,
-          record.id,
-        ),
-        sessionId: record.runtimeInfo.sessionId,
-        ...(Object.prototype.hasOwnProperty.call(record.runtimeInfo, "model")
-          ? { model: record.runtimeInfo.model ?? null }
-          : {}),
-        ...(Object.prototype.hasOwnProperty.call(record.runtimeInfo, "thinkingOptionId")
-          ? { thinkingOptionId: record.runtimeInfo.thinkingOptionId ?? null }
-          : {}),
-        ...(Object.prototype.hasOwnProperty.call(record.runtimeInfo, "modeId")
-          ? { modeId: record.runtimeInfo.modeId ?? null }
-          : {}),
-        ...(record.runtimeInfo.extra ? { extra: record.runtimeInfo.extra } : {}),
-      }
-    : undefined;
-
-  return {
-    id: record.id,
-    provider,
-    cwd: record.cwd,
-    model: record.config?.model ?? null,
-    thinkingOptionId: record.config?.thinkingOptionId ?? null,
-    effectiveThinkingOptionId: resolveEffectiveThinkingOptionId({
-      runtimeInfo,
-      configuredThinkingOptionId: record.config?.thinkingOptionId ?? null,
-    }),
-    ...(runtimeInfo ? { runtimeInfo } : {}),
-    createdAt: createdAt.toISOString(),
-    updatedAt: updatedAt.toISOString(),
-    lastUserMessageAt: lastUserMessageAt ? lastUserMessageAt.toISOString() : null,
-    status: record.lastStatus,
-    capabilities: defaultCapabilities,
-    currentModeId: record.lastModeId ?? null,
-    availableModes: [],
-    pendingPermissions: [],
-    persistence: toAgentPersistenceHandle(logger, providerRegistry, record.persistence),
-    title: record.title ?? record.config?.title ?? null,
-    requiresAttention: record.requiresAttention ?? false,
-    attentionReason: record.attentionReason ?? null,
-    attentionTimestamp: record.attentionTimestamp ?? null,
-    archivedAt: record.archivedAt ?? null,
-    labels: record.labels,
-  };
-}
-
-export function resolveStoredAgentPayloadUpdatedAt(record: StoredAgentRecord): string {
-  const timestamps = [record.updatedAt, record.lastActivityAt]
-    .filter((value): value is string => typeof value === "string" && value.length > 0)
-    .map((value) => ({
-      raw: value,
-      parsed: Date.parse(value),
-    }))
-    .filter((value) => !Number.isNaN(value.parsed));
-
-  if (timestamps.length === 0) {
-    return record.updatedAt;
-  }
-
-  timestamps.sort((a, b) => b.parsed - a.parsed);
-  return timestamps[0].raw;
-}
-
 function buildSerializableConfig(config: AgentSessionConfig): SerializableAgentConfig | null {
  const serializable: SerializableAgentConfig = {};
  if (Object.prototype.hasOwnProperty.call(config, "title")) {
@@ -42,7 +42,7 @@ async function startAgentMcpServer(logger: pino.Logger): Promise<AgentMcpServerH
    logger,
  });

-  let mcpAllowedHosts: string[] | undefined;
+  let allowedHosts: string[] | undefined;
  const agentMcpTransports = new Map<string, StreamableHTTPServerTransport>();

  const createAgentMcpTransport = async (callerAgentId?: string) => {
@@ -62,7 +62,7 @@ async function startAgentMcpServer(logger: pino.Logger): Promise<AgentMcpServerH
        agentMcpTransports.delete(sessionId);
      },
      enableDnsRebindingProtection: true,
-      ...(mcpAllowedHosts ? { allowedHosts: mcpAllowedHosts } : {}),
+      ...(allowedHosts ? { allowedHosts } : {}),
    });

    transport.onclose = () => {
@@ -129,7 +129,7 @@ async function startAgentMcpServer(logger: pino.Logger): Promise<AgentMcpServerH
    });
  });

-  mcpAllowedHosts = [`127.0.0.1:${port}`, `localhost:${port}`];
+  allowedHosts = [`127.0.0.1:${port}`, `localhost:${port}`];
  const url = `http://127.0.0.1:${port}/mcp/agents`;

  return {
@@ -478,28 +478,6 @@ describe("MCP parity end-to-end", () => {
      }
    });

-    test("create_schedule accepts provider/model syntax", async () => {
-      let scheduleId: string | null = null;
-      try {
-        const created = await callToolStructured(topLevelClient, "create_schedule", {
-          prompt: "say hello",
-          every: "5m",
-          name: "Parity provider schedule",
-          provider: "codex/gpt-5.4",
-        });
-        scheduleId = created.id as string;
-        expect(created.target).toMatchObject({
-          type: "new-agent",
-          config: {
-            provider: "codex",
-            model: "gpt-5.4",
-          },
-        });
-      } finally {
-        await deleteScheduleIfPresent(scheduleId);
-      }
-    });
-
    test("inspect_schedule returns details", async () => {
      let scheduleId: string | null = null;
      try {
@@ -590,27 +568,6 @@ describe("MCP parity end-to-end", () => {
      }
    });

-    test("create_schedule on agent MCP accepts provider/model override for new-agent", async () => {
-      let scheduleId: string | null = null;
-      try {
-        const created = await callToolStructured(agentScopedClient, "create_schedule", {
-          prompt: "say hello",
-          every: "5m",
-          provider: "codex/gpt-5.4",
-        });
-        scheduleId = created.id as string;
-        expect(created.target).toMatchObject({
-          type: "new-agent",
-          config: {
-            provider: "codex",
-            model: "gpt-5.4",
-          },
-        });
-      } finally {
-        await deleteScheduleIfPresent(scheduleId);
-      }
-    });
-
    test("create_schedule target self without callerAgentId throws", async () => {
      await expectToolError(
        topLevelClient,
@@ -2,14 +2,12 @@ import { describe, expect, it, vi } from "vitest";
 import { mkdtemp, mkdir, rm } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
-import { z } from "zod";

 import { createTestLogger } from "../../test-utils/test-logger.js";
 import { createAgentMcpServer } from "./mcp-server.js";
 import type { AgentManager, ManagedAgent } from "./agent-manager.js";
-import type { AgentStorage, StoredAgentRecord } from "./agent-storage.js";
+import type { AgentStorage } from "./agent-storage.js";
 import type { ProviderDefinition } from "./provider-registry.js";
-import { AgentSnapshotPayloadSchema } from "../../shared/messages.js";

 type TestDeps = {
  agentManager: AgentManager;
@@ -31,17 +29,10 @@ function createTestDeps(): TestDeps {
    archiveAgent: vi.fn().mockResolvedValue({ archivedAt: new Date().toISOString() }),
    notifyAgentState: vi.fn(),
    getAgent: vi.fn(),
-    listAgents: vi.fn().mockReturnValue([]),
-    getTimeline: vi.fn().mockReturnValue([]),
-    resumeAgentFromPersistence: vi.fn(),
-    hydrateTimelineFromProvider: vi.fn().mockResolvedValue(undefined),
-    hasInFlightRun: vi.fn().mockReturnValue(false),
-    subscribe: vi.fn().mockReturnValue(() => {}),
    streamAgent: vi.fn(() => (async function* noop() {})()),
    respondToPermission: vi.fn(),
    cancelAgentRun: vi.fn(),
    getPendingPermissions: vi.fn(),
-    getRegisteredProviderIds: vi.fn().mockReturnValue(["claude"]),
  };

  const agentStorageSpies = {
@@ -49,7 +40,7 @@ function createTestDeps(): TestDeps {
    setTitle: vi.fn().mockResolvedValue(undefined),
    upsert: vi.fn().mockResolvedValue(undefined),
    applySnapshot: vi.fn(),
-    list: vi.fn().mockResolvedValue([]),
+    list: vi.fn(),
    remove: vi.fn(),
  };

@@ -77,43 +68,6 @@ function createProviderDefinition(overrides: Partial<ProviderDefinition>): Provi
  };
 }

-function createStoredRecord(overrides: Partial<StoredAgentRecord> = {}): StoredAgentRecord {
-  const now = "2026-04-11T00:00:00.000Z";
-  return {
-    id: "stored-agent",
-    provider: "claude",
-    cwd: "/tmp/stored-project",
-    createdAt: now,
-    updatedAt: now,
-    lastActivityAt: now,
-    lastUserMessageAt: null,
-    title: "Stored agent",
-    labels: {},
-    lastStatus: "closed",
-    lastModeId: "default",
-    config: {
-      modeId: "default",
-      model: "claude-sonnet-4-20250514",
-    },
-    runtimeInfo: {
-      provider: "claude",
-      sessionId: "session-123",
-      model: "claude-sonnet-4-20250514",
-    },
-    features: [],
-    persistence: {
-      provider: "claude",
-      sessionId: "session-123",
-    },
-    requiresAttention: false,
-    attentionReason: null,
-    attentionTimestamp: null,
-    internal: false,
-    archivedAt: "2026-04-12T00:00:00.000Z",
-    ...overrides,
-  };
-}
-
 describe("create_agent MCP tool", () => {
  const logger = createTestLogger();
  const existingCwd = process.cwd();
@@ -529,276 +483,4 @@ describe("agent snapshot MCP serialization", () => {
    });
    expect(Array.isArray(structured.agents[0].features)).toBe(true);
  });
-
-  it("returns archived agent snapshots from storage for get_agent_status", async () => {
-    const { agentManager, agentStorage, spies } = createTestDeps();
-    const record = createStoredRecord({
-      id: "archived-agent",
-      archivedAt: "2026-04-12T00:00:00.000Z",
-    });
-    spies.agentManager.getAgent.mockReturnValue(null);
-    spies.agentStorage.get.mockResolvedValue(record);
-
-    const server = await createAgentMcpServer({
-      agentManager,
-      agentStorage,
-      logger,
-      providerRegistry: {
-        claude: createProviderDefinition({}),
-      } as any,
-    });
-    const tool = (server as any)._registeredTools["get_agent_status"];
-    const response = await tool.callback({ agentId: "archived-agent" });
-
-    expect(response.structuredContent).toEqual({
-      status: "closed",
-      snapshot: expect.objectContaining({
-        id: "archived-agent",
-        archivedAt: "2026-04-12T00:00:00.000Z",
-        title: "Stored agent",
-        status: "closed",
-      }),
-    });
-    expect(spies.agentStorage.get).toHaveBeenCalledWith("archived-agent");
-  });
-
-  it("does not expose internal stored agents from get_agent_status", async () => {
-    const { agentManager, agentStorage, spies } = createTestDeps();
-    spies.agentManager.getAgent.mockReturnValue(null);
-    spies.agentStorage.get.mockResolvedValue(
-      createStoredRecord({
-        id: "internal-agent",
-        internal: true,
-      }),
-    );
-
-    const server = await createAgentMcpServer({
-      agentManager,
-      agentStorage,
-      logger,
-      providerRegistry: {
-        claude: createProviderDefinition({}),
-      } as any,
-    });
-    const tool = (server as any)._registeredTools["get_agent_status"];
-
-    await expect(tool.callback({ agentId: "internal-agent" })).rejects.toThrow(
-      "Agent internal-agent not found",
-    );
-  });
-
-  it("includes stored non-archived agents in list_agents by default", async () => {
-    const { agentManager, agentStorage, spies } = createTestDeps();
-    const liveAgent = {
-      id: "live-agent",
-      provider: "claude",
-      cwd: "/tmp/live-project",
-      config: {},
-      runtimeInfo: undefined,
-      createdAt: new Date("2026-04-11T00:00:00.000Z"),
-      updatedAt: new Date("2026-04-11T00:00:00.000Z"),
-      lastUserMessageAt: null,
-      lifecycle: "idle",
-      capabilities: {
-        supportsStreaming: false,
-        supportsSessionPersistence: false,
-        supportsDynamicModes: false,
-        supportsMcpServers: true,
-        supportsReasoningStream: false,
-        supportsToolInvocations: true,
-      },
-      currentModeId: null,
-      availableModes: [],
-      features: [],
-      pendingPermissions: new Map(),
-      persistence: null,
-      labels: {},
-      attention: { requiresAttention: false },
-    } as unknown as ManagedAgent;
-    spies.agentManager.listAgents.mockReturnValue([liveAgent]);
-    spies.agentStorage.list.mockResolvedValue([
-      createStoredRecord({ id: "closed-agent", archivedAt: null }),
-      createStoredRecord({ id: "archived-agent", archivedAt: "2026-04-12T00:00:00.000Z" }),
-      createStoredRecord({ id: "live-agent", archivedAt: null }),
-      createStoredRecord({ id: "internal-agent", archivedAt: null, internal: true }),
-    ]);
-
-    const server = await createAgentMcpServer({
-      agentManager,
-      agentStorage,
-      logger,
-      providerRegistry: {
-        claude: createProviderDefinition({}),
-      } as any,
-    });
-    const tool = (server as any)._registeredTools["list_agents"];
-    const response = await tool.callback({});
-
-    expect(response.structuredContent.agents).toEqual([
-      expect.objectContaining({ id: "live-agent" }),
-      expect.objectContaining({ id: "closed-agent", archivedAt: null }),
-    ]);
-  });
-
-  it("includes archived stored agents in list_agents when requested", async () => {
-    const { agentManager, agentStorage, spies } = createTestDeps();
-    const liveAgent = {
-      id: "live-agent",
-      provider: "claude",
-      cwd: "/tmp/live-project",
-      config: {},
-      runtimeInfo: undefined,
-      createdAt: new Date("2026-04-11T00:00:00.000Z"),
-      updatedAt: new Date("2026-04-11T00:00:00.000Z"),
-      lastUserMessageAt: null,
-      lifecycle: "idle",
-      capabilities: {
-        supportsStreaming: false,
-        supportsSessionPersistence: false,
-        supportsDynamicModes: false,
-        supportsMcpServers: true,
-        supportsReasoningStream: false,
-        supportsToolInvocations: true,
-      },
-      currentModeId: null,
-      availableModes: [],
-      features: [],
-      pendingPermissions: new Map(),
-      persistence: null,
-      labels: {},
-      attention: { requiresAttention: false },
-    } as unknown as ManagedAgent;
-    spies.agentManager.listAgents.mockReturnValue([liveAgent]);
-    spies.agentStorage.list.mockResolvedValue([
-      createStoredRecord({ id: "archived-agent", archivedAt: "2026-04-12T00:00:00.000Z" }),
-      createStoredRecord({ id: "live-agent", archivedAt: "2026-04-12T00:00:00.000Z" }),
-      createStoredRecord({
-        id: "internal-archived-agent",
-        archivedAt: "2026-04-12T00:00:00.000Z",
-        internal: true,
-      }),
-      createStoredRecord({ id: "not-archived-agent", archivedAt: null }),
-    ]);
-
-    const server = await createAgentMcpServer({
-      agentManager,
-      agentStorage,
-      logger,
-      providerRegistry: {
-        claude: createProviderDefinition({}),
-      } as any,
-    });
-    const tool = (server as any)._registeredTools["list_agents"];
-    const response = await tool.callback({ includeArchived: true });
-
-    expect(response.structuredContent.agents).toEqual([
-      expect.objectContaining({ id: "live-agent" }),
-      expect.objectContaining({
-        id: "archived-agent",
-        archivedAt: "2026-04-12T00:00:00.000Z",
-      }),
-      expect.objectContaining({
-        id: "not-archived-agent",
-        archivedAt: null,
-      }),
-    ]);
-  });
-
-  it("emits list_agents payloads that satisfy the declared output schema", async () => {
-    const { agentManager, agentStorage, spies } = createTestDeps();
-    const liveAgent = {
-      id: "live-agent",
-      provider: "claude",
-      cwd: "/tmp/live-project",
-      config: {},
-      runtimeInfo: undefined,
-      createdAt: new Date("2026-04-11T00:00:00.000Z"),
-      updatedAt: new Date("2026-04-11T00:00:00.000Z"),
-      lastUserMessageAt: null,
-      lifecycle: "idle",
-      capabilities: {
-        supportsStreaming: false,
-        supportsSessionPersistence: false,
-        supportsDynamicModes: false,
-        supportsMcpServers: true,
-        supportsReasoningStream: false,
-        supportsToolInvocations: true,
-      },
-      currentModeId: null,
-      availableModes: [],
-      features: [],
-      pendingPermissions: new Map(),
-      persistence: null,
-      labels: {},
-      attention: { requiresAttention: false },
-    } as unknown as ManagedAgent;
-    spies.agentManager.listAgents.mockReturnValue([liveAgent]);
-    spies.agentStorage.list.mockResolvedValue([
-      createStoredRecord({ id: "stored-non-archived", archivedAt: null }),
-      createStoredRecord({ id: "stored-archived", archivedAt: "2026-04-12T00:00:00.000Z" }),
-    ]);
-
-    const server = await createAgentMcpServer({
-      agentManager,
-      agentStorage,
-      logger,
-      providerRegistry: {
-        claude: createProviderDefinition({}),
-      } as any,
-    });
-    const tool = (server as any)._registeredTools["list_agents"];
-    const response = await tool.callback({ includeArchived: true });
-
-    const parsed = z.array(AgentSnapshotPayloadSchema).safeParse(response.structuredContent.agents);
-    if (!parsed.success) {
-      throw new Error(
-        `list_agents response failed AgentSnapshotPayloadSchema: ${JSON.stringify(parsed.error.issues, null, 2)}`,
-      );
-    }
-  });
-
-  it("loads archived agents before reading get_agent_activity", async () => {
-    const { agentManager, agentStorage, spies } = createTestDeps();
-    const record = createStoredRecord({ id: "archived-activity-agent" });
-    const snapshot = {
-      id: "archived-activity-agent",
-      currentModeId: "default",
-    } as ManagedAgent;
-    spies.agentManager.getAgent
-      .mockReturnValueOnce(null)
-      .mockReturnValue(snapshot)
-      .mockReturnValue(snapshot);
-    spies.agentStorage.get.mockResolvedValue(record);
-    spies.agentManager.resumeAgentFromPersistence.mockResolvedValue(snapshot);
-    spies.agentManager.getTimeline.mockReturnValue([
-      {
-        kind: "status",
-        timestamp: "2026-04-11T00:00:00.000Z",
-        text: "Agent resumed",
-      },
-    ]);
-
-    const server = await createAgentMcpServer({
-      agentManager,
-      agentStorage,
-      logger,
-      providerRegistry: {
-        claude: createProviderDefinition({}),
-      } as any,
-    });
-    const tool = (server as any)._registeredTools["get_agent_activity"];
-    const response = await tool.callback({ agentId: "archived-activity-agent" });
-
-    expect(response.structuredContent).toEqual(
-      expect.objectContaining({
-        agentId: "archived-activity-agent",
-        updateCount: 1,
-        currentModeId: "default",
-      }),
-    );
-    expect(spies.agentManager.resumeAgentFromPersistence).toHaveBeenCalled();
-    expect(spies.agentManager.hydrateTimelineFromProvider).toHaveBeenCalledWith(
-      "archived-activity-agent",
-    );
-  });
 });
@@ -12,10 +12,9 @@ import {
  AgentPermissionResponseSchema,
  AgentSnapshotPayloadSchema,
 } from "../messages.js";
-import { buildStoredAgentPayload, toAgentPayload } from "./agent-projections.js";
+import { toAgentPayload } from "./agent-projections.js";
 import { curateAgentActivity } from "./activity-curator.js";
 import { AgentStorage } from "./agent-storage.js";
-import { ensureAgentLoaded } from "./agent-loading.js";
 import {
  appendTimelineItemIfAgentKnown,
  emitLiveTimelineItemIfAgentKnown,
@@ -38,9 +37,7 @@ import {
  AgentStatusEnum,
  ProviderSummarySchema,
  parseDurationString,
-  resolveProviderAndModel,
  sanitizePermissionRequest,
-  sendPromptToAgent,
  setupFinishNotification,
  serializeSnapshotWithMetadata,
  startAgentRun,
@@ -200,13 +197,6 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
    version: "2.0.0",
  });

-  const requireProviderRegistry = (): Record<AgentProvider, ProviderDefinition> => {
-    if (!providerRegistry) {
-      throw new Error("Provider registry is required to load stored agent records");
-    }
-    return providerRegistry;
-  };
-
  const resolveCallerAgent = () => {
    if (!callerAgentId) {
      return null;
@@ -240,36 +230,16 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
    return expandUserPath(trimmedCwd);
  };

-  const resolveNewAgentScheduleTarget = (params?: { provider?: string; cwd?: string }) => {
+  const resolveNewAgentScheduleTarget = () => {
    const callerAgent = resolveCallerAgent();
    if (callerAgent) {
-      const hasProviderOverride = params?.provider !== undefined;
-      const resolvedProviderModel = hasProviderOverride
-        ? resolveProviderAndModel({
-            provider: params?.provider,
-            defaultProvider: callerAgent.provider,
-          })
-        : null;
-      const resolvedProvider = resolvedProviderModel?.provider ?? callerAgent.provider;
      return {
        type: "new-agent" as const,
        config: {
-          provider: resolvedProvider,
-          cwd: params?.cwd?.trim() ? expandUserPath(params.cwd) : callerAgent.cwd,
-          ...(callerAgent.currentModeId
-            ? {
-                modeId: mapModeAcrossProviders(
-                  callerAgent.currentModeId,
-                  callerAgent.provider,
-                  resolvedProvider,
-                ),
-              }
-            : {}),
-          ...(resolvedProviderModel?.model
-            ? { model: resolvedProviderModel.model }
-            : !hasProviderOverride && callerAgent.config.model
-              ? { model: callerAgent.config.model }
-              : {}),
+          provider: callerAgent.provider,
+          cwd: callerAgent.cwd,
+          ...(callerAgent.currentModeId ? { modeId: callerAgent.currentModeId } : {}),
+          ...(callerAgent.config.model ? { model: callerAgent.config.model } : {}),
          ...(callerAgent.config.thinkingOptionId
            ? { thinkingOptionId: callerAgent.config.thinkingOptionId }
            : {}),
@@ -297,17 +267,10 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom

    return {
      type: "new-agent" as const,
-      config: (() => {
-        const resolvedProviderModel = resolveProviderAndModel({
-          provider: params?.provider,
-          defaultProvider: "claude",
-        });
-        return {
-          provider: resolvedProviderModel.provider,
-          cwd: params?.cwd?.trim() ? expandUserPath(params.cwd) : process.cwd(),
-          ...(resolvedProviderModel.model ? { model: resolvedProviderModel.model } : {}),
-        };
-      })(),
+      config: {
+        provider: "claude" as AgentProvider,
+        cwd: process.cwd(),
+      },
    };
  };
  const agentToAgentInputSchema = {
@@ -603,7 +566,6 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
        if (notifyOnFinish && callerAgentId) {
          setupFinishNotification({
            agentManager,
-            agentStorage,
            childAgentId: snapshot.id,
            callerAgentId,
            logger: childLogger,
@@ -769,24 +731,33 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
      },
    },
    async ({ agentId, prompt, sessionMode, background = false, notifyOnFinish = false }) => {
+      const snapshot = agentManager.getAgent(agentId);
+      if (!snapshot) {
+        throw new Error(`Agent ${agentId} not found`);
+      }
+
      if (agentManager.hasInFlightRun(agentId)) {
        waitTracker.cancel(agentId, "Agent run interrupted by new prompt");
      }

-      await sendPromptToAgent({
-        agentManager,
-        agentStorage,
-        agentId,
-        userMessageText: prompt,
-        prompt,
-        sessionMode,
-        logger: childLogger,
-      });
+      if (sessionMode) {
+        await agentManager.setAgentMode(agentId, sessionMode);
+      }

+      try {
+        agentManager.recordUserMessage(agentId, prompt, {
+          emitState: false,
+        });
+      } catch (error) {
+        childLogger.error({ err: error, agentId }, "Failed to record user message");
+      }
+
+      startAgentRun(agentManager, agentId, prompt, childLogger, {
+        replaceRunning: true,
+      });
      if (notifyOnFinish && callerAgentId) {
        setupFinishNotification({
          agentManager,
-          agentStorage,
          childAgentId: agentId,
          callerAgentId,
          logger: childLogger,
@@ -850,35 +821,19 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
    },
    async ({ agentId }) => {
      const snapshot = agentManager.getAgent(agentId);
-      if (snapshot) {
-        const structuredSnapshot = await serializeSnapshotWithMetadata(
-          agentStorage,
-          snapshot,
-          childLogger,
-        );
-        return {
-          content: [],
-          structuredContent: ensureValidJson({
-            status: snapshot.lifecycle,
-            snapshot: structuredSnapshot,
-          }),
-        };
-      }
-
-      const record = await agentStorage.get(agentId);
-      if (!record || record.internal) {
+      if (!snapshot) {
        throw new Error(`Agent ${agentId} not found`);
      }

-      const structuredSnapshot = buildStoredAgentPayload(
-        record,
-        requireProviderRegistry(),
+      const structuredSnapshot = await serializeSnapshotWithMetadata(
+        agentStorage,
+        snapshot,
        childLogger,
      );
      return {
        content: [],
        structuredContent: ensureValidJson({
-          status: structuredSnapshot.status,
+          status: snapshot.lifecycle,
          snapshot: structuredSnapshot,
        }),
      };
@@ -890,30 +845,21 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
    {
      title: "List agents",
      description: "List all live agents managed by the server.",
-      inputSchema: {
-        includeArchived: z.boolean().optional().default(false),
-      },
+      inputSchema: {},
      outputSchema: {
        agents: z.array(AgentSnapshotPayloadSchema),
      },
    },
-    async ({ includeArchived }) => {
-      const liveSnapshots = agentManager.listAgents();
-      const liveAgents = await Promise.all(
-        liveSnapshots.map((snapshot) =>
+    async () => {
+      const snapshots = agentManager.listAgents();
+      const agents = await Promise.all(
+        snapshots.map((snapshot) =>
          serializeSnapshotWithMetadata(agentStorage, snapshot, childLogger),
        ),
      );
-      const liveIds = new Set(liveSnapshots.map((snapshot) => snapshot.id));
-      const storedRecords = await agentStorage.list();
-      const storedAgents = storedRecords
-        .filter((record) => !record.internal && !liveIds.has(record.id))
-        .filter((record) => includeArchived || !record.archivedAt)
-        .map((record) => buildStoredAgentPayload(record, requireProviderRegistry(), childLogger));
-
      return {
        content: [],
-        structuredContent: ensureValidJson({ agents: [...liveAgents, ...storedAgents] }),
+        structuredContent: ensureValidJson({ agents }),
      };
    },
  );
@@ -1235,16 +1181,12 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
        cron: z.string().optional(),
        name: z.string().optional(),
        target: z.enum(["self", "new-agent"]).optional(),
-        provider: AgentProviderEnum.optional().describe(
-          "Provider, or provider/model (for example: codex or codex/gpt-5.4).",
-        ),
-        cwd: z.string().optional(),
        maxRuns: z.number().int().positive().optional(),
        expiresIn: z.string().optional(),
      },
      outputSchema: ScheduleSummarySchema.shape,
    },
-    async ({ prompt, every, cron, name, target, provider, cwd, maxRuns, expiresIn }) => {
+    async ({ prompt, every, cron, name, target, maxRuns, expiresIn }) => {
      if (!scheduleService) {
        throw new Error("Schedule service is not configured");
      }
@@ -1260,12 +1202,9 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
              if (!callerAgentId) {
                throw new Error("target=self requires a caller agent");
              }
-              if (provider !== undefined || cwd !== undefined) {
-                throw new Error("provider and cwd can only be used with target=new-agent");
-              }
              return { type: "agent" as const, agentId: callerAgentId };
            })()
-          : resolveNewAgentScheduleTarget({ provider, cwd });
+          : resolveNewAgentScheduleTarget();

      const schedule = await scheduleService.create({
        prompt: prompt.trim(),
@@ -1588,11 +1527,6 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
      },
    },
    async ({ agentId, limit }) => {
-      await ensureAgentLoaded(agentId, {
-        agentManager,
-        agentStorage,
-        logger: childLogger,
-      });
      const timeline = agentManager.getTimeline(agentId);
      const snapshot = agentManager.getAgent(agentId);

@@ -1,78 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-import { createTestLogger } from "../../test-utils/test-logger.js";
-import { setupFinishNotification } from "./mcp-shared.js";
-import type { AgentManager, AgentManagerEvent, ManagedAgent } from "./agent-manager.js";
-import type { AgentStorage } from "./agent-storage.js";
-
-describe("setupFinishNotification", () => {
-  it("does not notify archived callers", async () => {
-    let subscriber: ((event: AgentManagerEvent) => void) | null = null;
-
-    const childAgent = {
-      id: "child-agent",
-      lifecycle: "idle",
-      config: { title: "Child Agent" },
-    } as ManagedAgent;
-
-    const agentManager = {
-      getAgent: vi.fn((agentId: string) => {
-        if (agentId === "child-agent") {
-          return childAgent;
-        }
-        if (agentId === "caller-agent") {
-          return {
-            id: "caller-agent",
-            lifecycle: "idle",
-            config: { title: "Caller Agent" },
-          } as ManagedAgent;
-        }
-        return null;
-      }),
-      subscribe: vi.fn((callback: (event: AgentManagerEvent) => void) => {
-        subscriber = callback;
-        return () => {
-          subscriber = null;
-        };
-      }),
-      hasInFlightRun: vi.fn().mockReturnValue(false),
-      streamAgent: vi.fn(() => (async function* noop() {})()),
-      replaceAgentRun: vi.fn(() => (async function* noop() {})()),
-    } as unknown as AgentManager;
-
-    const agentStorage = {
-      get: vi.fn(async (agentId: string) =>
-        agentId === "caller-agent" ? { archivedAt: "2024-01-01" } : null,
-      ),
-    } as unknown as AgentStorage;
-
-    setupFinishNotification({
-      agentManager,
-      agentStorage,
-      childAgentId: "child-agent",
-      callerAgentId: "caller-agent",
-      logger: createTestLogger(),
-    });
-
-    expect(subscriber).not.toBeNull();
-
-    childAgent.lifecycle = "running";
-    subscriber?.({
-      type: "agent_state",
-      agent: childAgent,
-    });
-
-    childAgent.lifecycle = "idle";
-    subscriber?.({
-      type: "agent_state",
-      agent: childAgent,
-    });
-
-    await vi.waitFor(() => {
-      expect(agentStorage.get).toHaveBeenCalledWith("caller-agent");
-    });
-
-    expect((agentManager as any).streamAgent).not.toHaveBeenCalled();
-    expect((agentManager as any).replaceAgentRun).not.toHaveBeenCalled();
-  });
-});
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export * from "./use-web-scrollbar-style.web";`