chore(release): cut 0.1.80

Home screen now leads with action tiles (Add a project, Import session,
Setup providers, Pair device) instead of a single button, giving new
users a clear path in even before they've added a project.

Import session is the onboarding hook: the sheet now works without a
workspace context and lists recent sessions from every provider's native
history (Claude, Codex, OpenCode, Pi, ACP). Picking one imports the
agent and lands the user on its workspace.

To make that work end-to-end, the daemon upserts the imported agent's
cwd as a workspace so the sidebar surfaces it even when the user never
explicitly opened the folder.

Also adds a Home entry to cmd+K and a refresh button to the import
sheet header for explicit re-fetch.

.agents/skills/release-beta/SKILL.md

@@ -0,0 +1,11 @@
+---
+name: release-beta
+description: Cut a beta release of Paseo. Use when the user says "release beta", "cut a beta", "ship a beta", "beta release", or "/release-beta". Betas are silent release candidates — no changelog, no website move.
+user-invocable: true
+---
+
+# Release beta
+
+Read `docs/release.md` in the Paseo repo and follow the **Beta flow** section end-to-end. Run the **Beta release** completion checklist at the bottom of that doc.
+
+Key rule the doc enforces — betas don't touch `CHANGELOG.md`. Don't draft release notes.

.agents/skills/release-stable/SKILL.md

@@ -0,0 +1,11 @@
+---
+name: release-stable
+description: Cut a stable release of Paseo (fresh patch or promote from beta). Use when the user says "release stable", "ship stable", "promote", "release:patch", "release:promote", or "/release-stable".
+user-invocable: true
+---
+
+# Release stable
+
+Read `docs/release.md` in the Paseo repo and follow the **Standard release (patch)** flow if cutting fresh, or the **Beta flow** promotion step if promoting an existing beta. Run the **Stable release (or promotion)** completion checklist at the bottom of that doc.
+
+The doc covers the changelog (required for stable), the pre-release sanity check (required for stable), and the post-release babysit pattern. Don't skip steps.

.claude/skills/release-beta

@@ -0,0 +1 @@
+../../.agents/skills/release-beta

.claude/skills/release-stable

@@ -0,0 +1 @@
+../../.agents/skills/release-stable

.github/workflows/ci.yml

@@ -118,6 +118,7 @@ jobs:
         env:
           CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}
 
   desktop-tests:
     strategy:

CLAUDE.md

@@ -2,7 +2,7 @@
 
 Paseo is a mobile app for monitoring and controlling your local AI coding agents from anywhere. Your dev environment, in your pocket. Connects directly to your actual development environment — your code stays on your machine.
 
-**Supported agents:** Claude Code, Codex, and OpenCode.
+**Supported agents:** Claude Code, Codex, GitHub Copilot, OpenCode, and Pi.
 
 ## Repository map
 

README.md

@@ -19,7 +19,7 @@
   </a>
 </p>
 
-<p align="center">One interface for all your Claude Code, Codex and OpenCode agents.</p>
+<p align="center">One interface for Claude Code, Codex, Copilot, OpenCode, and Pi agents.</p>
 
 <p align="center">
   <img src="https://paseo.sh/hero-mockup.png" alt="Paseo app screenshot" width="100%">
@@ -34,7 +34,7 @@
 Run agents in parallel on your own machines. Ship from your phone or your desk.
 
 - **Self-hosted:** Agents run on your machine with your full dev environment. Use your tools, your configs, and your skills.
-- **Multi-provider:** Claude Code, Codex, and OpenCode through the same interface. Pick the right model for each job.
+- **Multi-provider:** Claude Code, Codex, Copilot, OpenCode, and Pi through the same interface. Pick the right model for each job.
 - **Voice control:** Dictate tasks or talk through problems in voice mode. Hands-free when you need it.
 - **Cross-device:** iOS, Android, desktop, web, and CLI. Start work at your desk, check in from your phone, script it from the terminal.
 - **Privacy-first:** Paseo doesn't have any telemetry, tracking, or forced log-ins.
@@ -49,7 +49,9 @@ You need at least one agent CLI installed and configured with your credentials:
 
 - [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
 - [Codex](https://github.com/openai/codex)
+- [GitHub Copilot](https://github.com/features/copilot/cli/)
 - [OpenCode](https://github.com/anomalyco/opencode)
+- [Pi](https://pi.dev)
 
 ### Desktop app (recommended)
 

docs/agent-lifecycle.md

@@ -27,6 +27,8 @@ Both look the same in storage. This is an accepted limitation — see [Limitatio
 
 Archive is a **soft delete**: the agent record stays on disk with `archivedAt` set, the runtime is closed, and the agent disappears from active lists. Archive is **global** — it lives on the server and propagates to every connected client.
 
+`create_agent_request` can opt an agent into `autoArchive`. In that mode the daemon archives the agent after the first terminal turn event (`turn_completed`, `turn_failed`, or `turn_canceled`). If the same request created a Paseo worktree through its `worktree` field, auto-archive archives that worktree too, which removes the agent records inside the worktree.
+
 Archiving runs through `AgentManager.archiveAgent` (`packages/server/src/server/agent/agent-manager.ts`):
 
 1. Snapshot the current session into the registry

docs/android.md

@@ -38,6 +38,10 @@ npx cross-env APP_VARIANT=production expo run:android --variant=release
 rm -rf android
 ```
 
+### React version lockstep
+
+Keep `react` and `react-dom` pinned to the React version embedded by the current `react-native` release. React Native `0.81.x` embeds `react-native-renderer` `19.1.0`, so `packages/app` must use React `19.1.0`. Bumping React to a newer patch can build successfully but crash at JS startup on Android with `Incompatible React versions`, leaving the app on the native splash screen.
+
 ## Screenshots
 
 ```bash
@@ -48,24 +52,28 @@ adb exec-out screencap -p > screenshot.png
 
 Stable tag pushes like `v0.1.0` trigger:
 
-- `packages/app/.eas/workflows/release-mobile.yml` on Expo servers (iOS + Android build + submit)
-- `.github/workflows/android-apk-release.yml` on GitHub Actions (APK asset on GitHub Release)
+- The EAS GitHub app on Expo servers (iOS + Android production builds + store submit). There is no workflow file in this repo for it.
+- `.github/workflows/android-apk-release.yml` on GitHub Actions (APK asset on GitHub Release).
+
+iOS auto-submits to App Store review via a Fastlane lane after EAS uploads to TestFlight. Android auto-submits to the Play Store via EAS-managed credentials.
 
 Beta tags like `v0.1.1-beta.1` only trigger the GitHub APK workflow. They publish a GitHub prerelease APK for testing and do not submit to the stores.
 
-`android-v*` tags also trigger only the GitHub APK workflow — useful when you want to ship an APK without going through stores. Both workflows also support `workflow_dispatch`; the GitHub APK one takes an existing `tag` input so you can rebuild without cutting a new tag.
+`android-v*` tags also trigger only the GitHub APK workflow — useful when you want to ship an APK without going through stores. The GitHub APK workflow supports `workflow_dispatch` with an existing `tag` input so you can rebuild without cutting a new tag.
 
 ### Useful commands
 
 ```bash
 cd packages/app
 
-# List recent workflow runs
-npx eas workflow:runs --workflow release-mobile.yml --limit 10
+# Recent builds
+npx eas build:list --limit 10 --non-interactive --json | jq '.[] | {platform, status, appVersion, gitCommitHash}'
 
-# Inspect a run
-npx eas workflow:view <run-id>
-
-# Stream logs for a failed job
-npx eas workflow:logs <job-id> --non-interactive --all-steps
+# Inspect a build (the printed `Logs` URL opens the build's Expo dashboard page,
+# which has a Submissions section showing the auto-submit to the Play Store).
+npx eas build:view <build-id>
 ```
+
+The Play Console (Internal testing → Production tracks) is the final confirmation that the binary reached the store.
+
+See [docs/release.md](release.md) for the full mobile-build babysitting flow.

docs/architecture.md

@@ -22,13 +22,13 @@ Your code never leaves your machine. Paseo is local-first.
             │  (Node.js)  │
             └──────┬──────┘
                    │
-      ┌────────────┼────────────┐
-      │            │            │
-┌─────▼─────┐ ┌───▼────┐ ┌────▼─────┐
-│  Claude   │ │ Codex  │ │ OpenCode │
-│  Agent    │ │ Agent  │ │  Agent   │
-│  SDK      │ │ Server │ │          │
-└───────────┘ └────────┘ └──────────┘
+      ┌────────────┼────────────┬────────────┬────────────┐
+      │            │            │            │            │
+┌─────▼─────┐ ┌───▼────┐ ┌──────▼─────┐ ┌────▼─────┐ ┌────▼────┐
+│  Claude   │ │ Codex  │ │  Copilot   │ │ OpenCode │ │   Pi    │
+│  Agent    │ │ Agent  │ │   Agent    │ │  Agent   │ │ Agent   │
+│  SDK      │ │ Server │ │    ACP     │ │          │ │         │
+└───────────┘ └────────┘ └────────────┘ └──────────┘ └─────────┘
 ```
 
 ## Components at a glance
@@ -146,6 +146,8 @@ There is no dedicated welcome message; the server emits a `status` session messa
 
 **Top-level WS envelopes** are `hello`, `recording_state`, `ping`/`pong`, and `session` (which wraps the rich union of session messages).
 
+Client liveness checks use the top-level JSON `ping`/`pong` envelope, not a session RPC and not RFC6455 protocol ping. The app runs through browser and React Native WebSocket APIs, which do not expose protocol ping, so this envelope is the portable way to test the direct or relay data path. Session RPC timeouts are operation failures and must not be treated as proof that the socket is dead.
+
 New session RPCs use dotted names with `.request` and `.response` suffixes, such as `checkout.github.set_auto_merge.request` and `checkout.github.set_auto_merge.response`. See [rpc-namespacing.md](rpc-namespacing.md) for the convention and migration rules for older flat RPC names.
 
 **Notable session message types:**
@@ -215,16 +217,17 @@ initializing → idle ⇄ running
 
 Each provider implements the `AgentClient` interface in `agent/agent-sdk-types.ts`. Provider implementations live in `agent/providers/`.
 
-The three first-class, user-facing providers are Claude Code, Codex, and OpenCode. Additional adapters exist in the same directory for ACP-compatible agents and internal use:
+The built-in, user-facing providers are Claude Code, Codex, Copilot, OpenCode, and Pi. Additional adapters exist in the same directory for ACP-compatible agents and internal use:
 
 | Provider           | Wraps                                | Session format                                     |
 | ------------------ | ------------------------------------ | -------------------------------------------------- |
 | Claude (`claude/`) | Anthropic Agent SDK                  | `~/.claude/projects/{cwd}/{session-id}.jsonl`      |
 | Codex              | Codex AppServer (`codex-app-server`) | `~/.codex/sessions/{date}/rollout-{ts}-{id}.jsonl` |
+| Copilot            | GitHub Copilot via ACP               | Provider-managed                                   |
 | OpenCode           | OpenCode server / CLI                | Provider-managed                                   |
-| Cursor / Copilot   | ACP wrapper (`acp-agent`)            | Provider-managed                                   |
+| Cursor             | ACP wrapper (`acp-agent`)            | Provider-managed                                   |
 | Generic ACP        | ACP wrapper                          | Provider-managed                                   |
-| Pi-direct          | Direct Anthropic API call            | Stateless                                          |
+| Pi                 | Local Pi RPC process                 | Provider-managed                                   |
 | Mock load test     | In-process fake                      | In-memory                                          |
 
 All providers:

docs/custom-providers.md

@@ -339,6 +339,8 @@ The [Agent Client Protocol (ACP)](https://agentclientprotocol.com) is an open st
 
 ACP agents communicate over JSON-RPC 2.0 on stdio. Paseo spawns the agent process and talks to it through stdin/stdout.
 
+Paseo also ships an in-app ACP provider catalog for common agents, including Cursor, DeepAgents, DeepSeek TUI, DimCode, Gemini CLI, Hermes, Qwen Code, and Kimi Code. Catalog entries create the same `extends: "acp"` provider config shown below.
+
 ### Adding a generic ACP provider
 
 Set `extends: "acp"` and provide a `command`:

docs/data-model.md

@@ -139,6 +139,7 @@ Single file, validated with `PersistedConfigSchema`.
     listen: "127.0.0.1:6767",
     hostnames: true | string[],   // legacy alias `allowedHosts` is migrated on load
     mcp: { enabled: boolean, injectIntoAgents: boolean },
+    appendSystemPrompt: string,    // appended to supported provider system/developer prompts
     cors: { allowedOrigins: string[] },
     relay: { enabled: boolean, endpoint: string, publicEndpoint: string, useTls: boolean, publicUseTls: boolean },
     auth: { password: string }    // bcrypt hash, optional

docs/development.md

@@ -43,6 +43,22 @@ In any worktree-style or portless setup, never assume default ports.
 `http://127.0.0.1:9223` so renderer CPU profiles can be captured through CDP.
 Override the port with `PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when `9223` is busy.
 
+### Desktop macOS compositor watchdog
+
+macOS display sleep can leave Chromium's GPU-process display link — the vsync
+source that drives frame production — stuck on a stale display. The compositor
+then stops producing frames and the window looks frozen: unresponsive to clicks
+and keys even though the renderer and every process stay alive. It self-recovers
+after a few minutes, which is too long for a foreground app.
+
+`setupDarwinCompositorWatchdog`
+(`packages/desktop/src/window/compositor-watchdog/index.ts`) guards against
+this. It polls the renderer for frame production every couple of seconds and,
+after a sustained stall while the window is visible and unlocked, restarts the
+GPU process so Chromium rebuilds the display link. The probe is skipped while
+the screen is locked or the window is hidden or minimized, since a window
+legitimately stops producing frames then.
+
 ### Daemon logs
 
 Check `$PASEO_HOME/daemon.log` for daemon logs. The default level is `info`; set

docs/glossary.md

@@ -15,7 +15,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Repository / Remote** — Internal git inputs (`remoteUrl`, `mainRepoRoot`) used to derive `projectKey`. No UI label.
 - **Session** — Per-client connection to a daemon. Internal. Code: `Session` (`packages/server/src/server/session.ts`). Don't confuse with: provider-side agent session log.
 - **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing.
-- **Provider** — Agent backend (Claude Code, Codex, OpenCode). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/server/src/shared/messages.ts:198`).
+- **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/server/src/shared/messages.ts:198`).
 - **Model** — A specific LLM offered by a provider. UI: "Model" / "Select model". Code: `AgentModelDefinition` (`packages/server/src/shared/messages.ts:187`).
 - **Terminal** — Workspace-scoped PTY shell streamed over the binary mux channel. UI: "Terminal". Code: `TerminalStreamFrame` (`packages/server/src/shared/terminal-stream-protocol.ts`).
 - **Schedule** — Cron-style trigger that creates remote agents. UI: CLI only (`paseo schedule`). Code: `ScheduleCreateRequest` (re-exported from `packages/server/src/shared/messages.ts`). Don't confuse with: Loop (iterative re-execution of one agent).

docs/opencode-global-event-baseline.md

@@ -16,7 +16,7 @@ Replace the OpenCode provider's per-directory `/event` stream with OpenCode's `/
 Each OpenCode test file was run independently with:
 
 ```bash
-/opt/homebrew/bin/timeout 420s npx vitest run <file> --maxWorkers=1 --minWorkers=1
+/opt/homebrew/bin/timeout 420s npx vitest run <file> --maxWorkers=1
 ```
 
 ## Baseline
@@ -44,6 +44,6 @@ One live reasoning-dedup matrix run returned no reasoning content; an immediate
 - `npm run typecheck`
 - `npm run lint`
 - `git diff --check`
-- `npx vitest run packages/server/src/server/agent/providers/opencode-agent.test.ts --maxWorkers=1 --minWorkers=1`
-- `npx vitest run packages/server/src/server/agent/providers/opencode-agent.error-handling.real.e2e.test.ts --maxWorkers=1 --minWorkers=1`
-- `npx vitest run packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts --maxWorkers=1 --minWorkers=1`
+- `npx vitest run packages/server/src/server/agent/providers/opencode-agent.test.ts --maxWorkers=1`
+- `npx vitest run packages/server/src/server/agent/providers/opencode-agent.error-handling.real.e2e.test.ts --maxWorkers=1`
+- `npx vitest run packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts --maxWorkers=1`

docs/product.md

@@ -71,7 +71,7 @@ Anyone who builds software:
 
 - Desktop (Electron), mobile (iOS/Android), web, CLI
 - Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi
-- One-click ACP provider catalog: Cursor, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
+- One-click ACP provider catalog: Cursor, DeepSeek TUI, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
 - Voice mode: dictate prompts or talk through problems hands-free
 - MCP server exposes the daemon to other agents (create_agent, send_agent_prompt, schedules, terminals, worktrees)
 - Scheduled agents (cron-style triggers) via app, CLI, and MCP

docs/providers.md

@@ -14,7 +14,15 @@ The only built-in ACP provider today is `copilot` (`copilot-acp-agent.ts`). `Gen
 
 Implement the `AgentClient` and `AgentSession` interfaces from `agent-sdk-types.ts` yourself. This gives full control but requires you to handle process management, streaming, permissions, and session persistence from scratch.
 
-Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`pi-direct-agent.ts`). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
+Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`providers/pi/agent.ts`). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
+
+Pi is a process-backed provider. Paseo requires the user to have the `pi` binary installed and talks to it through `pi --mode rpc`; the server package does not embed Pi's SDK/runtime packages.
+
+Paseo's per-agent and daemon-wide system prompts are passed to Pi with `--append-system-prompt`, so Pi keeps its default coding prompt while receiving Paseo's additional instructions.
+
+Pi MCP support depends on the open-source `pi-mcp-adapter` extension being loaded for the agent cwd. Probe with Pi RPC `get_commands`; the adapter registers an extension command named `mcp` (often with `sourceInfo.source` containing `pi-mcp-adapter`). When Paseo injects MCP servers into Pi, write a per-agent MCP config and pass it with `--mcp-config` instead of modifying user or project MCP files. For local HTTP servers such as Paseo's own `/mcp/agents` endpoint, explicitly disable adapter OAuth (`auth: false`, `oauth: false`) in the generated config.
+
+Pi import discovery reads Pi's persisted JSONL session files because Pi RPC does not expose a recent-session listing command. Resume and full history hydration still go through `pi --mode rpc` using the session file as `nativeHandle`.
 
 Draft metadata lookups should avoid creating provider sessions when the upstream provider has top-level APIs for that metadata. Prefer `AgentClient.listModels`, `listModes`, `listCommands`, or `listFeatures` over creating a scratch `AgentSession`; scratch sessions can show up as empty native sessions in provider import/history UIs.
 

docs/release.md

@@ -7,7 +7,7 @@ All workspaces share one version and release together.
 There are two supported ways to ship from `main`:
 
 1. **Direct stable release**: you are ready to ship the current `main` commit to everyone immediately.
-2. **Beta flow**: you want public test builds first, but you are not ready for the website, npm, or production mobile release flows to move yet.
+2. **Beta flow**: silent release candidates. Betas don't touch the changelog, don't move the website, and don't publish npm or production mobile builds.
 
 ## Standard release (patch)
 
@@ -21,11 +21,11 @@ Before running any stable patch release command:
 npm run release:patch
 ```
 
-This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag (triggering `Desktop Release`, `Android APK Release`, EAS `release-mobile.yml`, and `Release Notes Sync` workflows).
+This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag. The tag push triggers `Desktop Release`, `Android APK Release`, and `Release Notes Sync` on GitHub Actions. EAS picks up the same tag via the EAS GitHub app and starts the iOS + Android store builds in parallel (see "Mobile builds (EAS)" below) — there is no `release-mobile.yml` in this repo.
 
-If asked to "release paseo" without specifying major/minor, treat it as a patch release.
+**Releases are always patch.** "Release paseo", "release stable", "ship stable", and similar always mean a patch bump from the previous stable. Never bump minor or major to trigger a build, ever — minor and major bumps are reserved for genuinely larger product cuts and require an explicit user instruction with the word "minor" or "major". If you find yourself reaching for `release:minor` to retrigger a failed build, you are doing the wrong thing — push a retry tag instead (see "Fixing a failed release build" below).
 
-Use the direct stable path when the current `main` changes are ready to become the public release immediately.
+**Stable means stable.** If the user says "stable" or "ship stable", do not ask whether they want a beta first. They picked stable; treat it as a direct stable release. Only run the beta flow when the user explicitly says "beta".
 
 ## Manual step-by-step
 
@@ -51,10 +51,11 @@ npm run release:promote          # Promote X.Y.Z-beta.N to stable X.Y.Z
 - `release:promote` creates a fresh stable tag like `v0.1.41`; the final release never reuses the beta tag
 - Desktop assets now come from the Electron package at `packages/desktop`
 - Beta releases use Electron's `beta` update channel. Users on the stable channel only receive stable releases; users on the beta channel receive beta releases and the final stable release when it is published.
-- **Do create a changelog entry for betas.** The beta entry is temporary and gets updated in place until promotion.
+- **Betas don't touch `CHANGELOG.md`.** Beta GitHub releases ship with empty notes — that's intentional. The changelog entry is written once, at promotion time, covering the full stable-to-stable diff. The release-notes sync script skips betas cleanly because no matching section exists.
 
 Use the beta path when you need to:
 
+- smoke a build yourself before promoting it to everyone
 - test a build manually in a Linux or Windows VM
 - send a build to a user who is hitting a specific problem
 - iterate on `beta.1`, `beta.2`, `beta.3`, and so on before deciding to ship broadly
@@ -147,6 +148,63 @@ If N+1 is a hotfix for a bug in N, dispatch `desktop-rollout.yml -f tag=v0.1.<N+
 - **Bootstrap caveat.** Clients running a build older than the rollout feature ignore `rolloutHours` and admit immediately. Rollout protection only applies to clients running the rollout-aware version or later.
 - **Up to ~30 min admission latency.** Renderer polls every 30 minutes, so a stable user may take up to that long to be evaluated against the rollout window.
 
+## Mobile builds (EAS)
+
+iOS and Android store builds are not in `.github/workflows`. They are triggered by the EAS GitHub app the moment the `v*` tag is pushed:
+
+- **Android (Play Store)** — EAS builds with profile `production` and auto-submits to the Play Store via `eas submit` (EAS-managed credentials, no Fastlane).
+- **iOS (TestFlight + App Store)** — EAS builds with profile `production`, uploads to TestFlight, and a Fastlane lane submits the build for App Store review.
+- **Android APK (GitHub Release asset)** — separate, via `.github/workflows/android-apk-release.yml`. This is the only Android-related workflow that lives in this repo.
+
+There is no `release-mobile.yml` in this repo. Earlier versions of these docs referenced one — that workflow was removed and the EAS GitHub app handles tag triggering directly.
+
+### Watching mobile builds from the terminal
+
+Use the EAS CLI from `packages/app/`:
+
+```bash
+cd packages/app
+
+# Recent builds (newest first). Pipe to jq for status only.
+npx eas build:list --limit 8 --non-interactive --json | jq '.[] | {platform, status, appVersion, gitCommitHash}'
+
+# Filter by platform.
+npx eas build:list --platform ios --limit 5 --non-interactive --json
+npx eas build:list --platform android --limit 5 --non-interactive --json
+
+# Inspect a specific build.
+npx eas build:view <build-id>
+
+# Stream logs for a build.
+npx eas build:view <build-id> --json | jq '.logFiles[]'
+```
+
+A build's `gitCommitHash` must match the release tag commit. `status` walks through `NEW` → `IN_QUEUE` → `IN_PROGRESS` → `FINISHED` (or `ERRORED`/`CANCELED`).
+
+Once a build is `FINISHED`, EAS auto-submits it to the store: Android via the `submit` block in `eas.json` (EAS-managed Play Console credentials), iOS via the Fastlane `submit_review` lane (uploads to TestFlight, then submits for App Store review). To confirm the submission landed, run `npx eas build:view <build-id>` and open the `Logs` URL it prints — the build's Expo dashboard page has a Submissions section listing each attempt with its store response. App Store Connect (TestFlight tab → ready for review) and the Play Console (Internal testing / Production tracks) are the final ground truth.
+
+### Babysitting mobile after a release
+
+The user rarely opens the Expo dashboard. A failed EAS build can sit silently until users complain about a stale version. After every stable release, set up a long-delay babysit that re-checks both EAS builds and GitHub Actions for the release tag. If anything is `ERRORED` or `FAILED`, surface it immediately. If everything is `FINISHED`/`SUCCESS`, confirm and stop.
+
+**Use a heartbeat schedule, never a new-agent schedule.** Babysitting fires back into the current conversation as a wake-up prompt — `target: "self"` in `mcp__paseo__create_schedule`. Never use `target: "new-agent"`. A new agent spawns a fresh conversation the user has to find and read; a heartbeat surfaces the build status inline in the conversation that owns the release, where it is impossible to miss. If you find yourself reaching for `new-agent` for a release babysit, you are about to ship a status report into a void.
+
+Pattern:
+
+```jsonc
+// mcp__paseo__create_schedule arguments
+{
+  "name": "vX.Y.Z release babysit heartbeat",
+  "every": "15m",
+  "maxRuns": 8, // covers ~2h of build + store-submission window
+  "target": "self", // heartbeat, NOT "new-agent"
+  "cwd": "/path/to/paseo",
+  "prompt": "Heartbeat: check vX.Y.Z release builds. Run gh run list + eas build:list, report concisely; flag any ERRORED/FAILED/CANCELED.",
+}
+```
+
+Tight cadence on purpose. The first run fires immediately, giving a near-real-time status check before the conversation closes. Subsequent runs at 15-minute intervals catch transitions quickly: a failed EAS build that errors at +20m should not wait until +50m to surface. Keep the prompt short — the heartbeat is a status probe, not a research task — and have it bail out as soon as everything is green so the remaining runs do not generate noise.
+
 ## Release notes on GitHub
 
 The GitHub Release body is populated automatically by the `Release Notes Sync` workflow (`.github/workflows/release-notes-sync.yml`). It triggers on every `v*` tag push and on any push to `main` that touches `CHANGELOG.md`, then runs `scripts/sync-release-notes-from-changelog.mjs` to mirror the matching changelog entry into the release body. You don't need to write release notes on GitHub manually — keep `CHANGELOG.md` correct and the workflow will sync it. To force a re-sync, dispatch the workflow with the tag input.
@@ -207,18 +265,15 @@ Release notes depend on the changelog heading format. The heading **must** be st
 
 ```
 ## X.Y.Z - YYYY-MM-DD
-## X.Y.Z-beta.N - YYYY-MM-DD
 ```
 
 No prefix (`v`), no extra text. The parser matches the first `## X.Y.Z` line to extract the version. A malformed heading will break download links on the homepage.
 
 ## Changelog policy
 
-- `CHANGELOG.md` includes stable releases and the current beta line.
-- The first beta inserts a top entry like `## 0.1.60-beta.1 - YYYY-MM-DD`.
-- The next beta updates that same top entry in place, for example from `0.1.60-beta.1` to `0.1.60-beta.2`.
-- Stable promotion updates that same entry in place, for example from `0.1.60-beta.2` to `0.1.60`.
-- Do not create duplicate entries for each beta on the same version line.
+- `CHANGELOG.md` only lists stable releases. Betas are silent.
+- The changelog entry is authored once, at stable promotion time, with the date set to the promotion day.
+- It covers the full diff from the previous stable tag, regardless of how many betas were cut in between.
 
 ## Changelog ownership
 
@@ -230,7 +285,20 @@ No prefix (`v`), no extra text. The parser matches the first `## X.Y.Z` line to
 The changelog is shown on the Paseo homepage. Write it for **end users**, not developers.
 
 - **Frame everything from the user's perspective.** Describe what changed in the app, not what changed in the code. Users care that "workspaces load instantly" — not that a component no longer remounts.
-- **Never mention component names, internal modules, or implementation details.** No `WorkingIndicator`, no `accumulatedUsage`, no `reconcileAndEmitWorkspaceUpdates`.
+- **Never mention component names, internal modules, or implementation details.** No `WorkingIndicator`, no `accumulatedUsage`, no `reconcileAndEmitWorkspaceUpdates`. Also no "virtualized lists", no "remount", no "memoization", no "debounced", no "fuzzy ranking", no "controlled input", no "uncontrolled input" — these are implementation words masquerading as user-facing copy.
+- **Concrete WRONG → RIGHT examples** (real mistakes from past releases):
+
+  | Wrong (implementation-facing)                                                       | Right (user-facing)                                         |
+  | ----------------------------------------------------------------------------------- | ----------------------------------------------------------- |
+  | Switching layouts no longer remounts the active agent                               | Splitting a pane no longer loses your scroll position       |
+  | Model, mode, and thinking pickers — searchable virtualized lists with fuzzy ranking | Mobile model selector is faster and more straightforward    |
+  | Text inputs in mobile sheets no longer flicker while typing fast                    | Typing in mobile sheets no longer flickers                  |
+  | Compact web sheets no longer crash when swiped to dismiss                           | Sheets on mobile web no longer crash when swiped to dismiss |
+  | Reduced re-renders in the agent list                                                | Agent list scrolls smoothly                                 |
+  | Added debouncing to the search input                                                | Search results no longer lag behind typing                  |
+
+  Test: would a non-developer reader recognise what changed when using the app? If they'd need an engineer to translate ("what's a remount?"), the bullet is still implementation-facing — rewrite it as the symptom the user experiences.
+
 - **Collapse internal iterations.** If a feature was added and then fixed within the same release, just list the feature as working. Users never saw the broken version.
 - **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.
   - **Common trap:** when drafting from `git log`, every commit looks like a separate bullet — including the "fix X" commits that landed on top of a brand-new feature in the same release window. Before listing a Fixed entry, check whether the thing being fixed was itself added in this same release. If so, drop the fix and fold it into the feature bullet.
@@ -241,9 +309,12 @@ The changelog is shown on the Paseo homepage. Write it for **end users**, not de
 
 Every bullet must be scannable at a glance. The changelog is not release documentation — it's a list.
 
+- **One sentence per bullet, max.** If a bullet contains two sentences, the second one is doing work that belongs in product docs, not the changelog. Cut it.
+- **No trailing periods.** Bullets are list items, not prose. Drop the period at the end of every bullet, including the period inside any bolded lead-in. `**Configurable terminal scrollback**` not `**Configurable terminal scrollback.**`.
 - **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 what the user can do, not the mechanism.** The reader cares about the capability, not how it works under the hood. Do not explain LAN vs WAN, TLS handshakes, IPC, the daemon-relay topology, or any internal concept the user has not asked about. "Self-hosted relays can use a different TLS setting for the public endpoint" — not "Self-hosted relays support a separate TLS setting for the public endpoint, so the daemon can reach the relay over the LAN while the phone reaches it over the public secure address." If a feature genuinely needs background to be understood, it belongs in product docs, with a one-line teaser in the changelog.
 - **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.
 
@@ -286,7 +357,7 @@ Entries within each section (Added, Improved, Fixed) are ordered by user impact:
 
 ## Pre-release sanity check
 
-Before cutting any release (beta or stable), run a Codex review of the diff as a last line of defence against shipping bugs.
+Before cutting a **stable** release, run a Codex review of the diff as a last line of defence against shipping bugs. Skip this for betas — the beta itself is the smoke test, and gating each beta on a code review defeats the point of using betas as fast release candidates.
 
 Load the `paseo` skill and launch a **Codex 5.4** agent with a prompt like:
 
@@ -302,15 +373,19 @@ The agent's job is a deep sanity check, not a full code review. If it flags anyt
 
 ## Changelog scope
 
-The changelog always covers **stable-to-HEAD**:
-
-- **Beta release**: the diff and release notes cover `latest stable tag -> HEAD`. The current beta changelog entry is updated in place.
-- **Stable release**: the same changelog entry is promoted in place. It still captures the full delta from the previous stable release, not just what changed since the last beta.
-
-In other words, betas are checkpoints along the way; the changelog entry remains the single record for the final jump from one stable version to the next.
+The changelog covers **stable-to-stable**. Betas are not represented. When you promote, draft the entry from the diff between the previous stable tag and `HEAD`, ignoring beta tag boundaries — they're just checkpoints along the way.
 
 ## Completion checklist
 
+### Beta release
+
+- [ ] Working tree is clean and the intended commit is on `main`
+- [ ] `npm run release:beta:patch` (or `:next`) completes successfully
+- [ ] GitHub `Desktop Release` workflow for the `v*-beta.N` tag is green
+- [ ] GitHub `Android APK Release` workflow for the same tag is green
+
+### Stable release (or promotion)
+
 - [ ] Run the pre-release sanity check (see above) and address any findings
 - [ ] Ensure the intended release commit is already committed and the git worktree is clean before running any `release:*` patch/promote command
 - [ ] Ensure local `npm run typecheck` passes on that exact commit before running any `release:*` patch/promote command
@@ -319,4 +394,5 @@ In other words, betas are checkpoints along the way; the changelog entry remains
 - [ ] `npm run release:patch` or `npm run release:promote` completes successfully
 - [ ] GitHub `Desktop Release` workflow for the `v*` tag is green
 - [ ] GitHub `Android APK Release` workflow for the same tag is green
-- [ ] EAS `release-mobile.yml` workflow for the same tag is green
+- [ ] EAS iOS production build for the same tag completes and submits via Fastlane
+- [ ] EAS Android production build for the same tag completes and auto-submits to the Play Store

docs/rpc-namespacing.md

@@ -11,7 +11,7 @@ The namespace reads left to right:
 
 - Domain: `checkout`
 - Provider or subsystem: `github`
-- Operation: `set_auto_merge`
+- Operation: `set_auto_merge`; this segment is a verb, not a noun. If you would name an RPC `noun.request`, name it `get_noun.request` instead.
 - Direction: `request` or `response`
 
 Use dots, not slashes. Dots are protocol namespaces; slashes imply paths or transport routing.

docs/testing.md

@@ -102,14 +102,14 @@ When a test is labeled end-to-end, it calls the real service. No environment var
 
 Vitest picks up tests by suffix. The suffix tells the runner which category it belongs to.
 
-| Suffix                | What it is                                                                                         | Where it runs                                                                        |
-| --------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
-| `*.test.ts(x)`        | Unit test — pure, fast, no daemon                                                                  | `npm run test:unit`                                                                  |
-| `*.posix.test.ts`     | Unit test that needs POSIX-only behavior                                                           | unit, skipped on Windows                                                             |
-| `*.browser.test.ts`   | App test that needs a real browser (DOM)                                                           | `npm run test:browser` (Vitest browser mode, Playwright provider, headless Chromium) |
-| `*.e2e.test.ts`       | End-to-end against a real daemon                                                                   | `npm run test:e2e`                                                                   |
-| `*.real.e2e.test.ts`  | E2E that hits a real provider (Claude/Codex/OpenCode) — needs creds in `packages/server/.env.test` | `npm run test:integration:real` / `test:e2e:real`                                    |
-| `*.local.e2e.test.ts` | E2E that needs a local-only resource                                                               | `npm run test:integration:local` / `test:e2e:local`                                  |
+| Suffix                | What it is                                                                                                    | Where it runs                                                                        |
+| --------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
+| `*.test.ts(x)`        | Unit test — pure, fast, no daemon                                                                             | `npm run test:unit`                                                                  |
+| `*.posix.test.ts`     | Unit test that needs POSIX-only behavior                                                                      | unit, skipped on Windows                                                             |
+| `*.browser.test.ts`   | App test that needs a real browser (DOM)                                                                      | `npm run test:browser` (Vitest browser mode, Playwright provider, headless Chromium) |
+| `*.e2e.test.ts`       | End-to-end against a real daemon                                                                              | `npm run test:e2e`                                                                   |
+| `*.real.e2e.test.ts`  | E2E that hits a real provider (Claude/Codex/Copilot/OpenCode/Pi) — needs creds in `packages/server/.env.test` | `npm run test:integration:real` / `test:e2e:real`                                    |
+| `*.local.e2e.test.ts` | E2E that needs a local-only resource                                                                          | `npm run test:integration:local` / `test:e2e:local`                                  |
 
 App-level Playwright browser E2E lives in `packages/app/e2e/*.spec.ts` and runs via `npm run test:e2e --workspace=@getpaseo/app` (separate from Vitest E2E).
 
@@ -127,7 +127,7 @@ Test suites in this repo are heavy. Running them in bulk freezes the machine, es
 - For a broad sweep, redirect to a file and read it after: `npx vitest run <path> --bail=1 > /tmp/test-output.txt 2>&1`
 - Never re-run a suite another agent already reported green.
 - For full-suite confidence, push to CI and check GitHub Actions.
-- Never run Playwright E2E (`packages/app/e2e/*.spec.ts`) locally — defer to CI.
+- Never run the full Playwright E2E suite locally — defer whole-suite verification to CI. Targeted Playwright specs are allowed when you changed or need to prove that specific flow.
 
 ## Agent authentication in tests
 

docs/unistyles.md

@@ -80,6 +80,34 @@ The important detail: the automatic native path tracks `props.style`. It does no
 
 [`useUnistyles()`](https://www.unistyl.es/v3/references/use-unistyles) is different. It gives React access to the current theme/runtime and can make a component re-render when those values change. Use it for values that must be rendered through React props, such as icon colors or small escape hatches. Do not expect direct reads from `UnistylesRuntime` to re-render a component; [issue #817](https://github.com/jpudysz/react-native-unistyles/issues/817) is a useful reminder of that invariant.
 
+## Dynamic Pixel Styles On Web
+
+Avoid feeding changing pixel values such as `{ top, left }`, `{ maxHeight }`, or `{ minWidth }` into the `style` prop of Unistyles-managed React Native components on web. The web runtime hashes each distinct style object by value and appends a CSS rule to `#unistyles-web`; those rules are not reclaimed during the page lifetime, so pointer-driven positioning can turn into steady stylesheet growth.
+
+Use the inline style escape hatch below for high-churn values. Do not split a component into plain/web/native variants just to keep one measured value out of the CSS registry. Raw DOM wrappers are reserved for real DOM infrastructure, such as terminal hosts, virtualized web rows, or third-party drag wrappers.
+
+## Inline Style Escape Hatch
+
+When a style value is high-churn and must bypass Unistyles' CSS registry, keep the component on the normal Unistyles path and mark only that style object with `inlineUnistylesStyle`.
+
+```tsx
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
+
+const styles = StyleSheet.create({
+  thumb: {
+    position: "absolute",
+  },
+});
+
+<View style={[styles.thumb, inlineUnistylesStyle({ height, transform: [{ translateY }] })]} />;
+```
+
+This uses Unistyles' own animated-style lane: ordinary styles still become Unistyles classes, while the marked style object stays in React Native's inline style array. Use it for measured geometry, scroll or drag transforms, and pressed/hovered/open state where generating CSS classes is the wrong ownership boundary.
+
+Do not split a component into plain and Unistyles variants just to handle one high-churn value. The component remains a normal Unistyles component; only the specific style object escapes.
+
+When a reusable component has a prop whose whole job is dynamic geometry, make that prop the seam. For example, `FloatingSurface.frameStyle` and `FloatingScrollView.style` own their own escape hatch so menu, tooltip, hover-card, and combobox callers can stay declarative instead of knowing about Unistyles internals.
+
 ## Main Gotcha: `contentContainerStyle`
 
 `ScrollView.contentContainerStyle` is the canonical trap. It looks like a style prop, but it is not the same prop that Unistyles' remapped native component registers by default. The upstream tutorial calls this out directly in its [ScrollView Background Issue](https://www.unistyl.es/v3/tutorial/settings-screen#scrollview-background-issue) section.

nix/module.nix

@@ -124,6 +124,17 @@ in
         default = true;
         description = "Whether to use TLS when connecting to the relay. Used when `relay.mode = \"remote\"`.";
       };
+
+      publicUseTls = lib.mkOption {
+        type = lib.types.nullOr lib.types.bool;
+        default = null;
+        description = ''
+          Whether the public (client-facing) relay endpoint uses TLS.
+          When `null` (default), the daemon falls back to `relay.useTls`.
+          Override when the internal path is plain `ws://` behind a
+          TLS-terminating reverse proxy.
+        '';
+      };
     };
 
     inheritUserEnvironment = lib.mkOption {
@@ -253,6 +264,8 @@ in
       } // lib.optionalAttrs (cfg.relay.enable && cfg.relay.mode == "remote") {
         PASEO_RELAY_ENDPOINT = "${cfg.relay.host}:${toString cfg.relay.port}";
         PASEO_RELAY_USE_TLS = if cfg.relay.useTls then "true" else "false";
+      } // lib.optionalAttrs (cfg.relay.enable && cfg.relay.mode == "remote" && cfg.relay.publicUseTls != null) {
+        PASEO_RELAY_PUBLIC_USE_TLS = if cfg.relay.publicUseTls then "true" else "false";
       } // cfg.environment;
 
       serviceConfig = {

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-SRax+Frqf0OhDhfWICSlhOnHBGsoHiXQc6P+zo5VjN8=
+sha256-ipuV4cM3LUqMQ39LyB4X3ezz5UgxyHGEhpBOq7en2Jw=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.1.77",
+  "version": "0.1.80",
   "private": true,
   "description": "Paseo: voice-controlled development environment with OpenAI Realtime API",
   "keywords": [

packages/app/.eas/workflows/resubmit-ios-review.yml

@@ -1,9 +1,9 @@
 name: Resubmit iOS for App Store review
 
 # Standalone re-trigger for the App Store review submission step. The iOS
-# binary is already uploaded to TestFlight via the main release-mobile flow;
-# this workflow just runs the fastlane submit_review lane against the latest
-# TestFlight build, without rebuilding or re-uploading.
+# binary is already uploaded to TestFlight via the EAS GitHub app's tag-push
+# build; this workflow just runs the fastlane submit_review lane against the
+# latest TestFlight build, without rebuilding or re-uploading.
 
 on:
   workflow_dispatch:

packages/app/e2e/global-setup.ts

@@ -188,7 +188,7 @@ async function isOpenAiApiKeyUsable(apiKey: string | undefined): Promise<boolean
 let daemonProcess: ChildProcess | null = null;
 let metroProcess: ChildProcess | null = null;
 let paseoHome: string | null = null;
-let fakeGhBinDir: string | null = null;
+let fakeToolBinDir: string | null = null;
 let relayProcess: ChildProcess | null = null;
 
 function resolveOptionalPaseoHomeEnv(value: string | undefined): string | null {
@@ -209,8 +209,8 @@ interface OfferPayload {
   relay: { endpoint: string };
 }
 
-async function createFakeGhBin(): Promise<string> {
-  const binDir = await mkdtemp(path.join(tmpdir(), "paseo-e2e-gh-bin-"));
+async function createFakeToolBin(): Promise<string> {
+  const binDir = await mkdtemp(path.join(tmpdir(), "paseo-e2e-tool-bin-"));
   const ghPath = path.join(binDir, "gh");
   await writeFile(
     ghPath,
@@ -284,6 +284,27 @@ forwardToRealGh();
 `,
   );
   await chmod(ghPath, 0o755);
+
+  const fakeEditorSource = `#!/usr/bin/env node
+const fs = require("fs");
+const path = require("path");
+const recordPath = process.env.PASEO_E2E_EDITOR_RECORD_PATH;
+
+if (recordPath) {
+  fs.appendFileSync(recordPath, JSON.stringify({
+    command: path.basename(process.argv[1]),
+    args: process.argv.slice(2),
+    cwd: process.cwd(),
+    at: Date.now()
+  }) + "\\n");
+}
+`;
+  for (const editorCommand of ["cursor", "code"]) {
+    const editorPath = path.join(binDir, editorCommand);
+    await writeFile(editorPath, fakeEditorSource);
+    await chmod(editorPath, 0o755);
+  }
+
   return binDir;
 }
 
@@ -599,7 +620,8 @@ interface DaemonSpawnArgs {
   relayPort: number;
   metroPort: number;
   paseoHome: string;
-  fakeGhBinDir: string;
+  fakeToolBinDir: string;
+  editorRecordPath: string;
   dictation: DictationConfig;
   buffer: ReturnType<typeof createLineBuffer>;
 }
@@ -613,8 +635,9 @@ function startDaemon(args: DaemonSpawnArgs): ChildProcess {
     cwd: serverDir,
     env: {
       ...process.env,
-      PATH: `${args.fakeGhBinDir}${path.delimiter}${process.env.PATH ?? ""}`,
+      PATH: `${args.fakeToolBinDir}${path.delimiter}${process.env.PATH ?? ""}`,
       PASEO_HOME: args.paseoHome,
+      PASEO_E2E_EDITOR_RECORD_PATH: args.editorRecordPath,
       PASEO_SERVER_ID: "srv_e2e_test_daemon",
       PASEO_LISTEN: `0.0.0.0:${args.port}`,
       PASEO_RELAY_ENDPOINT: `127.0.0.1:${args.relayPort}`,
@@ -678,9 +701,9 @@ async function performCleanup(shouldRemovePaseoHome: boolean): Promise<void> {
   } else if (paseoHome) {
     console.log(`[e2e] Preserving PASEO_HOME: ${paseoHome}`);
   }
-  if (fakeGhBinDir) {
-    await rm(fakeGhBinDir, { recursive: true, force: true });
-    fakeGhBinDir = null;
+  if (fakeToolBinDir) {
+    await rm(fakeToolBinDir, { recursive: true, force: true });
+    fakeToolBinDir = null;
   }
 }
 
@@ -694,7 +717,8 @@ export default async function globalSetup() {
   const requestedPaseoHome = resolveOptionalPaseoHomeEnv(process.env.E2E_PASEO_HOME);
   const shouldRemovePaseoHome = !requestedPaseoHome && process.env.E2E_KEEP_PASEO_HOME !== "1";
   paseoHome = requestedPaseoHome ?? (await mkdtemp(path.join(tmpdir(), "paseo-e2e-home-")));
-  fakeGhBinDir = await createFakeGhBin();
+  const editorRecordPath = path.join(paseoHome, "editor-open-records.jsonl");
+  fakeToolBinDir = await createFakeToolBin();
   const metroLineBuffer = createLineBuffer();
   const daemonLineBuffer = createLineBuffer();
 
@@ -712,7 +736,8 @@ export default async function globalSetup() {
       relayPort,
       metroPort,
       paseoHome,
-      fakeGhBinDir,
+      fakeToolBinDir,
+      editorRecordPath,
       dictation,
       buffer: daemonLineBuffer,
     });
@@ -742,6 +767,7 @@ export default async function globalSetup() {
     process.env.E2E_RELAY_DAEMON_PUBLIC_KEY = offer.daemonPublicKeyB64;
     process.env.E2E_METRO_PORT = String(metroPort);
     process.env.E2E_PASEO_HOME = paseoHome;
+    process.env.E2E_EDITOR_RECORD_PATH = editorRecordPath;
     console.log(
       `[e2e] Test daemon started on port ${port}, Metro on port ${metroPort}, home: ${paseoHome}`,
     );

packages/app/e2e/helpers/rename.ts

@@ -0,0 +1,40 @@
+import { type Page } from "@playwright/test";
+
+/**
+ * Listens for outbound WebSocket "session" frames of a given inner message type
+ * and accumulates them. The returned array is populated in-place as frames arrive.
+ */
+export function captureWsSessionFrames<T extends Record<string, unknown>>(
+  page: Page,
+  messageType: string,
+  extract: (inner: Record<string, unknown>) => T,
+): T[] {
+  const captured: T[] = [];
+  page.on("websocket", (ws) => {
+    ws.on("framesent", (frame) => {
+      const raw = frame.payload;
+      const text = typeof raw === "string" ? raw : raw.toString("utf8");
+      try {
+        const outer = JSON.parse(text) as { type?: string; message?: Record<string, unknown> };
+        if (outer.type === "session" && outer.message?.type === messageType) {
+          captured.push(extract(outer.message));
+        }
+      } catch {
+        // Ignore non-JSON and binary frames.
+      }
+    });
+  });
+  return captured;
+}
+
+export function renameModalInput(page: Page, testIdPrefix: string) {
+  return page.getByTestId(`${testIdPrefix}-input`);
+}
+
+export function renameModalSubmit(page: Page, testIdPrefix: string) {
+  return page.getByTestId(`${testIdPrefix}-submit`);
+}
+
+export function renameModalError(page: Page, testIdPrefix: string) {
+  return page.getByTestId(`${testIdPrefix}-error`);
+}

packages/app/e2e/helpers/settings.ts

@@ -168,7 +168,7 @@ export async function expectGeneralContent(page: Page): Promise<void> {
 
 export async function expectHostLabelDisplayed(page: Page): Promise<void> {
   await expect(page.getByTestId("host-page-label-edit-button")).toBeVisible();
-  await expect(page.getByTestId("host-page-label-input")).toHaveCount(0);
+  await expect(page.getByTestId("host-page-rename-modal-input")).toHaveCount(0);
 }
 
 export async function clickEditHostLabel(page: Page): Promise<void> {
@@ -176,9 +176,9 @@ export async function clickEditHostLabel(page: Page): Promise<void> {
 }
 
 export async function expectHostLabelEditMode(page: Page, expectedLabel: string): Promise<void> {
-  await expect(page.getByTestId("host-page-label-input")).toBeVisible();
-  await expect(page.getByTestId("host-page-label-input")).toHaveValue(expectedLabel);
-  await expect(page.getByTestId("host-page-label-save")).toBeVisible();
+  await expect(page.getByTestId("host-page-rename-modal-input")).toBeVisible();
+  await expect(page.getByTestId("host-page-rename-modal-input")).toHaveValue(expectedLabel);
+  await expect(page.getByTestId("host-page-rename-modal-submit")).toBeVisible();
 }
 
 export async function expectHostConnectionsCard(page: Page, port: string): Promise<void> {

packages/app/e2e/sidebar-workspace-rename.spec.ts

@@ -0,0 +1,138 @@
+import { execSync } from "node:child_process";
+import { test, expect, type Page } from "./fixtures";
+import { gotoAppShell } from "./helpers/app";
+import { createTempGitRepo } from "./helpers/workspace";
+import { connectWorkspaceSetupClient } from "./helpers/workspace-setup";
+import { captureWsSessionFrames } from "./helpers/rename";
+
+function getServerId(): string {
+  const serverId = process.env.E2E_SERVER_ID;
+  if (!serverId) {
+    throw new Error("E2E_SERVER_ID is not set (expected from Playwright globalSetup).");
+  }
+  return serverId;
+}
+
+function workspaceRowTestId(workspaceId: string): string {
+  return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
+}
+
+function workspaceRenameModalTestId(workspaceId: string, suffix: string): string {
+  return `sidebar-workspace-rename-modal-${getServerId()}:${workspaceId}-${suffix}`;
+}
+
+async function openProjectViaDaemon(
+  client: Awaited<ReturnType<typeof connectWorkspaceSetupClient>>,
+  cwd: string,
+): Promise<{ id: string; name: string; workspaceDirectory: string }> {
+  const result = await client.openProject(cwd);
+  if (!result.workspace || result.error) {
+    throw new Error(result.error ?? `Failed to open project ${cwd}`);
+  }
+  return {
+    id: String(result.workspace.id),
+    name: result.workspace.name,
+    workspaceDirectory: result.workspace.workspaceDirectory,
+  };
+}
+
+async function openRenameModal(page: Page, workspaceId: string) {
+  const serverId = getServerId();
+  const row = page.getByTestId(`sidebar-workspace-row-${serverId}:${workspaceId}`);
+  await expect(row).toBeVisible({ timeout: 30_000 });
+  await row.hover();
+
+  const kebab = page.getByTestId(`sidebar-workspace-kebab-${serverId}:${workspaceId}`);
+  await expect(kebab).toBeVisible({ timeout: 10_000 });
+  await kebab.click();
+
+  const renameItem = page.getByTestId(`sidebar-workspace-menu-rename-${serverId}:${workspaceId}`);
+  await expect(renameItem).toBeVisible({ timeout: 10_000 });
+  await renameItem.click();
+
+  const input = page.getByTestId(workspaceRenameModalTestId(workspaceId, "input"));
+  await expect(input).toBeVisible({ timeout: 10_000 });
+  return input;
+}
+
+test.describe("Sidebar workspace rename", () => {
+  test("renaming via kebab updates the branch name on disk and in the sidebar", async ({
+    page,
+  }) => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("sidebar-rename-");
+
+    try {
+      const workspace = await openProjectViaDaemon(client, repo.path);
+      expect(workspace.name).toBe("main");
+
+      const renameRequests = captureWsSessionFrames(
+        page,
+        "checkout.rename_branch.request",
+        (inner) => ({
+          branch: String(inner.branch ?? ""),
+          cwd: String(inner.cwd ?? ""),
+        }),
+      );
+
+      await gotoAppShell(page);
+      await expect(page.getByTestId(workspaceRowTestId(workspace.id))).toBeVisible({
+        timeout: 30_000,
+      });
+
+      const input = await openRenameModal(page, workspace.id);
+      await expect(input).toHaveValue("main");
+      await input.fill("Feature Rename 2");
+
+      await page.getByTestId(workspaceRenameModalTestId(workspace.id, "submit")).click();
+
+      await expect(input).toHaveCount(0, { timeout: 15_000 });
+      await expect(page.getByTestId(workspaceRowTestId(workspace.id))).toContainText(
+        "feature-rename-2",
+        { timeout: 15_000 },
+      );
+
+      expect(renameRequests.length).toBeGreaterThan(0);
+      expect(renameRequests.at(-1)).toEqual({
+        branch: "feature-rename-2",
+        cwd: workspace.workspaceDirectory,
+      });
+
+      const currentBranchOnDisk = execSync("git branch --show-current", {
+        cwd: repo.path,
+        stdio: "pipe",
+      })
+        .toString()
+        .trim();
+      expect(currentBranchOnDisk).toBe("feature-rename-2");
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
+  test("rename surfaces server errors inline and keeps the modal open", async ({ page }) => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("sidebar-rename-error-", { branches: ["taken"] });
+
+    try {
+      const workspace = await openProjectViaDaemon(client, repo.path);
+
+      await gotoAppShell(page);
+      const input = await openRenameModal(page, workspace.id);
+      await expect(input).toHaveValue("main");
+
+      await input.fill("taken");
+      await page.getByTestId(workspaceRenameModalTestId(workspace.id, "submit")).click();
+
+      const errorNode = page.getByTestId(workspaceRenameModalTestId(workspace.id, "error"));
+      await expect(errorNode).toBeVisible({ timeout: 15_000 });
+      await expect(errorNode).toContainText(/already exists|branch/i);
+      await expect(input).toBeVisible();
+      await expect(page.getByTestId(workspaceRowTestId(workspace.id))).toContainText("main");
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+});

packages/app/e2e/workspace-agent-tab-rename.spec.ts

@@ -0,0 +1,88 @@
+import { randomUUID } from "node:crypto";
+import { test, expect, type Page } from "./fixtures";
+import { createTempGitRepo } from "./helpers/workspace";
+import {
+  connectArchiveTabDaemonClient,
+  createIdleAgent,
+  expectWorkspaceTabVisible,
+} from "./helpers/archive-tab";
+import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { captureWsSessionFrames, renameModalInput, renameModalSubmit } from "./helpers/rename";
+
+function getServerId(): string {
+  const serverId = process.env.E2E_SERVER_ID;
+  if (!serverId) {
+    throw new Error("E2E_SERVER_ID is not set (expected from Playwright globalSetup).");
+  }
+  return serverId;
+}
+
+async function openAgentInWorkspace(page: Page, agent: { id: string; cwd: string }) {
+  await page.goto(buildHostAgentDetailRoute(getServerId(), agent.id, agent.cwd));
+  await page.waitForURL(
+    (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
+    { timeout: 60_000 },
+  );
+  await waitForWorkspaceTabsVisible(page);
+  await expectWorkspaceTabVisible(page, agent.id);
+}
+
+test.describe("Workspace agent tab rename", () => {
+  test("right-click rename sends update_agent_request and updates the tab label", async ({
+    page,
+  }) => {
+    test.setTimeout(120_000);
+
+    const client = await connectArchiveTabDaemonClient();
+    const repo = await createTempGitRepo("workspace-agent-rename-");
+
+    try {
+      const initialTitle = `agent-rename-${randomUUID().slice(0, 8)}`;
+      const agent = await createIdleAgent(client, {
+        cwd: repo.path,
+        title: initialTitle,
+      });
+
+      const updateFrames = captureWsSessionFrames(page, "update_agent_request", (inner) => ({
+        agentId: String(inner.agentId ?? ""),
+        name: String(inner.name ?? ""),
+        requestId: String(inner.requestId ?? ""),
+      }));
+
+      await openAgentInWorkspace(page, agent);
+
+      const tab = page.getByTestId(`workspace-tab-agent_${agent.id}`).first();
+      await expect(tab).toContainText(initialTitle, { timeout: 15_000 });
+
+      await tab.click({ button: "right" });
+      await expect(page.getByTestId(`workspace-tab-context-agent_${agent.id}`)).toBeVisible({
+        timeout: 10_000,
+      });
+      const renameItem = page.getByTestId(`workspace-tab-context-agent_${agent.id}-rename`);
+      await expect(renameItem).toBeVisible({ timeout: 10_000 });
+      await renameItem.click();
+
+      const modalPrefix = `workspace-tab-rename-modal-agent-${agent.id}`;
+      const input = renameModalInput(page, modalPrefix);
+      await expect(input).toBeVisible({ timeout: 10_000 });
+      await expect(input).toHaveValue(initialTitle);
+
+      const renamed = "My Renamed Agent";
+      await input.fill(renamed);
+      await renameModalSubmit(page, modalPrefix).click();
+
+      await expect(input).toHaveCount(0, { timeout: 15_000 });
+      await expect(tab).toContainText(renamed, { timeout: 15_000 });
+
+      expect(updateFrames.length).toBeGreaterThan(0);
+      const lastFrame = updateFrames.at(-1)!;
+      expect(lastFrame.agentId).toBe(agent.id);
+      expect(lastFrame.name).toBe(renamed);
+      expect(lastFrame.requestId.length).toBeGreaterThan(0);
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+});

packages/app/e2e/workspace-open-in-editor.spec.ts

@@ -0,0 +1,113 @@
+import { readFile, rm } from "node:fs/promises";
+import { expect, test, type Page } from "./fixtures";
+import { gotoAppShell, openSettings } from "./helpers/app";
+import { injectDesktopBridge } from "./helpers/desktop-updates";
+import { clickSettingsBackToWorkspace } from "./helpers/settings";
+
+interface EditorOpenRecord {
+  command: string;
+  args: string[];
+}
+
+function requireE2EEnv(name: string): string {
+  const value = process.env[name]?.trim();
+  if (!value) {
+    throw new Error(`${name} is not set.`);
+  }
+  return value;
+}
+
+async function readEditorOpenRecords(recordPath: string): Promise<EditorOpenRecord[]> {
+  try {
+    const contents = await readFile(recordPath, "utf8");
+    return contents
+      .split("\n")
+      .filter((line) => line.trim().length > 0)
+      .map((line) => JSON.parse(line) as EditorOpenRecord);
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+      return [];
+    }
+    throw error;
+  }
+}
+
+async function chooseEditorTarget(page: Page, targetId: "vscode"): Promise<void> {
+  await expect(page.getByTestId("workspace-open-in-editor-primary")).toBeVisible({
+    timeout: 30_000,
+  });
+  await page.getByTestId("workspace-open-in-editor-caret").click();
+  await expect(page.getByTestId("workspace-open-in-editor-menu")).toBeVisible();
+  await page.getByTestId(`workspace-open-in-editor-item-${targetId}`).click();
+}
+
+async function expectEditorOpened(input: {
+  recordPath: string;
+  command: string;
+  workspacePath: string;
+  afterCount: number;
+}): Promise<void> {
+  await expect
+    .poll(
+      async () => {
+        const records = await readEditorOpenRecords(input.recordPath);
+        return records
+          .slice(input.afterCount)
+          .some(
+            (record) =>
+              record.command === input.command && record.args.includes(input.workspacePath),
+          );
+      },
+      { timeout: 30_000 },
+    )
+    .toBe(true);
+}
+
+test.describe("Workspace open in editor", () => {
+  test("keeps the selected editor target after leaving and returning to the workspace", async ({
+    page,
+    withWorkspace,
+  }) => {
+    test.setTimeout(90_000);
+
+    const serverId = requireE2EEnv("E2E_SERVER_ID");
+    const recordPath = requireE2EEnv("E2E_EDITOR_RECORD_PATH");
+    await rm(recordPath, { force: true });
+    await injectDesktopBridge(page, { serverId });
+
+    const workspace = await withWorkspace({ prefix: "workspace-editor-target-" });
+    await workspace.navigateTo();
+
+    await chooseEditorTarget(page, "vscode");
+    await expectEditorOpened({
+      recordPath,
+      command: "code",
+      workspacePath: workspace.repoPath,
+      afterCount: 0,
+    });
+    const recordsAfterSelection = (await readEditorOpenRecords(recordPath)).length;
+
+    await openSettings(page);
+    await clickSettingsBackToWorkspace(page);
+    await expect(page).toHaveURL(/\/workspace\//, { timeout: 30_000 });
+
+    await page.getByTestId("workspace-open-in-editor-primary").click();
+    await expectEditorOpened({
+      recordPath,
+      command: "code",
+      workspacePath: workspace.repoPath,
+      afterCount: recordsAfterSelection,
+    });
+    const recordsAfterReturnOpen = (await readEditorOpenRecords(recordPath)).length;
+
+    await gotoAppShell(page);
+    await workspace.navigateTo();
+    await page.getByTestId("workspace-open-in-editor-primary").click();
+    await expectEditorOpened({
+      recordPath,
+      command: "code",
+      workspacePath: workspace.repoPath,
+      afterCount: recordsAfterReturnOpen,
+    });
+  });
+});

packages/app/e2e/workspace-pane-remount.spec.ts

@@ -0,0 +1,64 @@
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { expect, test } from "./fixtures";
+import {
+  archiveAgentFromDaemon,
+  connectArchiveTabDaemonClient,
+  createIdleAgent,
+} from "./helpers/archive-tab";
+import { expectComposerVisible } from "./helpers/composer";
+import { createTempGitRepo } from "./helpers/workspace";
+import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+
+test.describe("Workspace pane mounting", () => {
+  test("opening the first split pane keeps the existing agent composer mounted", async ({
+    page,
+  }) => {
+    test.setTimeout(90_000);
+    const serverId = process.env.E2E_SERVER_ID;
+    if (!serverId) {
+      throw new Error("E2E_SERVER_ID is not set.");
+    }
+
+    const client = await connectArchiveTabDaemonClient();
+    const repo = await createTempGitRepo("pane-remount-");
+    let agentId: string | null = null;
+
+    try {
+      const agent = await createIdleAgent(client, {
+        cwd: repo.path,
+        title: `pane-remount-${Date.now()}`,
+      });
+      agentId = agent.id;
+
+      await page.goto(buildHostAgentDetailRoute(serverId, agent.id, agent.cwd));
+      await page.waitForURL(
+        (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
+        { timeout: 60_000 },
+      );
+      await waitForWorkspaceTabsVisible(page);
+      await expectComposerVisible(page);
+
+      const originalComposer = await page
+        .getByTestId("message-input-root")
+        .filter({ visible: true })
+        .first()
+        .elementHandle();
+      expect(originalComposer).not.toBeNull();
+
+      await page.getByRole("button", { name: "Split pane right" }).first().click();
+      await expect(page.getByTestId("message-input-root").filter({ visible: true })).toHaveCount(
+        2,
+        { timeout: 30_000 },
+      );
+
+      const originalStillConnected = await originalComposer!.evaluate((node) => node.isConnected);
+      expect(originalStillConnected).toBe(true);
+    } finally {
+      if (agentId) {
+        await archiveAgentFromDaemon(client, agentId).catch(() => undefined);
+      }
+      await client.close().catch(() => undefined);
+      await repo.cleanup();
+    }
+  });
+});

packages/app/e2e/workspace-terminal-tab-rename.spec.ts

@@ -0,0 +1,67 @@
+import { test, expect } from "./fixtures";
+import { createTempGitRepo } from "./helpers/workspace";
+import { connectTerminalClient, navigateToTerminal } from "./helpers/terminal-perf";
+import { captureWsSessionFrames, renameModalInput, renameModalSubmit } from "./helpers/rename";
+
+test.describe("Workspace terminal tab rename", () => {
+  test("right-click rename sends terminal.rename.request and updates the tab label", async ({
+    page,
+  }) => {
+    test.setTimeout(60_000);
+
+    const client = await connectTerminalClient();
+    const repo = await createTempGitRepo("workspace-terminal-rename-");
+
+    try {
+      const seeded = await client.openProject(repo.path);
+      if (!seeded.workspace) {
+        throw new Error(seeded.error ?? "Failed to seed workspace");
+      }
+      const workspaceId = seeded.workspace.id;
+
+      const created = await client.createTerminal(repo.path);
+      if (!created.terminal) {
+        throw new Error(created.error ?? "Failed to create terminal");
+      }
+      const terminalId = created.terminal.id;
+
+      const renameFrames = captureWsSessionFrames(page, "terminal.rename.request", (inner) => ({
+        terminalId: String(inner.terminalId ?? ""),
+        title: String(inner.title ?? ""),
+        requestId: String(inner.requestId ?? ""),
+      }));
+
+      await navigateToTerminal(page, { workspaceId, terminalId });
+
+      const tab = page.getByTestId(`workspace-tab-terminal_${terminalId}`).first();
+      await expect(tab).toBeVisible({ timeout: 15_000 });
+
+      await tab.click({ button: "right" });
+      await expect(page.getByTestId(`workspace-tab-context-terminal_${terminalId}`)).toBeVisible({
+        timeout: 10_000,
+      });
+      const renameItem = page.getByTestId(`workspace-tab-context-terminal_${terminalId}-rename`);
+      await expect(renameItem).toBeVisible({ timeout: 10_000 });
+      await renameItem.click();
+
+      const modalPrefix = `workspace-tab-rename-modal-terminal-${terminalId}`;
+      const input = renameModalInput(page, modalPrefix);
+      await expect(input).toBeVisible({ timeout: 10_000 });
+
+      await input.fill("My Renamed Terminal");
+      await renameModalSubmit(page, modalPrefix).click();
+
+      await expect(input).toHaveCount(0, { timeout: 15_000 });
+      await expect(tab).toContainText("My Renamed Terminal", { timeout: 15_000 });
+
+      expect(renameFrames.length).toBeGreaterThan(0);
+      const lastFrame = renameFrames.at(-1)!;
+      expect(lastFrame.terminalId).toBe(terminalId);
+      expect(lastFrame.title).toBe("My Renamed Terminal");
+      expect(lastFrame.requestId.length).toBeGreaterThan(0);
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+});

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.1.77",
+  "version": "0.1.80",
   "private": true,
   "main": "index.ts",
   "scripts": {
@@ -33,7 +33,7 @@
     "@floating-ui/react-native": "^0.10.7",
     "@getpaseo/expo-two-way-audio": "*",
     "@getpaseo/highlight": "*",
-    "@gorhom/bottom-sheet": "^5.2.6",
+    "@gorhom/bottom-sheet": "^5.2.14",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "2.2.0",
     "@react-native-masked-view/masked-view": "^0.3.2",
@@ -85,12 +85,12 @@
     "react-native-gesture-handler": "~2.28.0",
     "react-native-keyboard-controller": "^1.19.2",
     "react-native-markdown-display": "^7.0.2",
-    "react-native-nitro-modules": "0.33.8",
+    "react-native-nitro-modules": "0.35.5",
     "react-native-reanimated": "~4.1.1",
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",
     "react-native-svg": "^15.14.0",
-    "react-native-unistyles": "^3.0.15",
+    "react-native-unistyles": "^3.2.4",
     "react-native-web": "~0.21.0",
     "react-native-webview": "^13.16.0",
     "react-native-worklets": "0.5.1",
@@ -105,7 +105,8 @@
     "@types/qrcode": "^1.5.6",
     "@types/react": "~19.2.0",
     "@types/ws": "^8.18.1",
-    "@vitest/browser": "^3.2.4",
+    "@vitest/browser": "^4.1.7",
+    "@vitest/browser-playwright": "^4.1.7",
     "@xterm/headless": "^6.0.0",
     "dotenv": "^17.2.3",
     "eas-cli": "^16.24.1",
@@ -115,7 +116,7 @@
     "material-icon-theme": "^5.32.0",
     "playwright": "^1.56.1",
     "typescript": "~5.9.2",
-    "vitest": "^3.2.4",
+    "vitest": "^4.1.6",
     "wrangler": "^4.75.0",
     "ws": "^8.20.0"
   }

packages/app/public/index.html

@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="robots" content="noindex,nofollow" />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1, shrink-to-fit=no, viewport-fit=cover"

packages/app/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

packages/app/src/app/host-runtime-bootstrap.test.ts

@@ -171,14 +171,24 @@ describe("resolveStartupRedirectRoute", () => {
       expect(selection).toEqual({ serverId: "server-1", workspaceId: "workspace-a" });
     });
 
-    it("redirects to the host root when the persisted workspace targets a different server", () => {
+    it("leaves persisted workspace navigation to the workspace navigator when another host is first online", () => {
       const route = resolveStartupRedirectRoute({
         ...baseInput,
         anyOnlineHostServerId: "server-2",
         workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
       });
 
-      expect(route).toBe("/h/server-2");
+      expect(route).toBeNull();
+    });
+
+    it("resolves the persisted workspace when another host is first online", () => {
+      const selection = resolveStartupWorkspaceSelection({
+        ...baseInput,
+        anyOnlineHostServerId: "server-2",
+        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
+      });
+
+      expect(selection).toEqual({ serverId: "server-1", workspaceId: "workspace-a" });
     });
 
     it("redirects to the host root when no persisted workspace exists", () => {

packages/app/src/app/host-runtime-bootstrap.ts

@@ -79,11 +79,7 @@ export function resolveStartupWorkspaceSelection(
   if (!input.isWorkspaceSelectionLoaded) {
     return null;
   }
-  if (
-    !input.anyOnlineHostServerId ||
-    !input.workspaceSelection ||
-    input.workspaceSelection.serverId !== input.anyOnlineHostServerId
-  ) {
+  if (!input.workspaceSelection) {
     return null;
   }
   return input.workspaceSelection;

packages/app/src/app/index.test.tsx

@@ -8,7 +8,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { HostRuntimeBootstrapState } from "./_layout";
 import type { ActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
 
-const { navigateToWorkspaceMock, redirectMock, state } = vi.hoisted(() => {
+const { redirectMock, state } = vi.hoisted(() => {
   const hoistedState = {
     pathname: "/",
     bootstrapState: {
@@ -18,11 +18,11 @@ const { navigateToWorkspaceMock, redirectMock, state } = vi.hoisted(() => {
       storeReady: false,
     } as HostRuntimeBootstrapState,
     anyOnlineHostServerId: null as string | null,
+    isWorkspaceSelectionLoaded: true,
     workspaceSelection: null as ActiveWorkspaceSelection | null,
   };
 
   return {
-    navigateToWorkspaceMock: vi.fn(),
     redirectMock: vi.fn(),
     state: hoistedState,
   };
@@ -50,8 +50,8 @@ vi.mock("@/screens/startup-splash-screen", () => ({
 }));
 
 vi.mock("@/stores/navigation-active-workspace-store", () => ({
-  navigateToWorkspace: navigateToWorkspaceMock,
-  useActiveWorkspaceSelection: () => state.workspaceSelection,
+  useIsLastWorkspaceSelectionHydrated: () => state.isWorkspaceSelectionLoaded,
+  useLastWorkspaceSelection: () => state.workspaceSelection,
 }));
 
 describe("Index route startup navigation", () => {
@@ -68,8 +68,8 @@ describe("Index route startup navigation", () => {
       storeReady: false,
     };
     state.anyOnlineHostServerId = null;
+    state.isWorkspaceSelectionLoaded = true;
     state.workspaceSelection = null;
-    navigateToWorkspaceMock.mockReset();
     redirectMock.mockReset();
 
     container = document.createElement("div");
@@ -98,26 +98,33 @@ describe("Index route startup navigation", () => {
     expect(redirectMock).not.toHaveBeenCalled();
   });
 
+  it("shows the startup splash while the persisted workspace selection has not loaded", async () => {
+    state.anyOnlineHostServerId = "server-1";
+    state.isWorkspaceSelectionLoaded = false;
+
+    await renderIndex();
+
+    expect(container.querySelector("[data-testid='startup-splash']")).not.toBeNull();
+    expect(redirectMock).not.toHaveBeenCalled();
+  });
+
   it("restores the persisted workspace when the online host matches its server id", async () => {
     state.anyOnlineHostServerId = "server-1";
     state.workspaceSelection = { serverId: "server-1", workspaceId: "workspace-a" };
 
     await renderIndex();
 
-    expect(navigateToWorkspaceMock).toHaveBeenCalledWith("server-1", "workspace-a", {
-      currentPathname: "/",
-    });
-    expect(redirectMock).not.toHaveBeenCalled();
-    expect(container.querySelector("[data-testid='startup-splash']")).not.toBeNull();
+    expect(redirectMock).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
+    expect(container.querySelector("[data-testid='redirect']")).not.toBeNull();
   });
 
-  it("navigates to the host root when the persisted workspace targets a different server", async () => {
+  it("restores the persisted workspace even when the first online host is different", async () => {
     state.anyOnlineHostServerId = "server-2";
     state.workspaceSelection = { serverId: "server-1", workspaceId: "workspace-a" };
 
     await renderIndex();
 
-    expect(redirectMock).toHaveBeenCalledWith("/h/server-2");
+    expect(redirectMock).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
   });
 
   it("navigates to the host root when no persisted workspace exists", async () => {

packages/app/src/app/index.tsx

@@ -7,10 +7,11 @@ import {
   resolveStartupWorkspaceSelection,
 } from "@/app/host-runtime-bootstrap";
 import {
-  navigateToWorkspace,
-  useActiveWorkspaceSelection,
+  useIsLastWorkspaceSelectionHydrated,
+  useLastWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
+import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 
 const isDesktop = shouldUseDesktopDaemon();
 
@@ -18,34 +19,33 @@ export default function Index() {
   const pathname = usePathname();
   const bootstrapState = useHostRuntimeBootstrapState();
   const anyOnlineHostServerId = useEarliestOnlineHostServerId();
-  const workspaceSelection = useActiveWorkspaceSelection();
+  const workspaceSelection = useLastWorkspaceSelection();
+  const isWorkspaceSelectionLoaded = useIsLastWorkspaceSelectionHydrated();
 
   const redirectRoute = resolveStartupRedirectRoute({
     pathname,
     anyOnlineHostServerId,
     workspaceSelection,
-    isWorkspaceSelectionLoaded: true,
+    isWorkspaceSelectionLoaded,
     hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
   });
   const startupWorkspaceSelection = resolveStartupWorkspaceSelection({
     pathname,
     anyOnlineHostServerId,
     workspaceSelection,
-    isWorkspaceSelectionLoaded: true,
+    isWorkspaceSelectionLoaded,
     hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
   });
 
-  React.useEffect(() => {
-    if (!startupWorkspaceSelection) {
-      return;
-    }
-    navigateToWorkspace(startupWorkspaceSelection.serverId, startupWorkspaceSelection.workspaceId, {
-      currentPathname: pathname,
-    });
-  }, [pathname, startupWorkspaceSelection]);
-
   if (startupWorkspaceSelection) {
-    return <StartupSplashScreen bootstrapState={isDesktop ? bootstrapState : undefined} />;
+    return (
+      <Redirect
+        href={buildHostWorkspaceRoute(
+          startupWorkspaceSelection.serverId,
+          startupWorkspaceSelection.workspaceId,
+        )}
+      />
+    );
   }
 
   if (redirectRoute) {

packages/app/src/assets/acp-provider-icons.ts

@@ -27,6 +27,8 @@ export const ACP_PROVIDER_ICON_SVGS = {
     '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 466.73 532.09">\n  <path fill="currentColor" d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"/>\n</svg>\n',
   deepagents:
     '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 128 128">\n  <path fill="currentColor" d="M40.1024 85.0722C47.6207 77.5537 51.8469 67.3453 51.8469 56.7136C51.8469 46.0818 47.617 35.8734 40.1024 28.355L11.7446 0C4.22995 7.5185 0 17.7269 0 28.3586C0 38.9903 4.22995 49.1987 11.7446 56.7172L40.0987 85.0722H40.1024Z"/>\n  <path fill="currentColor" d="M99.4385 87.698C91.9239 80.1832 81.7121 75.9531 71.0844 75.9531C60.4566 75.9531 50.2448 80.1832 42.7266 87.698L71.0844 116.057C78.599 123.571 88.8107 127.802 99.4421 127.802C110.074 127.802 120.282 123.571 127.8 116.057L99.4421 87.698H99.4385Z"/>\n  <path fill="currentColor" d="M11.8146 115.987C19.3329 123.502 29.541 127.732 40.1724 127.732V87.6289H0.0664062C0.0700559 98.2606 4.29635 108.469 11.8146 115.987Z"/>\n  <path fill="currentColor" d="M110.387 45.7684C102.869 38.2535 92.6608 34.0198 82.0258 34.0234C71.3943 34.0234 61.1863 38.2535 53.668 45.772L82.0258 74.1306L110.387 45.7684Z"/>\n</svg>\n',
+  "deepseek-tui":
+    '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 32 32">\n  <rect width="32" height="32" fill="currentColor" opacity="0.18"/>\n  <text x="50%" y="55%" text-anchor="middle" dominant-baseline="middle" font-family="\'Noto Serif SC\', serif" font-weight="700" font-size="20" fill="currentColor">深</text>\n  <rect x="0" y="29" width="32" height="3" fill="currentColor"/>\n</svg>\n',
   dimcode:
     '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M3.12109 11.0078H1.99902V5.49316H3.12109V11.0078ZM3.7041 5.49316C4.91979 5.49316 5.31142 5.57449 5.80762 5.7373C6.50208 5.97365 6.85299 6.40958 6.86133 7.04492V9.45605C6.86125 10.207 6.37767 10.6797 5.41016 10.874C4.95546 10.9633 4.69632 11.0078 3.7041 11.0078V10.6064C4.72131 10.6064 4.95994 10.5507 5.34863 10.4404C5.91072 10.2671 6.19576 9.93907 6.2041 9.45605V7.04492C6.20402 6.4883 5.83211 6.13886 5.08789 5.99707C4.74057 5.93405 4.58897 5.89978 3.7041 5.89453V5.49316ZM9.16797 5.49316V11.0078H8.0459V5.49316H9.16797ZM14 6.79297V11.0078H12.8779V8.0791L13.8877 6.79297H14ZM14 5.49316V5.7373L11.3594 8.97852H10.7852L9.74219 6.94531V6.07812H9.86719L11.0723 8.33203L13.4258 5.49316H14Z" fill="currentColor"/>\n</svg>\n',
   dirac:

packages/app/src/assets/acp-provider-icons/deepseek-tui.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 32 32">
+  <rect width="32" height="32" fill="currentColor" opacity="0.18"/>
+  <text x="50%" y="55%" text-anchor="middle" dominant-baseline="middle" font-family="'Noto Serif SC', serif" font-weight="700" font-size="20" fill="currentColor">深</text>
+  <rect x="0" y="29" width="32" height="3" fill="currentColor"/>
+</svg>

packages/app/src/assistant-file-links/index.ts

@@ -1,6 +1,5 @@
 export {
   AssistantInlineCodePathLink,
-  AssistantInlinePathLink,
   AssistantMarkdownCodeLink,
   AssistantMarkdownLink,
 } from "./link";
@@ -9,5 +8,9 @@ export {
   normalizeInlinePathTarget,
   type InlinePathTarget,
 } from "./parse";
+export {
+  AssistantFileLinkResolverProvider,
+  type AssistantFileLinkResolverProviderProps,
+} from "./provider";
 export type { AssistantFileLinkSource } from "./resolver";
-export { useAssistantFileLinkResolver } from "./use-resolver";
+export { useAssistantFileLinkActions } from "./use-file-link";

packages/app/src/assistant-file-links/link.tsx

@@ -1,11 +1,4 @@
-import {
-  useCallback,
-  useMemo,
-  useState,
-  type CSSProperties,
-  type ReactNode,
-  type MouseEvent,
-} from "react";
+import { useMemo, useState, type CSSProperties, type MouseEvent, type ReactNode } from "react";
 import {
   Pressable,
   Text,
@@ -16,128 +9,66 @@ import {
 } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { isNative, isWeb } from "@/constants/platform";
-import type { OpenFileDisposition } from "@/workspace/file-open";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { classifyAssistantFileLink, type InlinePathTarget } from "./parse";
+import { useStableEvent } from "@/hooks/use-stable-event";
+import { useAssistantFileLinkResolverContext } from "./provider";
 import type { AssistantFileLinkSource } from "./resolver";
-
-interface AssistantInlinePathLinkProps {
-  content: string;
-  parsed: InlinePathTarget;
-  onPress: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
-  workspaceRoot?: string;
-  style: StyleProp<TextStyle>;
-}
-
-export function AssistantInlinePathLink({
-  content,
-  parsed,
-  onPress,
-  workspaceRoot,
-  style,
-}: AssistantInlinePathLinkProps) {
-  const handlePress = useCallback(() => onPress(parsed, "main"), [onPress, parsed]);
-  const handleAnchorClickCapture = useCallback(
-    (event: MouseEvent<HTMLAnchorElement>) => {
-      event.preventDefault();
-      if (!isModifiedOpenEvent(event)) {
-        return;
-      }
-      event.stopPropagation();
-      onPress(parsed, "side");
-    },
-    [onPress, parsed],
-  );
-
-  if (!isNative) {
-    return (
-      <FileLinkHoverTooltip filePath={formatInlinePathTargetForTooltip(parsed, workspaceRoot)}>
-        <a
-          href={parsed.path}
-          onClickCapture={handleAnchorClickCapture}
-          onAuxClickCapture={preventAnchorNavigation}
-          style={LINK_ANCHOR_STYLE}
-        >
-          <Text onPress={handlePress} selectable={isWeb ? undefined : false} style={style}>
-            {content}
-          </Text>
-        </a>
-      </FileLinkHoverTooltip>
-    );
-  }
-
-  return (
-    <Text onPress={handlePress} selectable={isWeb ? undefined : false} style={style}>
-      {content}
-    </Text>
-  );
-}
+import { useFileLink } from "./use-file-link";
 
 interface AssistantMarkdownLinkProps {
   source: AssistantFileLinkSource;
   style: StyleProp<TextStyle>;
-  onPress: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
-  onPrefetch: (source: AssistantFileLinkSource) => void;
-  workspaceRoot?: string;
   children: ReactNode;
 }
 
-export function AssistantMarkdownLink({
-  source,
-  style,
-  onPress,
-  onPrefetch,
-  workspaceRoot,
-  children,
-}: AssistantMarkdownLinkProps) {
+export function AssistantMarkdownLink({ source, style, children }: AssistantMarkdownLinkProps) {
   const [hovered, setHovered] = useState(false);
-  const href = source.href;
-  const handlePress = useCallback(() => onPress(source, "main"), [onPress, source]);
-  const handleAnchorClickCapture = useCallback(
-    (event: MouseEvent<HTMLAnchorElement>) => {
-      event.preventDefault();
-      if (!isModifiedOpenEvent(event)) {
-        return;
-      }
-      event.stopPropagation();
-      onPress(source, "side");
-    },
-    [onPress, source],
+  const { target, onHoverIn, onPress, onAuxPress } = useFileLink(source);
+  const { configRef } = useAssistantFileLinkResolverContext();
+  const workspaceRoot = configRef.current.workspaceRoot;
+  const tooltipPath = useMemo(
+    () => (target ? formatInlinePathTargetForTooltip(target, workspaceRoot) : null),
+    [target, workspaceRoot],
   );
-  const handlePrefetch = useCallback(() => onPrefetch(source), [onPrefetch, source]);
-  const handleHoverIn = useCallback(() => {
+  const handleAnchorClickCapture = useStableEvent((event: MouseEvent<HTMLAnchorElement>) => {
+    event.preventDefault();
+    if (!isModifiedOpenEvent(event)) {
+      return;
+    }
+    event.stopPropagation();
+    onAuxPress();
+  });
+  const handleHoverIn = useStableEvent(() => {
     setHovered(true);
-    handlePrefetch();
-  }, [handlePrefetch]);
-  const handleHoverOut = useCallback(() => setHovered(false), []);
+    onHoverIn();
+  });
+  const handleHoverOut = useStableEvent(() => setHovered(false));
   const hoveredTextStyle = useMemo<StyleProp<TextStyle>>(
     () => [style, hovered && { textDecorationLine: "underline" as const }],
     [style, hovered],
   );
-  const tooltipFilePath = useMemo(
-    () => getMarkdownLinkTooltipFilePath(source.href, workspaceRoot),
-    [source.href, workspaceRoot],
-  );
+
   if (isNative) {
     return (
-      <Text accessibilityRole="link" onPress={handlePress} style={style}>
-        {children}
-      </Text>
+      <FileLinkHoverTooltip filePath={tooltipPath}>
+        <Text accessibilityRole="link" onPress={onPress} style={style}>
+          {children}
+        </Text>
+      </FileLinkHoverTooltip>
     );
   }
 
   const anchor = (
     <a
-      href={href}
+      href={source.href}
       onClickCapture={handleAnchorClickCapture}
       onAuxClickCapture={preventAnchorNavigation}
       style={LINK_ANCHOR_STYLE}
     >
       <Pressable
         accessibilityRole="link"
-        onPress={handlePress}
-        onFocus={handlePrefetch}
+        onPress={onPress}
         onHoverIn={handleHoverIn}
         onHoverOut={handleHoverOut}
       >
@@ -146,10 +77,7 @@ export function AssistantMarkdownLink({
     </a>
   );
 
-  if (tooltipFilePath) {
-    return <FileLinkHoverTooltip filePath={tooltipFilePath}>{anchor}</FileLinkHoverTooltip>;
-  }
-  return anchor;
+  return <FileLinkHoverTooltip filePath={tooltipPath}>{anchor}</FileLinkHoverTooltip>;
 }
 
 interface AssistantMarkdownCodeLinkProps {
@@ -157,9 +85,6 @@ interface AssistantMarkdownCodeLinkProps {
   inheritedStyles: TextStyle;
   codeInlineStyle: TextStyle;
   linkStyle: TextStyle;
-  onPress: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
-  onPrefetch: (source: AssistantFileLinkSource) => void;
-  workspaceRoot?: string;
   children: ReactNode;
 }
 
@@ -168,9 +93,6 @@ export function AssistantMarkdownCodeLink({
   inheritedStyles,
   codeInlineStyle,
   linkStyle,
-  onPress,
-  onPrefetch,
-  workspaceRoot,
   children,
 }: AssistantMarkdownCodeLinkProps) {
   const style = useMemo(
@@ -178,74 +100,14 @@ export function AssistantMarkdownCodeLink({
     [inheritedStyles, codeInlineStyle, linkStyle],
   );
   return (
-    <AssistantMarkdownLink
-      source={source}
-      style={style}
-      onPress={onPress}
-      onPrefetch={onPrefetch}
-      workspaceRoot={workspaceRoot}
-    >
+    <AssistantMarkdownLink source={source} style={style}>
       {children}
     </AssistantMarkdownLink>
   );
 }
 
-interface AssistantInlineCodePathLinkProps {
-  content: string;
-  inheritedStyles: TextStyle;
-  codeInlineStyle: TextStyle;
-  linkStyle: TextStyle;
-  onPress: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
-  onPrefetch: (source: AssistantFileLinkSource) => void;
-  workspaceRoot?: string;
-}
-
-export function AssistantInlineCodePathLink({
-  content,
-  inheritedStyles,
-  codeInlineStyle,
-  linkStyle,
-  onPress,
-  onPrefetch,
-  workspaceRoot,
-}: AssistantInlineCodePathLinkProps) {
-  const source = useMemo<AssistantFileLinkSource>(
-    () => ({
-      href: content,
-      text: content,
-      sourceType: "inline-code",
-    }),
-    [content],
-  );
-
-  return (
-    <AssistantMarkdownCodeLink
-      source={source}
-      inheritedStyles={inheritedStyles}
-      codeInlineStyle={codeInlineStyle}
-      linkStyle={linkStyle}
-      onPress={onPress}
-      onPrefetch={onPrefetch}
-      workspaceRoot={workspaceRoot}
-    >
-      {content}
-    </AssistantMarkdownCodeLink>
-  );
-}
-
-function getMarkdownLinkTooltipFilePath(
-  href: string,
-  workspaceRoot: string | undefined,
-): string | null {
-  const classification = classifyAssistantFileLink(href, { workspaceRoot });
-  if (classification?.kind !== "directFile") {
-    return null;
-  }
-  return formatInlinePathTargetForTooltip(classification.target, workspaceRoot);
-}
-
 function formatInlinePathTargetForTooltip(
-  target: InlinePathTarget,
+  target: { path: string; lineStart?: number; lineEnd?: number },
   workspaceRoot: string | undefined,
 ): string {
   let result = relativizePathToWorkspace(target.path, workspaceRoot);
@@ -276,6 +138,40 @@ function relativizePathToWorkspace(filePath: string, workspaceRoot: string | und
   return filePath;
 }
 
+interface AssistantInlineCodePathLinkProps {
+  content: string;
+  inheritedStyles: TextStyle;
+  codeInlineStyle: TextStyle;
+  linkStyle: TextStyle;
+}
+
+export function AssistantInlineCodePathLink({
+  content,
+  inheritedStyles,
+  codeInlineStyle,
+  linkStyle,
+}: AssistantInlineCodePathLinkProps) {
+  const source = useMemo<AssistantFileLinkSource>(
+    () => ({
+      href: content,
+      text: content,
+      sourceType: "inline-code",
+    }),
+    [content],
+  );
+
+  return (
+    <AssistantMarkdownCodeLink
+      source={source}
+      inheritedStyles={inheritedStyles}
+      codeInlineStyle={codeInlineStyle}
+      linkStyle={linkStyle}
+    >
+      {content}
+    </AssistantMarkdownCodeLink>
+  );
+}
+
 const FILE_LINK_TOOLTIP_TRIGGER_STYLE: ViewStyle = {
   // RN doesn't type "inline-flex" but RN-web honors it at runtime, which keeps
   // the tooltip wrapper from breaking inline link flow.
@@ -284,7 +180,13 @@ const FILE_LINK_TOOLTIP_TRIGGER_STYLE: ViewStyle = {
 
 const FILE_LINK_TOOLTIP_MOD_KEYS = ["mod"];
 
-function FileLinkHoverTooltip({ filePath, children }: { filePath: string; children: ReactNode }) {
+function FileLinkHoverTooltip({
+  filePath,
+  children,
+}: {
+  filePath: string | null;
+  children: ReactNode;
+}) {
   if (!isWeb) {
     return children;
   }
@@ -293,19 +195,21 @@ function FileLinkHoverTooltip({ filePath, children }: { filePath: string; childr
       <TooltipTrigger asChild>
         <View style={FILE_LINK_TOOLTIP_TRIGGER_STYLE}>{children}</View>
       </TooltipTrigger>
-      <TooltipContent side="top" align="start" maxWidth={520}>
-        <View style={styles.tooltipBody}>
-          <Text selectable={false} style={styles.tooltipPath}>
-            {filePath}
-          </Text>
-          <View style={styles.tooltipHintRow}>
-            <Shortcut keys={FILE_LINK_TOOLTIP_MOD_KEYS} />
-            <Text selectable={false} style={styles.tooltipHintText}>
-              click for side pane
+      {filePath ? (
+        <TooltipContent side="top" align="start" maxWidth={520}>
+          <View style={styles.tooltipBody}>
+            <Text selectable={false} style={styles.tooltipPath}>
+              {filePath}
             </Text>
+            <View style={styles.tooltipHintRow}>
+              <Shortcut keys={FILE_LINK_TOOLTIP_MOD_KEYS} />
+              <Text selectable={false} style={styles.tooltipHintText}>
+                click for side pane
+              </Text>
+            </View>
           </View>
-        </View>
-      </TooltipContent>
+        </TooltipContent>
+      ) : null}
     </Tooltip>
   );
 }

packages/app/src/assistant-file-links/provider.tsx

@@ -0,0 +1,87 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  useRef,
+  type MutableRefObject,
+  type ReactNode,
+} from "react";
+import React from "react";
+import type { ToastApi } from "@/components/toast-host";
+import type { OpenFileDisposition } from "@/workspace/file-open";
+import type { InlinePathTarget } from "./parse";
+import type { AssistantFileLinkContext, GetDirectorySuggestions } from "./resolver";
+
+export interface AssistantFileLinkDaemonClient {
+  getDirectorySuggestions: GetDirectorySuggestions;
+}
+
+export interface AssistantFileLinkResolverConfig {
+  client?: AssistantFileLinkDaemonClient | null;
+  serverId?: string;
+  workspaceRoot?: string;
+  onOpenWorkspaceFile?: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
+  toast?: ToastApi | null;
+}
+
+export interface AssistantFileLinkResolverProviderProps extends AssistantFileLinkResolverConfig {
+  children: ReactNode;
+}
+
+export interface AssistantFileLinkResolverContextValue {
+  configRef: MutableRefObject<AssistantFileLinkResolverConfig>;
+  getDirectorySuggestions: GetDirectorySuggestions;
+}
+
+const AssistantFileLinkResolverContext =
+  createContext<AssistantFileLinkResolverContextValue | null>(null);
+
+export function AssistantFileLinkResolverProvider({
+  client,
+  serverId,
+  workspaceRoot,
+  onOpenWorkspaceFile,
+  toast,
+  children,
+}: AssistantFileLinkResolverProviderProps) {
+  const configRef = useRef<AssistantFileLinkResolverConfig>({
+    client,
+    serverId,
+    workspaceRoot,
+    onOpenWorkspaceFile,
+    toast,
+  });
+  configRef.current = { client, serverId, workspaceRoot, onOpenWorkspaceFile, toast };
+
+  const getDirectorySuggestions = useCallback<GetDirectorySuggestions>(async (input) => {
+    const activeClient = configRef.current.client;
+    if (!activeClient) {
+      return { entries: [], error: null };
+    }
+
+    const result = await activeClient.getDirectorySuggestions(input);
+    return { entries: result.entries, error: result.error };
+  }, []);
+
+  const value = useMemo<AssistantFileLinkResolverContextValue>(
+    () => ({ configRef, getDirectorySuggestions }),
+    [getDirectorySuggestions],
+  );
+
+  return (
+    <AssistantFileLinkResolverContext.Provider value={value}>
+      {children}
+    </AssistantFileLinkResolverContext.Provider>
+  );
+}
+
+export function useAssistantFileLinkResolverContext(): AssistantFileLinkResolverContextValue {
+  const context = useContext(AssistantFileLinkResolverContext);
+  if (!context) {
+    throw new Error("AssistantFileLinkResolverProvider is required for assistant file links.");
+  }
+  return context;
+}
+
+export type { AssistantFileLinkContext };

packages/app/src/assistant-file-links/resolver.test.ts

@@ -1,16 +1,16 @@
 import { describe, expect, it, vi } from "vitest";
 import {
-  createAssistantFileLinkResolver,
+  classifyForResolution,
+  fetchDaemonResolution,
   getAssistantFileLinkToken,
+  UnresolvedFileLinkError,
   type AssistantFileLinkContext,
   type DirectorySuggestionEntry,
   type DirectorySuggestionResult,
+  type GetDirectorySuggestions,
 } from "./resolver";
-import type { OpenFileDisposition } from "@/workspace/file-open";
-import type { InlinePathTarget } from "./parse";
 
 const CONTEXT: AssistantFileLinkContext = {
-  serverId: "server-1",
   workspaceRoot: "/Users/test/project",
 };
 
@@ -20,554 +20,201 @@ function resolvedSuggestions(
   return { entries, error: null };
 }
 
-function createDeferred<T>() {
-  let resolve!: (value: T) => void;
-  let reject!: (error: unknown) => void;
-  const promise = new Promise<T>((promiseResolve, promiseReject) => {
-    resolve = promiseResolve;
-    reject = promiseReject;
-  });
-
-  return { promise, resolve, reject };
+function suggestionsFromMap(entriesByQuery: Record<string, DirectorySuggestionEntry[]>): {
+  getDirectorySuggestions: GetDirectorySuggestions;
+  searches: Array<{
+    query: string;
+    cwd: string;
+    matchMode: "suffix";
+    limit: number;
+  }>;
+} {
+  const searches: Array<{
+    query: string;
+    cwd: string;
+    matchMode: "suffix";
+    limit: number;
+  }> = [];
+  const getDirectorySuggestions = vi.fn<GetDirectorySuggestions>(
+    async (input: {
+      query: string;
+      cwd: string;
+      includeFiles: true;
+      includeDirectories: false;
+      matchMode: "suffix";
+      limit: number;
+    }) => {
+      searches.push({
+        query: input.query,
+        cwd: input.cwd,
+        matchMode: input.matchMode,
+        limit: input.limit,
+      });
+      return resolvedSuggestions(entriesByQuery[input.query] ?? []);
+    },
+  );
+  return { getDirectorySuggestions, searches };
 }
 
-interface DirectorySearch {
-  query: string;
-  cwd: string;
-  includeFiles: true;
-  includeDirectories: false;
-  matchMode: "suffix";
-  limit: number;
-}
+describe("classifyForResolution", () => {
+  it("returns the directFile target synchronously", () => {
+    const result = classifyForResolution({ href: "src/components/message.tsx#L33" }, CONTEXT);
 
-interface OpenedFile {
-  target: InlinePathTarget;
-  disposition: OpenFileDisposition;
-}
-
-class FakeWorkspaceFiles {
-  readonly searches: DirectorySearch[] = [];
-  readonly openedFiles: OpenedFile[] = [];
-  readonly unresolvedTokens: string[] = [];
-
-  constructor(private readonly entriesByQuery: Record<string, DirectorySuggestionEntry[]>) {}
-
-  createResolver() {
-    return createAssistantFileLinkResolver({
-      getDirectorySuggestions: this.getDirectorySuggestions,
-      openWorkspaceFile: this.openWorkspaceFile,
-      openExternalUrl: async () => {},
-      onUnresolvedFileCandidate: this.onUnresolvedFileCandidate,
+    expect(result).toEqual({
+      kind: "resolved",
+      value: {
+        kind: "file",
+        target: {
+          raw: "src/components/message.tsx#L33",
+          path: "/Users/test/project/src/components/message.tsx",
+          lineStart: 33,
+          lineEnd: undefined,
+        },
+      },
     });
-  }
+  });
 
-  private getDirectorySuggestions = async (
-    search: DirectorySearch,
-  ): Promise<DirectorySuggestionResult> => {
-    this.searches.push(search);
-    return resolvedSuggestions(this.entriesByQuery[search.query] ?? []);
-  };
+  it("preserves line ranges on direct workspace files", () => {
+    const result = classifyForResolution({ href: "src/components/message.tsx:33-40" }, CONTEXT);
 
-  private openWorkspaceFile = (
-    target: InlinePathTarget,
-    disposition: OpenFileDisposition,
-  ): void => {
-    this.openedFiles.push({ target, disposition });
-  };
+    expect(result).toEqual({
+      kind: "resolved",
+      value: {
+        kind: "file",
+        target: {
+          raw: "src/components/message.tsx:33-40",
+          path: "/Users/test/project/src/components/message.tsx",
+          lineStart: 33,
+          lineEnd: 40,
+        },
+      },
+    });
+  });
 
-  private onUnresolvedFileCandidate = (token: string): void => {
-    this.unresolvedTokens.push(token);
-  };
-}
-
-describe("assistant file link resolver", () => {
-  it("dedupes in-flight prefetches and serves the click from cache", async () => {
-    const suggestions = vi.fn(async () =>
-      resolvedSuggestions([{ path: "src/dumm.md", kind: "file" }]),
+  it("flags basename inline-code as a daemon lookup keyed by suggestion query", () => {
+    const result = classifyForResolution(
+      { href: "file.ts:12", text: "file.ts:12", sourceType: "inline-code" },
+      CONTEXT,
     );
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl,
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
 
-    await Promise.all([
-      resolver.prefetch({ context: CONTEXT, source }),
-      resolver.prefetch({ context: CONTEXT, source }),
-    ]);
-    const result = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-
-    expect(suggestions).toHaveBeenCalledTimes(1);
-    expect(suggestions).toHaveBeenCalledWith({
-      query: "dumm.md",
-      cwd: "/Users/test/project",
-      includeFiles: true,
-      includeDirectories: false,
-      matchMode: "suffix",
-      limit: 1,
-    });
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/src/dumm.md",
-        lineStart: undefined,
+    expect(result).toEqual({
+      kind: "needsLookup",
+      ambiguousQuery: "file.ts",
+      token: "file.ts:12",
+      target: {
+        raw: "file.ts:12",
+        path: "/Users/test/project/file.ts",
+        lineStart: 12,
         lineEnd: undefined,
       },
-      "main",
+    });
+  });
+
+  it("keeps explicit external URLs external", () => {
+    const result = classifyForResolution({ href: "http://dumm.md", text: "dumm.md" }, CONTEXT);
+
+    expect(result).toEqual({
+      kind: "resolved",
+      value: { kind: "external", url: "http://dumm.md" },
+    });
+  });
+
+  it("keeps auto-linkified normal domains external", () => {
+    const result = classifyForResolution(
+      { href: "http://google.com", text: "google.com", markup: "linkify" },
+      CONTEXT,
     );
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(result.opened).toBe(true);
+
+    expect(result).toEqual({
+      kind: "resolved",
+      value: { kind: "external", url: "http://google.com" },
+    });
   });
 
-  it("click consumes an in-flight hover resolution", async () => {
-    const deferred = createDeferred<DirectorySuggestionResult>();
-    const suggestions = vi.fn(() => deferred.promise);
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", sourceInfo: "auto" };
+  it("returns ignored for non-file-looking content", () => {
+    const result = classifyForResolution({ href: "" }, CONTEXT);
 
-    const prefetch = resolver.prefetch({ context: CONTEXT, source });
-    const opened = resolver.open({ context: CONTEXT, source, disposition: "main" });
-    deferred.resolve(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
-
-    await prefetch;
-    const result = await opened;
-
-    expect(suggestions).toHaveBeenCalledTimes(1);
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/docs/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(result.opened).toBe(true);
+    expect(result).toEqual({ kind: "resolved", value: { kind: "ignored" } });
   });
+});
 
-  it("retries a click after hover prefetch fails to query suggestions", async () => {
-    const suggestions = vi
-      .fn()
-      .mockRejectedValueOnce(new Error("daemon unavailable"))
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl,
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
-
-    const prefetchResult = await resolver.prefetch({ context: CONTEXT, source });
-    const openResult = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-
-    expect(prefetchResult).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-    });
-    expect(suggestions).toHaveBeenCalledTimes(2);
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/docs/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(openResult.opened).toBe(true);
-  });
-
-  it("does not cache unresolved candidates", async () => {
-    const suggestions = vi
-      .fn()
-      .mockResolvedValueOnce(resolvedSuggestions([]))
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const onUnresolvedFileCandidate = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl,
-      onUnresolvedFileCandidate,
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
-
-    const first = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-    const second = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-
-    expect(first).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-      opened: false,
-    });
-    expect(second.opened).toBe(true);
-    expect(suggestions).toHaveBeenCalledTimes(2);
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/docs/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledTimes(1);
-  });
-
-  it("keys cache entries by server, workspace, and token", async () => {
-    const suggestions = vi
-      .fn()
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "one/dumm.md", kind: "file" }]))
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "two/dumm.md", kind: "file" }]));
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
-
-    await resolver.open({ context: CONTEXT, source, disposition: "main" });
-    await resolver.open({
-      context: { serverId: "server-1", workspaceRoot: "/Users/test/other" },
-      source,
-      disposition: "main",
-    });
-
-    expect(suggestions).toHaveBeenCalledTimes(2);
-    expect(openWorkspaceFile).toHaveBeenLastCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/other/two/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-  });
-
-  it("does not apply stale async results after the active context changes", async () => {
-    const deferred = createDeferred<DirectorySuggestionResult>();
-    let isCurrent = true;
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(() => deferred.promise),
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-      isCurrentContext: () => isCurrent,
-    });
-
-    const opened = resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", markup: "linkify" },
-      disposition: "main",
-    });
-    isCurrent = false;
-    deferred.resolve(resolvedSuggestions([{ path: "dumm.md", kind: "file" }]));
-    const result = await opened;
-
-    expect(openWorkspaceFile).not.toHaveBeenCalled();
-    expect(result.opened).toBe(false);
-    expect(result.kind).toBe("file");
-  });
-
-  it("opens direct workspace file links without querying suggestions", async () => {
-    const suggestions = vi.fn(async () => resolvedSuggestions([]));
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "src/components/message.tsx#L33" },
-      disposition: "main",
-    });
-
-    expect(suggestions).not.toHaveBeenCalled();
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "src/components/message.tsx#L33",
-        path: "/Users/test/project/src/components/message.tsx",
-        lineStart: 33,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(result.opened).toBe(true);
-  });
-
-  it("preserves direct workspace file line ranges", async () => {
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-
-    await resolver.open({
-      context: CONTEXT,
-      source: { href: "src/components/message.tsx:33-40" },
-      disposition: "main",
-    });
-
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "src/components/message.tsx:33-40",
-        path: "/Users/test/project/src/components/message.tsx",
-        lineStart: 33,
-        lineEnd: 40,
-      },
-      "main",
-    );
-  });
-
-  it("opens basename line refs when the daemon returns that exact filename", async () => {
-    const workspaceFiles = new FakeWorkspaceFiles({
+describe("fetchDaemonResolution", () => {
+  it("resolves daemon suggestions into workspace file targets", async () => {
+    const { getDirectorySuggestions, searches } = suggestionsFromMap({
       "file.ts": [{ path: "packages/app/src/file.ts", kind: "file" }],
     });
-    const resolver = workspaceFiles.createResolver();
 
-    const result = await resolver.open({
-      context: { ...CONTEXT, workspaceRoot: "/Users/test/project" },
-      source: {
-        href: "file.ts:12",
-        text: "file.ts:12",
-        sourceType: "inline-code",
+    const result = await fetchDaemonResolution({
+      ambiguousQuery: "file.ts",
+      token: "file.ts:12",
+      target: {
+        raw: "file.ts:12",
+        path: "/Users/test/project/file.ts",
+        lineStart: 12,
+        lineEnd: undefined,
       },
-      disposition: "main",
+      workspaceRoot: "/Users/test/project",
+      getDirectorySuggestions,
     });
 
-    expect(workspaceFiles.searches).toEqual([
+    expect(searches).toEqual([
       {
         query: "file.ts",
         cwd: "/Users/test/project",
-        includeFiles: true,
-        includeDirectories: false,
         matchMode: "suffix",
         limit: 1,
       },
     ]);
-    expect(workspaceFiles.openedFiles).toEqual([
-      {
+    expect(result).toEqual({
+      raw: "file.ts:12",
+      path: "/Users/test/project/packages/app/src/file.ts",
+      lineStart: 12,
+      lineEnd: undefined,
+    });
+  });
+
+  it("throws a typed unresolved error when the daemon finds no match", async () => {
+    const { getDirectorySuggestions } = suggestionsFromMap({});
+
+    await expect(
+      fetchDaemonResolution({
+        ambiguousQuery: "src/file.ts",
+        token: "src/file.ts",
         target: {
-          raw: "file.ts:12",
-          path: "/Users/test/project/packages/app/src/file.ts",
-          lineStart: 12,
+          raw: "src/file.ts",
+          path: "/Users/test/project/src/file.ts",
+          lineStart: undefined,
           lineEnd: undefined,
         },
-        disposition: "main",
-      },
-    ]);
-    expect(result.opened).toBe(true);
-  });
-
-  it("reports inline-code subpaths as unresolved when suffix suggestions find no file", async () => {
-    const workspaceFiles = new FakeWorkspaceFiles({});
-    const resolver = workspaceFiles.createResolver();
-
-    const result = await resolver.open({
-      context: { ...CONTEXT, workspaceRoot: "/Users/test/project" },
-      source: {
-        href: "src/file.ts",
-        text: "src/file.ts",
-        sourceType: "inline-code",
-      },
-      disposition: "main",
-    });
-
-    expect(workspaceFiles.searches).toEqual([
-      {
-        query: "src/file.ts",
-        cwd: "/Users/test/project",
-        includeFiles: true,
-        includeDirectories: false,
-        matchMode: "suffix",
-        limit: 1,
-      },
-    ]);
-    expect(workspaceFiles.openedFiles).toEqual([]);
-    expect(workspaceFiles.unresolvedTokens).toEqual(["src/file.ts"]);
-    expect(result).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "src/file.ts",
-      opened: false,
-    });
-  });
-
-  it("passes side open disposition to workspace file links", async () => {
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-
-    await resolver.open({
-      context: CONTEXT,
-      source: { href: "src/components/message.tsx#L33" },
-      disposition: "side",
-    });
-
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "src/components/message.tsx#L33",
-        path: "/Users/test/project/src/components/message.tsx",
-        lineStart: 33,
-        lineEnd: undefined,
-      },
-      "side",
-    );
-  });
-
-  it("keeps explicit external URLs external", async () => {
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md" },
-      disposition: "main",
-    });
-
-    expect(openExternalUrl).toHaveBeenCalledWith("http://dumm.md");
-    expect(result).toEqual({
-      kind: "external",
-      url: "http://dumm.md",
-      opened: true,
-    });
-  });
-
-  it("keeps auto-linkified normal domains external", async () => {
-    const suggestions = vi.fn(async () => resolvedSuggestions([]));
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://google.com", text: "google.com", markup: "linkify" },
-      disposition: "main",
-    });
-
-    expect(suggestions).not.toHaveBeenCalled();
-    expect(openExternalUrl).toHaveBeenCalledWith("http://google.com");
-    expect(result).toEqual({
-      kind: "external",
-      url: "http://google.com",
-      opened: true,
-    });
-  });
-
-  it("keeps auto-linkified normal domain paths external", async () => {
-    const suggestions = vi.fn(async () => resolvedSuggestions([]));
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://openai.com/path", text: "openai.com/path", sourceInfo: "auto" },
-      disposition: "main",
-    });
-
-    expect(suggestions).not.toHaveBeenCalled();
-    expect(openExternalUrl).toHaveBeenCalledWith("http://openai.com/path");
-    expect(result).toEqual({
-      kind: "external",
-      url: "http://openai.com/path",
-      opened: true,
-    });
-  });
-
-  it("does not open unresolved linkified markdown filenames in the browser", async () => {
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const onUnresolvedFileCandidate = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile,
-      openExternalUrl,
-      onUnresolvedFileCandidate,
-    });
-
-    const prefetchResult = await resolver.prefetch({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", sourceInfo: "auto" },
-    });
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", sourceInfo: "auto" },
-      disposition: "main",
-    });
-
-    expect(openWorkspaceFile).not.toHaveBeenCalled();
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(prefetchResult).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-    });
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledTimes(1);
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledWith("dumm.md");
-    expect(result).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-      opened: false,
-    });
-  });
-
-  it("keeps failed ambiguous resolution out of the browser", async () => {
-    const openExternalUrl = vi.fn();
-    const onUnresolvedFileCandidate = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => {
-        throw new Error("daemon unavailable");
+        workspaceRoot: "/Users/test/project",
+        getDirectorySuggestions,
       }),
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-      onUnresolvedFileCandidate,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", markup: "linkify" },
-      disposition: "main",
-    });
-
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledWith("dumm.md");
-    expect(result).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-      opened: false,
-    });
+    ).rejects.toEqual(new UnresolvedFileLinkError("src/file.ts"));
   });
 
+  it("throws a typed unresolved error when the daemon throws", async () => {
+    const getDirectorySuggestions = vi.fn<GetDirectorySuggestions>(async () => {
+      throw new Error("daemon unavailable");
+    });
+
+    await expect(
+      fetchDaemonResolution({
+        ambiguousQuery: "dumm.md",
+        token: "dumm.md",
+        target: {
+          raw: "dumm.md",
+          path: "/Users/test/project/dumm.md",
+          lineStart: undefined,
+          lineEnd: undefined,
+        },
+        workspaceRoot: "/Users/test/project",
+        getDirectorySuggestions,
+      }),
+    ).rejects.toEqual(new UnresolvedFileLinkError("dumm.md"));
+  });
+});
+
+describe("getAssistantFileLinkToken", () => {
   it("uses rendered text for markdown-it linkified tokens and href for explicit links", () => {
     expect(
       getAssistantFileLinkToken({

packages/app/src/assistant-file-links/resolver.ts

@@ -4,12 +4,6 @@ import {
   type AssistantFileLinkClassification,
   type InlinePathTarget,
 } from "./parse";
-import type { OpenFileDisposition } from "@/workspace/file-open";
-
-export interface AssistantFileLinkContext {
-  serverId?: string;
-  workspaceRoot?: string;
-}
 
 export interface AssistantFileLinkSource {
   href: string;
@@ -19,6 +13,10 @@ export interface AssistantFileLinkSource {
   sourceType?: "inline-code";
 }
 
+export interface AssistantFileLinkContext {
+  workspaceRoot?: string;
+}
+
 export interface DirectorySuggestionEntry {
   path: string;
   kind: "file" | "directory";
@@ -29,152 +27,121 @@ export interface DirectorySuggestionResult {
   error: string | null;
 }
 
-export interface AssistantFileLinkResolverDependencies {
-  getDirectorySuggestions: (input: {
-    query: string;
-    cwd: string;
-    includeFiles: true;
-    includeDirectories: false;
-    matchMode: "suffix";
-    limit: number;
-  }) => Promise<DirectorySuggestionResult>;
-  openWorkspaceFile: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
-  openExternalUrl: (url: string) => void | Promise<void>;
-  onUnresolvedFileCandidate?: (token: string) => void;
-  isCurrentContext?: (context: AssistantFileLinkContext) => boolean;
-}
-
-export interface AssistantFileLinkResolver {
-  prefetch(input: AssistantFileLinkPrefetchInput): Promise<ResolvedAssistantFileLink>;
-  open(input: AssistantFileLinkOpenInput): Promise<AssistantFileLinkOpenResult>;
-}
-
-export interface AssistantFileLinkPrefetchInput {
-  context: AssistantFileLinkContext;
-  source: AssistantFileLinkSource;
-}
-
-export interface AssistantFileLinkOpenInput extends AssistantFileLinkPrefetchInput {
-  disposition: OpenFileDisposition;
-}
+export type GetDirectorySuggestions = (input: {
+  query: string;
+  cwd: string;
+  includeFiles: true;
+  includeDirectories: false;
+  matchMode: "suffix";
+  limit: number;
+}) => Promise<DirectorySuggestionResult>;
 
 export type ResolvedAssistantFileLink =
+  | { kind: "external"; url: string }
+  | { kind: "file"; target: InlinePathTarget }
+  | { kind: "ignored" };
+
+export type AssistantFileLinkResolution =
+  | { kind: "resolved"; value: ResolvedAssistantFileLink }
   | {
-      kind: "external";
-      url: string;
-    }
-  | {
-      kind: "file";
-      target: InlinePathTarget;
-    }
-  | {
-      kind: "unresolvedFileCandidate";
+      kind: "needsLookup";
+      ambiguousQuery: string;
       token: string;
-    }
-  | {
-      kind: "ignored";
+      target: InlinePathTarget;
     };
 
-export type AssistantFileLinkOpenResult = ResolvedAssistantFileLink & {
-  opened: boolean;
-};
-
-type CachedAssistantFileLink = Exclude<ResolvedAssistantFileLink, { kind: "external" }>;
-
-interface ParsedAssistantFileLinkInteraction {
+export interface FetchDaemonResolutionInput {
+  ambiguousQuery: string;
   token: string;
-  classification: AssistantFileLinkClassification;
+  target: InlinePathTarget;
+  workspaceRoot?: string;
+  getDirectorySuggestions: GetDirectorySuggestions;
 }
 
-export function createAssistantFileLinkResolver(
-  dependencies: AssistantFileLinkResolverDependencies,
-): AssistantFileLinkResolver {
-  const cache = new Map<string, CachedAssistantFileLink>();
-  const inFlight = new Map<string, Promise<CachedAssistantFileLink>>();
+export class UnresolvedFileLinkError extends Error {
+  constructor(readonly token: string) {
+    super(`No file found for ${token}`);
+    this.name = "UnresolvedFileLinkError";
+  }
+}
 
-  async function resolve(
-    input: AssistantFileLinkPrefetchInput,
-  ): Promise<ResolvedAssistantFileLink> {
-    const parsed = parseInteraction(input);
-    if (!parsed) {
-      return { kind: "ignored" };
-    }
+export async function fetchDaemonResolution({
+  ambiguousQuery,
+  token,
+  target,
+  workspaceRoot,
+  getDirectorySuggestions,
+}: FetchDaemonResolutionInput): Promise<InlinePathTarget> {
+  const trimmedRoot = workspaceRoot?.trim();
+  if (!trimmedRoot) {
+    throw new UnresolvedFileLinkError(token);
+  }
 
-    if (parsed.classification.kind === "external") {
-      return { kind: "external", url: parsed.classification.raw };
-    }
+  let suggestions: DirectorySuggestionResult;
+  try {
+    suggestions = await getDirectorySuggestions({
+      query: ambiguousQuery,
+      cwd: trimmedRoot,
+      includeFiles: true,
+      includeDirectories: false,
+      matchMode: "suffix",
+      limit: 1,
+    });
+  } catch {
+    throw new UnresolvedFileLinkError(token);
+  }
 
-    if (
-      parsed.classification.kind === "directFile" &&
-      !shouldResolveDirectFileThroughSuggestions({
-        context: input.context,
-        source: input.source,
-        token: parsed.token,
-        target: parsed.classification.target,
-      })
-    ) {
-      return { kind: "file", target: parsed.classification.target };
-    }
-
-    const key = getResolutionKey(input.context, parsed.token);
-    const cached = cache.get(key);
-    if (cached) {
-      return cached;
-    }
-
-    const active = inFlight.get(key);
-    if (active) {
-      return active;
-    }
-
-    const request = resolveAmbiguousCandidate({
-      context: input.context,
-      token: parsed.token,
-      target: parsed.classification.target,
-      getDirectorySuggestions: dependencies.getDirectorySuggestions,
-    })
-      .then((result) => {
-        if (result.kind === "file") {
-          cache.set(key, result);
-        }
-        inFlight.delete(key);
-        return result;
-      })
-      .catch((): CachedAssistantFileLink => {
-        inFlight.delete(key);
-        return { kind: "unresolvedFileCandidate", token: parsed.token };
-      });
-
-    inFlight.set(key, request);
-    return request;
+  const match = suggestions.entries.find((entry) => entry.kind === "file");
+  if (!match || suggestions.error) {
+    throw new UnresolvedFileLinkError(token);
   }
 
   return {
-    prefetch(input) {
-      return resolve(input);
-    },
-    async open(input) {
-      const resolved = await resolve(input);
-      if (!canApplyResult(input.context, dependencies.isCurrentContext)) {
-        return { ...resolved, opened: false };
-      }
+    ...target,
+    path: joinWorkspacePath(trimmedRoot, match.path),
+  };
+}
 
-      if (resolved.kind === "file") {
-        dependencies.openWorkspaceFile(resolved.target, input.disposition);
-        return { ...resolved, opened: true };
-      }
+export function classifyForResolution(
+  source: AssistantFileLinkSource,
+  context: AssistantFileLinkContext,
+): AssistantFileLinkResolution {
+  const token = getAssistantFileLinkToken(source).trim();
+  if (!token) {
+    return { kind: "resolved", value: { kind: "ignored" } };
+  }
 
-      if (resolved.kind === "external") {
-        await dependencies.openExternalUrl(resolved.url);
-        return { ...resolved, opened: true };
-      }
+  const classification = classifyAssistantFileLink(token, {
+    workspaceRoot: context.workspaceRoot,
+  });
+  if (!classification) {
+    return { kind: "resolved", value: { kind: "ignored" } };
+  }
+  if (classification.kind === "external") {
+    return { kind: "resolved", value: { kind: "external", url: classification.raw } };
+  }
+  if (
+    classification.kind === "directFile" &&
+    !shouldResolveDirectFileThroughSuggestions({
+      context,
+      source,
+      token,
+      target: classification.target,
+    })
+  ) {
+    return { kind: "resolved", value: { kind: "file", target: classification.target } };
+  }
 
-      if (resolved.kind === "unresolvedFileCandidate") {
-        dependencies.onUnresolvedFileCandidate?.(resolved.token);
-      }
+  const workspaceRoot = context.workspaceRoot?.trim();
+  if (!workspaceRoot) {
+    return { kind: "resolved", value: { kind: "ignored" } };
+  }
 
-      return { ...resolved, opened: false };
-    },
+  return {
+    kind: "needsLookup",
+    ambiguousQuery: getAmbiguousSuggestionQuery(classification.target, workspaceRoot),
+    token,
+    target: classification.target,
   };
 }
 
@@ -189,59 +156,10 @@ export function getAssistantFileLinkToken(source: AssistantFileLinkSource): stri
   return source.href;
 }
 
-function parseInteraction(
-  input: AssistantFileLinkPrefetchInput,
-): ParsedAssistantFileLinkInteraction | null {
-  const token = getAssistantFileLinkToken(input.source).trim();
-  if (!token) {
-    return null;
-  }
-
-  const classification = classifyAssistantFileLink(token, {
-    workspaceRoot: input.context.workspaceRoot,
-  });
-  if (!classification) {
-    return null;
-  }
-
-  return { token, classification };
-}
-
-async function resolveAmbiguousCandidate(input: {
-  context: AssistantFileLinkContext;
-  token: string;
-  target: InlinePathTarget;
-  getDirectorySuggestions: AssistantFileLinkResolverDependencies["getDirectorySuggestions"];
-}): Promise<CachedAssistantFileLink> {
-  const workspaceRoot = input.context.workspaceRoot?.trim();
-  if (!workspaceRoot) {
-    return { kind: "unresolvedFileCandidate", token: input.token };
-  }
-
-  const query = getAmbiguousSuggestionQuery(input.target, workspaceRoot);
-  const suggestions = await input.getDirectorySuggestions({
-    query,
-    cwd: workspaceRoot,
-    includeFiles: true,
-    includeDirectories: false,
-    matchMode: "suffix",
-    limit: 1,
-  });
-  const match = suggestions.entries.find((entry) => entry.kind === "file");
-  if (!match || suggestions.error) {
-    return { kind: "unresolvedFileCandidate", token: input.token };
-  }
-
-  return {
-    kind: "file",
-    target: {
-      ...input.target,
-      path: joinWorkspacePath(workspaceRoot, match.path),
-    },
-  };
-}
-
-function getAmbiguousSuggestionQuery(target: InlinePathTarget, workspaceRoot: string): string {
+export function getAmbiguousSuggestionQuery(
+  target: InlinePathTarget,
+  workspaceRoot: string,
+): string {
   const normalizedRoot = workspaceRoot.replace(/\\/g, "/").replace(/\/+$/, "");
   const normalizedPath = target.path.replace(/\\/g, "/");
   const prefix = `${normalizedRoot}/`;
@@ -253,7 +171,7 @@ function getAmbiguousSuggestionQuery(target: InlinePathTarget, workspaceRoot: st
   return lastSlash >= 0 ? normalizedPath.slice(lastSlash + 1) : normalizedPath;
 }
 
-function shouldResolveDirectFileThroughSuggestions(input: {
+export function shouldResolveDirectFileThroughSuggestions(input: {
   context: AssistantFileLinkContext;
   source: AssistantFileLinkSource;
   token: string;
@@ -285,23 +203,14 @@ function isAbsoluteInlineCodeToken(token: string): boolean {
   );
 }
 
-function getResolutionKey(context: AssistantFileLinkContext, token: string): string {
-  return [context.serverId ?? "", context.workspaceRoot ?? "", token].join("\0");
-}
-
 function isLinkifiedSource(source: AssistantFileLinkSource): boolean {
   return source.markup === "linkify" || source.sourceInfo === "auto";
 }
 
-function canApplyResult(
-  context: AssistantFileLinkContext,
-  isCurrentContext: AssistantFileLinkResolverDependencies["isCurrentContext"],
-): boolean {
-  return isCurrentContext ? isCurrentContext(context) : true;
-}
-
 function joinWorkspacePath(workspaceRoot: string, relativePath: string): string {
   const root = workspaceRoot.replace(/\\/g, "/").replace(/\/+$/, "");
   const child = relativePath.replace(/\\/g, "/").replace(/^\/+/, "");
   return root ? `${root}/${child}` : child;
 }
+
+export type { AssistantFileLinkClassification };

packages/app/src/assistant-file-links/use-file-link.test.tsx

@@ -0,0 +1,329 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { act, renderHook, waitFor } from "@testing-library/react";
+import React, { useCallback, useMemo, useState, type ReactNode } from "react";
+import { describe, expect, it, vi } from "vitest";
+import type { ToastApi } from "@/components/toast-host";
+import type { InlinePathTarget } from "./parse";
+import { AssistantFileLinkResolverProvider } from "./provider";
+import type { DirectorySuggestionResult } from "./resolver";
+import { useFileLink } from "./use-file-link";
+import type { OpenFileDisposition } from "@/workspace/file-open";
+
+vi.mock("@/utils/open-external-url", () => ({
+  openExternalUrl: vi.fn(async () => {}),
+}));
+
+const SOURCE = {
+  href: "http://dumm.md",
+  text: "dumm.md",
+  markup: "linkify",
+};
+
+function resolvedSuggestions(
+  entries: DirectorySuggestionResult["entries"],
+): DirectorySuggestionResult {
+  return { entries, error: null };
+}
+
+function createDeferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((promiseResolve, promiseReject) => {
+    resolve = promiseResolve;
+    reject = promiseReject;
+  });
+
+  return { promise, resolve, reject };
+}
+
+interface OpenedFile {
+  target: InlinePathTarget;
+  disposition: OpenFileDisposition;
+}
+
+interface TestClient {
+  getDirectorySuggestions: (input: {
+    query: string;
+    cwd: string;
+    includeFiles: true;
+    includeDirectories: false;
+    matchMode: "suffix";
+    limit: number;
+  }) => Promise<DirectorySuggestionResult>;
+}
+
+function createQueryClient(): QueryClient {
+  return new QueryClient({
+    defaultOptions: {
+      queries: { retry: false },
+      mutations: { retry: false },
+    },
+  });
+}
+
+function createToast(): ToastApi {
+  return {
+    show: vi.fn<ToastApi["show"]>(),
+    copied: vi.fn<ToastApi["copied"]>(),
+    error: vi.fn<ToastApi["error"]>(),
+  };
+}
+
+function createWrapper(input: { client: TestClient; openedFiles: OpenedFile[]; toast?: ToastApi }) {
+  const queryClient = createQueryClient();
+  return function Wrapper({ children }: { children: ReactNode }) {
+    const openWorkspaceFile = useCallback(
+      (target: InlinePathTarget, disposition: OpenFileDisposition) => {
+        input.openedFiles.push({ target, disposition });
+      },
+      [],
+    );
+
+    return (
+      <QueryClientProvider client={queryClient}>
+        <AssistantFileLinkResolverProvider
+          client={input.client}
+          serverId="server-1"
+          workspaceRoot="/Users/test/project"
+          onOpenWorkspaceFile={openWorkspaceFile}
+          toast={input.toast}
+        >
+          {children}
+        </AssistantFileLinkResolverProvider>
+      </QueryClientProvider>
+    );
+  };
+}
+
+describe("useFileLink", () => {
+  it("returns the same object across no-op parent rerenders", () => {
+    const getDirectorySuggestions = vi.fn(async () => resolvedSuggestions([]));
+    const queryClient = createQueryClient();
+    const Provider = AssistantFileLinkResolverProvider as React.ComponentType<
+      Omit<React.ComponentProps<typeof AssistantFileLinkResolverProvider>, "children"> & {
+        children?: ReactNode;
+      }
+    >;
+
+    function ChurningProviderWrapper({ children }: { children: ReactNode }) {
+      return React.createElement(
+        QueryClientProvider,
+        { client: queryClient },
+        React.createElement(
+          Provider,
+          {
+            client: { getDirectorySuggestions },
+            serverId: "server-1",
+            workspaceRoot: "/Users/test/project",
+            onOpenWorkspaceFile: () => {},
+            toast: createToast(),
+          },
+          children,
+        ),
+      );
+    }
+
+    const { result, rerender } = renderHook(() => useFileLink({ ...SOURCE }), {
+      wrapper: ChurningProviderWrapper,
+    });
+    const first = result.current;
+
+    rerender();
+
+    expect(result.current).toBe(first);
+    expect(result.current.onHoverIn).toBe(first.onHoverIn);
+    expect(result.current.onPress).toBe(first.onPress);
+    expect(result.current.onAuxPress).toBe(first.onAuxPress);
+    expect(result.current.open).toBe(first.open);
+  });
+
+  it("does not cache unresolved lookups forever", async () => {
+    const getDirectorySuggestions = vi
+      .fn()
+      .mockResolvedValueOnce(resolvedSuggestions([]))
+      .mockResolvedValueOnce(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
+    const openedFiles: OpenedFile[] = [];
+    const toast = createToast();
+    const { result } = renderHook(() => useFileLink(SOURCE), {
+      wrapper: createWrapper({
+        client: { getDirectorySuggestions },
+        openedFiles,
+        toast,
+      }),
+    });
+
+    act(() => {
+      result.current.onPress();
+    });
+    await waitFor(() => {
+      expect(toast.show).toHaveBeenCalledWith("No file found for dumm.md", {
+        variant: "error",
+        testID: "assistant-file-link-not-found-toast",
+      });
+    });
+
+    act(() => {
+      result.current.onPress();
+    });
+    await waitFor(() => {
+      expect(openedFiles).toEqual([
+        {
+          target: {
+            raw: "dumm.md",
+            path: "/Users/test/project/docs/dumm.md",
+            lineStart: undefined,
+            lineEnd: undefined,
+          },
+          disposition: "main",
+        },
+      ]);
+    });
+    expect(getDirectorySuggestions).toHaveBeenCalledTimes(2);
+  });
+
+  it("click retries after hover prefetch fails", async () => {
+    const getDirectorySuggestions = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("daemon unavailable"))
+      .mockResolvedValueOnce(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
+    const openedFiles: OpenedFile[] = [];
+    const { result } = renderHook(() => useFileLink(SOURCE), {
+      wrapper: createWrapper({
+        client: { getDirectorySuggestions },
+        openedFiles,
+      }),
+    });
+
+    act(() => {
+      result.current.onHoverIn();
+    });
+    await waitFor(() => {
+      expect(getDirectorySuggestions).toHaveBeenCalledTimes(1);
+    });
+
+    act(() => {
+      result.current.onPress();
+    });
+    await waitFor(() => {
+      expect(openedFiles).toHaveLength(1);
+    });
+    expect(getDirectorySuggestions).toHaveBeenCalledTimes(2);
+  });
+
+  it("dedupes two links pointing at the same source", async () => {
+    const deferred = createDeferred<DirectorySuggestionResult>();
+    const getDirectorySuggestions = vi.fn(() => deferred.promise);
+    const openedFiles: OpenedFile[] = [];
+    const { result } = renderHook(
+      () => ({
+        first: useFileLink(SOURCE),
+        second: useFileLink(SOURCE),
+      }),
+      {
+        wrapper: createWrapper({
+          client: { getDirectorySuggestions },
+          openedFiles,
+        }),
+      },
+    );
+
+    act(() => {
+      result.current.first.onHoverIn();
+      result.current.second.onHoverIn();
+    });
+    await waitFor(() => {
+      expect(getDirectorySuggestions).toHaveBeenCalledTimes(1);
+    });
+    deferred.resolve(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
+    await waitFor(() => {
+      expect(result.current.first.target?.path).toBe("/Users/test/project/docs/dumm.md");
+      expect(result.current.second.target?.path).toBe("/Users/test/project/docs/dumm.md");
+    });
+  });
+
+  it("hover then click uses the prefetched result", async () => {
+    const getDirectorySuggestions = vi.fn(async () =>
+      resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]),
+    );
+    const openedFiles: OpenedFile[] = [];
+    const { result } = renderHook(() => useFileLink(SOURCE), {
+      wrapper: createWrapper({
+        client: { getDirectorySuggestions },
+        openedFiles,
+      }),
+    });
+
+    act(() => {
+      result.current.onHoverIn();
+    });
+    await waitFor(() => {
+      expect(result.current.target?.path).toBe("/Users/test/project/docs/dumm.md");
+    });
+
+    act(() => {
+      result.current.onPress();
+    });
+    await waitFor(() => {
+      expect(openedFiles).toHaveLength(1);
+    });
+    expect(getDirectorySuggestions).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not open a stale result after the workspace changes", async () => {
+    const deferred = createDeferred<DirectorySuggestionResult>();
+    const getDirectorySuggestions = vi.fn(() => deferred.promise);
+    const openedFiles: OpenedFile[] = [];
+    const queryClient = createQueryClient();
+
+    function Wrapper({ children }: { children: ReactNode }) {
+      const [workspaceRoot, setWorkspaceRoot] = useState("/Users/test/project");
+      const client = useMemo(() => ({ getDirectorySuggestions }), []);
+      const openWorkspaceFile = useCallback(
+        (target: InlinePathTarget, disposition: OpenFileDisposition) => {
+          openedFiles.push({ target, disposition });
+        },
+        [],
+      );
+      return (
+        <QueryClientProvider client={queryClient}>
+          <AssistantFileLinkResolverProvider
+            client={client}
+            serverId="server-1"
+            workspaceRoot={workspaceRoot}
+            onOpenWorkspaceFile={openWorkspaceFile}
+          >
+            <WorkspaceSwitchContext.Provider value={setWorkspaceRoot}>
+              {children}
+            </WorkspaceSwitchContext.Provider>
+          </AssistantFileLinkResolverProvider>
+        </QueryClientProvider>
+      );
+    }
+
+    const { result } = renderHook(
+      () => ({
+        link: useFileLink(SOURCE),
+        setWorkspaceRoot: React.useContext(WorkspaceSwitchContext),
+      }),
+      { wrapper: Wrapper },
+    );
+
+    act(() => {
+      result.current.link.onPress();
+    });
+    act(() => {
+      result.current.setWorkspaceRoot("/Users/test/other");
+    });
+    deferred.resolve(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
+
+    await waitFor(() => {
+      expect(getDirectorySuggestions).toHaveBeenCalledTimes(1);
+    });
+    expect(openedFiles).toEqual([]);
+  });
+});
+
+const WorkspaceSwitchContext = React.createContext<(workspaceRoot: string) => void>(() => {});

packages/app/src/assistant-file-links/use-file-link.ts

@@ -0,0 +1,347 @@
+import { useCallback, useMemo } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useStableEvent } from "@/hooks/use-stable-event";
+import type { OpenFileDisposition } from "@/workspace/file-open";
+import { openExternalUrl } from "@/utils/open-external-url";
+import type { InlinePathTarget } from "./parse";
+import {
+  useAssistantFileLinkResolverContext,
+  type AssistantFileLinkResolverContextValue,
+} from "./provider";
+import {
+  classifyForResolution,
+  fetchDaemonResolution,
+  UnresolvedFileLinkError,
+  type AssistantFileLinkResolution,
+  type AssistantFileLinkSource,
+} from "./resolver";
+
+export interface UseFileLinkResult {
+  target: InlinePathTarget | null;
+  onHoverIn: () => void;
+  onPress: () => void;
+  onAuxPress: () => void;
+  open: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
+}
+
+export interface AssistantFileLinkActions {
+  open(source: AssistantFileLinkSource, disposition: OpenFileDisposition): void;
+  canOpen(source: AssistantFileLinkSource): boolean;
+  canResolveFile(source: AssistantFileLinkSource): boolean;
+}
+
+type AssistantFileLinkQueryKey = readonly [
+  "assistantFileLink",
+  string | null,
+  string | null,
+  string,
+];
+
+const DISABLED_QUERY_KEY = ["assistantFileLink", null, null, ""] as const;
+
+export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult {
+  const context = useAssistantFileLinkResolverContext();
+  const queryClient = useQueryClient();
+  const stableSource = useStableSource(source);
+  const activeConfig = context.configRef.current;
+  const workspaceRoot = activeConfig.workspaceRoot;
+  const serverId = activeConfig.serverId;
+  const resolution = useMemo(
+    () =>
+      classifyForResolution(stableSource, {
+        workspaceRoot,
+      }),
+    [stableSource, workspaceRoot],
+  );
+  const queryKey = useMemo(
+    () =>
+      resolution.kind === "needsLookup"
+        ? assistantFileLinkQueryKey({
+            serverId,
+            workspaceRoot,
+            ambiguousQuery: resolution.ambiguousQuery,
+          })
+        : DISABLED_QUERY_KEY,
+    [resolution, serverId, workspaceRoot],
+  );
+
+  const query = useQuery({
+    queryKey,
+    queryFn: () => {
+      if (resolution.kind !== "needsLookup") {
+        throw new Error("Assistant file link lookup requested for a sync link.");
+      }
+      return fetchDaemonResolution({
+        ambiguousQuery: resolution.ambiguousQuery,
+        token: resolution.token,
+        target: resolution.target,
+        workspaceRoot,
+        getDirectorySuggestions: context.getDirectorySuggestions,
+      });
+    },
+    enabled: false,
+    retry: 0,
+    staleTime: Infinity,
+  });
+
+  const open = useStableEvent(
+    (nextSource: AssistantFileLinkSource, disposition: OpenFileDisposition) => {
+      openAssistantFileLink({
+        source: nextSource,
+        disposition,
+        context,
+        queryClient,
+      });
+    },
+  );
+
+  const onHoverIn = useStableEvent(() => {
+    if (resolution.kind !== "needsLookup") {
+      return;
+    }
+
+    void queryClient.prefetchQuery({
+      queryKey,
+      queryFn: () =>
+        fetchDaemonResolution({
+          ambiguousQuery: resolution.ambiguousQuery,
+          token: resolution.token,
+          target: resolution.target,
+          workspaceRoot,
+          getDirectorySuggestions: context.getDirectorySuggestions,
+        }),
+      retry: 0,
+      staleTime: Infinity,
+    });
+  });
+
+  const onPress = useStableEvent(() => {
+    open(stableSource, "main");
+  });
+  const onAuxPress = useStableEvent(() => {
+    open(stableSource, "side");
+  });
+
+  const target = useMemo(() => {
+    if (resolution.kind === "resolved") {
+      return resolution.value.kind === "file" ? resolution.value.target : null;
+    }
+    return query.data ?? null;
+  }, [query.data, resolution]);
+
+  return useMemo(
+    () => ({ target, onHoverIn, onPress, onAuxPress, open }),
+    [target, onHoverIn, onPress, onAuxPress, open],
+  );
+}
+
+export function useAssistantFileLinkActions(): AssistantFileLinkActions {
+  const context = useAssistantFileLinkResolverContext();
+  const actionLink = useFileLink(ACTION_LINK_SOURCE);
+
+  const open = useStableEvent(
+    (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => {
+      actionLink.open(source, disposition);
+    },
+  );
+  const canOpen = useCallback(
+    (source: AssistantFileLinkSource) =>
+      canOpenAssistantFileLink(source, context.configRef.current.workspaceRoot),
+    [context.configRef],
+  );
+  const canResolveFile = useCallback(
+    (source: AssistantFileLinkSource) =>
+      canResolveAssistantFileLinkToFile(source, context.configRef.current.workspaceRoot),
+    [context.configRef],
+  );
+
+  return useMemo(() => ({ open, canOpen, canResolveFile }), [open, canOpen, canResolveFile]);
+}
+
+function openAssistantFileLink(input: {
+  source: AssistantFileLinkSource;
+  disposition: OpenFileDisposition;
+  context: AssistantFileLinkResolverContextValue;
+  queryClient: ReturnType<typeof useQueryClient>;
+}): void {
+  const capturedConfig = input.context.configRef.current;
+  const capturedResolution = classifyForResolution(input.source, {
+    workspaceRoot: capturedConfig.workspaceRoot,
+  });
+
+  if (capturedResolution.kind === "resolved") {
+    void dispatchResolvedLink({
+      resolution: capturedResolution,
+      disposition: input.disposition,
+      capturedServerId: capturedConfig.serverId,
+      capturedWorkspaceRoot: capturedConfig.workspaceRoot,
+      context: input.context,
+    });
+    return;
+  }
+
+  const capturedQueryKey = assistantFileLinkQueryKey({
+    serverId: capturedConfig.serverId,
+    workspaceRoot: capturedConfig.workspaceRoot,
+    ambiguousQuery: capturedResolution.ambiguousQuery,
+  });
+
+  const run = async () => {
+    try {
+      const target = await input.queryClient.fetchQuery({
+        queryKey: capturedQueryKey,
+        queryFn: () =>
+          fetchDaemonResolution({
+            ambiguousQuery: capturedResolution.ambiguousQuery,
+            token: capturedResolution.token,
+            target: capturedResolution.target,
+            workspaceRoot: capturedConfig.workspaceRoot,
+            getDirectorySuggestions: input.context.getDirectorySuggestions,
+          }),
+        retry: 0,
+        staleTime: Infinity,
+      });
+      await dispatchFileTarget({
+        target,
+        disposition: input.disposition,
+        capturedServerId: capturedConfig.serverId,
+        capturedWorkspaceRoot: capturedConfig.workspaceRoot,
+        context: input.context,
+      });
+    } catch (error) {
+      await dispatchUnresolvedError({
+        error,
+        fallbackToken: capturedResolution.token,
+        capturedServerId: capturedConfig.serverId,
+        capturedWorkspaceRoot: capturedConfig.workspaceRoot,
+        context: input.context,
+      });
+    }
+  };
+
+  void run();
+}
+
+function canOpenAssistantFileLink(
+  source: AssistantFileLinkSource,
+  workspaceRoot: string | undefined,
+): boolean {
+  const resolution = classifyForResolution(source, { workspaceRoot });
+  return resolution.kind === "needsLookup" || resolution.value.kind !== "ignored";
+}
+
+function canResolveAssistantFileLinkToFile(
+  source: AssistantFileLinkSource,
+  workspaceRoot: string | undefined,
+): boolean {
+  const resolution = classifyForResolution(source, { workspaceRoot });
+  return resolution.kind === "needsLookup" || resolution.value.kind === "file";
+}
+
+function useStableSource(source: AssistantFileLinkSource): AssistantFileLinkSource {
+  const { href, text, markup, sourceInfo, sourceType } = source;
+  return useMemo(
+    () => ({ href, text, markup, sourceInfo, sourceType }),
+    [href, text, markup, sourceInfo, sourceType],
+  );
+}
+
+function assistantFileLinkQueryKey(input: {
+  serverId?: string;
+  workspaceRoot?: string;
+  ambiguousQuery: string;
+}): AssistantFileLinkQueryKey {
+  return [
+    "assistantFileLink",
+    input.serverId ?? null,
+    input.workspaceRoot ?? null,
+    input.ambiguousQuery,
+  ];
+}
+
+async function dispatchResolvedLink(input: {
+  resolution: Extract<AssistantFileLinkResolution, { kind: "resolved" }>;
+  disposition: OpenFileDisposition;
+  capturedServerId?: string;
+  capturedWorkspaceRoot?: string;
+  context: AssistantFileLinkResolverContextValue;
+}) {
+  const { value } = input.resolution;
+  if (value.kind === "file") {
+    await dispatchFileTarget({
+      target: value.target,
+      disposition: input.disposition,
+      capturedServerId: input.capturedServerId,
+      capturedWorkspaceRoot: input.capturedWorkspaceRoot,
+      context: input.context,
+    });
+    return;
+  }
+  if (value.kind === "external") {
+    await dispatchExternalUrl({
+      url: value.url,
+      capturedServerId: input.capturedServerId,
+      capturedWorkspaceRoot: input.capturedWorkspaceRoot,
+      context: input.context,
+    });
+  }
+}
+
+async function dispatchFileTarget(input: {
+  target: InlinePathTarget;
+  disposition: OpenFileDisposition;
+  capturedServerId?: string;
+  capturedWorkspaceRoot?: string;
+  context: AssistantFileLinkResolverContextValue;
+}) {
+  const current = input.context.configRef.current;
+  if (
+    current.serverId !== input.capturedServerId ||
+    current.workspaceRoot !== input.capturedWorkspaceRoot
+  ) {
+    return;
+  }
+  current.onOpenWorkspaceFile?.(input.target, input.disposition);
+}
+
+async function dispatchExternalUrl(input: {
+  url: string;
+  capturedServerId?: string;
+  capturedWorkspaceRoot?: string;
+  context: AssistantFileLinkResolverContextValue;
+}) {
+  const current = input.context.configRef.current;
+  if (
+    current.serverId !== input.capturedServerId ||
+    current.workspaceRoot !== input.capturedWorkspaceRoot
+  ) {
+    return;
+  }
+  await openExternalUrl(input.url);
+}
+
+async function dispatchUnresolvedError(input: {
+  error: unknown;
+  fallbackToken: string;
+  capturedServerId?: string;
+  capturedWorkspaceRoot?: string;
+  context: AssistantFileLinkResolverContextValue;
+}) {
+  const current = input.context.configRef.current;
+  if (
+    current.serverId !== input.capturedServerId ||
+    current.workspaceRoot !== input.capturedWorkspaceRoot
+  ) {
+    return;
+  }
+  const token =
+    input.error instanceof UnresolvedFileLinkError ? input.error.token : input.fallbackToken;
+  current.toast?.show(`No file found for ${token}`, {
+    variant: "error",
+    testID: "assistant-file-link-not-found-toast",
+  });
+}
+
+const ACTION_LINK_SOURCE: AssistantFileLinkSource = {
+  href: "",
+};

packages/app/src/assistant-file-links/use-resolver.ts

@@ -1,90 +0,0 @@
-import { useMemo, useRef } from "react";
-import type { DaemonClient } from "@server/client/daemon-client";
-import type { ToastApi } from "@/components/toast-host";
-import {
-  createAssistantFileLinkResolver,
-  type AssistantFileLinkContext,
-  type AssistantFileLinkOpenInput,
-  type AssistantFileLinkPrefetchInput,
-} from "./resolver";
-import type { InlinePathTarget } from "./parse";
-import type { OpenFileDisposition } from "@/workspace/file-open";
-import { openExternalUrl } from "@/utils/open-external-url";
-
-export interface UseAssistantFileLinkResolverOptions {
-  client?: DaemonClient | null;
-  serverId?: string;
-  workspaceRoot?: string;
-  onOpenWorkspaceFile?: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
-  toast?: ToastApi | null;
-}
-
-export interface AssistantFileLinkActions {
-  prefetch(input: Omit<AssistantFileLinkPrefetchInput, "context">): void;
-  open(input: Omit<AssistantFileLinkOpenInput, "context">): void;
-}
-
-export function useAssistantFileLinkResolver({
-  client,
-  serverId,
-  workspaceRoot,
-  onOpenWorkspaceFile,
-  toast,
-}: UseAssistantFileLinkResolverOptions): AssistantFileLinkActions {
-  const context: AssistantFileLinkContext = useMemo(
-    () => ({
-      serverId,
-      workspaceRoot,
-    }),
-    [serverId, workspaceRoot],
-  );
-  const latestContextRef = useRef(context);
-  latestContextRef.current = context;
-
-  const resolver = useMemo(
-    () =>
-      createAssistantFileLinkResolver({
-        async getDirectorySuggestions(input) {
-          if (!client) {
-            return { entries: [], error: null };
-          }
-
-          const result = await client.getDirectorySuggestions(input);
-          return {
-            entries: result.entries,
-            error: result.error,
-          };
-        },
-        openWorkspaceFile(target, disposition) {
-          onOpenWorkspaceFile?.(target, disposition);
-        },
-        openExternalUrl,
-        onUnresolvedFileCandidate(token) {
-          toast?.show(`No file found for ${token}`, {
-            variant: "error",
-            testID: "assistant-file-link-not-found-toast",
-          });
-        },
-        isCurrentContext(candidate) {
-          const current = latestContextRef.current;
-          return (
-            current.serverId === candidate.serverId &&
-            current.workspaceRoot === candidate.workspaceRoot
-          );
-        },
-      }),
-    [client, onOpenWorkspaceFile, toast],
-  );
-
-  return useMemo(
-    () => ({
-      prefetch(input) {
-        void resolver.prefetch({ ...input, context });
-      },
-      open(input) {
-        void resolver.open({ ...input, context });
-      },
-    }),
-    [context, resolver],
-  );
-}

packages/app/src/components/adaptive-modal-sheet.tsx

@@ -12,7 +12,7 @@ import {
   BottomSheetTextInput,
   type BottomSheetBackgroundProps,
 } from "@gorhom/bottom-sheet";
-import { X } from "lucide-react-native";
+import { ArrowLeft, Search, X } from "lucide-react-native";
 import { FileDropZone } from "@/components/file-drop-zone";
 import type { ImageAttachment } from "@/components/message-input";
 import {
@@ -21,6 +21,37 @@ import {
 } from "@/components/ui/isolated-bottom-sheet-modal";
 import { isNative, isWeb } from "@/constants/platform";
 
+// Horizontal indent token shared by the sheet header (title, back arrow,
+// leading icon, search input icon) and any row primitive rendered inside the
+// sheet body. Rows whose leading icon should line up with the header must
+// match this padding.
+export const SHEET_HORIZONTAL_PADDING_SCALE = 6;
+
+export interface SheetHeaderSearch {
+  value: string;
+  onChange: (value: string) => void;
+  initialValue?: string;
+  resetKey?: string | number;
+  placeholder?: string;
+  autoFocus?: boolean;
+  testID?: string;
+}
+
+export interface SheetHeaderBack {
+  onPress: () => void;
+  label?: string;
+  accessibilityLabel?: string;
+}
+
+export interface SheetHeader {
+  title: string;
+  subtitle?: ReactNode;
+  back?: SheetHeaderBack;
+  leading?: ReactNode;
+  actions?: ReactNode;
+  search?: SheetHeaderSearch;
+}
+
 type EscHandler = () => void;
 const escStack: EscHandler[] = [];
 let escListenerAttached = false;
@@ -72,23 +103,30 @@ const styles = StyleSheet.create((theme) => ({
     borderWidth: 1,
     borderColor: theme.colors.surface2,
   },
-  header: {
-    paddingHorizontal: theme.spacing[6],
-    paddingVertical: theme.spacing[4],
-    flexDirection: "row",
-    alignItems: "flex-start",
-    justifyContent: "space-between",
+  headerContainer: {
     borderBottomWidth: 1,
     borderBottomColor: theme.colors.surface2,
-    gap: theme.spacing[3],
+  },
+  headerRow: {
+    paddingHorizontal: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+    paddingVertical: theme.spacing[4],
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  headerBackButton: {
+    borderRadius: theme.borderRadius.lg,
+  },
+  headerLeadingSlot: {
+    alignItems: "center",
+    justifyContent: "center",
   },
   headerTitleGroup: {
     flex: 1,
-    gap: theme.spacing[2],
+    gap: theme.spacing[1],
     minWidth: 0,
   },
   title: {
-    flex: 1,
     fontSize: theme.fontSize.lg,
     fontWeight: theme.fontWeight.medium,
   },
@@ -96,52 +134,84 @@ const styles = StyleSheet.create((theme) => ({
     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,
-    backgroundColor: theme.colors.surface2,
+  },
+  searchRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+    paddingBottom: theme.spacing[3],
+  },
+  // Inline variants for InlineHeaderView inside the desktop Combobox popover.
+  // Horizontal padding matches the model picker's row indent: the picker uses
+  // children mode (desktopChildrenScrollContent, no scroll padding), so the
+  // row content starts at item.paddingHorizontal = spacing[3].
+  inlineHeaderRow: {
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  inlineSearchRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.border,
+  },
+  inlineTitle: {
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foreground,
+  },
+  searchInput: {
+    flex: 1,
+    paddingVertical: theme.spacing[2],
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
   },
   desktopScroll: {
     flexShrink: 1,
     minHeight: 0,
   },
   desktopContent: {
-    padding: theme.spacing[6],
+    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
     gap: theme.spacing[4],
     flexGrow: 1,
   },
-  bottomSheetHeader: {
-    paddingHorizontal: theme.spacing[6],
-    paddingTop: theme.spacing[4],
-    paddingBottom: theme.spacing[3],
-    flexDirection: "row",
-    justifyContent: "space-between",
-    alignItems: "flex-start",
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.surface2,
-    gap: theme.spacing[3],
-  },
   bottomSheetContent: {
-    padding: theme.spacing[6],
+    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
     gap: theme.spacing[4],
   },
   bottomSheetStaticContent: {
     flex: 1,
-    padding: theme.spacing[6],
+    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
     gap: theme.spacing[4],
     minHeight: 0,
   },
   desktopStaticContent: {
     flexShrink: 1,
     minHeight: 0,
-    padding: theme.spacing[6],
+    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
     gap: theme.spacing[4],
   },
+  adaptiveInputOutline: {
+    outlineColor: theme.colors.accent,
+  },
+  adaptiveInputPlaceholder: {
+    color: theme.colors.foregroundMuted,
+  },
 }));
 
+const SEARCH_INPUT_STYLE = [styles.searchInput, isWeb && { outlineStyle: "none" }];
+
 function SheetBackground({ style }: BottomSheetBackgroundProps) {
   const { theme } = useUnistyles();
   const combinedStyle = useMemo(
@@ -158,14 +228,199 @@ function SheetBackground({ style }: BottomSheetBackgroundProps) {
   return <View style={combinedStyle} />;
 }
 
+export type AdaptiveTextInputProps = TextInputProps & {
+  initialValue?: string;
+  resetKey?: string | number;
+};
+
+// React Native controlled TextInput can replay stale JS values during fast input
+// and visibly flicker/cursor-jump. Keep the rendered text native-owned; callers
+// can seed it once with initialValue and remount with resetKey for real resets.
+// See https://github.com/facebook/react-native/issues/44157
+export const AdaptiveTextInput = forwardRef<TextInput, AdaptiveTextInputProps>(
+  function AdaptiveTextInputInner(props, ref) {
+    const isMobile = useIsCompactFormFactor();
+    const {
+      value: _value,
+      initialValue,
+      resetKey,
+      defaultValue,
+      style,
+      placeholderTextColor,
+      ...inputProps
+    } = props;
+    // Recolor the browser's :focus-visible outline (defined in public/index.html)
+    // so it matches the active theme's accent instead of its hard-coded fallback.
+    // Consumer style wins if it sets outlineColor explicitly.
+    const textInputProps = {
+      ...inputProps,
+      defaultValue: initialValue ?? defaultValue,
+      placeholderTextColor: placeholderTextColor ?? styles.adaptiveInputPlaceholder.color,
+      style: [styles.adaptiveInputOutline, style],
+    };
+
+    if (isMobile && isNative) {
+      return (
+        <BottomSheetTextInput
+          key={resetKey}
+          ref={ref as unknown as Ref<never>}
+          {...textInputProps}
+        />
+      );
+    }
+    return <TextInput key={resetKey} ref={ref} {...textInputProps} />;
+  },
+);
+
+export function SheetHeaderView({
+  header,
+  onClose,
+  showCloseButton = true,
+  testID,
+}: {
+  header: SheetHeader;
+  onClose: () => void;
+  showCloseButton?: boolean;
+  testID?: string;
+}) {
+  const { theme } = useUnistyles();
+  const titleStyle = useMemo(
+    () => [styles.title, { color: theme.colors.foreground }],
+    [theme.colors.foreground],
+  );
+  const back = header.back;
+  const handleBackPress = back?.onPress;
+  const search = header.search;
+  const handleSearchChange = useCallback(
+    (value: string) => {
+      search?.onChange(value);
+    },
+    [search],
+  );
+
+  return (
+    <View style={styles.headerContainer} testID={testID}>
+      <View style={styles.headerRow}>
+        {handleBackPress ? (
+          <Pressable
+            onPress={handleBackPress}
+            hitSlop={8}
+            style={styles.headerBackButton}
+            accessibilityRole="button"
+            accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? "Back"}
+            testID="sheet-header-back"
+          >
+            {({ pressed }) => (
+              <ArrowLeft
+                size={18}
+                color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
+              />
+            )}
+          </Pressable>
+        ) : null}
+        {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
+        <View style={styles.headerTitleGroup}>
+          <Text style={titleStyle} numberOfLines={1}>
+            {header.title}
+          </Text>
+          {header.subtitle}
+        </View>
+        {header.actions ? <View style={styles.headerActions}>{header.actions}</View> : null}
+        {showCloseButton ? (
+          <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
+            {({ pressed }) => (
+              <X
+                size={16}
+                color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
+              />
+            )}
+          </Pressable>
+        ) : null}
+      </View>
+      {search ? (
+        <View style={styles.searchRow}>
+          <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+          <AdaptiveTextInput
+            // @ts-expect-error - outlineStyle is web-only
+            style={SEARCH_INPUT_STYLE}
+            placeholder={search.placeholder ?? "Search"}
+            placeholderTextColor={theme.colors.foregroundMuted}
+            initialValue={search.initialValue}
+            resetKey={search.resetKey}
+            value={search.value}
+            onChangeText={handleSearchChange}
+            autoCapitalize="none"
+            autoCorrect={false}
+            autoFocus={search.autoFocus}
+            testID={search.testID}
+          />
+        </View>
+      ) : null}
+    </View>
+  );
+}
+
+export function InlineHeaderView({ header }: { header: SheetHeader }) {
+  const { theme } = useUnistyles();
+  const back = header.back;
+  const handleBackPress = back?.onPress;
+  const hasInlineRow = Boolean(handleBackPress || header.leading);
+  if (!hasInlineRow && !header.search) return null;
+  return (
+    <View>
+      {hasInlineRow ? (
+        <View style={styles.inlineHeaderRow}>
+          {handleBackPress ? (
+            <Pressable
+              onPress={handleBackPress}
+              hitSlop={8}
+              style={styles.headerBackButton}
+              accessibilityRole="button"
+              accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? "Back"}
+              testID="sheet-header-back"
+            >
+              {({ pressed }) => (
+                <ArrowLeft
+                  size={16}
+                  color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
+                />
+              )}
+            </Pressable>
+          ) : null}
+          {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
+          <Text style={styles.inlineTitle} numberOfLines={1}>
+            {header.title}
+          </Text>
+        </View>
+      ) : null}
+      {header.search ? (
+        <View style={styles.inlineSearchRow}>
+          <Search size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+          <AdaptiveTextInput
+            // @ts-expect-error - outlineStyle is web-only
+            style={SEARCH_INPUT_STYLE}
+            placeholder={header.search.placeholder ?? "Search"}
+            placeholderTextColor={theme.colors.foregroundMuted}
+            initialValue={header.search.initialValue}
+            resetKey={header.search.resetKey}
+            value={header.search.value}
+            onChangeText={header.search.onChange}
+            autoCapitalize="none"
+            autoCorrect={false}
+            autoFocus={header.search.autoFocus}
+            testID={header.search.testID}
+          />
+        </View>
+      ) : null}
+    </View>
+  );
+}
+
 export interface AdaptiveModalSheetProps {
-  title: string;
-  /** Optional content rendered below the title in the header area. */
-  subtitle?: ReactNode;
+  header: SheetHeader;
   visible: boolean;
   onClose: () => void;
   children: ReactNode;
-  headerActions?: ReactNode;
   snapPoints?: string[];
   testID?: string;
   /** Override the max width of the desktop card. */
@@ -176,12 +431,10 @@ export interface AdaptiveModalSheetProps {
 }
 
 export function AdaptiveModalSheet({
-  title,
-  subtitle,
+  header,
   visible,
   onClose,
   children,
-  headerActions,
   snapPoints,
   testID,
   desktopMaxWidth,
@@ -190,7 +443,6 @@ export function AdaptiveModalSheet({
 }: AdaptiveModalSheetProps) {
   const { theme } = useUnistyles();
   const isMobile = useIsCompactFormFactor();
-  const titleColor = theme.colors.foreground;
   const resolvedSnapPoints = useMemo(() => snapPoints ?? ["65%", "90%"], [snapPoints]);
   const handleIndicatorStyle = useMemo(
     () => ({ backgroundColor: theme.colors.surface2 }),
@@ -209,7 +461,6 @@ export function AdaptiveModalSheet({
     [],
   );
 
-  const titleStyle = useMemo(() => [styles.title, { color: titleColor }], [titleColor]);
   const desktopCardStyle = useMemo(
     () => [styles.desktopCard, desktopMaxWidth != null && { maxWidth: desktopMaxWidth }],
     [desktopMaxWidth],
@@ -237,18 +488,7 @@ export function AdaptiveModalSheet({
         keyboardBlurBehavior="restore"
         accessible={false}
       >
-        <View style={styles.bottomSheetHeader} testID={testID}>
-          <View style={styles.headerTitleGroup}>
-            <Text key={titleColor} style={titleStyle} numberOfLines={1}>
-              {title}
-            </Text>
-            {subtitle}
-          </View>
-          {headerActions ? <View style={styles.headerActions}>{headerActions}</View> : null}
-          <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
-            <X size={16} color={theme.colors.foregroundMuted} />
-          </Pressable>
-        </View>
+        <SheetHeaderView header={header} onClose={onClose} testID={testID} />
         {scrollable ? (
           <BottomSheetScrollView
             contentContainerStyle={styles.bottomSheetContent}
@@ -266,18 +506,7 @@ export function AdaptiveModalSheet({
 
   const cardInner = (
     <>
-      <View style={styles.header}>
-        <View style={styles.headerTitleGroup}>
-          <Text key={titleColor} style={titleStyle} numberOfLines={1}>
-            {title}
-          </Text>
-          {subtitle}
-        </View>
-        {headerActions ? <View style={styles.headerActions}>{headerActions}</View> : null}
-        <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
-          <X size={16} color={theme.colors.foregroundMuted} />
-        </Pressable>
-      </View>
+      <SheetHeaderView header={header} onClose={onClose} />
       {scrollable ? (
         <ScrollView
           style={styles.desktopScroll}
@@ -324,19 +553,3 @@ export function AdaptiveModalSheet({
     </Modal>
   );
 }
-
-/**
- * TextInput that automatically uses BottomSheetTextInput on mobile
- * for proper keyboard dodging in AdaptiveModalSheet.
- */
-export const AdaptiveTextInput = forwardRef<TextInput, TextInputProps>(
-  function AdaptiveTextInput(props, ref) {
-    const isMobile = useIsCompactFormFactor();
-
-    if (isMobile && isNative) {
-      return <BottomSheetTextInput ref={ref as unknown as Ref<never>} {...props} />;
-    }
-
-    return <TextInput ref={ref} {...props} />;
-  },
-);

packages/app/src/components/add-host-method-modal.tsx

@@ -2,9 +2,11 @@ import { useCallback } from "react";
 import { Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { QrCode, Link2, ClipboardPaste } from "lucide-react-native";
-import { AdaptiveModalSheet } from "./adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "./adaptive-modal-sheet";
 import { isNative } from "@/constants/platform";
 
+const ADD_CONNECTION_HEADER: SheetHeader = { title: "Add connection" };
+
 const styles = StyleSheet.create((theme) => ({
   option: {
     flexDirection: "row",
@@ -62,7 +64,7 @@ export function AddHostMethodModal({
 
   return (
     <AdaptiveModalSheet
-      title="Add connection"
+      header={ADD_CONNECTION_HEADER}
       visible={visible}
       onClose={onClose}
       testID="add-host-method-modal"

packages/app/src/components/add-host-modal.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useMemo, useReducer, useState } from "react";
 import { Alert, Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -11,10 +11,11 @@ import {
   serializeConnectionUriForStorage,
 } from "@/utils/daemon-endpoints";
 import { DaemonConnectionTestError } from "@/utils/test-daemon-connection";
-import { AdaptiveModalSheet, AdaptiveTextInput } from "./adaptive-modal-sheet";
+import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 
 const FLEX_ONE_STYLE = { flex: 1 } as const;
+const DIRECT_CONNECTION_HEADER: SheetHeader = { title: "Direct connection" };
 
 interface DirectConnectionDraft {
   host: string;
@@ -279,6 +280,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [isAdvancedOpen, setIsAdvancedOpen] = useState(false);
   const [advancedUri, setAdvancedUri] = useState("");
+  const [inputResetKey, bumpInputResetKey] = useReducer((key: number) => key + 1, 0);
 
   const clearInput = useCallback(() => {
     setHost("");
@@ -288,6 +290,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
     setIsPasswordVisible(false);
     setIsAdvancedOpen(false);
     setAdvancedUri("");
+    bumpInputResetKey();
   }, []);
 
   const connectIcon = useMemo(
@@ -411,6 +414,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
       setUseTls(next.useTls);
       setPassword(next.password);
       setErrorMessage("");
+      bumpInputResetKey();
     } catch {
       setErrorMessage("");
     }
@@ -422,7 +426,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
 
   return (
     <AdaptiveModalSheet
-      title="Direct connection"
+      header={DIRECT_CONNECTION_HEADER}
       visible={visible}
       onClose={handleClose}
       testID="add-host-modal"
@@ -436,6 +440,8 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-host-input"
             nativeID="direct-host-input"
             accessibilityLabel="Host"
+            initialValue={host}
+            resetKey={`direct-host-${inputResetKey}`}
             value={host}
             onChangeText={setHost}
             placeholder="localhost"
@@ -454,6 +460,8 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-port-input"
             nativeID="direct-port-input"
             accessibilityLabel="Port"
+            initialValue={port}
+            resetKey={`direct-port-${inputResetKey}`}
             value={port}
             onChangeText={setPort}
             placeholder="6767"
@@ -481,7 +489,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
         <View style={checkboxStyle}>
           {useTls ? (
             <View testID="direct-ssl-toggle-checked">
-              <Check size={14} color={theme.colors.palette.white} />
+              <Check size={14} color={theme.colors.accentForeground} />
             </View>
           ) : null}
         </View>
@@ -495,6 +503,8 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-password-input"
             nativeID="direct-password-input"
             accessibilityLabel="Password"
+            initialValue={password}
+            resetKey={`direct-password-${inputResetKey}`}
             value={password}
             onChangeText={setPassword}
             placeholder="Optional"
@@ -537,6 +547,8 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-host-uri-input"
             nativeID="direct-host-uri-input"
             accessibilityLabel="Connection URI"
+            initialValue={advancedUri}
+            resetKey={`direct-host-uri-${inputResetKey}`}
             value={advancedUri}
             onChangeText={setAdvancedUri}
             placeholder="tcp://localhost:6767?ssl=true"

packages/app/src/components/add-provider-modal.tsx

@@ -1,9 +1,13 @@
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useMemo, useReducer, useState } from "react";
 import { Alert, Pressable, Text, View } from "react-native";
 import { SvgXml } from "react-native-svg";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { ExternalLink, PackagePlus, Search } from "lucide-react-native";
-import { AdaptiveModalSheet, AdaptiveTextInput } from "@/components/adaptive-modal-sheet";
+import {
+  AdaptiveModalSheet,
+  AdaptiveTextInput,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import {
   buildAcpProviderConfigPatch,
@@ -26,6 +30,7 @@ type InstallState = "installed" | "available";
 const FLEX_ONE_STYLE = { flex: 1 } as const;
 const ACTION_BUTTON_STYLE = { width: 92 } as const;
 const MODAL_SNAP_POINTS = ["78%", "92%"];
+const ADD_PROVIDER_HEADER: SheetHeader = { title: "Add provider" };
 const SEARCH_ICON_SIZE = 16;
 const PROVIDER_FALLBACK_ICON_SIZE = 20;
 const PROVIDER_REMOTE_ICON_SIZE = 24;
@@ -138,8 +143,15 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
   const { entries: providerEntries, refresh } = useProvidersSnapshot(serverId);
   const { patchConfig } = useDaemonConfig(serverId);
   const [search, setSearch] = useState("");
+  const [searchResetKey, bumpSearchResetKey] = useReducer((key: number) => key + 1, 0);
   const [installingProviderId, setInstallingProviderId] = useState<string | null>(null);
 
+  const handleClose = useCallback(() => {
+    setSearch("");
+    bumpSearchResetKey();
+    onClose();
+  }, [onClose]);
+
   const installedProviderIds = useMemo(
     () => new Set(providerEntries?.map((entry) => entry.provider) ?? []),
     [providerEntries],
@@ -157,7 +169,7 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
       try {
         await patchConfig(buildAcpProviderConfigPatch(entry));
         await refresh([entry.id]);
-        onClose();
+        handleClose();
       } catch (installError) {
         Alert.alert(
           "Unable to install provider",
@@ -167,14 +179,14 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
         setInstallingProviderId((current) => (current === entry.id ? null : current));
       }
     },
-    [installingProviderId, onClose, patchConfig, refresh],
+    [installingProviderId, handleClose, patchConfig, refresh],
   );
 
   return (
     <AdaptiveModalSheet
-      title="Add provider"
+      header={ADD_PROVIDER_HEADER}
       visible={visible}
-      onClose={onClose}
+      onClose={handleClose}
       desktopMaxWidth={680}
       snapPoints={MODAL_SNAP_POINTS}
       testID="add-provider-modal"
@@ -186,6 +198,8 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
         <AdaptiveTextInput
           testID="provider-catalog-search"
           accessibilityLabel="Search providers"
+          initialValue={search}
+          resetKey={`provider-catalog-search-${searchResetKey}`}
           value={search}
           onChangeText={setSearch}
           placeholder="Search providers"
@@ -216,7 +230,7 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
       ) : null}
 
       <View style={styles.actions}>
-        <Button style={FLEX_ONE_STYLE} variant="secondary" onPress={onClose}>
+        <Button style={FLEX_ONE_STYLE} variant="secondary" onPress={handleClose}>
           Cancel
         </Button>
       </View>

packages/app/src/components/agent-status-bar.tsx

@@ -16,7 +16,7 @@ import {
   type StyleProp,
   type ViewStyle,
 } from "react-native";
-import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useShallow } from "zustand/shallow";
 import { useStoreWithEqualityFn } from "zustand/traditional";
 import {
@@ -32,6 +32,10 @@ import {
 } from "lucide-react-native";
 import { getProviderIcon } from "@/components/provider-icons";
 import { CombinedModelSelector } from "@/components/combined-model-selector";
+import {
+  buildProviderSelectorProviders,
+  type ProviderSelectorProvider,
+} from "@/provider-selection/provider-selection";
 import { useSessionStore } from "@/stores/session-store";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { resolveProviderDefinition } from "@/utils/provider-definitions";
@@ -48,7 +52,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
-import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import type {
   AgentFeature,
@@ -58,14 +62,13 @@ import type {
 } from "@server/server/agent/agent-sdk-types";
 import type { AgentProviderDefinition } from "@server/server/agent/provider-manifest";
 import { getModeVisuals, type AgentModeColorTier } from "@server/server/agent/provider-manifest";
-import type { Theme } from "@/styles/theme";
 import {
   getFeatureHighlightColor,
   getFeatureTooltip,
   getStatusSelectorHint,
   resolveAgentModelSelection,
 } from "@/components/agent-status-bar.utils";
-import { isWeb as platformIsWeb } from "@/constants/platform";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { useToast } from "@/contexts/toast-context";
 import { toErrorMessage } from "@/utils/error-messages";
 
@@ -94,8 +97,7 @@ interface ControlledAgentStatusBarProps {
   disabled?: boolean;
   isModelLoading?: boolean;
   providerDefinitions: AgentProviderDefinition[];
-  allProviderModels?: Map<string, AgentModelDefinition[]>;
-  canSelectModelProvider?: (providerId: string) => boolean;
+  modelSelectorProviders?: ProviderSelectorProvider[];
   favoriteKeys?: Set<string>;
   onToggleFavoriteModel?: (provider: string, modelId: string) => void;
   features?: AgentFeature[];
@@ -115,7 +117,7 @@ export interface DraftAgentStatusBarProps {
   selectedModel: string;
   onSelectModel: (modelId: string) => void;
   isModelLoading: boolean;
-  allProviderModels: Map<string, AgentModelDefinition[]>;
+  modelSelectorProviders: ProviderSelectorProvider[];
   isAllModelsLoading: boolean;
   onSelectProviderAndModel: (provider: AgentProvider, modelId: string) => void;
   thinkingOptions: NonNullable<AgentModelDefinition["thinkingOptions"]>;
@@ -184,25 +186,6 @@ const MODE_ICONS = {
   ShieldOff,
   ShieldQuestionMark,
 } as const;
-const ThemedShieldCheck = withUnistyles(ShieldCheck);
-const ThemedShieldAlert = withUnistyles(ShieldAlert);
-const ThemedShieldOff = withUnistyles(ShieldOff);
-const ThemedShieldQuestionMark = withUnistyles(ShieldQuestionMark);
-
-const foregroundColorMapping = (theme: Theme) => ({
-  color: theme.colors.foreground,
-});
-
-const MODE_MENU_LEADING_ICONS = {
-  ShieldCheck: <ThemedShieldCheck size={16} uniProps={foregroundColorMapping} />,
-  ShieldAlert: <ThemedShieldAlert size={16} uniProps={foregroundColorMapping} />,
-  ShieldOff: <ThemedShieldOff size={16} uniProps={foregroundColorMapping} />,
-  ShieldQuestionMark: <ThemedShieldQuestionMark size={16} uniProps={foregroundColorMapping} />,
-} as const;
-
-function alwaysTrue() {
-  return true;
-}
 
 function resolveDisplayModel(
   isModelLoading: boolean,
@@ -215,6 +198,16 @@ function resolveDisplayModel(
   return findOptionLabel(modelOptions, selectedModelId, "Select model");
 }
 
+// Mobile status bar only — strip namespace prefix so providers like OpenCode
+// show "gpt-5.5" instead of "openrouter/gpt-5.5". Full label still appears in
+// the model picker.
+function shortModelLabel(label: string): string {
+  const i = label.lastIndexOf("/");
+  return i === -1 ? label : label.slice(i + 1);
+}
+
+type ActiveSheet = "thinking" | "mode" | "features" | null;
+
 function resolveHasAnyControl({
   providerOptions,
   modeOptions,
@@ -241,23 +234,29 @@ function toComboboxOptions(options: StatusOption[] | undefined): ComboboxOption[
   return (options ?? []).map((o) => ({ id: o.id, label: o.label }));
 }
 
-function buildFallbackAllProviderModels(
+function buildFallbackModelSelectorProviders(
   provider: string,
   modelOptions: StatusOption[] | undefined,
-): Map<string, AgentModelDefinition[]> {
-  const map = new Map<string, AgentModelDefinition[]>();
+): ProviderSelectorProvider[] {
   if (!modelOptions || modelOptions.length === 0) {
-    return map;
+    return [];
   }
-  map.set(
-    provider,
-    modelOptions.map((option) => ({
-      provider: provider,
-      id: option.id,
-      label: option.label,
-    })),
-  );
-  return map;
+  return [
+    {
+      id: provider,
+      label: provider,
+      modelSelection: {
+        kind: "models",
+        rows: modelOptions.map((option) => ({
+          favoriteKey: buildFavoriteModelKey({ provider, modelId: option.id }),
+          provider,
+          providerLabel: provider,
+          modelId: option.id,
+          modelLabel: option.label,
+        })),
+      },
+    },
+  ];
 }
 
 function makeBadgePressableStyle(
@@ -274,18 +273,6 @@ function makeBadgePressableStyle(
   ];
 }
 
-function makeSheetPressableStyle(isDisabled: boolean) {
-  return ({ pressed }: PressableStateCallbackType) => [
-    styles.sheetSelect,
-    pressed && styles.sheetSelectPressed,
-    isDisabled && styles.disabledSheetSelect,
-  ];
-}
-
-function makePrefsButtonStyle({ pressed }: PressableStateCallbackType) {
-  return [styles.prefsButton, pressed && styles.prefsButtonPressed];
-}
-
 function pickSheetModel({
   nextProviderId,
   modelId,
@@ -436,27 +423,6 @@ function buildOpenChangeHandler(
   };
 }
 
-function SheetModelTriggerView({
-  selectedModelLabel,
-  style,
-  ProviderIcon,
-}: {
-  selectedModelLabel: string;
-  style: StyleProp<ViewStyle>;
-  ProviderIcon: ReturnType<typeof getProviderIcon> | null;
-}) {
-  const { theme } = useUnistyles();
-  return (
-    <View style={style} pointerEvents="none" testID="agent-preferences-model">
-      {ProviderIcon ? (
-        <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-      ) : null}
-      <Text style={styles.sheetSelectText}>{selectedModelLabel}</Text>
-      <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-    </View>
-  );
-}
-
 function getModeIconColor(
   colorTier: AgentModeColorTier | undefined,
   palette: {
@@ -498,8 +464,7 @@ function ControlledStatusBar({
   disabled = false,
   isModelLoading = false,
   providerDefinitions,
-  allProviderModels,
-  canSelectModelProvider,
+  modelSelectorProviders,
   favoriteKeys = new Set<string>(),
   onToggleFavoriteModel,
   features,
@@ -508,7 +473,8 @@ function ControlledStatusBar({
   onModelSelectorOpen,
 }: ControlledAgentStatusBarProps) {
   const { theme } = useUnistyles();
-  const [prefsOpen, setPrefsOpen] = useState(false);
+  const isCompact = useIsCompactFormFactor();
+  const [activeSheet, setActiveSheet] = useState<ActiveSheet>(null);
   const [openSelector, setOpenSelector] = useState<StatusSelector | null>(null);
 
   const providerAnchorRef = useRef<View>(null);
@@ -526,7 +492,6 @@ function ControlledStatusBar({
   );
 
   const displayProvider = findOptionLabel(providerOptions, selectedProviderId, "Provider");
-  const displayMode = findOptionLabel(modeOptions, selectedModeId, "Default");
   const displayModel = resolveDisplayModel(isModelLoading, modelOptions, selectedModelId);
   const displayThinking = findOptionLabel(
     thinkingOptions,
@@ -560,13 +525,11 @@ function ControlledStatusBar({
     () => toComboboxOptions(modeOptions),
     [modeOptions],
   );
-  const fallbackAllProviderModels = useMemo(
-    () => buildFallbackAllProviderModels(provider, modelOptions),
+  const fallbackModelSelectorProviders = useMemo(
+    () => buildFallbackModelSelectorProviders(provider, modelOptions),
     [modelOptions, provider],
   );
-  const effectiveProviderDefinitions = providerDefinitions;
-  const effectiveAllProviderModels = allProviderModels ?? fallbackAllProviderModels;
-  const canSelectProviderInModelMenu = canSelectModelProvider ?? alwaysTrue;
+  const effectiveModelSelectorProviders = modelSelectorProviders ?? fallbackModelSelectorProviders;
   const comboboxThinkingOptions = useMemo<ComboboxOption[]>(
     () => toComboboxOptions(thinkingOptions),
     [thinkingOptions],
@@ -586,6 +549,18 @@ function ControlledStatusBar({
     ),
     [provider, providerDefinitions, theme.colors.foreground],
   );
+  const renderThinkingOption = useCallback(
+    (args: { option: ComboboxOption; selected: boolean; active: boolean; onPress: () => void }) => (
+      <ThinkingComboboxOption
+        option={args.option}
+        selected={args.selected}
+        active={args.active}
+        onPress={args.onPress}
+        iconColor={theme.colors.foreground}
+      />
+    ),
+    [theme.colors.foreground],
+  );
 
   const handleOpenChange = useCallback(
     (selector: StatusSelector) =>
@@ -659,16 +634,30 @@ function ControlledStatusBar({
     [canSelectMode, disabled, openSelector],
   );
 
-  const handleOpenPrefs = useCallback(() => {
+  const handleOpenSheet = useCallback((sheet: Exclude<ActiveSheet, null>) => {
     Keyboard.dismiss();
-    setPrefsOpen(true);
+    setActiveSheet(sheet);
   }, []);
 
-  const handleClosePrefs = useCallback(() => {
-    setPrefsOpen(false);
+  const handleCloseSheet = useCallback(() => {
+    setActiveSheet(null);
   }, []);
 
-  const prefsButtonStyle = makePrefsButtonStyle;
+  const handleSelectThinkingAndClose = useCallback(
+    (thinkingOptionId: string) => {
+      onSelectThinkingOption?.(thinkingOptionId);
+      setActiveSheet(null);
+    },
+    [onSelectThinkingOption],
+  );
+
+  const handleSelectModeAndClose = useCallback(
+    (modeId: string) => {
+      onSelectMode?.(modeId);
+      setActiveSheet(null);
+    },
+    [onSelectMode],
+  );
 
   const handleSheetModelSelect = useCallback(
     (nextProviderId: string, modelId: string) => {
@@ -684,38 +673,13 @@ function ControlledStatusBar({
     [onSelectModel, onSelectProvider, onSelectProviderAndModel, provider],
   );
 
-  const sheetThinkingPressableStyle = useMemo(
-    () => makeSheetPressableStyle(disabled || !canSelectThinking),
-    [canSelectThinking, disabled],
-  );
-
-  const sheetModePressableStyle = useMemo(
-    () => makeSheetPressableStyle(disabled || !canSelectMode),
-    [canSelectMode, disabled],
-  );
-
-  const sheetSelectStyle = useMemo(
-    () => [styles.sheetSelect, modelDisabled && styles.disabledSheetSelect],
-    [modelDisabled],
-  );
-  const renderSheetModelTrigger = useCallback(
-    ({ selectedModelLabel }: { selectedModelLabel: string }) => (
-      <SheetModelTriggerView
-        selectedModelLabel={selectedModelLabel}
-        style={sheetSelectStyle}
-        ProviderIcon={ProviderIcon}
-      />
-    ),
-    [ProviderIcon, sheetSelectStyle],
-  );
-
   if (!hasAnyControl) {
     return null;
   }
 
   return (
     <View style={styles.container}>
-      {platformIsWeb ? (
+      {!isCompact ? (
         <DesktopStatusBarContent
           provider={provider}
           providerOptions={providerOptions}
@@ -739,10 +703,8 @@ function ControlledStatusBar({
           canSelectMode={canSelectMode}
           canSelectModel={canSelectModel}
           canSelectThinking={canSelectThinking}
-          canSelectProviderInModelMenu={canSelectProviderInModelMenu}
+          modelSelectorProviders={effectiveModelSelectorProviders}
           modelDisabled={modelDisabled}
-          effectiveProviderDefinitions={effectiveProviderDefinitions}
-          effectiveAllProviderModels={effectiveAllProviderModels}
           comboboxProviderOptions={comboboxProviderOptions}
           comboboxModeOptions={comboboxModeOptions}
           comboboxThinkingOptions={comboboxThinkingOptions}
@@ -770,51 +732,42 @@ function ControlledStatusBar({
           handleModeOpenChange={handleModeOpenChange}
           handleOpenChange={handleOpenChange}
           renderModeOption={renderModeOption}
+          renderThinkingOption={renderThinkingOption}
         />
       ) : (
         <SheetStatusBarContent
           provider={provider}
-          modeOptions={modeOptions}
           selectedModeId={selectedModeId}
           selectedModelId={selectedModelId}
-          thinkingOptions={thinkingOptions}
           selectedThinkingOptionId={selectedThinkingOptionId}
           features={features}
           onSetFeature={onSetFeature}
-          onSelectMode={onSelectMode}
-          onSelectThinkingOption={onSelectThinkingOption}
           onToggleFavoriteModel={onToggleFavoriteModel}
           onDropdownClose={onDropdownClose}
           onModelSelectorOpen={onModelSelectorOpen}
-          providerDefinitions={providerDefinitions}
           favoriteKeys={favoriteKeys}
           disabled={disabled}
           isModelLoading={isModelLoading}
           canSelectMode={canSelectMode}
           canSelectModel={canSelectModel}
           canSelectThinking={canSelectThinking}
-          canSelectProviderInModelMenu={canSelectProviderInModelMenu}
+          modelSelectorProviders={effectiveModelSelectorProviders}
           modelDisabled={modelDisabled}
-          effectiveProviderDefinitions={effectiveProviderDefinitions}
-          effectiveAllProviderModels={effectiveAllProviderModels}
-          displayMode={displayMode}
-          displayModel={displayModel}
-          displayThinking={displayThinking}
+          comboboxModeOptions={comboboxModeOptions}
+          comboboxThinkingOptions={comboboxThinkingOptions}
           ModeIconComponent={ModeIconComponent}
           modeIconColor={modeIconColor}
           openSelector={openSelector}
           ProviderIcon={ProviderIcon}
-          prefsOpen={prefsOpen}
-          handleOpenPrefs={handleOpenPrefs}
-          handleClosePrefs={handleClosePrefs}
-          prefsButtonStyle={prefsButtonStyle}
-          sheetThinkingPressableStyle={sheetThinkingPressableStyle}
-          sheetModePressableStyle={sheetModePressableStyle}
+          activeSheet={activeSheet}
+          handleOpenSheet={handleOpenSheet}
+          handleCloseSheet={handleCloseSheet}
           handleSheetModelSelect={handleSheetModelSelect}
-          handleThinkingOpenChange={handleThinkingOpenChange}
-          handleModeOpenChange={handleModeOpenChange}
+          handleSelectThinkingAndClose={handleSelectThinkingAndClose}
+          handleSelectModeAndClose={handleSelectModeAndClose}
           handleOpenChange={handleOpenChange}
-          renderSheetModelTrigger={renderSheetModelTrigger}
+          renderModeOption={renderModeOption}
+          renderThinkingOption={renderThinkingOption}
         />
       )}
     </View>
@@ -844,10 +797,8 @@ interface DesktopStatusBarContentProps {
   canSelectMode: boolean;
   canSelectModel: boolean;
   canSelectThinking: boolean;
-  canSelectProviderInModelMenu: (providerId: string) => boolean;
+  modelSelectorProviders: ProviderSelectorProvider[];
   modelDisabled: boolean;
-  effectiveProviderDefinitions: AgentProviderDefinition[];
-  effectiveAllProviderModels: Map<string, AgentModelDefinition[]>;
   comboboxProviderOptions: ComboboxOption[];
   comboboxModeOptions: ComboboxOption[];
   comboboxThinkingOptions: ComboboxOption[];
@@ -880,6 +831,12 @@ interface DesktopStatusBarContentProps {
     active: boolean;
     onPress: () => void;
   }) => ReactElement;
+  renderThinkingOption: (args: {
+    option: ComboboxOption;
+    selected: boolean;
+    active: boolean;
+    onPress: () => void;
+  }) => ReactElement;
 }
 
 const DESKTOP_SEARCH_THRESHOLD = 6;
@@ -907,10 +864,8 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
     canSelectMode,
     canSelectModel,
     canSelectThinking,
-    canSelectProviderInModelMenu,
+    modelSelectorProviders,
     modelDisabled,
-    effectiveProviderDefinitions,
-    effectiveAllProviderModels,
     comboboxProviderOptions,
     comboboxModeOptions,
     comboboxThinkingOptions,
@@ -938,6 +893,7 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
     handleModeOpenChange,
     handleOpenChange,
     renderModeOption,
+    renderThinkingOption,
   } = props;
 
   return (
@@ -980,11 +936,9 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
           <TooltipTrigger asChild triggerRefProp="ref">
             <View>
               <CombinedModelSelector
-                providerDefinitions={effectiveProviderDefinitions}
-                allProviderModels={effectiveAllProviderModels}
+                providers={modelSelectorProviders}
                 selectedProvider={provider}
                 selectedModel={selectedModelId ?? ""}
-                canSelectProvider={canSelectProviderInModelMenu}
                 onSelect={handleDesktopModelSelect}
                 favoriteKeys={favoriteKeys}
                 onToggleFavorite={onToggleFavoriteModel}
@@ -1033,6 +987,7 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
             onOpenChange={handleThinkingOpenChange}
             anchorRef={thinkingAnchorRef}
             desktopPlacement="top-start"
+            renderOption={renderThinkingOption}
           />
         </>
       ) : null}
@@ -1092,203 +1047,255 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
 
 interface SheetStatusBarContentProps {
   provider: string;
-  modeOptions?: StatusOption[];
   selectedModeId?: string;
   selectedModelId?: string;
-  thinkingOptions?: StatusOption[];
   selectedThinkingOptionId?: string;
   features?: AgentFeature[];
   onSetFeature?: (featureId: string, value: unknown) => void;
-  onSelectMode?: (modeId: string) => void;
-  onSelectThinkingOption?: (thinkingOptionId: string) => void;
   onToggleFavoriteModel?: (provider: string, modelId: string) => void;
   onDropdownClose?: () => void;
   onModelSelectorOpen?: () => void;
-  providerDefinitions: AgentProviderDefinition[];
   favoriteKeys: Set<string>;
   disabled: boolean;
   isModelLoading: boolean;
   canSelectMode: boolean;
   canSelectModel: boolean;
   canSelectThinking: boolean;
-  canSelectProviderInModelMenu: (providerId: string) => boolean;
+  modelSelectorProviders: ProviderSelectorProvider[];
   modelDisabled: boolean;
-  effectiveProviderDefinitions: AgentProviderDefinition[];
-  effectiveAllProviderModels: Map<string, AgentModelDefinition[]>;
-  displayMode: string;
-  displayModel: string;
-  displayThinking: string;
+  comboboxModeOptions: ComboboxOption[];
+  comboboxThinkingOptions: ComboboxOption[];
   ModeIconComponent: (typeof MODE_ICONS)[keyof typeof MODE_ICONS] | null;
   modeIconColor: string;
   openSelector: StatusSelector | null;
   ProviderIcon: ReturnType<typeof getProviderIcon> | null;
-  prefsOpen: boolean;
-  handleOpenPrefs: () => void;
-  handleClosePrefs: () => void;
-  prefsButtonStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
-  sheetThinkingPressableStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
-  sheetModePressableStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
+  activeSheet: ActiveSheet;
+  handleOpenSheet: (sheet: Exclude<ActiveSheet, null>) => void;
+  handleCloseSheet: () => void;
   handleSheetModelSelect: (providerId: string, modelId: string) => void;
-  handleThinkingOpenChange: (open: boolean) => void;
-  handleModeOpenChange: (open: boolean) => void;
+  handleSelectThinkingAndClose: (thinkingOptionId: string) => void;
+  handleSelectModeAndClose: (modeId: string) => void;
   handleOpenChange: (selector: StatusSelector) => (nextOpen: boolean) => void;
-  renderSheetModelTrigger: (args: { selectedModelLabel: string }) => ReactElement;
+  renderModeOption: (args: {
+    option: ComboboxOption;
+    selected: boolean;
+    active: boolean;
+    onPress: () => void;
+  }) => ReactElement;
+  renderThinkingOption: (args: {
+    option: ComboboxOption;
+    selected: boolean;
+    active: boolean;
+    onPress: () => void;
+  }) => ReactElement;
 }
 
 function SheetStatusBarContent(props: SheetStatusBarContentProps) {
   const { theme } = useUnistyles();
   const {
     provider,
-    modeOptions,
     selectedModeId,
     selectedModelId,
-    thinkingOptions,
     selectedThinkingOptionId,
     features,
     onSetFeature,
-    onSelectMode,
-    onSelectThinkingOption,
     onToggleFavoriteModel,
     onDropdownClose,
     onModelSelectorOpen,
-    providerDefinitions,
     favoriteKeys,
     disabled,
     isModelLoading,
     canSelectMode,
     canSelectModel,
     canSelectThinking,
-    canSelectProviderInModelMenu,
+    modelSelectorProviders,
     modelDisabled,
-    effectiveProviderDefinitions,
-    effectiveAllProviderModels,
-    displayMode,
-    displayModel,
-    displayThinking,
+    comboboxModeOptions,
+    comboboxThinkingOptions,
     ModeIconComponent,
     modeIconColor,
     openSelector,
     ProviderIcon,
-    prefsOpen,
-    handleOpenPrefs,
-    handleClosePrefs,
-    prefsButtonStyle,
-    sheetThinkingPressableStyle,
-    sheetModePressableStyle,
+    activeSheet,
+    handleOpenSheet,
+    handleCloseSheet,
     handleSheetModelSelect,
-    handleThinkingOpenChange,
-    handleModeOpenChange,
+    handleSelectThinkingAndClose,
+    handleSelectModeAndClose,
     handleOpenChange,
-    renderSheetModelTrigger,
+    renderModeOption,
+    renderThinkingOption,
   } = props;
 
-  return (
-    <>
-      <Pressable
-        onPress={handleOpenPrefs}
-        style={prefsButtonStyle}
-        accessibilityRole="button"
-        accessibilityLabel="Agent preferences"
-        testID="agent-preferences-button"
-      >
+  const thinkingAnchorRef = useRef<View | null>(null);
+  const modeAnchorRef = useRef<View | null>(null);
+
+  const hasThinking = comboboxThinkingOptions.length > 0;
+  const hasMode = Boolean(canSelectMode && comboboxModeOptions.length > 0);
+  const hasFeatures = Boolean(features && features.length > 0);
+
+  const handleOpenThinking = useCallback(() => handleOpenSheet("thinking"), [handleOpenSheet]);
+  const handleOpenMode = useCallback(() => handleOpenSheet("mode"), [handleOpenSheet]);
+  const handleOpenFeatures = useCallback(() => handleOpenSheet("features"), [handleOpenSheet]);
+  const handleThinkingSheetOpenChange = useCallback(
+    (nextOpen: boolean) => {
+      if (nextOpen) {
+        handleOpenSheet("thinking");
+      } else {
+        handleCloseSheet();
+      }
+    },
+    [handleCloseSheet, handleOpenSheet],
+  );
+  const handleModeSheetOpenChange = useCallback(
+    (nextOpen: boolean) => {
+      if (nextOpen) {
+        handleOpenSheet("mode");
+      } else {
+        handleCloseSheet();
+      }
+    },
+    [handleCloseSheet, handleOpenSheet],
+  );
+
+  const renderModelTrigger = useCallback(
+    ({
+      selectedModelLabel,
+    }: {
+      selectedModelLabel: string;
+      onPress: () => void;
+      disabled: boolean;
+      isOpen: boolean;
+    }) => (
+      <View pointerEvents="none" style={styles.prefsButton} testID="agent-status-bar-model">
         {ProviderIcon ? (
           <ProviderIcon size={theme.iconSize.lg} color={theme.colors.foregroundMuted} />
         ) : null}
         <Text style={styles.prefsButtonText} numberOfLines={1}>
-          {displayModel}
+          {shortModelLabel(selectedModelLabel)}
         </Text>
-      </Pressable>
+      </View>
+    ),
+    [ProviderIcon, theme.iconSize.lg, theme.colors.foregroundMuted],
+  );
+
+  const thinkingButtonStyle = makeBadgePressableStyle(
+    styles.modeIconBadge,
+    styles.disabledBadge,
+    disabled || !canSelectThinking,
+    activeSheet === "thinking",
+  );
+  const modeButtonStyle = makeBadgePressableStyle(
+    styles.modeIconBadge,
+    styles.disabledBadge,
+    disabled || !canSelectMode,
+    activeSheet === "mode",
+  );
+  const featuresButtonStyle = makeBadgePressableStyle(
+    styles.modeIconBadge,
+    styles.disabledBadge,
+    disabled,
+    activeSheet === "features",
+  );
+
+  return (
+    <>
+      {canSelectModel ? (
+        <CombinedModelSelector
+          providers={modelSelectorProviders}
+          selectedProvider={provider}
+          selectedModel={selectedModelId ?? ""}
+          onSelect={handleSheetModelSelect}
+          favoriteKeys={favoriteKeys}
+          onToggleFavorite={onToggleFavoriteModel}
+          isLoading={isModelLoading}
+          disabled={modelDisabled}
+          onOpen={onModelSelectorOpen}
+          onClose={onDropdownClose}
+          renderTrigger={renderModelTrigger}
+        />
+      ) : null}
+
+      {hasThinking ? (
+        <Pressable
+          ref={thinkingAnchorRef}
+          onPress={handleOpenThinking}
+          disabled={disabled || !canSelectThinking}
+          style={thinkingButtonStyle}
+          accessibilityRole="button"
+          accessibilityLabel="Select thinking option"
+          testID="agent-status-bar-thinking"
+        >
+          <Brain size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+        </Pressable>
+      ) : null}
+
+      {hasMode ? (
+        <Pressable
+          ref={modeAnchorRef}
+          onPress={handleOpenMode}
+          disabled={disabled || !canSelectMode}
+          style={modeButtonStyle}
+          accessibilityRole="button"
+          accessibilityLabel={`Select agent mode (${selectedModeId ?? ""})`}
+          testID="agent-preferences-mode"
+        >
+          {ModeIconComponent ? (
+            <ModeIconComponent size={theme.iconSize.md} color={modeIconColor} />
+          ) : (
+            <ShieldCheck size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+          )}
+        </Pressable>
+      ) : null}
+
+      {hasFeatures ? (
+        <Pressable
+          onPress={handleOpenFeatures}
+          disabled={disabled}
+          style={featuresButtonStyle}
+          accessibilityRole="button"
+          accessibilityLabel="Open agent features"
+          testID="agent-status-bar-features"
+        >
+          <Settings2 size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+        </Pressable>
+      ) : null}
+
+      {hasThinking ? (
+        <Combobox
+          options={comboboxThinkingOptions}
+          value={selectedThinkingOptionId ?? ""}
+          onSelect={handleSelectThinkingAndClose}
+          searchable={false}
+          title="Thinking"
+          open={activeSheet === "thinking"}
+          onOpenChange={handleThinkingSheetOpenChange}
+          anchorRef={thinkingAnchorRef}
+          renderOption={renderThinkingOption}
+        />
+      ) : null}
+
+      {hasMode ? (
+        <Combobox
+          options={comboboxModeOptions}
+          value={selectedModeId ?? ""}
+          onSelect={handleSelectModeAndClose}
+          searchable={false}
+          title="Mode"
+          open={activeSheet === "mode"}
+          onOpenChange={handleModeSheetOpenChange}
+          renderOption={renderModeOption}
+          anchorRef={modeAnchorRef}
+        />
+      ) : null}
 
       <AdaptiveModalSheet
-        title="Preferences"
-        visible={prefsOpen}
-        onClose={handleClosePrefs}
-        testID="agent-preferences-sheet"
+        header={FEATURES_SHEET_HEADER}
+        visible={activeSheet === "features"}
+        onClose={handleCloseSheet}
+        testID="agent-features-sheet"
       >
-        {canSelectModel ? (
-          <View style={styles.sheetSection}>
-            <CombinedModelSelector
-              providerDefinitions={effectiveProviderDefinitions}
-              allProviderModels={effectiveAllProviderModels}
-              selectedProvider={provider}
-              selectedModel={selectedModelId ?? ""}
-              canSelectProvider={canSelectProviderInModelMenu}
-              onSelect={handleSheetModelSelect}
-              favoriteKeys={favoriteKeys}
-              onToggleFavorite={onToggleFavoriteModel}
-              isLoading={isModelLoading}
-              disabled={modelDisabled}
-              onOpen={onModelSelectorOpen}
-              onClose={onDropdownClose}
-              renderTrigger={renderSheetModelTrigger}
-            />
-          </View>
-        ) : null}
-
-        {thinkingOptions && thinkingOptions.length > 0 ? (
-          <View style={styles.sheetSection}>
-            <DropdownMenu
-              open={openSelector === "thinking"}
-              onOpenChange={handleThinkingOpenChange}
-            >
-              <DropdownMenuTrigger
-                disabled={disabled || !canSelectThinking}
-                style={sheetThinkingPressableStyle}
-                accessibilityRole="button"
-                accessibilityLabel="Select thinking option"
-                testID="agent-preferences-thinking"
-              >
-                <Brain size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-                <Text style={styles.sheetSelectText}>{displayThinking}</Text>
-                <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-              </DropdownMenuTrigger>
-              <DropdownMenuContent side="top" align="start">
-                {thinkingOptions.map((thinking) => (
-                  <ThinkingMenuItem
-                    key={thinking.id}
-                    thinking={thinking}
-                    selected={thinking.id === selectedThinkingOptionId}
-                    onSelectThinkingOption={onSelectThinkingOption}
-                  />
-                ))}
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </View>
-        ) : null}
-
-        {modeOptions && modeOptions.length > 0 ? (
-          <View style={styles.sheetSection}>
-            <DropdownMenu open={openSelector === "mode"} onOpenChange={handleModeOpenChange}>
-              <DropdownMenuTrigger
-                disabled={disabled || !canSelectMode}
-                style={sheetModePressableStyle}
-                accessibilityRole="button"
-                accessibilityLabel="Select agent mode"
-                testID="agent-preferences-mode"
-              >
-                {ModeIconComponent ? (
-                  <ModeIconComponent size={theme.iconSize.md} color={modeIconColor} />
-                ) : null}
-                <Text style={styles.sheetSelectText}>{displayMode}</Text>
-                <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-              </DropdownMenuTrigger>
-              <DropdownMenuContent side="top" align="start">
-                {modeOptions.map((mode) => (
-                  <ModeMenuItem
-                    key={mode.id}
-                    mode={mode}
-                    provider={provider}
-                    providerDefinitions={providerDefinitions}
-                    selected={mode.id === selectedModeId}
-                    onSelectMode={onSelectMode}
-                  />
-                ))}
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </View>
-        ) : null}
-
-        {features?.map((feature) => (
+        {(features ?? []).map((feature) => (
           <SheetFeatureItem
             key={`feature-${feature.id}`}
             feature={feature}
@@ -1555,23 +1562,28 @@ function FeatureOptionMenuItem({
   );
 }
 
-function ThinkingMenuItem({
-  thinking,
+function ThinkingComboboxOption({
+  option,
   selected,
-  onSelectThinkingOption,
+  active,
+  onPress,
+  iconColor,
 }: {
-  thinking: StatusOption;
+  option: ComboboxOption;
   selected: boolean;
-  onSelectThinkingOption?: (thinkingOptionId: string) => void;
+  active: boolean;
+  onPress: () => void;
+  iconColor: string;
 }) {
-  const handleSelect = useCallback(() => {
-    onSelectThinkingOption?.(thinking.id);
-  }, [onSelectThinkingOption, thinking.id]);
-
+  const leadingSlot = useMemo(() => <Brain size={16} color={iconColor} />, [iconColor]);
   return (
-    <DropdownMenuItem selected={selected} onSelect={handleSelect}>
-      {thinking.label}
-    </DropdownMenuItem>
+    <ComboboxItem
+      label={option.label}
+      selected={selected}
+      active={active}
+      onPress={onPress}
+      leadingSlot={leadingSlot}
+    />
   );
 }
 
@@ -1609,33 +1621,8 @@ function ModeComboboxOption({
   );
 }
 
-function ModeMenuItem({
-  mode,
-  provider,
-  providerDefinitions,
-  selected,
-  onSelectMode,
-}: {
-  mode: StatusOption;
-  provider: string;
-  providerDefinitions: AgentProviderDefinition[];
-  selected: boolean;
-  onSelectMode?: (modeId: string) => void;
-}) {
-  const visuals = getModeVisuals(provider, mode.id, providerDefinitions);
-  const leadingIcon = visuals?.icon ? MODE_MENU_LEADING_ICONS[visuals.icon] : null;
-  const handleSelect = useCallback(() => {
-    onSelectMode?.(mode.id);
-  }, [mode.id, onSelectMode]);
-
-  return (
-    <DropdownMenuItem selected={selected} onSelect={handleSelect} leading={leadingIcon}>
-      {mode.label}
-    </DropdownMenuItem>
-  );
-}
-
 const EMPTY_MODES: AgentMode[] = [];
+const FEATURES_SHEET_HEADER: SheetHeader = { title: "Features" };
 
 export const AgentStatusBar = memo(function AgentStatusBar({
   agentId,
@@ -1677,6 +1664,14 @@ export const AgentStatusBar = memo(function AgentStatusBar({
     () => buildAgentProviderModels(agent?.provider, models),
     [agent?.provider, models],
   );
+  const agentModelSelectorProviders = useMemo(
+    () =>
+      buildProviderSelectorProviders({
+        providerDefinitions: agentProviderDefinitions,
+        modelsByProvider: agentProviderModels,
+      }),
+    [agentProviderDefinitions, agentProviderModels],
+  );
 
   const displayMode = resolveAgentDisplayMode(availableModes, agent?.currentModeId);
 
@@ -1840,7 +1835,7 @@ export const AgentStatusBar = memo(function AgentStatusBar({
       modeOptions={fallbackModeOptions}
       selectedModeId={agent.currentModeId ?? undefined}
       providerDefinitions={agentProviderDefinitions}
-      allProviderModels={agentProviderModels}
+      modelSelectorProviders={agentModelSelectorProviders}
       onSelectMode={handleSelectMode}
       modelOptions={modelOptions}
       selectedModelId={modelSelection.activeModelId ?? undefined}
@@ -1871,7 +1866,7 @@ export function DraftAgentStatusBar({
   selectedModel,
   onSelectModel,
   isModelLoading: _isModelLoading,
-  allProviderModels,
+  modelSelectorProviders,
   isAllModelsLoading,
   onSelectProviderAndModel,
   thinkingOptions,
@@ -1884,6 +1879,7 @@ export function DraftAgentStatusBar({
   disabled = false,
 }: DraftAgentStatusBarProps) {
   const { preferences, updatePreferences } = useFormPreferences();
+  const isCompact = useIsCompactFormFactor();
 
   const mappedModeOptions = useMemo<StatusOption[]>(() => {
     if (modeOptions.length === 0) {
@@ -1931,12 +1927,11 @@ export function DraftAgentStatusBar({
     [updatePreferences],
   );
 
-  if (platformIsWeb) {
+  if (!isCompact) {
     return (
       <View style={styles.container}>
         <CombinedModelSelector
-          providerDefinitions={providerDefinitions}
-          allProviderModels={allProviderModels}
+          providers={modelSelectorProviders}
           selectedProvider={selectedProvider ?? ""}
           selectedModel={selectedModel}
           onSelect={onSelectProviderAndModel}
@@ -1971,7 +1966,7 @@ export function DraftAgentStatusBar({
     <ControlledStatusBar
       provider={selectedProvider ?? ""}
       providerDefinitions={providerDefinitions}
-      allProviderModels={allProviderModels}
+      modelSelectorProviders={modelSelectorProviders}
       modeOptions={hasSelectedProvider ? mappedModeOptions : undefined}
       selectedModeId={effectiveSelectedMode}
       onSelectMode={onSelectMode}
@@ -2045,9 +2040,6 @@ const styles = StyleSheet.create((theme) => ({
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius["2xl"],
   },
-  prefsButtonPressed: {
-    backgroundColor: theme.colors.surface0,
-  },
   prefsButtonText: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,

packages/app/src/components/agent-stream-view.tsx

@@ -74,7 +74,10 @@ import {
   type BottomAnchorLocalRequest,
   type BottomAnchorRouteRequest,
 } from "./use-bottom-anchor-controller";
-import { normalizeInlinePathTarget } from "@/assistant-file-links";
+import {
+  AssistantFileLinkResolverProvider,
+  normalizeInlinePathTarget,
+} from "@/assistant-file-links";
 import {
   createWorkspaceFileTabTarget,
   normalizeWorkspaceFileLocation,
@@ -83,6 +86,7 @@ import {
 } from "@/workspace/file-open";
 import { resolveWorkspaceIdByExecutionDirectory } from "@/utils/workspace-execution";
 import { navigateToPreparedWorkspaceTab } from "@/utils/workspace-navigation";
+import { useStableEvent } from "@/hooks/use-stable-event";
 import { isWeb } from "@/constants/platform";
 import type { Theme } from "@/styles/theme";
 
@@ -322,7 +326,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       setExpandedInlineToolCallIds(new Set());
     }, [agentId]);
 
-    const handleInlinePathPress = useCallback(
+    const handleInlinePathPress = useStableEvent(
       (target: InlinePathTarget, disposition: OpenFileDisposition) => {
         if (!target.path) {
           return;
@@ -377,25 +381,11 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
           checkout,
         });
       },
-      [
-        agent.cwd,
-        agent.projectPlacement?.checkout?.isGit,
-        isMobile,
-        openFileExplorerForCheckout,
-        onOpenWorkspaceFile,
-        requestDirectoryListing,
-        resolvedServerId,
-        setExplorerTabForCheckout,
-        workspaceId,
-      ],
     );
 
-    const handleToolCallOpenFile = useCallback(
-      (filePath: string) => {
-        handleInlinePathPress({ raw: filePath, path: filePath }, "main");
-      },
-      [handleInlinePathPress],
-    );
+    const handleToolCallOpenFile = useStableEvent((filePath: string) => {
+      handleInlinePathPress({ raw: filePath, path: filePath }, "main");
+    });
 
     const baseRenderModel = useMemo(() => {
       return buildAgentStreamRenderModel({
@@ -510,19 +500,25 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
           belowItem,
         });
         return (
-          <AssistantMessage
-            message={item.text}
-            timestamp={item.timestamp.getTime()}
-            onInlinePathPress={handleInlinePathPress}
-            workspaceRoot={workspaceRoot}
-            serverId={serverId}
+          <AssistantFileLinkResolverProvider
             client={client}
+            serverId={resolvedServerId}
+            workspaceRoot={workspaceRoot}
+            onOpenWorkspaceFile={handleInlinePathPress}
             toast={toast}
-            spacing={spacing}
-          />
+          >
+            <AssistantMessage
+              message={item.text}
+              timestamp={item.timestamp.getTime()}
+              workspaceRoot={workspaceRoot}
+              serverId={resolvedServerId}
+              client={client}
+              spacing={spacing}
+            />
+          </AssistantFileLinkResolverProvider>
         );
       },
-      [handleInlinePathPress, streamRenderStrategy, workspaceRoot, serverId, client, toast],
+      [client, handleInlinePathPress, resolvedServerId, streamRenderStrategy, toast, workspaceRoot],
     );
 
     const renderThoughtItem = useCallback(

packages/app/src/components/combined-model-selector.test.ts

@@ -1,90 +0,0 @@
-import { describe, expect, it } from "vitest";
-import type { AgentModelDefinition } from "@server/server/agent/agent-sdk-types";
-import {
-  buildModelRows,
-  buildSelectedTriggerLabel,
-  matchesSearch,
-  resolveProviderLabel,
-} from "./combined-model-selector.utils";
-
-describe("combined model selector helpers", () => {
-  const providerDefinitions = [
-    {
-      id: "claude",
-      label: "Claude",
-      description: "Claude provider",
-      defaultModeId: "default",
-      modes: [],
-    },
-    {
-      id: "codex",
-      label: "Codex",
-      description: "Codex provider",
-      defaultModeId: "auto",
-      modes: [],
-    },
-  ];
-
-  const claudeModels: AgentModelDefinition[] = [
-    {
-      provider: "claude",
-      id: "sonnet-4.6",
-      label: "Sonnet 4.6",
-    },
-  ];
-
-  const codexModels: AgentModelDefinition[] = [
-    {
-      provider: "codex",
-      id: "gpt-5.4",
-      label: "GPT-5.4",
-    },
-  ];
-
-  it("keeps enough data to search by model and provider name", async () => {
-    const rows = buildModelRows(
-      providerDefinitions,
-      new Map([
-        ["claude", claudeModels],
-        ["codex", codexModels],
-      ]),
-    );
-
-    expect(rows).toEqual([
-      expect.objectContaining({
-        providerLabel: "Claude",
-        modelLabel: "Sonnet 4.6",
-        modelId: "sonnet-4.6",
-      }),
-      expect.objectContaining({
-        providerLabel: "Codex",
-        modelLabel: "GPT-5.4",
-        modelId: "gpt-5.4",
-      }),
-    ]);
-
-    expect(matchesSearch(rows[0], "claude")).toBe(true);
-    expect(matchesSearch(rows[1], "gpt-5.4")).toBe(true);
-  });
-
-  it("matches across label, provider, and description with multi-token fuzzy search", () => {
-    const row = {
-      favoriteKey: "opencode:opencode-zen/kimi-k2.5",
-      provider: "opencode",
-      providerLabel: "OpenCode",
-      modelId: "opencode-zen/kimi-k2.5",
-      modelLabel: "Kimi K2.5",
-      description: "OpenCode Zen - kimi",
-    };
-
-    expect(matchesSearch(row, "kimi zen")).toBe(true);
-    expect(matchesSearch(row, "zen kimi")).toBe(true);
-    expect(matchesSearch(row, "k2.5 zen")).toBe(true);
-    expect(matchesSearch(row, "kimi gemini")).toBe(false);
-  });
-
-  it("keeps the selected trigger label model-only", () => {
-    expect(resolveProviderLabel(providerDefinitions, "codex")).toBe("Codex");
-    expect(buildSelectedTriggerLabel("GPT-5.4")).toBe("GPT-5.4");
-  });
-});

packages/app/src/components/combined-model-selector.tsx

@@ -1,21 +1,19 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { Ref } from "react";
+import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
 import {
   View,
   Text,
-  TextInput,
   Pressable,
   ActivityIndicator,
   type GestureResponderEvent,
   type PressableStateCallbackType,
 } from "react-native";
-import { BottomSheetTextInput } from "@gorhom/bottom-sheet";
+import { BottomSheetFlatList } from "@gorhom/bottom-sheet";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb as platformIsWeb } from "@/constants/platform";
-import { ArrowLeft, ChevronDown, ChevronRight, Search, Star } from "lucide-react-native";
-import type { AgentModelDefinition, AgentProvider } from "@server/server/agent/agent-sdk-types";
-import type { AgentProviderDefinition } from "@server/server/agent/provider-manifest";
+import { ChevronDown, ChevronRight, Search, Star } from "lucide-react-native";
+import type { AgentProvider } from "@server/server/agent/agent-sdk-types";
+import type { SheetHeader } from "@/components/adaptive-modal-sheet";
 const IS_WEB = platformIsWeb;
 
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
@@ -45,22 +43,17 @@ function drillDownRowStyle({
     pressed && styles.drillDownRowPressed,
   ];
 }
-
-function backButtonStyle({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) {
-  return [
-    styles.backButton,
-    Boolean(hovered) && styles.backButtonHovered,
-    pressed && styles.backButtonPressed,
-  ];
-}
 import { getProviderIcon } from "@/components/provider-icons";
 import {
-  buildModelRows,
   buildSelectedTriggerLabel,
-  matchesSearch,
-  resolveProviderLabel,
-  type SelectorModelRow,
-} from "./combined-model-selector.utils";
+  filterAndRankModelRows,
+  getAllProviderModelRows,
+  getProviderDefaultLabel,
+  getProviderModelRows,
+  resolveSelectedModelLabel,
+  type ProviderSelectionModelRow,
+  type ProviderSelectorProvider,
+} from "@/provider-selection/provider-selection";
 
 // TODO: this should be configured per provider in the provider manifest
 const PROVIDERS_WITH_MODEL_DESCRIPTIONS = new Set(["opencode", "pi"]);
@@ -70,13 +63,11 @@ type SelectorView =
   | { kind: "provider"; providerId: string; providerLabel: string };
 
 interface CombinedModelSelectorProps {
-  providerDefinitions: AgentProviderDefinition[];
-  allProviderModels: Map<string, AgentModelDefinition[]>;
+  providers: ProviderSelectorProvider[];
   selectedProvider: string;
   selectedModel: string;
   onSelect: (provider: AgentProvider, modelId: string) => void;
   isLoading: boolean;
-  canSelectProvider?: (provider: string) => boolean;
   favoriteKeys?: Set<string>;
   onToggleFavorite?: (provider: string, modelId: string) => void;
   renderTrigger?: (input: {
@@ -92,54 +83,26 @@ interface CombinedModelSelectorProps {
 
 interface SelectorContentProps {
   view: SelectorView;
-  providerDefinitions: AgentProviderDefinition[];
-  allProviderModels: Map<string, AgentModelDefinition[]>;
+  providers: ProviderSelectorProvider[];
   selectedProvider: string;
   selectedModel: string;
   searchQuery: string;
-  onSearchChange: (query: string) => void;
   favoriteKeys: Set<string>;
   onSelect: (provider: string, modelId: string) => void;
-  canSelectProvider: (provider: string) => boolean;
   onToggleFavorite?: (provider: string, modelId: string) => void;
   onDrillDown: (providerId: string, providerLabel: string) => void;
 }
 
-function resolveDefaultModelLabel(models: AgentModelDefinition[] | undefined): string {
-  if (!models || models.length === 0) {
-    return "Select model";
-  }
-  return (models.find((model) => model.isDefault) ?? models[0])?.label ?? "Select model";
-}
-
 function normalizeSearchQuery(value: string): string {
   return value.trim().toLowerCase();
 }
 
-function partitionRows(
-  rows: SelectorModelRow[],
-  favoriteKeys: Set<string>,
-): { favoriteRows: SelectorModelRow[]; regularRows: SelectorModelRow[] } {
-  const favoriteRows: SelectorModelRow[] = [];
-  const regularRows: SelectorModelRow[] = [];
-
-  for (const row of rows) {
-    if (favoriteKeys.has(row.favoriteKey)) {
-      favoriteRows.push(row);
-      continue;
-    }
-    regularRows.push(row);
-  }
-
-  return { favoriteRows, regularRows };
-}
-
 function sortFavoritesFirst(
-  rows: SelectorModelRow[],
+  rows: ProviderSelectionModelRow[],
   favoriteKeys: Set<string>,
-): SelectorModelRow[] {
-  const favorites: SelectorModelRow[] = [];
-  const rest: SelectorModelRow[] = [];
+): ProviderSelectionModelRow[] {
+  const favorites: ProviderSelectionModelRow[] = [];
+  const rest: ProviderSelectionModelRow[] = [];
   for (const row of rows) {
     if (favoriteKeys.has(row.favoriteKey)) {
       favorites.push(row);
@@ -150,44 +113,17 @@ function sortFavoritesFirst(
   return [...favorites, ...rest];
 }
 
-function groupRowsByProvider(
-  rows: SelectorModelRow[],
-): Array<{ providerId: string; providerLabel: string; rows: SelectorModelRow[] }> {
-  const grouped = new Map<
-    string,
-    { providerId: string; providerLabel: string; rows: SelectorModelRow[] }
-  >();
-
-  for (const row of rows) {
-    const existing = grouped.get(row.provider);
-    if (existing) {
-      existing.rows.push(row);
-      continue;
-    }
-
-    grouped.set(row.provider, {
-      providerId: row.provider,
-      providerLabel: row.providerLabel,
-      rows: [row],
-    });
-  }
-
-  return Array.from(grouped.values());
-}
-
 function ModelRow({
   row,
   isSelected,
   isFavorite,
-  disabled = false,
   elevated = false,
   onPress,
   onToggleFavorite,
 }: {
-  row: SelectorModelRow;
+  row: ProviderSelectionModelRow;
   isSelected: boolean;
   isFavorite: boolean;
-  disabled?: boolean;
   elevated?: boolean;
   onPress: () => void;
   onToggleFavorite?: (provider: string, modelId: string) => void;
@@ -209,7 +145,7 @@ function ModelRow({
   );
   const trailingSlot = useMemo(
     () =>
-      onToggleFavorite && !disabled ? (
+      onToggleFavorite ? (
         <Pressable
           onPress={handleToggleFavorite}
           hitSlop={8}
@@ -235,7 +171,6 @@ function ModelRow({
       ) : null,
     [
       onToggleFavorite,
-      disabled,
       handleToggleFavorite,
       isFavorite,
       row.provider,
@@ -253,7 +188,6 @@ function ModelRow({
       label={row.modelLabel}
       description={showDescription ? row.description : undefined}
       selected={isSelected}
-      disabled={disabled}
       elevated={elevated}
       onPress={onPress}
       leadingSlot={leadingSlot}
@@ -263,10 +197,9 @@ function ModelRow({
 }
 
 interface SelectableModelRowProps {
-  row: SelectorModelRow;
+  row: ProviderSelectionModelRow;
   isSelected: boolean;
   isFavorite: boolean;
-  disabled?: boolean;
   elevated?: boolean;
   onSelect: (provider: string, modelId: string) => void;
   onToggleFavorite?: (provider: string, modelId: string) => void;
@@ -276,7 +209,6 @@ function SelectableModelRow({
   row,
   isSelected,
   isFavorite,
-  disabled,
   elevated,
   onSelect,
   onToggleFavorite,
@@ -289,7 +221,6 @@ function SelectableModelRow({
       row={row}
       isSelected={isSelected}
       isFavorite={isFavorite}
-      disabled={disabled}
       elevated={elevated}
       onPress={handlePress}
       onToggleFavorite={onToggleFavorite}
@@ -303,19 +234,15 @@ function FavoritesSection({
   selectedModel,
   favoriteKeys,
   onSelect,
-  canSelectProvider,
   onToggleFavorite,
 }: {
-  favoriteRows: SelectorModelRow[];
+  favoriteRows: ProviderSelectionModelRow[];
   selectedProvider: string;
   selectedModel: string;
   favoriteKeys: Set<string>;
   onSelect: (provider: string, modelId: string) => void;
-  canSelectProvider: (provider: string) => boolean;
   onToggleFavorite?: (provider: string, modelId: string) => void;
 }) {
-  const { theme: _theme } = useUnistyles();
-
   if (favoriteRows.length === 0) {
     return null;
   }
@@ -331,7 +258,6 @@ function FavoritesSection({
           row={row}
           isSelected={row.provider === selectedProvider && row.modelId === selectedModel}
           isFavorite={favoriteKeys.has(row.favoriteKey)}
-          disabled={!canSelectProvider(row.provider)}
           elevated
           onSelect={onSelect}
           onToggleFavorite={onToggleFavorite}
@@ -345,85 +271,69 @@ interface GroupProviderButtonProps {
   providerId: string;
   providerLabel: string;
   rowCount: number;
+  defaultLabel: string | null;
   onDrillDown: (providerId: string, providerLabel: string) => void;
+  onSelectDefault: (providerId: string) => void;
 }
 
 function GroupProviderButton({
   providerId,
   providerLabel,
   rowCount,
+  defaultLabel,
   onDrillDown,
+  onSelectDefault,
 }: GroupProviderButtonProps) {
   const { theme } = useUnistyles();
   const ProvIcon = getProviderIcon(providerId);
   const handlePress = useCallback(() => {
+    if (defaultLabel) {
+      onSelectDefault(providerId);
+      return;
+    }
     onDrillDown(providerId, providerLabel);
-  }, [onDrillDown, providerId, providerLabel]);
+  }, [defaultLabel, onDrillDown, onSelectDefault, providerId, providerLabel]);
   return (
     <Pressable onPress={handlePress} style={drillDownRowStyle}>
       <ProvIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
       <Text style={styles.drillDownText}>{providerLabel}</Text>
       <View style={styles.drillDownTrailing}>
         <Text style={styles.drillDownCount}>
-          {rowCount} {rowCount === 1 ? "model" : "models"}
+          {defaultLabel ?? `${rowCount} ${rowCount === 1 ? "model" : "models"}`}
         </Text>
-        <ChevronRight size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+        {defaultLabel ? null : (
+          <ChevronRight size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+        )}
       </View>
     </Pressable>
   );
 }
 
 function GroupedProviderRows({
-  groupedRows,
-  selectedProvider,
-  selectedModel,
-  favoriteKeys,
-  onSelect,
-  canSelectProvider,
-  onToggleFavorite,
+  providers,
   onDrillDown,
-  viewKind,
+  onSelectDefault,
 }: {
-  groupedRows: Array<{ providerId: string; providerLabel: string; rows: SelectorModelRow[] }>;
-  selectedProvider: string;
-  selectedModel: string;
-  favoriteKeys: Set<string>;
-  onSelect: (provider: string, modelId: string) => void;
-  canSelectProvider: (provider: string) => boolean;
-  onToggleFavorite?: (provider: string, modelId: string) => void;
+  providers: ProviderSelectorProvider[];
   onDrillDown: (providerId: string, providerLabel: string) => void;
-  viewKind: SelectorView["kind"];
+  onSelectDefault: (providerId: string) => void;
 }) {
   return (
     <View>
-      {groupedRows.map((group, index) => {
-        const isInline = viewKind === "provider";
-
+      {providers.map((provider, index) => {
+        const rows = getProviderModelRows(provider);
+        const defaultLabel = getProviderDefaultLabel(provider);
         return (
-          <View key={group.providerId}>
+          <View key={provider.id}>
             {index > 0 ? <View style={styles.separator} /> : null}
-            {isInline ? (
-              <>
-                {sortFavoritesFirst(group.rows, favoriteKeys).map((row) => (
-                  <SelectableModelRow
-                    key={row.favoriteKey}
-                    row={row}
-                    isSelected={row.provider === selectedProvider && row.modelId === selectedModel}
-                    isFavorite={favoriteKeys.has(row.favoriteKey)}
-                    disabled={!canSelectProvider(row.provider)}
-                    onSelect={onSelect}
-                    onToggleFavorite={onToggleFavorite}
-                  />
-                ))}
-              </>
-            ) : (
-              <GroupProviderButton
-                providerId={group.providerId}
-                providerLabel={group.providerLabel}
-                rowCount={group.rows.length}
-                onDrillDown={onDrillDown}
-              />
-            )}
+            <GroupProviderButton
+              providerId={provider.id}
+              providerLabel={provider.label}
+              rowCount={rows.length}
+              defaultLabel={defaultLabel}
+              onDrillDown={onDrillDown}
+              onSelectDefault={onSelectDefault}
+            />
           </View>
         );
       })}
@@ -431,178 +341,202 @@ function GroupedProviderRows({
   );
 }
 
-function ProviderSearchInput({
-  value,
-  onChangeText,
-  autoFocus = false,
+function DefaultProviderRow({
+  providerId,
+  isSelected,
+  onSelect,
 }: {
-  value: string;
-  onChangeText: (text: string) => void;
-  autoFocus?: boolean;
+  providerId: string;
+  isSelected: boolean;
+  onSelect: (provider: string, modelId: string) => void;
 }) {
   const { theme } = useUnistyles();
-  const inputRef = useRef<TextInput>(null);
-  const isMobile = useIsCompactFormFactor();
-  const InputComponent = isMobile && isNative ? BottomSheetTextInput : TextInput;
-
-  useEffect(() => {
-    if (!autoFocus || !platformIsWeb || !inputRef.current) return () => {};
-    const timer = setTimeout(() => {
-      inputRef.current?.focus();
-    }, 50);
-    return () => clearTimeout(timer);
-  }, [autoFocus]);
-
-  const inputStyle = useMemo(
-    () => [styles.providerSearchInput, platformIsWeb && { outlineStyle: "none" }],
-    [],
+  const ProviderIcon = getProviderIcon(providerId);
+  const handlePress = useCallback(() => {
+    onSelect(providerId, "");
+  }, [onSelect, providerId]);
+  const leadingSlot = useMemo(
+    () => <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />,
+    [ProviderIcon, theme.iconSize.sm, theme.colors.foregroundMuted],
   );
 
   return (
-    <View style={styles.providerSearchContainer}>
-      <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-      <InputComponent
-        ref={inputRef as unknown as Ref<never>}
-        // @ts-expect-error - outlineStyle is web-only
-        style={inputStyle}
-        placeholder="Search models..."
-        placeholderTextColor={theme.colors.foregroundMuted}
-        value={value}
-        onChangeText={onChangeText}
-        autoCapitalize="none"
-        autoCorrect={false}
+    <ComboboxItem
+      label="Default"
+      selected={isSelected}
+      onPress={handlePress}
+      leadingSlot={leadingSlot}
+    />
+  );
+}
+
+function ProviderModelRows({
+  rows,
+  selectedProvider,
+  selectedModel,
+  favoriteKeys,
+  onSelect,
+  onToggleFavorite,
+  normalizedQuery,
+}: {
+  rows: ProviderSelectionModelRow[];
+  selectedProvider: string;
+  selectedModel: string;
+  favoriteKeys: Set<string>;
+  onSelect: (provider: string, modelId: string) => void;
+  onToggleFavorite?: (provider: string, modelId: string) => void;
+  normalizedQuery: string;
+}) {
+  const isMobile = useIsCompactFormFactor();
+  const useVirtualizedList = isMobile && isNative;
+  const displayRows = useMemo(
+    () => (normalizedQuery ? rows : sortFavoritesFirst(rows, favoriteKeys)),
+    [favoriteKeys, normalizedQuery, rows],
+  );
+  const renderItem = useCallback(
+    ({ item }: { item: ProviderSelectionModelRow }) => (
+      <SelectableModelRow
+        row={item}
+        isSelected={item.provider === selectedProvider && item.modelId === selectedModel}
+        isFavorite={favoriteKeys.has(item.favoriteKey)}
+        onSelect={onSelect}
+        onToggleFavorite={onToggleFavorite}
       />
+    ),
+    [favoriteKeys, onSelect, onToggleFavorite, selectedModel, selectedProvider],
+  );
+  const keyExtractor = useCallback((row: ProviderSelectionModelRow) => row.favoriteKey, []);
+
+  if (useVirtualizedList) {
+    return (
+      <BottomSheetFlatList
+        data={displayRows}
+        renderItem={renderItem}
+        keyExtractor={keyExtractor}
+        style={styles.virtualizedModelList}
+        keyboardShouldPersistTaps="handled"
+        showsVerticalScrollIndicator={false}
+        contentContainerStyle={styles.virtualizedModelListContent}
+      />
+    );
+  }
+
+  return (
+    <View>
+      {displayRows.map((row) => (
+        <View key={row.favoriteKey}>{renderItem({ item: row })}</View>
+      ))}
     </View>
   );
 }
 
 function SelectorContent({
   view,
-  providerDefinitions,
-  allProviderModels,
+  providers,
   selectedProvider,
   selectedModel,
   searchQuery,
-  onSearchChange: _onSearchChange,
   favoriteKeys,
   onSelect,
-  canSelectProvider,
   onToggleFavorite,
   onDrillDown,
 }: SelectorContentProps) {
   const { theme } = useUnistyles();
-  const allRows = useMemo(
-    () => buildModelRows(providerDefinitions, allProviderModels),
-    [allProviderModels, providerDefinitions],
-  );
-
-  const scopedRows = useMemo(() => {
-    if (view.kind === "provider") {
-      return allRows.filter((row) => row.provider === view.providerId);
-    }
-    return allRows;
-  }, [allRows, view]);
-
   const normalizedQuery = useMemo(() => normalizeSearchQuery(searchQuery), [searchQuery]);
-
+  const selectedViewProvider = useMemo(
+    () =>
+      view.kind === "provider"
+        ? providers.find((provider) => provider.id === view.providerId)
+        : null,
+    [providers, view],
+  );
   const visibleRows = useMemo(
-    () => scopedRows.filter((row) => matchesSearch(row, normalizedQuery)),
-    [normalizedQuery, scopedRows],
+    () =>
+      selectedViewProvider
+        ? filterAndRankModelRows(getProviderModelRows(selectedViewProvider), normalizedQuery)
+        : [],
+    [normalizedQuery, selectedViewProvider],
+  );
+  const favoriteRows = useMemo(
+    () => getAllProviderModelRows(providers).filter((row) => favoriteKeys.has(row.favoriteKey)),
+    [favoriteKeys, providers],
+  );
+  const handleSelectDefaultProvider = useCallback(
+    (providerId: string) => {
+      onSelect(providerId, "");
+    },
+    [onSelect],
+  );
+  const hasResults = favoriteRows.length > 0 || providers.length > 0;
+  const emptyState = (
+    <View style={styles.emptyState}>
+      <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+      <Text style={styles.emptyStateText}>No models match your search</Text>
+    </View>
   );
 
-  const { favoriteRows, regularRows: _regularRows } = useMemo(
-    () => partitionRows(visibleRows, favoriteKeys),
-    [favoriteKeys, visibleRows],
-  );
-
-  // Group ALL visible rows by provider — favorites are a cross-cutting view,
-  // not a partition. A model being favorited doesn't remove it from its provider.
-  const allGroupedRows = useMemo(() => groupRowsByProvider(visibleRows), [visibleRows]);
-
-  // When searching at Level 1, filter grouped rows to only providers whose name or models match
-  const filteredGroupedRows = useMemo(() => {
-    if (view.kind === "provider" || !normalizedQuery) {
-      return allGroupedRows;
+  if (view.kind === "provider") {
+    if (!selectedViewProvider) {
+      return emptyState;
     }
-    return allGroupedRows.filter(
-      (group) =>
-        group.providerLabel.toLowerCase().includes(normalizedQuery) || group.rows.length > 0,
-    );
-  }, [allGroupedRows, normalizedQuery, view.kind]);
 
-  const hasResults = favoriteRows.length > 0 || filteredGroupedRows.length > 0;
+    if (getProviderDefaultLabel(selectedViewProvider) && !normalizedQuery) {
+      return (
+        <DefaultProviderRow
+          providerId={view.providerId}
+          isSelected={view.providerId === selectedProvider && !selectedModel}
+          onSelect={onSelect}
+        />
+      );
+    }
+
+    if (visibleRows.length === 0) {
+      return emptyState;
+    }
+
+    return (
+      <ProviderModelRows
+        rows={visibleRows}
+        selectedProvider={selectedProvider}
+        selectedModel={selectedModel}
+        favoriteKeys={favoriteKeys}
+        onSelect={onSelect}
+        onToggleFavorite={onToggleFavorite}
+        normalizedQuery={normalizedQuery}
+      />
+    );
+  }
 
   return (
     <View>
-      {view.kind === "all" ? (
-        <FavoritesSection
-          favoriteRows={favoriteRows}
-          selectedProvider={selectedProvider}
-          selectedModel={selectedModel}
-          favoriteKeys={favoriteKeys}
-          onSelect={onSelect}
-          canSelectProvider={canSelectProvider}
-          onToggleFavorite={onToggleFavorite}
-        />
-      ) : null}
+      <FavoritesSection
+        favoriteRows={favoriteRows}
+        selectedProvider={selectedProvider}
+        selectedModel={selectedModel}
+        favoriteKeys={favoriteKeys}
+        onSelect={onSelect}
+        onToggleFavorite={onToggleFavorite}
+      />
 
-      {filteredGroupedRows.length > 0 ? (
+      {providers.length > 0 ? (
         <GroupedProviderRows
-          groupedRows={filteredGroupedRows}
-          selectedProvider={selectedProvider}
-          selectedModel={selectedModel}
-          favoriteKeys={favoriteKeys}
-          onSelect={onSelect}
-          canSelectProvider={canSelectProvider}
-          onToggleFavorite={onToggleFavorite}
+          providers={providers}
           onDrillDown={onDrillDown}
-          viewKind={view.kind}
+          onSelectDefault={handleSelectDefaultProvider}
         />
       ) : null}
 
-      {!hasResults ? (
-        <View style={styles.emptyState}>
-          <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-          <Text style={styles.emptyStateText}>No models match your search</Text>
-        </View>
-      ) : null}
+      {!hasResults ? emptyState : null}
     </View>
   );
 }
 
-function ProviderBackButton({
-  providerId,
-  providerLabel,
-  onBack,
-}: {
-  providerId: string;
-  providerLabel: string;
-  onBack?: () => void;
-}) {
-  const { theme } = useUnistyles();
-  const ProviderIcon = getProviderIcon(providerId);
-
-  if (!onBack) {
-    return null;
-  }
-
-  return (
-    <Pressable onPress={onBack} style={backButtonStyle}>
-      <ArrowLeft size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-      <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-      <Text style={styles.backButtonText}>{providerLabel}</Text>
-    </Pressable>
-  );
-}
-
 export function CombinedModelSelector({
-  providerDefinitions,
-  allProviderModels,
+  providers,
   selectedProvider,
   selectedModel,
   onSelect,
   isLoading,
-  canSelectProvider = () => true,
   favoriteKeys = new Set<string>(),
   onToggleFavorite,
   renderTrigger,
@@ -616,27 +550,28 @@ export function CombinedModelSelector({
   const [isContentReady, setIsContentReady] = useState(platformIsWeb);
   const [view, setView] = useState<SelectorView>({ kind: "all" });
   const [searchQuery, setSearchQuery] = useState("");
+  const [searchResetKey, bumpSearchResetKey] = useReducer((key: number) => key + 1, 0);
 
-  // Single-provider mode: only one provider with models → skip Level 1 entirely
+  // Single-provider mode: only one provider → skip Level 1 entirely
   const singleProviderView = useMemo<SelectorView | null>(() => {
-    const providers = Array.from(allProviderModels.keys());
     if (providers.length !== 1) return null;
-    const providerId = providers[0];
-    const label = resolveProviderLabel(providerDefinitions, providerId);
-    return { kind: "provider", providerId, providerLabel: label };
-  }, [allProviderModels, providerDefinitions]);
+    const provider = providers[0];
+    if (!provider) return null;
+    return { kind: "provider", providerId: provider.id, providerLabel: provider.label };
+  }, [providers]);
 
   const computeInitialView = useCallback((): SelectorView => {
     if (singleProviderView) return singleProviderView;
 
     const selectedFavoriteKey = `${selectedProvider}:${selectedModel}`;
     if (selectedProvider && selectedModel && !favoriteKeys.has(selectedFavoriteKey)) {
-      const label = resolveProviderLabel(providerDefinitions, selectedProvider);
-      return { kind: "provider", providerId: selectedProvider, providerLabel: label };
+      const provider = providers.find((entry) => entry.id === selectedProvider);
+      if (provider)
+        return { kind: "provider", providerId: provider.id, providerLabel: provider.label };
     }
 
     return { kind: "all" };
-  }, [singleProviderView, selectedProvider, selectedModel, favoriteKeys, providerDefinitions]);
+  }, [singleProviderView, selectedProvider, selectedModel, favoriteKeys, providers]);
 
   const handleOpenChange = useCallback(
     (open: boolean) => {
@@ -646,6 +581,7 @@ export function CombinedModelSelector({
         onOpen?.();
       } else {
         setSearchQuery("");
+        bumpSearchResetKey();
         onClose?.();
       }
     },
@@ -657,6 +593,7 @@ export function CombinedModelSelector({
       onSelect(provider, modelId);
       setIsOpen(false);
       setSearchQuery("");
+      bumpSearchResetKey();
     },
     [onSelect],
   );
@@ -665,28 +602,22 @@ export function CombinedModelSelector({
   const ProviderIcon = hasSelectedProvider ? getProviderIcon(selectedProvider) : null;
 
   const selectedModelLabel = useMemo(() => {
-    if (!selectedModel) {
-      if (!hasSelectedProvider) {
-        return "Select model";
-      }
-      return isLoading ? "Loading..." : "Select model";
-    }
-    const models = allProviderModels.get(selectedProvider);
-    if (!models) {
-      return isLoading ? "Loading..." : "Select model";
-    }
-    const model = models.find((entry) => entry.id === selectedModel);
-    return model?.label ?? resolveDefaultModelLabel(models);
-  }, [allProviderModels, hasSelectedProvider, isLoading, selectedModel, selectedProvider]);
+    return resolveSelectedModelLabel({
+      providers,
+      selectedProvider,
+      selectedModel,
+      isLoading,
+    });
+  }, [isLoading, providers, selectedModel, selectedProvider]);
 
   const desktopFixedHeight = useMemo(() => {
     if (view.kind !== "provider") {
       return undefined;
     }
-    const models = allProviderModels.get(view.providerId);
-    const modelCount = models?.length ?? 0;
+    const provider = providers.find((entry) => entry.id === view.providerId);
+    const modelCount = provider ? getProviderModelRows(provider).length : 0;
     return Math.min(80 + modelCount * 40, 400);
-  }, [allProviderModels, view]);
+  }, [providers, view]);
 
   const triggerLabel = useMemo(() => {
     if (selectedModelLabel === "Loading..." || selectedModelLabel === "Select model") {
@@ -731,32 +662,48 @@ export function CombinedModelSelector({
   const handleBackToAll = useCallback(() => {
     setView({ kind: "all" });
     setSearchQuery("");
+    bumpSearchResetKey();
   }, []);
 
   const handleDrillDown = useCallback((providerId: string, providerLabel: string) => {
     setView({ kind: "provider", providerId, providerLabel });
   }, []);
 
-  const stickyHeader = useMemo(
-    () =>
-      view.kind === "provider" ? (
-        <View style={styles.level2Header}>
-          {!singleProviderView ? (
-            <ProviderBackButton
-              providerId={view.providerId}
-              providerLabel={view.providerLabel}
-              onBack={handleBackToAll}
-            />
-          ) : null}
-          <ProviderSearchInput
-            value={searchQuery}
-            onChangeText={setSearchQuery}
-            autoFocus={platformIsWeb}
-          />
-        </View>
+  const handleSearchQueryChange = useCallback((value: string) => {
+    setSearchQuery(value);
+  }, []);
+
+  const sheetHeader = useMemo<SheetHeader>(() => {
+    if (view.kind === "all") {
+      return { title: "Select provider" };
+    }
+    const ProviderIconForView = getProviderIcon(view.providerId);
+    return {
+      title: view.providerLabel,
+      leading: ProviderIconForView ? (
+        <ProviderIconForView size={theme.iconSize.md} color={theme.colors.foreground} />
       ) : undefined,
-    [view, singleProviderView, handleBackToAll, searchQuery],
-  );
+      back: singleProviderView ? undefined : { onPress: handleBackToAll },
+      search: {
+        value: searchQuery,
+        onChange: handleSearchQueryChange,
+        initialValue: searchQuery,
+        resetKey: `${view.providerId}:${searchResetKey}`,
+        placeholder: "Search models...",
+        autoFocus: platformIsWeb,
+        testID: "model-search-input",
+      },
+    };
+  }, [
+    view,
+    singleProviderView,
+    handleBackToAll,
+    handleSearchQueryChange,
+    searchQuery,
+    searchResetKey,
+    theme.iconSize.md,
+    theme.colors.foreground,
+  ]);
 
   return (
     <>
@@ -799,21 +746,18 @@ export function CombinedModelSelector({
         desktopPlacement="top-start"
         desktopMinWidth={360}
         desktopFixedHeight={desktopFixedHeight}
-        title="Select model"
-        stickyHeader={stickyHeader}
+        header={sheetHeader}
+        mobileChildrenScrollEnabled={view.kind !== "provider" || !isNative}
       >
         {isContentReady ? (
           <SelectorContent
             view={view}
-            providerDefinitions={providerDefinitions}
-            allProviderModels={allProviderModels}
+            providers={providers}
             selectedProvider={selectedProvider}
             selectedModel={selectedModel}
             searchQuery={searchQuery}
-            onSearchChange={setSearchQuery}
             favoriteKeys={favoriteKeys}
             onSelect={handleSelect}
-            canSelectProvider={canSelectProvider}
             onToggleFavorite={onToggleFavorite}
             onDrillDown={handleDrillDown}
           />
@@ -913,27 +857,6 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.xs,
     color: theme.colors.foregroundMuted,
   },
-  level2Header: {},
-  backButton: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingHorizontal: theme.spacing[3],
-    paddingVertical: theme.spacing[2],
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.border,
-    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
-  },
-  backButtonHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  backButtonPressed: {
-    backgroundColor: theme.colors.surface2,
-  },
-  backButtonText: {
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foregroundMuted,
-  },
   emptyState: {
     paddingVertical: theme.spacing[4],
     alignItems: "center",
@@ -943,6 +866,14 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.sm,
     color: theme.colors.foregroundMuted,
   },
+  virtualizedModelList: {
+    flex: 1,
+  },
+  virtualizedModelListContent: {
+    paddingHorizontal: theme.spacing[2],
+    paddingTop: theme.spacing[1],
+    paddingBottom: theme.spacing[8],
+  },
   favoriteButton: {
     width: 24,
     height: 24,
@@ -966,17 +897,4 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
   },
-  providerSearchContainer: {
-    flexDirection: "row",
-    alignItems: "center",
-    paddingHorizontal: theme.spacing[3],
-    gap: theme.spacing[2],
-    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
-  },
-  providerSearchInput: {
-    flex: 1,
-    paddingVertical: theme.spacing[3],
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-  },
 }));

packages/app/src/components/combined-model-selector.utils.ts

@@ -1,57 +0,0 @@
-import type { AgentModelDefinition } from "@server/server/agent/agent-sdk-types";
-import type { AgentProviderDefinition } from "@server/server/agent/provider-manifest";
-import { buildFavoriteModelKey, type FavoriteModelRow } from "@/hooks/use-form-preferences";
-
-export type SelectorModelRow = FavoriteModelRow;
-
-export function resolveProviderLabel(
-  providerDefinitions: AgentProviderDefinition[],
-  providerId: string,
-): string {
-  return (
-    providerDefinitions.find((definition) => definition.id === providerId)?.label ?? providerId
-  );
-}
-
-export function buildSelectedTriggerLabel(modelLabel: string): string {
-  return modelLabel;
-}
-
-export function buildModelRows(
-  providerDefinitions: AgentProviderDefinition[],
-  allProviderModels: Map<string, AgentModelDefinition[]>,
-): SelectorModelRow[] {
-  const providerLabelMap = new Map(
-    providerDefinitions.map((definition) => [definition.id, definition.label]),
-  );
-  const rows: SelectorModelRow[] = [];
-
-  for (const definition of providerDefinitions) {
-    const providerLabel = providerLabelMap.get(definition.id) ?? definition.label;
-    for (const model of allProviderModels.get(definition.id) ?? []) {
-      rows.push({
-        favoriteKey: buildFavoriteModelKey({ provider: definition.id, modelId: model.id }),
-        provider: definition.id,
-        providerLabel,
-        modelId: model.id,
-        modelLabel: model.label,
-        description: model.description,
-      });
-    }
-  }
-
-  return rows;
-}
-
-export function matchesSearch(row: SelectorModelRow, normalizedQuery: string): boolean {
-  if (!normalizedQuery) {
-    return true;
-  }
-
-  const haystack = [row.modelLabel, row.modelId, row.providerLabel, row.description ?? ""]
-    .join(" ")
-    .toLowerCase();
-
-  const tokens = normalizedQuery.split(/\s+/).filter((token) => token.length > 0);
-  return tokens.every((token) => haystack.includes(token));
-}

packages/app/src/components/command-center.tsx

@@ -8,7 +8,7 @@ import {
   type PressableStateCallbackType,
 } from "react-native";
 import { memo, useCallback, useEffect, useMemo, useRef, type ReactNode } from "react";
-import { Plus, Settings } from "lucide-react-native";
+import { Home, Plus, Settings } from "lucide-react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useCommandCenter } from "@/hooks/use-command-center";
 import type { AggregatedAgent } from "@/hooks/use-aggregated-agents";
@@ -106,6 +106,8 @@ function CommandCenterActionRow({
     actionIcon = <Plus size={16} strokeWidth={2.4} color={theme.colors.foregroundMuted} />;
   } else if (action.icon === "settings") {
     actionIcon = <Settings size={16} strokeWidth={2.2} color={theme.colors.foregroundMuted} />;
+  } else if (action.icon === "home") {
+    actionIcon = <Home size={16} strokeWidth={2.2} color={theme.colors.foregroundMuted} />;
   }
   const titleStyle = useMemo(
     () => [styles.title, { color: theme.colors.foreground }],

packages/app/src/components/composer.status-controls.test.ts

@@ -19,7 +19,7 @@ describe("resolveStatusControlMode", () => {
         selectedModel: "",
         onSelectModel: () => undefined,
         isModelLoading: false,
-        allProviderModels: new Map(),
+        modelSelectorProviders: [],
         isAllModelsLoading: false,
         onSelectProviderAndModel: () => undefined,
         thinkingOptions: [],

packages/app/src/components/composer.tsx

@@ -463,7 +463,7 @@ function QueuedMessageRow({ item, onEdit, onSendNow }: QueuedMessageRowProps) {
           accessibilityLabel="Send queued message now"
           accessibilityRole="button"
         >
-          <ArrowUp size={ICON_SIZE.sm} color="white" />
+          <ThemedArrowUp size={ICON_SIZE.sm} uniProps={iconAccentForegroundMapping} />
         </Pressable>
       </View>
     </View>
@@ -741,6 +741,7 @@ interface ComposerRightControlsSlotProps extends ComposerVoiceModeButtonProps {
   isAgentRunning: boolean;
   hasSendableContent: boolean;
   isProcessing: boolean;
+  isCompact: boolean;
   cancelButton: ReactElement;
 }
 
@@ -750,10 +751,13 @@ function ComposerRightControlsSlot({
   isAgentRunning,
   hasSendableContent,
   isProcessing,
+  isCompact,
   cancelButton,
   ...voiceProps
 }: ComposerRightControlsSlotProps) {
-  const showVoiceModeButton = !isVoiceModeForAgent && hasAgent;
+  const hideVoiceForCompactInput = isCompact && hasSendableContent;
+  const showVoiceModeButton =
+    !isVoiceModeForAgent && hasAgent && !isAgentRunning && !hideVoiceForCompactInput;
   const shouldShowCancelButton = isAgentRunning && !hasSendableContent && !isProcessing;
   if (!showVoiceModeButton && !shouldShowCancelButton) return null;
   return (
@@ -1401,6 +1405,7 @@ export function Composer({
         isAgentRunning={isAgentRunning}
         hasSendableContent={hasSendableContent}
         isProcessing={isProcessing}
+        isCompact={isMobile}
         buttonIconSize={buttonIconSize}
         handleToggleRealtimeVoice={handleToggleRealtimeVoice}
         isConnected={isConnected}
@@ -1418,6 +1423,7 @@ export function Composer({
       hasSendableContent,
       isAgentRunning,
       isConnected,
+      isMobile,
       isProcessing,
       isVoiceModeForAgent,
       isVoiceSwitching,
@@ -1841,6 +1847,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
 const QUEUE_SEND_BUTTON_STYLE = [styles.queueActionButton, styles.queueSendButton];
 
 const ThemedPencil = withUnistyles(Pencil);
+const ThemedArrowUp = withUnistyles(ArrowUp);
 const ThemedGitPullRequest = withUnistyles(GitPullRequest);
 const ThemedCircleDot = withUnistyles(CircleDot);
 const ThemedAudioLines = withUnistyles(AudioLines);
@@ -1849,3 +1856,4 @@ const ThemedGithub = withUnistyles(Github);
 
 const iconForegroundMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const iconForegroundMutedMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const iconAccentForegroundMapping = (theme: Theme) => ({ color: theme.colors.accentForeground });

packages/app/src/components/dictation-controls.tsx

@@ -166,16 +166,16 @@ export function DictationOverlay({
     [actionsDisabled, isFailed],
   );
   const overlayTimerTextStyle = useMemo(
-    () => [overlayStyles.timerText, { color: theme.colors.palette.white }],
-    [theme.colors.palette.white],
+    () => [overlayStyles.timerText, { color: theme.colors.accentForeground }],
+    [theme.colors.accentForeground],
   );
   const overlayTranscriptTextStyle = useMemo(
-    () => [overlayStyles.transcriptText, { color: theme.colors.palette.white, opacity: 0.95 }],
-    [theme.colors.palette.white],
+    () => [overlayStyles.transcriptText, { color: theme.colors.accentForeground, opacity: 0.95 }],
+    [theme.colors.accentForeground],
   );
   const overlayRetryButtonStyle = useMemo(
-    () => [overlayStyles.actionButton, { backgroundColor: theme.colors.palette.white }],
-    [theme.colors.palette.white],
+    () => [overlayStyles.actionButton, { backgroundColor: theme.colors.accentForeground }],
+    [theme.colors.accentForeground],
   );
   const overlayConfirmButtonStyle = overlayRetryButtonStyle;
 
@@ -192,7 +192,7 @@ export function DictationOverlay({
         accessibilityLabel="Cancel dictation"
         style={overlayCancelButtonStyle}
       >
-        <X size={theme.iconSize.lg} color={theme.colors.palette.white} strokeWidth={2.5} />
+        <X size={theme.iconSize.lg} color={theme.colors.accentForeground} strokeWidth={2.5} />
       </Pressable>
 
       <View style={overlayStyles.centerContainer}>
@@ -202,7 +202,7 @@ export function DictationOverlay({
             isMuted={false}
             isSpeaking={false}
             orientation="horizontal"
-            color={theme.colors.palette.white}
+            color={theme.colors.accentForeground}
           />
           <Text style={overlayTimerTextStyle}>{formatDuration(duration)}</Text>
         </View>
@@ -216,7 +216,7 @@ export function DictationOverlay({
       <View style={overlayStyles.actionButtonsContainer}>
         {actionsDisabled ? (
           <View style={overlayStyles.loadingContainer}>
-            <ActivityIndicator size="small" color={theme.colors.palette.white} />
+            <ActivityIndicator size="small" color={theme.colors.accentForeground} />
           </View>
         ) : null}
         {!actionsDisabled && isFailed ? (
@@ -239,7 +239,7 @@ export function DictationOverlay({
             >
               <Pencil
                 size={theme.iconSize.lg}
-                color={theme.colors.palette.white}
+                color={theme.colors.accentForeground}
                 strokeWidth={2.5}
               />
             </Pressable>

packages/app/src/components/diff-viewer.tsx

@@ -5,6 +5,7 @@ import { StyleSheet } from "react-native-unistyles";
 import { Fonts } from "@/constants/theme";
 import type { DiffLine } from "@/utils/tool-call-parsers";
 import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { getCodeInsets } from "./code-insets";
 import { isWeb } from "@/constants/platform";
 
@@ -95,20 +96,27 @@ export function DiffViewer({
   const outerScrollStyle = React.useMemo(
     () => [
       styles.verticalScroll,
-      maxHeight !== undefined && { maxHeight },
+      maxHeight !== undefined && inlineUnistylesStyle({ maxHeight }),
       fillAvailableHeight && styles.fillHeight,
       webScrollbarStyle,
     ],
     [maxHeight, fillAvailableHeight, webScrollbarStyle],
   );
   const linesContainerStyle = React.useMemo(
-    () => [styles.linesContainer, scrollViewWidth > 0 && { minWidth: scrollViewWidth }],
+    () => [
+      styles.linesContainer,
+      scrollViewWidth > 0 && inlineUnistylesStyle({ minWidth: scrollViewWidth }),
+    ],
     [scrollViewWidth],
   );
   const keyedDiffLines = React.useMemo(
     () => diffLines.map((line, index) => ({ key: `${index}-${line.type}-${line.content}`, line })),
     [diffLines],
   );
+  const webVerticalContentStyle = React.useMemo(
+    () => [styles.verticalContent, fillAvailableHeight && styles.fillHeight],
+    [fillAvailableHeight],
+  );
 
   if (!diffLines.length) {
     return (
@@ -118,29 +126,39 @@ export function DiffViewer({
     );
   }
 
-  return (
+  const lines = (
+    <View style={linesContainerStyle}>
+      {keyedDiffLines.map(({ key, line }) => (
+        <DiffLineRow key={key} line={line} />
+      ))}
+    </View>
+  );
+
+  const horizontalScroll = (
+    <ScrollView
+      horizontal
+      nestedScrollEnabled
+      showsHorizontalScrollIndicator
+      style={webScrollbarStyle}
+      contentContainerStyle={styles.horizontalContent}
+      onLayout={handleInnerLayout}
+    >
+      {lines}
+    </ScrollView>
+  );
+
+  const content = (
     <ScrollView
       style={outerScrollStyle}
-      contentContainerStyle={styles.verticalContent}
+      contentContainerStyle={webVerticalContentStyle}
       nestedScrollEnabled
       showsVerticalScrollIndicator
     >
-      <ScrollView
-        horizontal
-        nestedScrollEnabled
-        showsHorizontalScrollIndicator
-        style={webScrollbarStyle}
-        contentContainerStyle={styles.horizontalContent}
-        onLayout={handleInnerLayout}
-      >
-        <View style={linesContainerStyle}>
-          {keyedDiffLines.map(({ key, line }) => (
-            <DiffLineRow key={key} line={line} />
-          ))}
-        </View>
-      </ScrollView>
+      {horizontalScroll}
     </ScrollView>
   );
+
+  return content;
 }
 
 const styles = StyleSheet.create((theme) => {

packages/app/src/components/file-pane.tsx

@@ -17,6 +17,7 @@ import { useWebScrollViewScrollbar } from "@/components/use-web-scrollbar";
 import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
 import { highlightCode, type HighlightToken } from "@getpaseo/highlight";
 import { syntaxTokenStyleFor } from "@/styles/syntax-token-styles";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { lineNumberGutterWidth } from "@/components/code-insets";
 import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
 import { isWeb } from "@/constants/platform";
@@ -120,7 +121,10 @@ const CodeLine = React.memo(function CodeLine({
   gutterWidth,
   highlighted,
 }: CodeLineProps) {
-  const gutterStyle = useMemo(() => [codeLineStyles.gutter, { width: gutterWidth }], [gutterWidth]);
+  const gutterStyle = useMemo(
+    () => [codeLineStyles.gutter, inlineUnistylesStyle({ width: gutterWidth })],
+    [gutterWidth],
+  );
   const lineStyle = useMemo(
     () => [codeLineStyles.line, highlighted && codeLineStyles.highlightedLine],
     [highlighted],

packages/app/src/components/import-session-sheet.test.tsx

@@ -7,7 +7,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import type { DaemonClient, FetchRecentProviderSessionEntry } from "@server/client/daemon-client";
 import type { ProviderSnapshotEntry } from "@server/server/agent/agent-sdk-types";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { WorkspaceImportSheet } from "@/screens/workspace/workspace-import-sheet";
+import { ImportSessionSheet } from "@/components/import-session-sheet";
 
 const { theme } = vi.hoisted(() => ({
   theme: {
@@ -61,9 +61,21 @@ vi.mock("@/components/provider-icons", () => ({
   getProviderIcon: () => () => null,
 }));
 
+vi.mock("lucide-react-native", () => {
+  const icon = (name: string) => {
+    const Icon = () => React.createElement("span", { "data-icon": name });
+    Icon.displayName = name;
+    return Icon;
+  };
+  return {
+    Inbox: icon("Inbox"),
+    RotateCw: icon("RotateCw"),
+  };
+});
+
 vi.mock("@/components/ui/loading-spinner", () => ({
   LoadingSpinner: () =>
-    React.createElement("span", { "data-testid": "workspace-import-loading-spinner" }),
+    React.createElement("span", { "data-testid": "import-session-loading-spinner" }),
 }));
 
 vi.mock("@/components/ui/segmented-control", () => ({
@@ -100,18 +112,19 @@ vi.mock("@/components/ui/segmented-control", () => ({
 vi.mock("@/components/adaptive-modal-sheet", () => ({
   AdaptiveModalSheet: ({
     visible,
-    title,
+    header,
     children,
     testID,
   }: {
     visible: boolean;
-    title: string;
+    header?: { title: string; actions?: ReactNode };
     children: ReactNode;
     testID?: string;
   }) =>
     visible ? (
       <section data-testid={testID}>
-        <h1>{title}</h1>
+        <h1>{header?.title}</h1>
+        {header?.actions}
         {children}
       </section>
     ) : null,
@@ -146,6 +159,8 @@ interface RenderOptions {
   visible?: boolean;
   onClose?: () => void;
   onImportedAgent?: (agentId: string) => void;
+  onImported?: (agent: Awaited<ReturnType<DaemonClient["importAgent"]>>) => void;
+  cwd?: string | null;
   snapshot?: {
     entries?: ProviderSnapshotEntry[];
     supportsSnapshot?: boolean;
@@ -168,15 +183,18 @@ function renderSheet(
     },
   });
 
+  const cwd = options && "cwd" in options ? (options.cwd ?? undefined) : "/repo/paseo";
+
   return render(
     <QueryClientProvider client={queryClient}>
-      <WorkspaceImportSheet
+      <ImportSessionSheet
         visible={options?.visible ?? true}
         client={client}
         serverId="server-1"
-        workspaceDirectory="/repo/paseo"
+        cwd={cwd}
         onClose={options?.onClose ?? vi.fn()}
         onImportedAgent={options?.onImportedAgent ?? vi.fn()}
+        onImported={options?.onImported}
       />
     </QueryClientProvider>,
   );
@@ -254,7 +272,7 @@ function createSnapshotEntry(
   };
 }
 
-describe("WorkspaceImportSheet", () => {
+describe("ImportSessionSheet", () => {
   afterEach(() => {
     cleanup();
     vi.clearAllMocks();
@@ -420,11 +438,11 @@ describe("WorkspaceImportSheet", () => {
     function TestSheet({ visible }: { visible: boolean }) {
       return (
         <QueryClientProvider client={queryClient}>
-          <WorkspaceImportSheet
+          <ImportSessionSheet
             visible={visible}
             client={client}
             serverId="server-1"
-            workspaceDirectory="/repo/paseo"
+            cwd="/repo/paseo"
             onClose={vi.fn()}
             onImportedAgent={vi.fn()}
           />
@@ -472,7 +490,7 @@ describe("WorkspaceImportSheet", () => {
       },
     );
 
-    fireEvent.click(await screen.findByTestId("workspace-import-session-claude-provider-thread-1"));
+    fireEvent.click(await screen.findByTestId("import-session-session-claude-provider-thread-1"));
 
     await waitFor(() => {
       expect(importAgent).toHaveBeenCalledWith({
@@ -508,7 +526,7 @@ describe("WorkspaceImportSheet", () => {
       },
     );
 
-    fireEvent.click(await screen.findByTestId("workspace-import-session-claude-provider-thread-1"));
+    fireEvent.click(await screen.findByTestId("import-session-session-claude-provider-thread-1"));
 
     await screen.findByText("Could not import selected session.");
     expect(importAgent).toHaveBeenCalledWith({
@@ -654,12 +672,12 @@ describe("WorkspaceImportSheet", () => {
     await screen.findByText("Session claude");
     await screen.findByText("Session codex");
 
-    fireEvent.click(screen.getByTestId("workspace-import-filter-codex"));
+    fireEvent.click(screen.getByTestId("import-session-filter-codex"));
 
     screen.getByText("Session codex");
     expect(screen.queryByText("Session claude")).toBeNull();
 
-    fireEvent.click(screen.getByTestId("workspace-import-filter-all"));
+    fireEvent.click(screen.getByTestId("import-session-filter-all"));
 
     screen.getByText("Session claude");
     screen.getByText("Session codex");
@@ -691,8 +709,8 @@ describe("WorkspaceImportSheet", () => {
     await waitFor(() => {
       expect(fetchRecentProviderSessions).toHaveBeenCalled();
     });
-    expect(screen.queryByTestId("workspace-import-filters")).toBeNull();
-    expect(screen.queryByTestId("workspace-import-filter-all")).toBeNull();
+    expect(screen.queryByTestId("import-session-filters")).toBeNull();
+    expect(screen.queryByTestId("import-session-filter-all")).toBeNull();
   });
 
   it("shows a no-importable-providers message when snapshot has no enabled importable providers", async () => {
@@ -720,4 +738,119 @@ describe("WorkspaceImportSheet", () => {
     await screen.findByText("No importable providers are enabled.");
     expect(fetchRecentProviderSessions).not.toHaveBeenCalled();
   });
+
+  it("omits cwd from fetch and renders the session cwd on each row when cwd is unset", async () => {
+    const fetchRecentProviderSessions = vi.fn(async () => ({
+      requestId: "recent-provider-sessions",
+      entries: [
+        createProviderSessionEntry({
+          providerId: "claude",
+          providerLabel: "Claude Code",
+          cwd: "/home/me/work/other-project",
+          title: "Cross-project session",
+        }),
+      ],
+    }));
+    const importAgent = vi.fn();
+
+    renderSheet(
+      { fetchRecentProviderSessions, importAgent } as Pick<
+        DaemonClient,
+        "fetchRecentProviderSessions" | "importAgent"
+      >,
+      {
+        cwd: null,
+        snapshot: { supportsSnapshot: true, entries: [createSnapshotEntry("claude")] },
+      },
+    );
+
+    await waitFor(() => {
+      expect(fetchRecentProviderSessions).toHaveBeenCalledWith({
+        providers: ["claude"],
+        limit: 15,
+      });
+    });
+    expect(fetchRecentProviderSessions).not.toHaveBeenCalledWith(
+      expect.objectContaining({ cwd: expect.anything() }),
+    );
+    await screen.findByText("/home/me/work/other-project");
+  });
+
+  it("uses the session's cwd when importing in cwd-less mode and fires onImported", async () => {
+    const fetchRecentProviderSessions = vi.fn(async () => ({
+      requestId: "recent-provider-sessions",
+      entries: [
+        createProviderSessionEntry({
+          providerId: "claude",
+          providerLabel: "Claude Code",
+          cwd: "/home/me/work/other-project",
+        }),
+      ],
+    }));
+    const importAgent = vi.fn(async () => createImportedAgentSnapshot("agent-imported"));
+    const onImported = vi.fn();
+    const onImportedAgent = vi.fn();
+    const onClose = vi.fn();
+
+    renderSheet(
+      { fetchRecentProviderSessions, importAgent } as Pick<
+        DaemonClient,
+        "fetchRecentProviderSessions" | "importAgent"
+      >,
+      {
+        cwd: null,
+        onClose,
+        onImported,
+        onImportedAgent,
+        snapshot: { supportsSnapshot: true, entries: [createSnapshotEntry("claude")] },
+      },
+    );
+
+    fireEvent.click(await screen.findByTestId("import-session-session-claude-provider-thread-1"));
+
+    await waitFor(() => {
+      expect(importAgent).toHaveBeenCalledWith({
+        providerId: "claude",
+        providerHandleId: "provider-thread-1",
+        cwd: "/home/me/work/other-project",
+      });
+    });
+    expect(onImported).toHaveBeenCalledTimes(1);
+    expect(onImported).toHaveBeenCalledWith(expect.objectContaining({ id: "agent-imported" }));
+    expect(onImportedAgent).toHaveBeenCalledWith("agent-imported");
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it("refetches sessions when the refresh button is clicked", async () => {
+    const fetchRecentProviderSessions = vi.fn(async () => ({
+      requestId: "recent-provider-sessions",
+      entries: [
+        createProviderSessionEntry({
+          providerId: "claude",
+          providerLabel: "Claude Code",
+          title: "Refreshable session",
+        }),
+      ],
+    }));
+    const importAgent = vi.fn();
+
+    renderSheet(
+      { fetchRecentProviderSessions, importAgent } as Pick<
+        DaemonClient,
+        "fetchRecentProviderSessions" | "importAgent"
+      >,
+      {
+        snapshot: { supportsSnapshot: true, entries: [createSnapshotEntry("claude")] },
+      },
+    );
+
+    await screen.findByText("Refreshable session");
+    expect(fetchRecentProviderSessions).toHaveBeenCalledTimes(1);
+
+    fireEvent.click(screen.getByTestId("import-session-refresh"));
+
+    await waitFor(() => {
+      expect(fetchRecentProviderSessions).toHaveBeenCalledTimes(2);
+    });
+  });
 });

packages/app/src/components/import-session-sheet.tsx

@@ -4,8 +4,9 @@ import { useMutation, useQueries, useQueryClient } from "@tanstack/react-query";
 import type { DaemonClient, FetchRecentProviderSessionEntry } from "@server/client/daemon-client";
 import type { AgentProvider } from "@server/server/agent/agent-sdk-types";
 import { IMPORTABLE_PROVIDERS } from "@server/shared/importable-providers";
+import { Inbox, RotateCw } from "lucide-react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { SegmentedControl, type SegmentedControlOption } from "@/components/ui/segmented-control";
 import { getProviderIcon } from "@/components/provider-icons";
@@ -23,13 +24,16 @@ type RecentProviderSessionsClient = Pick<
   "fetchRecentProviderSessions" | "importAgent"
 >;
 
-interface WorkspaceImportSheetProps {
+type ImportedAgent = Awaited<ReturnType<RecentProviderSessionsClient["importAgent"]>>;
+
+interface ImportSessionSheetProps {
   visible: boolean;
   client: RecentProviderSessionsClient | null;
   serverId: string | null;
-  workspaceDirectory: string | null;
+  cwd?: string | null;
   onClose: () => void;
-  onImportedAgent: (agentId: string) => void;
+  onImportedAgent?: (agentId: string) => void;
+  onImported?: (agent: ImportedAgent) => void;
 }
 
 type RecentSessionsResponse = Awaited<
@@ -82,20 +86,20 @@ function buildSessionsQueriesConfig(args: {
   sessionsQueryRoot: ReadonlyArray<string | null>;
   visible: boolean;
   client: RecentProviderSessionsClient | null;
-  workspaceDirectory: string | null;
+  cwd: string | null | undefined;
 }): SessionsQueryConfig[] {
-  const { providersToFetch, sessionsQueryRoot, visible, client, workspaceDirectory } = args;
+  const { providersToFetch, sessionsQueryRoot, visible, client, cwd } = args;
   if (providersToFetch === null) return [];
-  const enabled = visible && Boolean(client && workspaceDirectory);
+  const enabled = visible && Boolean(client);
   return providersToFetch.map((provider) => ({
     queryKey: [...sessionsQueryRoot, provider],
     enabled,
     queryFn: async () => {
-      if (!client || !workspaceDirectory) {
+      if (!client) {
         throw new Error("Host is not connected");
       }
       return await client.fetchRecentProviderSessions({
-        cwd: workspaceDirectory,
+        ...(cwd ? { cwd } : {}),
         providers: [provider],
         limit: PER_PROVIDER_LIMIT,
       });
@@ -171,8 +175,6 @@ interface SheetStatusMessagesProps {
   allQueriesErrored: boolean;
   erroredProviderLabels: ReadonlyArray<string>;
   importErrored: boolean;
-  showEmptyState: boolean;
-  allAlreadyImported: boolean;
 }
 
 function SheetStatusMessages({
@@ -183,12 +185,10 @@ function SheetStatusMessages({
   allQueriesErrored,
   erroredProviderLabels,
   importErrored,
-  showEmptyState,
-  allAlreadyImported,
 }: SheetStatusMessagesProps) {
   const { theme } = useUnistyles();
   if (!isClientReady) {
-    return <Text style={styles.statusText}>Connect to a workspace to import sessions</Text>;
+    return <Text style={styles.statusText}>Connect to a host to import sessions</Text>;
   }
   if (isSnapshotUnsupported) {
     return <Text style={styles.statusText}>Update the host to import sessions.</Text>;
@@ -215,45 +215,117 @@ function SheetStatusMessages({
       {importErrored ? (
         <Text style={styles.statusText}>Could not import selected session.</Text>
       ) : null}
-      {showEmptyState ? (
-        <Text style={styles.statusText}>
-          {allAlreadyImported
-            ? "All recent sessions are already imported."
-            : "No recent sessions to import."}
-        </Text>
-      ) : null}
     </>
   );
 }
 
+interface EmptyStateInputs {
+  isLoadingSessions: boolean;
+  allQueriesErrored: boolean;
+  isQueryingProviders: boolean;
+  allQueriesSettled: boolean;
+  selectedProvider: string;
+  aggregatedCount: number;
+  visibleCount: number;
+  totalAlreadyImportedCount: number;
+  providerLabelById: ReadonlyMap<string, string>;
+}
+
+function computeEmptyState(input: EmptyStateInputs): {
+  showEmptyState: boolean;
+  emptyStateTitle: string;
+} {
+  const showEmptyState =
+    !input.isLoadingSessions &&
+    !input.allQueriesErrored &&
+    input.isQueryingProviders &&
+    input.allQueriesSettled &&
+    input.visibleCount === 0;
+  if (!showEmptyState) {
+    return { showEmptyState, emptyStateTitle: "" };
+  }
+  const isFilteredEmpty = input.selectedProvider !== ALL_FILTER_VALUE && input.aggregatedCount > 0;
+  if (isFilteredEmpty) {
+    const label = input.providerLabelById.get(input.selectedProvider) ?? input.selectedProvider;
+    return { showEmptyState, emptyStateTitle: `No ${label} sessions found.` };
+  }
+  if (input.totalAlreadyImportedCount > 0) {
+    return { showEmptyState, emptyStateTitle: "All recent sessions are already imported." };
+  }
+  return { showEmptyState, emptyStateTitle: "No recent sessions to import." };
+}
+
+function RefreshAction({ isRefreshing, onPress }: { isRefreshing: boolean; onPress: () => void }) {
+  const { theme } = useUnistyles();
+  const pressableStyle = useCallback(
+    ({ pressed }: PressableStateCallbackType) => [
+      styles.refreshButton,
+      pressed && styles.refreshButtonPressed,
+    ],
+    [],
+  );
+  return (
+    <Pressable
+      onPress={onPress}
+      disabled={isRefreshing}
+      accessibilityLabel="Refresh sessions"
+      accessibilityRole="button"
+      testID="import-session-refresh"
+      style={pressableStyle}
+    >
+      <View style={styles.refreshIconSlot}>
+        {isRefreshing ? (
+          <LoadingSpinner color={theme.colors.foregroundMuted} />
+        ) : (
+          <RotateCw size={16} color={theme.colors.foregroundMuted} />
+        )}
+      </View>
+    </Pressable>
+  );
+}
+
+function SheetEmptyState({ title }: { title: string }) {
+  const { theme } = useUnistyles();
+  return (
+    <View style={styles.emptyState} testID="import-session-empty-state">
+      <View style={styles.emptyStateIcon}>
+        <Inbox size={theme.iconSize.lg} color={theme.colors.foregroundMuted} strokeWidth={1.5} />
+      </View>
+      <Text style={styles.emptyStateTitle}>{title}</Text>
+    </View>
+  );
+}
+
 function buildProviderFilterOptions(
   providers: ReadonlyArray<string>,
   providerLabelById: ReadonlyMap<string, string>,
 ): SegmentedControlOption<string>[] {
   const options: SegmentedControlOption<string>[] = [
-    { value: ALL_FILTER_VALUE, label: "All", testID: "workspace-import-filter-all" },
+    { value: ALL_FILTER_VALUE, label: "All", testID: "import-session-filter-all" },
   ];
   for (const provider of providers) {
     const ProviderIcon = getProviderIcon(provider);
     options.push({
       value: provider,
       label: providerLabelById.get(provider) ?? provider,
-      testID: `workspace-import-filter-${provider}`,
+      testID: `import-session-filter-${provider}`,
       icon: ({ color, size }) => <ProviderIcon color={color} size={size} />,
     });
   }
   return options;
 }
 
-function WorkspaceImportSheetRow({
+function ImportSessionSheetRow({
   entry,
   disabled,
   importing,
+  showCwd,
   onImportSession,
 }: {
   entry: FetchRecentProviderSessionEntry;
   disabled: boolean;
   importing: boolean;
+  showCwd: boolean;
   onImportSession: (entry: FetchRecentProviderSessionEntry) => void;
 }) {
   const { theme } = useUnistyles();
@@ -284,7 +356,7 @@ function WorkspaceImportSheetRow({
       accessibilityRole="button"
       accessibilityState={accessibilityState}
       style={pressableStyle}
-      testID={`workspace-import-session-${entry.providerId}-${entry.providerHandleId}`}
+      testID={`import-session-session-${entry.providerId}-${entry.providerHandleId}`}
     >
       <View style={styles.rowIconWrap}>
         <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
@@ -299,19 +371,25 @@ function WorkspaceImportSheetRow({
         <Text style={styles.rowPreview} numberOfLines={2}>
           {promptPreview}
         </Text>
+        {showCwd && entry.cwd ? (
+          <Text style={styles.rowCwd} numberOfLines={1}>
+            {entry.cwd}
+          </Text>
+        ) : null}
       </View>
     </Pressable>
   );
 }
 
-export function WorkspaceImportSheet({
+export function ImportSessionSheet({
   visible,
   client,
   serverId,
-  workspaceDirectory,
+  cwd,
   onClose,
   onImportedAgent,
-}: WorkspaceImportSheetProps) {
+  onImported,
+}: ImportSessionSheetProps) {
   const queryClient = useQueryClient();
 
   const { entries: snapshotEntries, supportsSnapshot } = useProvidersSnapshot(serverId, {
@@ -329,8 +407,8 @@ export function WorkspaceImportSheet({
   );
 
   const sessionsQueryRoot = useMemo(
-    () => ["recent-provider-sessions", workspaceDirectory] as const,
-    [workspaceDirectory],
+    () => ["recent-provider-sessions", cwd ?? null] as const,
+    [cwd],
   );
 
   const queriesConfig = useMemo(
@@ -340,9 +418,9 @@ export function WorkspaceImportSheet({
         sessionsQueryRoot,
         visible,
         client,
-        workspaceDirectory,
+        cwd,
       }),
-    [providersToFetch, sessionsQueryRoot, visible, client, workspaceDirectory],
+    [providersToFetch, sessionsQueryRoot, visible, client, cwd],
   );
 
   const queries = useQueries({ queries: queriesConfig });
@@ -378,20 +456,25 @@ export function WorkspaceImportSheet({
 
   const importMutation = useMutation({
     mutationFn: async (entry: FetchRecentProviderSessionEntry) => {
-      if (!client || !workspaceDirectory) {
+      if (!client) {
         throw new Error("Host is not connected");
       }
+      const effectiveCwd = cwd ?? entry.cwd;
+      if (!effectiveCwd) {
+        throw new Error("Session is missing a working directory");
+      }
       const agent = await client.importAgent({
         providerId: entry.providerId,
         providerHandleId: entry.providerHandleId,
-        cwd: workspaceDirectory,
+        cwd: effectiveCwd,
       });
       return agent;
     },
     onSuccess: async (agent) => {
       await queryClient.invalidateQueries({ queryKey: sessionsQueryRoot });
       onClose();
-      onImportedAgent(agent.id);
+      onImportedAgent?.(agent.id);
+      onImported?.(agent);
     },
   });
 
@@ -412,6 +495,20 @@ export function WorkspaceImportSheet({
     [queries, providersToFetch, providerLabelById],
   );
 
+  const isRefreshing = queries.some((query) => query.isFetching);
+
+  const handleRefresh = useCallback(() => {
+    void queryClient.invalidateQueries({ queryKey: sessionsQueryRoot });
+  }, [queryClient, sessionsQueryRoot]);
+
+  const header = useMemo<SheetHeader>(
+    () => ({
+      title: "Import session",
+      actions: <RefreshAction isRefreshing={isRefreshing} onPress={handleRefresh} />,
+    }),
+    [isRefreshing, handleRefresh],
+  );
+
   const isSnapshotUnsupported = !supportsSnapshot;
   const isWaitingForSnapshot = supportsSnapshot && snapshotEntries === undefined;
   const hasNoImportableProviders = providersToFetch !== null && providersToFetch.length === 0;
@@ -422,21 +519,25 @@ export function WorkspaceImportSheet({
   const allQueriesErrored = isQueryingProviders && queries.every((query) => query.isError);
   const allQueriesSettled =
     isQueryingProviders && queries.every((query) => !query.isLoading && !query.isPending);
-  const showEmptyState =
-    !isLoadingSessions &&
-    !allQueriesErrored &&
-    isQueryingProviders &&
-    allQueriesSettled &&
-    aggregatedEntries.length === 0;
-  const allAlreadyImported = showEmptyState && totalAlreadyImportedCount > 0;
+  const { showEmptyState, emptyStateTitle } = computeEmptyState({
+    isLoadingSessions,
+    allQueriesErrored,
+    isQueryingProviders,
+    allQueriesSettled,
+    selectedProvider,
+    aggregatedCount: aggregatedEntries.length,
+    visibleCount: visibleEntries.length,
+    totalAlreadyImportedCount,
+    providerLabelById,
+  });
   const showFilter = filterProviders.length > 1;
 
   return (
     <AdaptiveModalSheet
       visible={visible}
       onClose={onClose}
-      title="Import session"
-      testID="workspace-import-sheet"
+      header={header}
+      testID="import-session-sheet"
       desktopMaxWidth={560}
       snapPoints={IMPORT_SHEET_SNAP_POINTS}
     >
@@ -447,7 +548,7 @@ export function WorkspaceImportSheet({
           contentContainerStyle={styles.filterRow}
         >
           <SegmentedControl
-            testID="workspace-import-filters"
+            testID="import-session-filters"
             size="sm"
             options={filterOptions}
             value={selectedProvider}
@@ -456,29 +557,29 @@ export function WorkspaceImportSheet({
         </ScrollView>
       ) : null}
       <SheetStatusMessages
-        isClientReady={Boolean(client && workspaceDirectory)}
+        isClientReady={Boolean(client)}
         isSnapshotUnsupported={isSnapshotUnsupported}
         hasNoImportableProviders={hasNoImportableProviders}
         isLoadingSessions={isLoadingSessions}
         allQueriesErrored={allQueriesErrored}
         erroredProviderLabels={erroredProviderLabels}
         importErrored={importMutation.isError}
-        showEmptyState={showEmptyState}
-        allAlreadyImported={allAlreadyImported}
       />
       {visibleEntries.length > 0 ? (
         <View style={styles.list}>
           {visibleEntries.map((entry) => (
-            <WorkspaceImportSheetRow
+            <ImportSessionSheetRow
               key={`${entry.providerId}:${entry.providerHandleId}`}
               entry={entry}
               disabled={importMutation.isPending}
               importing={importingSessionKey === `${entry.providerId}:${entry.providerHandleId}`}
+              showCwd={!cwd}
               onImportSession={handleImportSession}
             />
           ))}
         </View>
       ) : null}
+      {showEmptyState ? <SheetEmptyState title={emptyStateTitle} /> : null}
     </AdaptiveModalSheet>
   );
 }
@@ -538,6 +639,10 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.sm,
     lineHeight: 20,
   },
+  rowCwd: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.xs,
+  },
   statusRow: {
     flexDirection: "row",
     alignItems: "center",
@@ -548,4 +653,34 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
   },
+  emptyState: {
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing[2],
+    paddingVertical: theme.spacing[8],
+    paddingHorizontal: theme.spacing[4],
+  },
+  emptyStateIcon: {
+    opacity: 0.6,
+    marginBottom: theme.spacing[1],
+  },
+  emptyStateTitle: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.base,
+    textAlign: "center",
+  },
+  refreshButton: {
+    padding: theme.spacing[2],
+    marginRight: theme.spacing[1],
+    borderRadius: theme.borderRadius.lg,
+  },
+  refreshButtonPressed: {
+    backgroundColor: theme.colors.surface2,
+  },
+  refreshIconSlot: {
+    width: 16,
+    height: 16,
+    alignItems: "center",
+    justifyContent: "center",
+  },
 }));

packages/app/src/components/keyboard-shortcuts-dialog.tsx

@@ -2,13 +2,14 @@ import { useCallback, useMemo } from "react";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { getIsElectronRuntime } from "@/constants/layout";
-import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Shortcut } from "@/components/ui/shortcut";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import { buildKeyboardShortcutHelpSections } from "@/keyboard/keyboard-shortcuts";
 
 const SNAP_POINTS: string[] = ["70%", "92%"];
+const SHORTCUTS_HEADER: SheetHeader = { title: "Shortcuts" };
 
 export function KeyboardShortcutsDialog() {
   const open = useKeyboardShortcutsStore((s) => s.shortcutsDialogOpen);
@@ -25,7 +26,7 @@ export function KeyboardShortcutsDialog() {
 
   return (
     <AdaptiveModalSheet
-      title="Shortcuts"
+      header={SHORTCUTS_HEADER}
       visible={open}
       onClose={handleClose}
       testID="keyboard-shortcuts-dialog"

packages/app/src/components/message-input.tsx

@@ -315,12 +315,12 @@ function SendButtonContent({
   buttonIconSize: number;
 }) {
   if (isSubmitLoading) {
-    return <ActivityIndicator size="small" color="white" />;
+    return <ThemedActivityIndicator size="small" uniProps={iconAccentForegroundMapping} />;
   }
   if (submitIcon === "return") {
-    return <CornerDownLeft size={buttonIconSize} color="white" />;
+    return <ThemedCornerDownLeft size={buttonIconSize} uniProps={iconAccentForegroundMapping} />;
   }
-  return <ArrowUp size={buttonIconSize} color="white" />;
+  return <ThemedArrowUp size={buttonIconSize} uniProps={iconAccentForegroundMapping} />;
 }
 
 function resolveSubmitAccessibilityLabel(input: {
@@ -799,6 +799,7 @@ interface ToggleRealtimeVoiceContext {
   voiceAgentId: string | undefined;
   isConnected: boolean;
   disabled: boolean;
+  isAgentRunning: boolean;
   handleStopRealtimeVoice: () => Promise<unknown> | void;
   toast: { error: (msg: string) => void };
 }
@@ -812,6 +813,10 @@ function toggleRealtimeVoiceImpl(ctx: ToggleRealtimeVoiceContext): void {
     void ctx.handleStopRealtimeVoice();
     return;
   }
+  if (ctx.isAgentRunning) {
+    ctx.toast.error("Interrupt the agent before starting voice mode");
+    return;
+  }
   void ctx.voice.startVoice(ctx.voiceServerId, ctx.voiceAgentId).catch((error) => {
     console.error("[MessageInput] Failed to start realtime voice", error);
     const message = extractErrorMessage(error);
@@ -1450,10 +1455,20 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         voiceAgentId,
         isConnected,
         disabled,
+        isAgentRunning,
         handleStopRealtimeVoice,
         toast,
       });
-    }, [disabled, handleStopRealtimeVoice, isConnected, toast, voice, voiceAgentId, voiceServerId]);
+    }, [
+      disabled,
+      handleStopRealtimeVoice,
+      isAgentRunning,
+      isConnected,
+      toast,
+      voice,
+      voiceAgentId,
+      voiceServerId,
+    ]);
 
     const minimizeInputHeight = useCallback(() => {
       inputHeightRef.current = MIN_INPUT_HEIGHT;
@@ -1962,10 +1977,14 @@ const styles = StyleSheet.create((theme: Theme) => ({
 const ThemedPlus = withUnistyles(Plus);
 const ThemedMic = withUnistyles(Mic);
 const ThemedMicOff = withUnistyles(MicOff);
+const ThemedArrowUp = withUnistyles(ArrowUp);
+const ThemedCornerDownLeft = withUnistyles(CornerDownLeft);
+const ThemedActivityIndicator = withUnistyles(ActivityIndicator);
 const ThemedTextInput = withUnistyles(TextInput);
 
 const iconForegroundMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const iconForegroundMutedMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const iconAccentForegroundMapping = (theme: Theme) => ({ color: theme.colors.accentForeground });
 const textInputPlaceholderColorMapping = (theme: Theme) => ({
   placeholderTextColor: theme.colors.surface4,
 });

packages/app/src/components/message.tsx

@@ -68,9 +68,8 @@ import type { AgentAttachment } from "@server/shared/messages";
 import type { ToolCallDetail } from "@server/server/agent/agent-sdk-types";
 import { buildToolCallPresentation } from "@/tool-calls/presentation";
 import { resolveToolCallIcon } from "@/utils/tool-call-icon";
-import type { OpenFileDisposition } from "@/workspace/file-open";
 import { getMarkdownListMarker, getMarkdownNextSiblingType } from "@/utils/markdown-list";
-import type { ToastApi } from "@/components/toast-host";
+import { useStableEvent } from "@/hooks/use-stable-event";
 import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
 import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
 import { formatDuration, formatMessageTimestamp } from "@/utils/time";
@@ -92,12 +91,11 @@ import { useToolCallSheet } from "./tool-call-sheet";
 import { ToolCallDetailsContent } from "./tool-call-details";
 import {
   AssistantInlineCodePathLink,
-  classifyAssistantFileLink,
   type AssistantFileLinkSource,
   AssistantMarkdownCodeLink,
   AssistantMarkdownLink,
   type InlinePathTarget,
-  useAssistantFileLinkResolver,
+  useAssistantFileLinkActions,
 } from "@/assistant-file-links";
 import { getCompactionMarkerLabel } from "./message-compaction-label";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
@@ -717,11 +715,9 @@ export const LiveElapsed = memo(function LiveElapsed({
 interface AssistantMessageProps {
   message: string;
   timestamp: number;
-  onInlinePathPress?: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
   workspaceRoot?: string;
   serverId?: string;
   client?: DaemonClient | null;
-  toast?: ToastApi | null;
   spacing?: "default" | "compactTop" | "compactBottom" | "compactBoth";
 }
 
@@ -1563,11 +1559,9 @@ function MarkdownListView({ baseStyle, marginBottom, children }: MarkdownListVie
 export const AssistantMessage = memo(function AssistantMessage({
   message,
   timestamp: _timestamp,
-  onInlinePathPress,
   workspaceRoot,
   serverId,
   client,
-  toast,
   spacing = "default",
 }: AssistantMessageProps) {
   const markdownParser = useMemo(() => {
@@ -1583,36 +1577,14 @@ export const AssistantMessage = memo(function AssistantMessage({
     return parser;
   }, []);
 
-  const fileLinkResolver = useAssistantFileLinkResolver({
-    client,
-    serverId,
-    workspaceRoot,
-    onOpenWorkspaceFile: onInlinePathPress,
-    toast,
+  const fileLinkActions = useAssistantFileLinkActions();
+  const handleMarkdownLinkPress = useStableEvent((url: string) => {
+    fileLinkActions.open({ href: url }, "main");
+    // react-native-markdown-display opens the link itself when this returns true.
+    // We already handled it above, so return false to avoid duplicate opens.
+    return false;
   });
 
-  const handleLinkPress = useCallback(
-    (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => {
-      fileLinkResolver.open({ source, disposition });
-    },
-    [fileLinkResolver],
-  );
-  const handleLinkPrefetch = useCallback(
-    (source: AssistantFileLinkSource) => {
-      fileLinkResolver.prefetch({ source });
-    },
-    [fileLinkResolver],
-  );
-  const handleMarkdownLinkPress = useCallback(
-    (url: string) => {
-      fileLinkResolver.open({ source: { href: url }, disposition: "main" });
-      // react-native-markdown-display opens the link itself when this returns true.
-      // We already handled it above, so return false to avoid duplicate opens.
-      return false;
-    },
-    [fileLinkResolver],
-  );
-
   const markdownRules = useMemo<RenderRules>(() => {
     return {
       text: (
@@ -1684,12 +1656,13 @@ export const AssistantMessage = memo(function AssistantMessage({
       ) => {
         const content = node.content ?? "";
         const isLinkedInlineCode = nodeHasParentType(parent, "link");
-        const inlineCodeFileLink = classifyAssistantFileLink(content, { workspaceRoot });
+        const inlineCodeSource: AssistantFileLinkSource = {
+          href: content,
+          text: content,
+          sourceType: "inline-code",
+        };
         const shouldResolveInlinePath =
-          onInlinePathPress &&
-          !isLinkedInlineCode &&
-          inlineCodeFileLink &&
-          inlineCodeFileLink.kind !== "external";
+          !isLinkedInlineCode && fileLinkActions.canResolveFile(inlineCodeSource);
 
         if (shouldResolveInlinePath) {
           return (
@@ -1699,9 +1672,6 @@ export const AssistantMessage = memo(function AssistantMessage({
               inheritedStyles={inheritedStyles}
               codeInlineStyle={styles.code_inline}
               linkStyle={styles.link}
-              onPress={handleLinkPress}
-              onPrefetch={handleLinkPrefetch}
-              workspaceRoot={workspaceRoot}
             />
           );
         }
@@ -1719,9 +1689,6 @@ export const AssistantMessage = memo(function AssistantMessage({
               inheritedStyles={inheritedStyles}
               codeInlineStyle={styles.code_inline}
               linkStyle={styles.link}
-              onPress={handleLinkPress}
-              onPrefetch={handleLinkPrefetch}
-              workspaceRoot={workspaceRoot}
             >
               {content}
             </AssistantMarkdownCodeLink>
@@ -1800,9 +1767,6 @@ export const AssistantMessage = memo(function AssistantMessage({
           key={node.key}
           source={getMarkdownLinkSource(node)}
           style={styles.link}
-          onPress={handleLinkPress}
-          onPrefetch={handleLinkPrefetch}
-          workspaceRoot={workspaceRoot}
         >
           {Children.map(children, (child) => {
             if (!isValidElement(child)) return child;
@@ -1841,15 +1805,7 @@ export const AssistantMessage = memo(function AssistantMessage({
         );
       },
     };
-  }, [
-    client,
-    handleLinkPrefetch,
-    handleLinkPress,
-    markdownParser,
-    onInlinePathPress,
-    serverId,
-    workspaceRoot,
-  ]);
+  }, [client, fileLinkActions, markdownParser, serverId, workspaceRoot]);
 
   const blocks = useMemo(() => splitMarkdownBlocks(message), [message]);
   const keyedBlocks = useMemo(

packages/app/src/components/pair-link-modal.tsx

@@ -8,10 +8,11 @@ import { useHosts, useHostMutations } from "@/runtime/host-runtime";
 import { decodeOfferFragmentPayload, normalizeHostPort } from "@/utils/daemon-endpoints";
 import { connectToDaemon } from "@/utils/test-daemon-connection";
 import { ConnectionOfferSchema } from "@server/shared/connection-offer";
-import { AdaptiveModalSheet, AdaptiveTextInput } from "./adaptive-modal-sheet";
+import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 
 const FLEX_ONE_STYLE = { flex: 1 } as const;
+const PAIR_LINK_HEADER: SheetHeader = { title: "Paste pairing link" };
 
 const styles = StyleSheet.create((theme) => ({
   helper: {
@@ -169,7 +170,7 @@ export function PairLinkModal({ visible, onClose, onCancel, onSaved }: PairLinkM
 
   return (
     <AdaptiveModalSheet
-      title="Paste pairing link"
+      header={PAIR_LINK_HEADER}
       visible={visible}
       onClose={handleClose}
       testID="pair-link-modal"

packages/app/src/components/provider-diagnostic-sheet.tsx

@@ -1,5 +1,5 @@
 import { AlertCircle, RotateCw, Search, Trash2 } from "lucide-react-native";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useReducer, useState } from "react";
 import {
   ActivityIndicator,
   Pressable,
@@ -9,7 +9,11 @@ import {
   View,
 } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { AdaptiveModalSheet, AdaptiveTextInput } from "@/components/adaptive-modal-sheet";
+import {
+  AdaptiveModalSheet,
+  AdaptiveTextInput,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { isWeb } from "@/constants/platform";
@@ -96,6 +100,7 @@ function CustomModelsSection(props: {
   const { theme } = useUnistyles();
   const { config, patchConfig } = useDaemonConfig(serverId);
   const [input, setInput] = useState("");
+  const [inputResetKey, bumpInputResetKey] = useReducer((key: number) => key + 1, 0);
   const [error, setError] = useState<string | null>(null);
   const [saving, setSaving] = useState(false);
   const [deletingModelId, setDeletingModelId] = useState<string | null>(null);
@@ -136,7 +141,11 @@ function CustomModelsSection(props: {
         label: trimmedInput,
       },
     ])
-      .then(() => setInput(""))
+      .then(() => {
+        setInput("");
+        bumpInputResetKey();
+        return undefined;
+      })
       .catch((err) => {
         setError(err instanceof Error ? err.message : "Failed to save model");
       })
@@ -163,6 +172,8 @@ function CustomModelsSection(props: {
       <View style={settingsStyles.card}>
         <View style={INLINE_ROW_STYLE}>
           <AdaptiveTextInput
+            initialValue={input}
+            resetKey={`custom-model-input-${inputResetKey}`}
             value={input}
             onChangeText={setInput}
             onSubmitEditing={handleAdd}
@@ -245,6 +256,7 @@ export function ProviderDiagnosticSheet({
   const [diagnostic, setDiagnostic] = useState<string | null>(null);
   const [loading, setLoading] = useState(false);
   const [query, setQuery] = useState("");
+  const [queryResetKey, bumpQueryResetKey] = useReducer((key: number) => key + 1, 0);
 
   const providerLabel = resolveProviderLabel(provider, snapshotEntries);
   const providerEntry = useMemo(
@@ -348,6 +360,7 @@ export function ProviderDiagnosticSheet({
     } else {
       setDiagnostic(null);
       setQuery("");
+      bumpQueryResetKey();
     }
   }, [visible, fetchDiagnostic]);
 
@@ -405,13 +418,17 @@ export function ProviderDiagnosticSheet({
     ));
   }
 
+  const sheetHeader = useMemo<SheetHeader>(
+    () => ({ title: providerLabel, actions: headerActions }),
+    [providerLabel, headerActions],
+  );
+
   return (
     <AdaptiveModalSheet
-      title={providerLabel}
+      header={sheetHeader}
       visible={visible}
       onClose={onClose}
       snapPoints={DIAGNOSTIC_SHEET_SNAP_POINTS}
-      headerActions={headerActions}
     >
       <SettingsSection title="Diagnostic">
         <View style={settingsStyles.card}>
@@ -434,6 +451,8 @@ export function ProviderDiagnosticSheet({
           <View style={INLINE_ROW_STYLE}>
             <Search size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
             <AdaptiveTextInput
+              initialValue={query}
+              resetKey={`provider-model-search-${queryResetKey}`}
               value={query}
               onChangeText={setQuery}
               placeholder="Search models"

packages/app/src/components/provider-icons.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("lucide-react-native", () => ({
+  Bot: function Bot() {
+    return null;
+  },
+  PackagePlus: function PackagePlus() {
+    return null;
+  },
+}));
+
+import { Bot, PackagePlus } from "lucide-react-native";
+import { getProviderIcon } from "./provider-icons";
+
+describe("getProviderIcon", () => {
+  it("keeps built-in provider icons", () => {
+    expect(getProviderIcon("kiro")).toBe(PackagePlus);
+  });
+
+  it("uses vendored ACP catalog icons for catalog provider ids", () => {
+    const icon = getProviderIcon("amp-acp");
+
+    expect(icon).not.toBe(Bot);
+    expect(getProviderIcon("amp-acp")).toBe(icon);
+  });
+
+  it("falls back to the robot icon for unknown custom providers", () => {
+    expect(getProviderIcon("custom-claude-profile")).toBe(Bot);
+  });
+});

packages/app/src/components/provider-icons.ts

@@ -1,18 +1,63 @@
-import { Bot } from "lucide-react-native";
+import { Bot, PackagePlus } from "lucide-react-native";
+import { createElement, type ComponentType } from "react";
+import { SvgXml } from "react-native-svg";
 import { ClaudeIcon } from "@/components/icons/claude-icon";
 import { CodexIcon } from "@/components/icons/codex-icon";
 import { CopilotIcon } from "@/components/icons/copilot-icon";
 import { OpenCodeIcon } from "@/components/icons/opencode-icon";
 import { PiIcon } from "@/components/icons/pi-icon";
+import { ACP_PROVIDER_CATALOG } from "@/data/acp-provider-catalog";
 
-const PROVIDER_ICONS: Record<string, typeof Bot> = {
-  claude: ClaudeIcon as unknown as typeof Bot,
-  codex: CodexIcon as unknown as typeof Bot,
-  copilot: CopilotIcon as unknown as typeof Bot,
-  opencode: OpenCodeIcon as unknown as typeof Bot,
-  pi: PiIcon as unknown as typeof Bot,
+export interface ProviderIconProps {
+  size: number;
+  color: string;
+}
+
+export type ProviderIconComponent = ComponentType<ProviderIconProps>;
+
+const PROVIDER_ICONS: Record<string, ProviderIconComponent> = {
+  claude: ClaudeIcon as unknown as ProviderIconComponent,
+  codex: CodexIcon as unknown as ProviderIconComponent,
+  copilot: CopilotIcon as unknown as ProviderIconComponent,
+  kiro: PackagePlus,
+  opencode: OpenCodeIcon as unknown as ProviderIconComponent,
+  pi: PiIcon as unknown as ProviderIconComponent,
 };
 
-export function getProviderIcon(provider: string): typeof Bot {
-  return PROVIDER_ICONS[provider] ?? Bot;
+const CATALOG_ICON_SVGS = new Map(
+  ACP_PROVIDER_CATALOG.flatMap((entry) => (entry.iconSvg ? [[entry.id, entry.iconSvg]] : [])),
+);
+
+const catalogIconComponents = new Map<string, ProviderIconComponent>();
+
+function createCatalogIcon(provider: string, iconSvg: string): ProviderIconComponent {
+  const CatalogProviderIcon: ProviderIconComponent = ({ size, color }) =>
+    createElement(SvgXml, {
+      xml: iconSvg,
+      width: size,
+      height: size,
+      color,
+    });
+  CatalogProviderIcon.displayName = `CatalogProviderIcon(${provider})`;
+  return CatalogProviderIcon;
+}
+
+function getCatalogProviderIcon(provider: string): ProviderIconComponent | undefined {
+  const cached = catalogIconComponents.get(provider);
+  if (cached) {
+    return cached;
+  }
+
+  const iconSvg = CATALOG_ICON_SVGS.get(provider);
+  if (!iconSvg) {
+    return undefined;
+  }
+
+  const icon = createCatalogIcon(provider, iconSvg);
+  catalogIconComponents.set(provider, icon);
+  return icon;
+}
+
+export function getProviderIcon(provider: string): ProviderIconComponent {
+  return PROVIDER_ICONS[provider] ?? getCatalogProviderIcon(provider) ?? Bot;
 }

packages/app/src/components/rename-modal.test.tsx

@@ -0,0 +1,368 @@
+import { JSDOM } from "jsdom";
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { AdaptiveRenameModal } from "./rename-modal";
+
+const { theme, adaptiveInputState } = vi.hoisted(() => ({
+  adaptiveInputState: {
+    latestProps: null as {
+      onChangeText?: (next: string) => void;
+      onSubmitEditing?: () => void;
+    } | null,
+  },
+  theme: {
+    spacing: { 2: 8, 3: 12 },
+    fontSize: { sm: 13, base: 15 },
+    borderRadius: { md: 6 },
+    colors: {
+      surface0: "#000",
+      foreground: "#fff",
+      foregroundMuted: "#aaa",
+      border: "#555",
+      palette: { red: { 300: "#f87171" } },
+    },
+  },
+}));
+
+vi.mock("react-native-unistyles", () => ({
+  StyleSheet: {
+    create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
+  },
+  useUnistyles: () => ({ theme }),
+}));
+
+vi.mock("@/constants/platform", () => ({
+  isWeb: true,
+  isNative: false,
+}));
+
+vi.mock("@/components/adaptive-modal-sheet", async () => {
+  const ReactModule = await import("react");
+  const AdaptiveModalSheet = ({
+    visible,
+    title,
+    children,
+    onClose,
+    testID,
+  }: {
+    visible: boolean;
+    title: string;
+    children: React.ReactNode;
+    onClose: () => void;
+    testID?: string;
+  }) => {
+    if (!visible) return null;
+    return ReactModule.createElement(
+      "div",
+      { "data-testid": testID ?? "adaptive-modal-sheet", "data-modal-title": title },
+      ReactModule.createElement(
+        "button",
+        {
+          type: "button",
+          "data-testid": "adaptive-modal-sheet-close",
+          onClick: onClose,
+        },
+        "Close",
+      ),
+      children,
+    );
+  };
+  // Mirrors production AdaptiveTextInput: native-owned input seeded by
+  // initialValue, remounted (via key) when resetKey changes so the new
+  // initialValue takes effect.
+  const AdaptiveTextInput = ReactModule.forwardRef<HTMLInputElement, Record<string, unknown>>(
+    (props, ref) => {
+      const p = props as {
+        initialValue?: string;
+        defaultValue?: string;
+        editable?: boolean;
+        maxLength?: number;
+        testID?: string;
+        onChangeText?: (next: string) => void;
+        onSubmitEditing?: () => void;
+      };
+      adaptiveInputState.latestProps = {
+        onChangeText: p.onChangeText,
+        onSubmitEditing: p.onSubmitEditing,
+      };
+      return ReactModule.createElement("input", {
+        ref,
+        defaultValue: p.initialValue ?? p.defaultValue ?? "",
+        disabled: p.editable === false,
+        maxLength: p.maxLength,
+        "data-testid": p.testID,
+        onChange: (e: { target: { value: string } }) => p.onChangeText?.(e.target.value),
+        onKeyDown: (e: { key: string; preventDefault: () => void }) => {
+          if (e.key === "Enter") {
+            e.preventDefault();
+            p.onSubmitEditing?.();
+          }
+        },
+      });
+    },
+  );
+  return { AdaptiveModalSheet, AdaptiveTextInput };
+});
+
+vi.mock("@/components/ui/button", async () => {
+  const ReactModule = await import("react");
+  return {
+    Button: ({
+      children,
+      onPress,
+      disabled,
+      testID,
+    }: {
+      children?: React.ReactNode;
+      onPress?: () => void;
+      disabled?: boolean;
+      testID?: string;
+    }) =>
+      ReactModule.createElement(
+        "button",
+        {
+          type: "button",
+          "data-testid": testID,
+          disabled: disabled || undefined,
+          onClick: () => !disabled && onPress?.(),
+        },
+        children,
+      ),
+  };
+});
+
+let root: Root | null = null;
+let container: HTMLElement | null = null;
+
+beforeEach(() => {
+  const dom = new JSDOM("<!doctype html><html><body></body></html>");
+  vi.stubGlobal("React", React);
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  vi.stubGlobal("window", dom.window);
+  vi.stubGlobal("document", dom.window.document);
+  vi.stubGlobal("HTMLElement", dom.window.HTMLElement);
+  vi.stubGlobal("HTMLInputElement", dom.window.HTMLInputElement);
+  vi.stubGlobal("KeyboardEvent", dom.window.KeyboardEvent);
+  vi.stubGlobal("Node", dom.window.Node);
+  vi.stubGlobal("navigator", dom.window.navigator);
+
+  container = document.createElement("div");
+  document.body.appendChild(container);
+  root = createRoot(container);
+  adaptiveInputState.latestProps = null;
+});
+
+afterEach(() => {
+  if (root) {
+    act(() => {
+      root?.unmount();
+    });
+  }
+  root = null;
+  container = null;
+  vi.unstubAllGlobals();
+  vi.useRealTimers();
+});
+
+interface RenderOptions {
+  visible?: boolean;
+  initialValue?: string;
+  title?: string;
+  placeholder?: string;
+  submitLabel?: string;
+  onClose?: () => void;
+  onSubmit?: (value: string) => Promise<void> | void;
+  validate?: (value: string) => string | null;
+  maxLength?: number;
+}
+
+function renderModal(options: RenderOptions = {}): void {
+  const {
+    visible = true,
+    initialValue = "",
+    title = "Rename",
+    placeholder,
+    submitLabel,
+    onClose = vi.fn(),
+    onSubmit = vi.fn(),
+    validate,
+    maxLength,
+  } = options;
+  act(() => {
+    root?.render(
+      <AdaptiveRenameModal
+        visible={visible}
+        title={title}
+        initialValue={initialValue}
+        placeholder={placeholder}
+        submitLabel={submitLabel}
+        onClose={onClose}
+        onSubmit={onSubmit}
+        validate={validate}
+        maxLength={maxLength}
+        testID="rename-modal"
+      />,
+    );
+  });
+}
+
+function queryInput(): HTMLInputElement | null {
+  return document.querySelector<HTMLInputElement>('[data-testid="rename-modal-input"]');
+}
+
+function querySubmit(): HTMLButtonElement | null {
+  return document.querySelector<HTMLButtonElement>('[data-testid="rename-modal-submit"]');
+}
+
+function queryCancel(): HTMLButtonElement | null {
+  return document.querySelector<HTMLButtonElement>('[data-testid="rename-modal-cancel"]');
+}
+
+function queryError(): HTMLElement | null {
+  return document.querySelector<HTMLElement>('[data-testid="rename-modal-error"]');
+}
+
+function click(element: Element | null): void {
+  if (!element) throw new Error("Cannot click null element");
+  act(() => {
+    element.dispatchEvent(new window.MouseEvent("click", { bubbles: true }));
+  });
+}
+
+function typeInto(value: string): void {
+  act(() => {
+    adaptiveInputState.latestProps?.onChangeText?.(value);
+  });
+}
+
+function pressEnter(): void {
+  act(() => {
+    adaptiveInputState.latestProps?.onSubmitEditing?.();
+  });
+}
+
+async function flush(): Promise<void> {
+  await act(async () => {
+    await Promise.resolve();
+    await Promise.resolve();
+  });
+}
+
+describe("RenameModal", () => {
+  it("renders with the initial value pre-filled and selects it after open", async () => {
+    vi.useFakeTimers();
+    renderModal({ initialValue: "main" });
+    const input = queryInput();
+    expect(input).not.toBeNull();
+    expect(input?.value).toBe("main");
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(100);
+    });
+
+    const focused = document.activeElement as HTMLInputElement | null;
+    expect(focused).toBe(input);
+    expect(focused?.selectionStart).toBe(0);
+    expect(focused?.selectionEnd).toBe("main".length);
+  });
+
+  it("submits on Enter keypress in the input when the value has changed", async () => {
+    const onSubmit = vi.fn();
+    const onClose = vi.fn();
+    renderModal({ initialValue: "feature", onSubmit, onClose });
+
+    typeInto("feature-2");
+    pressEnter();
+    await flush();
+
+    expect(onSubmit).toHaveBeenCalledTimes(1);
+    expect(onSubmit).toHaveBeenCalledWith("feature-2");
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it("calls onClose when AdaptiveModalSheet's close prop fires (cancel button / backdrop delegated)", () => {
+    const onClose = vi.fn();
+    const onSubmit = vi.fn();
+    renderModal({ initialValue: "main", onClose, onSubmit });
+
+    click(document.querySelector('[data-testid="adaptive-modal-sheet-close"]'));
+
+    expect(onClose).toHaveBeenCalledTimes(1);
+    expect(onSubmit).not.toHaveBeenCalled();
+  });
+
+  it("disables submit when draft equals initialValue and re-enables after a change", async () => {
+    const onSubmit = vi.fn();
+    renderModal({ initialValue: "main", onSubmit });
+
+    expect(querySubmit()?.disabled).toBe(true);
+
+    pressEnter();
+    await flush();
+    expect(onSubmit).not.toHaveBeenCalled();
+
+    typeInto("main-v2");
+    await flush();
+    expect(querySubmit()?.disabled).toBe(false);
+
+    typeInto("main");
+    await flush();
+    expect(querySubmit()?.disabled).toBe(true);
+  });
+
+  it("surfaces validate errors inline and blocks submission", async () => {
+    const onSubmit = vi.fn();
+    const validate = vi.fn((value: string) => (value === "bad" ? "Invalid name" : null));
+    renderModal({ initialValue: "ok", validate, onSubmit });
+
+    typeInto("bad");
+    const submit = querySubmit()!;
+    expect(submit.disabled).toBe(true);
+
+    pressEnter();
+    await flush();
+
+    expect(onSubmit).not.toHaveBeenCalled();
+    const errorNode = queryError();
+    expect(errorNode?.textContent).toContain("Invalid name");
+  });
+
+  it("disables the submit button while onSubmit is pending", async () => {
+    let resolve: () => void = () => {};
+    const onSubmit = vi.fn(
+      () =>
+        new Promise<void>((r) => {
+          resolve = r;
+        }),
+    );
+    renderModal({ initialValue: "main", onSubmit });
+
+    typeInto("main-renamed");
+    click(querySubmit());
+    await flush();
+
+    expect(onSubmit).toHaveBeenCalledTimes(1);
+    expect(querySubmit()?.disabled).toBe(true);
+    expect(queryCancel()?.disabled).toBe(true);
+
+    await act(async () => {
+      resolve();
+      await Promise.resolve();
+    });
+  });
+
+  it("keeps the modal open with an error when onSubmit rejects", async () => {
+    const onSubmit = vi.fn().mockRejectedValue(new Error("Server said no"));
+    const onClose = vi.fn();
+    renderModal({ initialValue: "main", onSubmit, onClose });
+
+    typeInto("main-renamed");
+    click(querySubmit());
+    await flush();
+
+    expect(onClose).not.toHaveBeenCalled();
+    expect(queryError()?.textContent).toContain("Server said no");
+    expect(querySubmit()?.disabled).toBe(false);
+  });
+});

packages/app/src/components/rename-modal.tsx

@@ -0,0 +1,195 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Text, TextInput, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import {
+  AdaptiveModalSheet,
+  AdaptiveTextInput,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
+import { Button } from "@/components/ui/button";
+import { isWeb } from "@/constants/platform";
+
+export interface AdaptiveRenameModalProps {
+  visible: boolean;
+  title: string;
+  initialValue: string;
+  placeholder?: string;
+  submitLabel?: string;
+  onClose: () => void;
+  onSubmit: (value: string) => Promise<void> | void;
+  validate?: (value: string) => string | null;
+  maxLength?: number;
+  testID?: string;
+}
+
+export function AdaptiveRenameModal({
+  visible,
+  title,
+  initialValue,
+  placeholder,
+  submitLabel = "Rename",
+  onClose,
+  onSubmit,
+  validate,
+  maxLength,
+  testID,
+}: AdaptiveRenameModalProps) {
+  const [draft, setDraft] = useState(initialValue);
+  const [error, setError] = useState<string | null>(null);
+  const [isPending, setIsPending] = useState(false);
+  const inputRef = useRef<TextInput>(null);
+
+  useEffect(() => {
+    if (!visible) return;
+    setDraft(initialValue);
+    setError(null);
+    setIsPending(false);
+  }, [visible, initialValue]);
+
+  useEffect(() => {
+    if (!visible) return;
+    const length = initialValue.length;
+    const timeout = setTimeout(() => {
+      const node = inputRef.current;
+      if (!node) return;
+      node.focus();
+      if (isWeb && node instanceof HTMLInputElement) {
+        node.setSelectionRange(0, length);
+      } else if (!isWeb && length > 0) {
+        node.setNativeProps({ selection: { start: 0, end: length } });
+      }
+    }, 50);
+    return () => clearTimeout(timeout);
+  }, [visible, initialValue]);
+
+  const computeError = useCallback(
+    (value: string): string | null => {
+      if (!value.trim()) return "Name is required";
+      return validate ? validate(value) : null;
+    },
+    [validate],
+  );
+
+  const handleChange = useCallback((value: string) => {
+    setDraft(value);
+    setError(null);
+  }, []);
+
+  const handleSubmit = useCallback(async () => {
+    if (isPending) return;
+    const value = draft;
+    if (value === initialValue) return;
+    const validationError = computeError(value);
+    if (validationError) {
+      setError(validationError);
+      return;
+    }
+    try {
+      setIsPending(true);
+      await onSubmit(value);
+      setIsPending(false);
+      onClose();
+    } catch (err) {
+      setIsPending(false);
+      const message = err instanceof Error && err.message ? err.message : "Unable to save";
+      setError(message);
+    }
+  }, [isPending, draft, initialValue, computeError, onSubmit, onClose]);
+
+  const handleCancel = useCallback(() => {
+    if (isPending) return;
+    onClose();
+  }, [isPending, onClose]);
+
+  const handleSubmitVoid = useCallback(() => {
+    void handleSubmit();
+  }, [handleSubmit]);
+
+  const submitDisabled = isPending || draft === initialValue || computeError(draft) !== null;
+  const inputTestID = testID ? `${testID}-input` : undefined;
+  const errorTestID = testID ? `${testID}-error` : undefined;
+  const submitTestID = testID ? `${testID}-submit` : undefined;
+  const cancelTestID = testID ? `${testID}-cancel` : undefined;
+  const sheetHeader = useMemo<SheetHeader>(() => ({ title }), [title]);
+
+  return (
+    <AdaptiveModalSheet
+      visible={visible}
+      onClose={handleCancel}
+      header={sheetHeader}
+      testID={testID}
+    >
+      <View style={styles.body}>
+        <AdaptiveTextInput
+          ref={inputRef}
+          initialValue={initialValue}
+          onChangeText={handleChange}
+          placeholder={placeholder}
+          autoCapitalize="none"
+          autoCorrect={false}
+          editable={!isPending}
+          maxLength={maxLength}
+          onSubmitEditing={handleSubmitVoid}
+          style={styles.input}
+          testID={inputTestID}
+        />
+        {error ? (
+          <Text style={styles.errorText} testID={errorTestID}>
+            {error}
+          </Text>
+        ) : null}
+        <View style={styles.actions}>
+          <Button
+            variant="secondary"
+            size="sm"
+            style={styles.actionButton}
+            onPress={handleCancel}
+            disabled={isPending}
+            testID={cancelTestID}
+          >
+            Cancel
+          </Button>
+          <Button
+            variant="default"
+            size="sm"
+            style={styles.actionButton}
+            onPress={handleSubmitVoid}
+            disabled={submitDisabled}
+            testID={submitTestID}
+          >
+            {isPending ? "Saving..." : submitLabel}
+          </Button>
+        </View>
+      </View>
+    </AdaptiveModalSheet>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  body: {
+    gap: theme.spacing[3],
+    paddingBottom: theme.spacing[2],
+  },
+  input: {
+    backgroundColor: theme.colors.surface0,
+    color: theme.colors.foreground,
+    paddingVertical: theme.spacing[3],
+    paddingHorizontal: theme.spacing[3],
+    borderRadius: theme.borderRadius.md,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    fontSize: theme.fontSize.base,
+  },
+  errorText: {
+    color: theme.colors.palette.red[300],
+    fontSize: theme.fontSize.sm,
+  },
+  actions: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  actionButton: {
+    flex: 1,
+  },
+}));

packages/app/src/components/settings-textarea.tsx

@@ -0,0 +1,58 @@
+import type { StyleProp, TextStyle } from "react-native";
+import { useMemo } from "react";
+import { TextInput, View } from "react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { settingsStyles } from "@/styles/settings";
+
+interface SettingsTextAreaProps {
+  accessibilityLabel: string;
+  value: string;
+  onChangeText: (text: string) => void;
+  placeholder?: string;
+  testID?: string;
+  style?: StyleProp<TextStyle>;
+}
+
+export function SettingsTextArea({
+  accessibilityLabel,
+  value,
+  onChangeText,
+  placeholder,
+  testID,
+  style,
+}: SettingsTextAreaProps) {
+  const { theme } = useUnistyles();
+  const inputStyle = useMemo(() => [styles.input, style], [style]);
+
+  return (
+    <TextInput
+      testID={testID}
+      accessibilityLabel={accessibilityLabel}
+      multiline
+      value={value}
+      onChangeText={onChangeText}
+      placeholder={placeholder}
+      placeholderTextColor={theme.colors.foregroundMuted}
+      style={inputStyle}
+    />
+  );
+}
+
+export function SettingsTextAreaCard(props: SettingsTextAreaProps) {
+  return (
+    <View style={settingsStyles.card}>
+      <SettingsTextArea {...props} />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  input: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    paddingVertical: theme.spacing[3],
+    paddingHorizontal: theme.spacing[4],
+    minHeight: 96,
+    textAlignVertical: "top",
+  },
+}));

packages/app/src/components/sidebar-workspace-list.tsx

@@ -12,7 +12,10 @@ import {
   type ViewStyle,
 } from "react-native";
 import * as Haptics from "expo-haptics";
-import { useQueries } from "@tanstack/react-query";
+import { useMutation, useQueries, useQueryClient } from "@tanstack/react-query";
+import { slugify, validateBranchSlug, MAX_SLUG_LENGTH } from "@server/utils/branch-slug";
+import { AdaptiveRenameModal } from "@/components/rename-modal";
+import { invalidateCheckoutGitQueriesForClient } from "@/git/query-keys";
 import {
   useCallback,
   useMemo,
@@ -45,6 +48,7 @@ import {
   SquareTerminal,
   Monitor,
   MoreVertical,
+  Pencil,
   Plus,
   Trash2,
 } from "lucide-react-native";
@@ -147,6 +151,7 @@ const ThemedTrash2 = withUnistyles(Trash2);
 const ThemedSettings = withUnistyles(Settings);
 const ThemedCopy = withUnistyles(Copy);
 const ThemedArchive = withUnistyles(Archive);
+const ThemedPencil = withUnistyles(Pencil);
 
 const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const foregroundMutedColorMapping = (theme: Theme) => ({
@@ -232,6 +237,7 @@ interface WorkspaceRowInnerProps {
   onArchive?: () => void;
   onCopyBranchName?: () => void;
   onCopyPath?: () => void;
+  onRename?: () => void;
   archiveShortcutKeys?: ShortcutKey[][] | null;
 }
 
@@ -565,6 +571,7 @@ const trash2LeadingIcon = <ThemedTrash2 size={14} uniProps={foregroundMutedColor
 const settingsLeadingIcon = <ThemedSettings size={14} uniProps={foregroundMutedColorMapping} />;
 const copyLeadingIcon = <ThemedCopy size={14} uniProps={foregroundMutedColorMapping} />;
 const archiveLeadingIcon = <ThemedArchive size={14} uniProps={foregroundMutedColorMapping} />;
+const renameLeadingIcon = <ThemedPencil size={14} uniProps={foregroundMutedColorMapping} />;
 
 function renderKebabTriggerIcon({ hovered }: { hovered?: boolean }) {
   return (
@@ -640,6 +647,7 @@ function WorkspaceRowRightGroup({
   onArchive,
   onCopyBranchName,
   onCopyPath,
+  onRename,
 }: {
   workspace: SidebarWorkspaceEntry;
   isHovered: boolean;
@@ -656,6 +664,7 @@ function WorkspaceRowRightGroup({
   onArchive?: () => void;
   onCopyBranchName?: () => void;
   onCopyPath?: () => void;
+  onRename?: () => void;
 }) {
   const showKebab = Boolean(onArchive && (isHovered || isTouchPlatform));
   return (
@@ -675,6 +684,7 @@ function WorkspaceRowRightGroup({
           workspaceKey={workspace.workspaceKey}
           onCopyPath={onCopyPath}
           onCopyBranchName={onCopyBranchName}
+          onRename={onRename}
           onArchive={onArchive}
           archiveLabel={archiveLabel}
           archiveStatus={archiveStatus}
@@ -701,6 +711,7 @@ function WorkspaceKebabMenu({
   workspaceKey,
   onCopyPath,
   onCopyBranchName,
+  onRename,
   onArchive,
   archiveLabel,
   archiveStatus,
@@ -710,6 +721,7 @@ function WorkspaceKebabMenu({
   workspaceKey: string;
   onCopyPath?: () => void;
   onCopyBranchName?: () => void;
+  onRename?: () => void;
   onArchive: () => void;
   archiveLabel?: string;
   archiveStatus?: "idle" | "pending" | "success";
@@ -750,6 +762,15 @@ function WorkspaceKebabMenu({
             Copy branch name
           </DropdownMenuItem>
         ) : null}
+        {onRename ? (
+          <DropdownMenuItem
+            testID={`sidebar-workspace-menu-rename-${workspaceKey}`}
+            leading={renameLeadingIcon}
+            onSelect={onRename}
+          >
+            Rename workspace
+          </DropdownMenuItem>
+        ) : null}
         <DropdownMenuItem
           testID={`sidebar-workspace-menu-archive-${workspaceKey}`}
           leading={archiveLeadingIcon}
@@ -1319,6 +1340,7 @@ function WorkspaceRowInner({
   onArchive,
   onCopyBranchName,
   onCopyPath,
+  onRename,
   archiveShortcutKeys,
 }: WorkspaceRowInnerProps) {
   const _isCompact = useIsCompactFormFactor();
@@ -1429,6 +1451,7 @@ function WorkspaceRowInner({
               onArchive={onArchive}
               onCopyBranchName={onCopyBranchName}
               onCopyPath={onCopyPath}
+              onRename={onRename}
             />
           </View>
           {prHint ? (
@@ -1469,7 +1492,9 @@ function WorkspaceRowWithMenu({
   const toast = useToast();
   const activeWorkspaceSelection = useActiveWorkspaceSelection();
   const archiveWorktree = useCheckoutGitActionsStore((state) => state.archiveWorktree);
+  const queryClient = useQueryClient();
   const [isArchivingWorkspace, setIsArchivingWorkspace] = useState(false);
+  const [isRenameOpen, setIsRenameOpen] = useState(false);
   const workspaceDirectory = resolveWorkspaceExecutionDirectory({
     workspaceDirectory: workspace.workspaceDirectory,
   });
@@ -1599,6 +1624,51 @@ function WorkspaceRowWithMenu({
     toast.copied("Branch name copied");
   }, [toast, workspace.name]);
 
+  const renameMutation = useMutation({
+    mutationFn: async (branch: string) => {
+      const client = getHostRuntimeStore().getClient(workspace.serverId);
+      if (!client) {
+        throw new Error("Host is not connected");
+      }
+      const targetCwd = requireWorkspaceExecutionDirectory({
+        workspaceId: workspace.workspaceId,
+        workspaceDirectory: workspace.workspaceDirectory,
+      });
+      const payload = await client.renameBranch({ cwd: targetCwd, branch });
+      if (!payload.success || payload.error) {
+        throw new Error(payload.error?.message ?? "Failed to rename branch");
+      }
+      return { targetCwd };
+    },
+    onSuccess: async ({ targetCwd }) => {
+      await invalidateCheckoutGitQueriesForClient(queryClient, {
+        serverId: workspace.serverId,
+        cwd: targetCwd,
+      });
+    },
+  });
+
+  const handleOpenRename = useCallback(() => {
+    setIsRenameOpen(true);
+  }, []);
+
+  const handleCloseRename = useCallback(() => {
+    setIsRenameOpen(false);
+  }, []);
+
+  const handleSubmitRename = useCallback(
+    async (value: string) => {
+      await renameMutation.mutateAsync(slugify(value));
+    },
+    [renameMutation],
+  );
+
+  const validateRenameSlug = useCallback((value: string): string | null => {
+    const result = validateBranchSlug(slugify(value));
+    if (result.valid) return null;
+    return result.error ?? "Invalid branch name";
+  }, []);
+
   const archiveShortcutKeys = useShortcutKeys("archive-worktree");
 
   useKeyboardActionHandler({
@@ -1617,26 +1687,41 @@ function WorkspaceRowWithMenu({
   });
 
   return (
-    <WorkspaceRowInner
-      workspace={workspace}
-      selected={selected}
-      shortcutNumber={shortcutNumber}
-      showShortcutBadge={showShortcutBadge}
-      onPress={onPress}
-      drag={drag}
-      isDragging={isDragging}
-      isArchiving={isArchiving}
-      isCreating={isCreating}
-      dragHandleProps={dragHandleProps}
-      menuController={null}
-      archiveLabel={isWorktree ? "Archive worktree" : "Hide from sidebar"}
-      archiveStatus={getWorkspaceArchiveStatus(isWorktree, archiveStatus, isArchivingWorkspace)}
-      archivePendingLabel={isWorktree ? "Archiving..." : "Hiding..."}
-      onArchive={isWorktree ? handleArchiveWorktree : handleArchiveWorkspace}
-      onCopyBranchName={canCopyBranchName ? handleCopyBranchName : undefined}
-      onCopyPath={handleCopyPath}
-      archiveShortcutKeys={selected ? archiveShortcutKeys : null}
-    />
+    <>
+      <WorkspaceRowInner
+        workspace={workspace}
+        selected={selected}
+        shortcutNumber={shortcutNumber}
+        showShortcutBadge={showShortcutBadge}
+        onPress={onPress}
+        drag={drag}
+        isDragging={isDragging}
+        isArchiving={isArchiving}
+        isCreating={isCreating}
+        dragHandleProps={dragHandleProps}
+        menuController={null}
+        archiveLabel={isWorktree ? "Archive worktree" : "Hide from sidebar"}
+        archiveStatus={getWorkspaceArchiveStatus(isWorktree, archiveStatus, isArchivingWorkspace)}
+        archivePendingLabel={isWorktree ? "Archiving..." : "Hiding..."}
+        onArchive={isWorktree ? handleArchiveWorktree : handleArchiveWorkspace}
+        onCopyBranchName={canCopyBranchName ? handleCopyBranchName : undefined}
+        onCopyPath={handleCopyPath}
+        onRename={canCopyBranchName ? handleOpenRename : undefined}
+        archiveShortcutKeys={selected ? archiveShortcutKeys : null}
+      />
+      <AdaptiveRenameModal
+        visible={isRenameOpen}
+        title="Rename workspace"
+        initialValue={workspace.name}
+        placeholder="branch-name"
+        submitLabel="Rename"
+        validate={validateRenameSlug}
+        maxLength={MAX_SLUG_LENGTH}
+        onClose={handleCloseRename}
+        onSubmit={handleSubmitRename}
+        testID={`sidebar-workspace-rename-modal-${workspace.workspaceKey}`}
+      />
+    </>
   );
 }
 

packages/app/src/components/split-container-pane-focus.test.ts

@@ -23,4 +23,13 @@ describe("shouldFocusPaneFromEventTarget", () => {
     ).toBe(true);
     expect(shouldFocusPaneFromEventTarget(null)).toBe(true);
   });
+
+  it("returns true for composer text inputs so focusing the composer focuses the pane", () => {
+    expect(
+      shouldFocusPaneFromEventTarget({
+        closest: (selector: string) =>
+          selector.includes("input") ? ({ tagName: "INPUT" } as Element) : null,
+      } as unknown as EventTarget),
+    ).toBe(true);
+  });
 });

packages/app/src/components/split-container-pane-focus.ts

@@ -1,9 +1,7 @@
 const INTERACTIVE_TARGET_SELECTOR = [
   "a",
   "button",
-  "input",
   "select",
-  "textarea",
   "[role='button']",
   "[role='link']",
   "[contenteditable='true']",

packages/app/src/components/split-container.tsx

@@ -86,6 +86,7 @@ interface SplitContainerProps {
   onCopyResumeCommand: (agentId: string) => Promise<void> | void;
   onCopyAgentId: (agentId: string) => Promise<void> | void;
   onReloadAgent: (agentId: string) => Promise<void> | void;
+  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
   onCloseTabsToLeft: (tabId: string, paneTabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
   onCloseTabsToRight: (tabId: string, paneTabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
   onCloseOtherTabs: (tabId: string, paneTabs: WorkspaceTabDescriptor[]) => Promise<void> | void;
@@ -362,6 +363,7 @@ export function SplitContainer({
   onCopyResumeCommand,
   onCopyAgentId,
   onReloadAgent,
+  onRenameTab,
   onCloseTabsToLeft,
   onCloseTabsToRight,
   onCloseOtherTabs,
@@ -406,6 +408,7 @@ export function SplitContainer({
     }
     return { kind: "pane" as const, pane: focusedPane };
   }, [focusModeEnabled, layout.root, layout.focusedPaneId, panesById]);
+  const renderRoot = useMemo(() => wrapRootPaneForStableMount(effectiveRoot), [effectiveRoot]);
 
   const handleDragStart = useCallback((event: DragStartEvent) => {
     const data = asWorkspaceTabDragData(event.active.data.current);
@@ -560,7 +563,7 @@ export function SplitContainer({
       onDragEnd={handleDragEnd}
     >
       <SplitNodeView
-        node={effectiveRoot}
+        node={renderRoot}
         workspaceKey={workspaceKey}
         uiTabs={uiTabs}
         focusedPaneId={layout.focusedPaneId}
@@ -576,6 +579,7 @@ export function SplitContainer({
         onCopyResumeCommand={onCopyResumeCommand}
         onCopyAgentId={onCopyAgentId}
         onReloadAgent={onReloadAgent}
+        onRenameTab={onRenameTab}
         onCloseTabsToLeft={onCloseTabsToLeft}
         onCloseTabsToRight={onCloseTabsToRight}
         onCloseOtherTabs={onCloseOtherTabs}
@@ -715,6 +719,7 @@ function SplitNodeView({
   onCopyResumeCommand,
   onCopyAgentId,
   onReloadAgent,
+  onRenameTab,
   onCloseTabsToLeft,
   onCloseTabsToRight,
   onCloseOtherTabs,
@@ -767,6 +772,7 @@ function SplitNodeView({
         onCopyResumeCommand={onCopyResumeCommand}
         onCopyAgentId={onCopyAgentId}
         onReloadAgent={onReloadAgent}
+        onRenameTab={onRenameTab}
         onCloseTabsToLeft={onCloseTabsToLeft}
         onCloseTabsToRight={onCloseTabsToRight}
         onCloseOtherTabs={onCloseOtherTabs}
@@ -812,6 +818,7 @@ function SplitNodeView({
               onCopyResumeCommand={onCopyResumeCommand}
               onCopyAgentId={onCopyAgentId}
               onReloadAgent={onReloadAgent}
+              onRenameTab={onRenameTab}
               onCloseTabsToLeft={onCloseTabsToLeft}
               onCloseTabsToRight={onCloseTabsToRight}
               onCloseOtherTabs={onCloseOtherTabs}
@@ -863,6 +870,7 @@ function SplitPaneView({
   onCopyResumeCommand,
   onCopyAgentId,
   onReloadAgent,
+  onRenameTab,
   onCloseTabsToLeft,
   onCloseTabsToRight,
   onCloseOtherTabs,
@@ -1003,6 +1011,7 @@ function SplitPaneView({
           onCopyResumeCommand={onCopyResumeCommand}
           onCopyAgentId={onCopyAgentId}
           onReloadAgent={onReloadAgent}
+          onRenameTab={onRenameTab}
           onCloseTabsToLeft={handleCloseTabsToLeft}
           onCloseTabsToRight={handleCloseTabsToRight}
           onCloseOtherTabs={handleCloseOtherTabs}
@@ -1071,6 +1080,22 @@ function getNodeKey(node: SplitNode): string {
   return node.group.id;
 }
 
+function wrapRootPaneForStableMount(node: SplitNode): SplitNode {
+  if (node.kind === "group") {
+    return node;
+  }
+
+  return {
+    kind: "group",
+    group: {
+      id: `root:${node.pane.id}`,
+      direction: "horizontal",
+      children: [node],
+      sizes: [1],
+    },
+  };
+}
+
 const styles = StyleSheet.create((theme) => ({
   group: {
     flex: 1,

packages/app/src/components/tool-call-details.tsx

@@ -13,6 +13,7 @@ import type { ToolCallDetail } from "@server/server/agent/agent-sdk-types";
 import { buildLineDiff, parseUnifiedDiff, type DiffLine } from "@/utils/tool-call-parsers";
 import { hasMeaningfulToolCallDetail } from "@/utils/tool-call-detail-state";
 import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { DiffViewer } from "./diff-viewer";
 import { getCodeInsets } from "./code-insets";
 import { isWeb } from "@/constants/platform";
@@ -79,7 +80,7 @@ function useDetailStyles(
   const codeVerticalScrollStyle = useMemo(
     () => [
       styles.codeVerticalScroll,
-      resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
+      resolvedMaxHeight !== undefined && inlineUnistylesStyle({ maxHeight: resolvedMaxHeight }),
       shouldFill && styles.fillHeight,
       webScrollbarStyle,
     ],
@@ -88,7 +89,7 @@ function useDetailStyles(
   const scrollAreaFillStyle = useMemo(
     () => [
       styles.scrollArea,
-      resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
+      resolvedMaxHeight !== undefined && inlineUnistylesStyle({ maxHeight: resolvedMaxHeight }),
       shouldFill && styles.fillHeight,
       webScrollbarStyle,
     ],
@@ -97,7 +98,7 @@ function useDetailStyles(
   const scrollAreaStyle = useMemo(
     () => [
       styles.scrollArea,
-      resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
+      resolvedMaxHeight !== undefined && inlineUnistylesStyle({ maxHeight: resolvedMaxHeight }),
       webScrollbarStyle,
     ],
     [resolvedMaxHeight, webScrollbarStyle],

packages/app/src/components/ui/combobox-options.test.ts

@@ -121,6 +121,16 @@ describe("filterAndRankComboboxOptions", () => {
     const result = filterAndRankComboboxOptions(items, "202");
     expect(result.map((o) => o.id)).toEqual(["github-pr:202", "github-pr:1202"]);
   });
+
+  it("matches fuzzy character sequences after stronger substring matches", () => {
+    const items = [
+      { id: "gpt-5.4", label: "GPT-5.4" },
+      { id: "gpt-4.1", label: "GPT-4.1" },
+      { id: "gemini", label: "Gemini" },
+    ];
+    const result = filterAndRankComboboxOptions(items, "gpt54");
+    expect(result.map((o) => o.id)).toEqual(["gpt-5.4"]);
+  });
 });
 
 describe("combobox above-search ordering", () => {

packages/app/src/components/ui/combobox-options.ts

@@ -1,4 +1,4 @@
-import { compareMatchScores, type MatchScore, scoreMatch } from "../../utils/score-match";
+import { compareMatchScores, type MatchScore, scoreTextFields } from "../../utils/score-match";
 
 export type ComboboxOptionKind = "directory" | "file";
 
@@ -12,18 +12,12 @@ export interface ComboboxOptionModel {
 const DESCRIPTION_FALLBACK_TIER = 99;
 
 function scoreOption(opt: ComboboxOptionModel, search: string): MatchScore | null {
-  const labelScore = scoreMatch(search, opt.label);
-  const idScore = scoreMatch(search, opt.id);
-  let best: MatchScore | null = null;
-  if (labelScore) best = labelScore;
-  if (idScore && (!best || compareMatchScores(idScore, best) < 0)) {
-    best = idScore;
-  }
+  const best = scoreTextFields(search, [opt.label, opt.id]);
   if (best) return best;
-  if (opt.description && opt.description.toLowerCase().includes(search)) {
-    return { tier: DESCRIPTION_FALLBACK_TIER, offset: 0 };
-  }
-  return null;
+  if (!opt.description) return null;
+  const descriptionScore = scoreTextFields(search, [opt.description]);
+  if (!descriptionScore) return null;
+  return { ...descriptionScore, tier: descriptionScore.tier + DESCRIPTION_FALLBACK_TIER };
 }
 
 export interface BuildVisibleComboboxOptionsInput {

packages/app/src/components/ui/combobox.tsx

@@ -1,5 +1,13 @@
-import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
-import type { ReactElement, ReactNode, Ref } from "react";
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+} from "react";
+import type { ReactElement, ReactNode } from "react";
 import {
   View,
   Text,
@@ -12,13 +20,14 @@ import {
   useWindowDimensions,
   type LayoutChangeEvent,
   type PressableStateCallbackType,
+  type StyleProp,
+  type ViewStyle,
 } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import {
   BottomSheetScrollView,
   BottomSheetBackdrop,
-  BottomSheetTextInput,
   BottomSheetBackgroundProps,
 } from "@gorhom/bottom-sheet";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
@@ -38,11 +47,18 @@ import {
   shouldShowCustomComboboxOption,
 } from "./combobox-options";
 import type { ComboboxOptionModel } from "./combobox-options";
-import { isNative, isWeb } from "@/constants/platform";
+import { isWeb } from "@/constants/platform";
 import {
   IsolatedBottomSheetModal,
   useIsolatedBottomSheetVisibility,
 } from "./isolated-bottom-sheet-modal";
+import {
+  AdaptiveTextInput,
+  InlineHeaderView,
+  SheetHeaderView,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
+import { FloatingSurface } from "@/components/ui/floating";
 
 const IS_WEB = isWeb;
 
@@ -69,6 +85,15 @@ export interface ComboboxProps {
   customValueKind?: "directory" | "file";
   optionsPosition?: "below-search" | "above-search";
   title?: string;
+  /**
+   * Structured header. When provided, replaces `title` + `stickyHeader` and
+   * is rendered via the shared SheetHeaderView (mobile) / InlineHeaderView
+   * (desktop). Built-in search (when `searchable=true` and no `header.search`)
+   * is folded into the header so its magnifying glass aligns with the title
+   * and any leading icon at the sheet's shared indent.
+   */
+  header?: SheetHeader;
+  mobileChildrenScrollEnabled?: boolean;
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
   desktopPlacement?: "top-start" | "bottom-start";
@@ -136,6 +161,7 @@ export interface SearchInputProps {
   onSubmitEditing?: () => void;
   autoFocus?: boolean;
   useBottomSheetInput?: boolean;
+  resetKey?: string | number;
 }
 
 export function SearchInput({
@@ -145,10 +171,10 @@ export function SearchInput({
   onSubmitEditing,
   autoFocus = false,
   useBottomSheetInput = false,
+  resetKey,
 }: SearchInputProps): ReactElement {
   const { theme } = useUnistyles();
   const inputRef = useRef<TextInput>(null);
-  const InputComponent = useBottomSheetInput && isNative ? BottomSheetTextInput : TextInput;
 
   useEffect(() => {
     if (autoFocus && IS_WEB && inputRef.current) {
@@ -162,18 +188,35 @@ export function SearchInput({
   return (
     <View style={styles.searchInputContainer}>
       <Search size={16} color={theme.colors.foregroundMuted} />
-      <InputComponent
-        ref={inputRef as unknown as Ref<never>}
-        // @ts-expect-error - outlineStyle is web-only
-        style={SEARCH_INPUT_STYLE}
-        placeholder={placeholder}
-        placeholderTextColor={theme.colors.foregroundMuted}
-        value={value}
-        onChangeText={onChangeText}
-        autoCapitalize="none"
-        autoCorrect={false}
-        onSubmitEditing={onSubmitEditing}
-      />
+      {useBottomSheetInput ? (
+        <AdaptiveTextInput
+          ref={inputRef}
+          // @ts-expect-error - outlineStyle is web-only
+          style={SEARCH_INPUT_STYLE}
+          placeholder={placeholder}
+          placeholderTextColor={theme.colors.foregroundMuted}
+          initialValue={value}
+          resetKey={resetKey}
+          value={value}
+          onChangeText={onChangeText}
+          autoCapitalize="none"
+          autoCorrect={false}
+          onSubmitEditing={onSubmitEditing}
+        />
+      ) : (
+        <TextInput
+          ref={inputRef}
+          // @ts-expect-error - outlineStyle is web-only
+          style={SEARCH_INPUT_STYLE}
+          placeholder={placeholder}
+          placeholderTextColor={theme.colors.foregroundMuted}
+          value={value}
+          onChangeText={onChangeText}
+          autoCapitalize="none"
+          autoCorrect={false}
+          onSubmitEditing={onSubmitEditing}
+        />
+      )}
     </View>
   );
 }
@@ -593,12 +636,14 @@ function useDesktopFloatingUpdate(
 function useResetSearchOnOpen(
   isOpen: boolean,
   setSearchQueryWithCallback: (query: string) => void,
+  bumpSearchResetKey: () => void,
 ) {
   useEffect(() => {
     if (isOpen) {
       setSearchQueryWithCallback("");
+      bumpSearchResetKey();
     }
-  }, [isOpen, setSearchQueryWithCallback]);
+  }, [isOpen, setSearchQueryWithCallback, bumpSearchResetKey]);
 }
 
 interface DesktopResetSetters {
@@ -816,7 +861,7 @@ interface DesktopContainerStyleInput {
   availableHeight: number | undefined;
 }
 
-function buildDesktopContainerStyle(input: DesktopContainerStyleInput) {
+function buildDesktopFrameStyle(input: DesktopContainerStyleInput): StyleProp<ViewStyle> {
   const {
     desktopMinWidth,
     referenceWidth,
@@ -835,7 +880,6 @@ function buildDesktopContainerStyle(input: DesktopContainerStyleInput) {
       ? { maxHeight: Math.min(availableHeight, desktopFixedHeight ?? 400) }
       : null;
   return [
-    styles.desktopContainer,
     {
       position: "absolute" as const,
       minWidth: desktopMinWidth ?? referenceWidth ?? 200,
@@ -919,9 +963,13 @@ interface MobileBodyProps {
   handleIndicatorStyle: { backgroundColor: string };
   titleColor: string;
   title: string;
+  header: SheetHeader | undefined;
+  onClose: () => void;
   stickyHeader: ReactNode;
   searchable: boolean;
   hasChildren: boolean;
+  mobileChildrenScrollEnabled: boolean;
+  searchResetKey: number;
   searchPlaceholder: string;
   searchQuery: string;
   setSearchQueryWithCallback: (query: string) => void;
@@ -981,29 +1029,40 @@ function MobileComboboxBody(props: MobileBodyProps): ReactElement {
       keyboardBehavior="extend"
       keyboardBlurBehavior="restore"
     >
-      <View style={styles.bottomSheetHeader}>
-        <Text key={props.titleColor} style={comboboxTitleStyle}>
-          {props.title}
-        </Text>
-      </View>
-      {props.stickyHeader}
-      {!props.hasChildren && props.searchable ? (
-        <SearchInput
-          placeholder={props.searchPlaceholder}
-          value={props.searchQuery}
-          onChangeText={props.setSearchQueryWithCallback}
-          onSubmitEditing={props.handleSubmitSearch}
-          autoFocus={false}
-          useBottomSheetInput
-        />
-      ) : null}
-      <BottomSheetScrollView
-        contentContainerStyle={styles.comboboxScrollContent}
-        keyboardShouldPersistTaps="handled"
-        showsVerticalScrollIndicator={false}
-      >
-        {body}
-      </BottomSheetScrollView>
+      {props.header ? (
+        <SheetHeaderView header={props.header} onClose={props.onClose} />
+      ) : (
+        <>
+          <View style={styles.bottomSheetHeader}>
+            <Text key={props.titleColor} style={comboboxTitleStyle}>
+              {props.title}
+            </Text>
+          </View>
+          {props.stickyHeader}
+          {!props.hasChildren && props.searchable ? (
+            <SearchInput
+              placeholder={props.searchPlaceholder}
+              value={props.searchQuery}
+              onChangeText={props.setSearchQueryWithCallback}
+              onSubmitEditing={props.handleSubmitSearch}
+              autoFocus={false}
+              useBottomSheetInput
+              resetKey={props.searchResetKey}
+            />
+          ) : null}
+        </>
+      )}
+      {props.hasChildren && !props.mobileChildrenScrollEnabled ? (
+        body
+      ) : (
+        <BottomSheetScrollView
+          contentContainerStyle={styles.comboboxScrollContent}
+          keyboardShouldPersistTaps="handled"
+          showsVerticalScrollIndicator={false}
+        >
+          {body}
+        </BottomSheetScrollView>
+      )}
     </IsolatedBottomSheetModal>
   );
 }
@@ -1013,8 +1072,9 @@ interface DesktopBodyProps {
   handleClose: () => void;
   refs: ReturnType<typeof useFloating>["refs"];
   shouldUseDesktopFade: boolean;
-  desktopContainerStyle: unknown;
+  desktopFrameStyle: StyleProp<ViewStyle>;
   handleDesktopContentLayout: (event: LayoutChangeEvent) => void;
+  header: SheetHeader | undefined;
   stickyHeader: ReactNode;
   searchable: boolean;
   searchPlaceholder: string;
@@ -1036,12 +1096,13 @@ interface DesktopBodyProps {
 }
 
 function DesktopComboboxChildrenBody(props: {
+  header: SheetHeader | undefined;
   stickyHeader: ReactNode;
   children: ReactNode;
 }): ReactElement {
   return (
     <>
-      {props.stickyHeader}
+      {props.header ? <InlineHeaderView header={props.header} /> : props.stickyHeader}
       <ScrollView
         contentContainerStyle={styles.desktopChildrenScrollContent}
         keyboardShouldPersistTaps="handled"
@@ -1055,6 +1116,7 @@ function DesktopComboboxChildrenBody(props: {
 }
 
 function DesktopComboboxOptionsBody(props: {
+  header: SheetHeader | undefined;
   stickyHeader: ReactNode;
   searchable: boolean;
   searchPlaceholder: string;
@@ -1085,8 +1147,8 @@ function DesktopComboboxOptionsBody(props: {
 
   return (
     <>
-      {props.stickyHeader}
-      {props.searchable ? (
+      {props.header ? <InlineHeaderView header={props.header} /> : props.stickyHeader}
+      {props.header || !props.searchable ? null : (
         <SearchInput
           placeholder={props.searchPlaceholder}
           value={props.searchQuery}
@@ -1095,7 +1157,7 @@ function DesktopComboboxOptionsBody(props: {
           autoFocus
           useBottomSheetInput={false}
         />
-      ) : null}
+      )}
       {props.effectiveOptionsPosition === "above-search" ? (
         <ScrollView
           ref={props.desktopOptionsScrollRef}
@@ -1131,21 +1193,23 @@ function DesktopComboboxBody(props: DesktopBodyProps): ReactElement {
     >
       <View ref={props.refs.setOffsetParent} collapsable={false} style={styles.desktopOverlay}>
         <Pressable style={styles.desktopBackdrop} onPress={props.handleClose} />
-        <Animated.View
+        <FloatingSurface
           testID="combobox-desktop-container"
           entering={props.shouldUseDesktopFade ? FadeIn.duration(100) : undefined}
           exiting={props.shouldUseDesktopFade ? FadeOut.duration(100) : undefined}
-          style={props.desktopContainerStyle as never}
+          style={styles.desktopContainer}
+          frameStyle={props.desktopFrameStyle}
           ref={props.refs.setFloating}
           collapsable={false}
           onLayout={props.handleDesktopContentLayout}
         >
           {props.hasChildren ? (
-            <DesktopComboboxChildrenBody stickyHeader={props.stickyHeader}>
+            <DesktopComboboxChildrenBody header={props.header} stickyHeader={props.stickyHeader}>
               {props.children}
             </DesktopComboboxChildrenBody>
           ) : (
             <DesktopComboboxOptionsBody
+              header={props.header}
               stickyHeader={props.stickyHeader}
               searchable={props.searchable}
               searchPlaceholder={props.searchPlaceholder}
@@ -1166,7 +1230,7 @@ function DesktopComboboxBody(props: DesktopBodyProps): ReactElement {
               renderOption={props.renderOption}
             />
           )}
-        </Animated.View>
+        </FloatingSurface>
       </View>
     </Modal>
   );
@@ -1188,6 +1252,8 @@ export function Combobox({
   customValueKind,
   optionsPosition = "below-search",
   title = "Select",
+  header,
+  mobileChildrenScrollEnabled = true,
   open,
   onOpenChange,
   desktopPlacement = "top-start",
@@ -1214,6 +1280,7 @@ export function Combobox({
   const [referenceTop, setReferenceTop] = useState<number | null>(null);
   const [referenceAtOrigin, setReferenceAtOrigin] = useState(false);
   const [searchQuery, setSearchQuery] = useState("");
+  const [searchResetKey, bumpSearchResetKey] = useReducer((key: number) => key + 1, 0);
   const [activeIndex, setActiveIndex] = useState<number>(-1);
   const desktopOptionsScrollRef = useRef<ScrollView>(null);
   const [desktopContentWidth, setDesktopContentWidth] = useState<number | null>(null);
@@ -1234,9 +1301,10 @@ export function Combobox({
   const handleClose = useCallback(() => {
     setOpen(false);
     setSearchQueryWithCallback("");
+    bumpSearchResetKey();
   }, [setOpen, setSearchQueryWithCallback]);
 
-  useResetSearchOnOpen(isOpen, setSearchQueryWithCallback);
+  useResetSearchOnOpen(isOpen, setSearchQueryWithCallback, bumpSearchResetKey);
 
   const collisionPadding = useMemo(computeCollisionPadding, []);
 
@@ -1427,9 +1495,9 @@ export function Combobox({
     [theme.colors.palette.zinc],
   );
 
-  const desktopContainerStyle = useMemo(
+  const desktopFrameStyle = useMemo(
     () =>
-      buildDesktopContainerStyle({
+      buildDesktopFrameStyle({
         desktopMinWidth,
         referenceWidth,
         desktopFixedHeight,
@@ -1465,9 +1533,13 @@ export function Combobox({
         handleIndicatorStyle={handleIndicatorStyle}
         titleColor={titleColor}
         title={title}
+        header={header}
+        onClose={handleClose}
         stickyHeader={stickyHeader}
         searchable={searchable}
         hasChildren={hasChildren}
+        mobileChildrenScrollEnabled={mobileChildrenScrollEnabled}
+        searchResetKey={searchResetKey}
         searchPlaceholder={effectiveSearchPlaceholder}
         searchQuery={searchQuery}
         setSearchQueryWithCallback={setSearchQueryWithCallback}
@@ -1492,8 +1564,9 @@ export function Combobox({
       handleClose={handleClose}
       refs={refs}
       shouldUseDesktopFade={shouldUseDesktopFade}
-      desktopContainerStyle={desktopContainerStyle}
+      desktopFrameStyle={desktopFrameStyle}
       handleDesktopContentLayout={handleDesktopContentLayout}
+      header={header}
       stickyHeader={stickyHeader}
       searchable={searchable}
       searchPlaceholder={effectiveSearchPlaceholder}

packages/app/src/components/ui/context-menu.tsx

@@ -18,7 +18,6 @@ import {
   Modal,
   Platform,
   Pressable,
-  ScrollView,
   StatusBar,
   Text,
   View,
@@ -28,7 +27,7 @@ import {
   type StyleProp,
   type ViewStyle,
 } from "react-native";
-import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
+import { FadeIn, FadeOut } from "react-native-reanimated";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { Check, CheckCircle } from "lucide-react-native";
@@ -38,6 +37,7 @@ import {
   IsolatedBottomSheetModal,
   useIsolatedBottomSheetVisibility,
 } from "@/components/ui/isolated-bottom-sheet-modal";
+import { FloatingScrollView, FloatingSurface } from "@/components/ui/floating";
 import { isWeb, isNative } from "@/constants/platform";
 import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
 
@@ -498,7 +498,7 @@ export function ContextMenuContent({
     [],
   );
 
-  const animatedContentStyle = useMemo(() => {
+  const frameStyle = useMemo(() => {
     const { width: screenWidth } = Dimensions.get("window");
     const resolvedWidthStyle: ViewStyle = fullWidth
       ? { width: screenWidth - horizontalPadding * 2 }
@@ -508,7 +508,6 @@ export function ContextMenuContent({
           ...(typeof maxWidth === "number" ? { maxWidth } : null),
         };
     return [
-      styles.content,
       resolvedWidthStyle,
       {
         position: "absolute" as const,
@@ -566,23 +565,24 @@ export function ContextMenuContent({
           onPress={handleClose}
           testID={testID ? `${testID}-backdrop` : undefined}
         />
-        <Animated.View
+        <FloatingSurface
           entering={FadeIn.duration(100)}
           exiting={FadeOut.duration(100)}
           collapsable={false}
           testID={testID}
           onLayout={handleContentLayout}
-          style={animatedContentStyle}
+          style={styles.content}
+          frameStyle={frameStyle}
         >
-          <ScrollView
+          <FloatingScrollView
             bounces={false}
             showsVerticalScrollIndicator
             style={webScrollbarStyle}
             contentContainerStyle={SCROLL_CONTENT_CONTAINER_STYLE}
           >
             {children}
-          </ScrollView>
-        </Animated.View>
+          </FloatingScrollView>
+        </FloatingSurface>
       </View>
     </Modal>
   );

packages/app/src/components/ui/dropdown-menu.tsx

@@ -14,7 +14,6 @@ import {
   ActivityIndicator,
   Modal,
   Pressable,
-  ScrollView,
   Text,
   View,
   Dimensions,
@@ -25,10 +24,10 @@ import {
   type ViewStyle,
   type StyleProp,
 } from "react-native";
-import Animated, { Keyframe, runOnJS } from "react-native-reanimated";
+import { Keyframe, runOnJS } from "react-native-reanimated";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { Check, CheckCircle } from "lucide-react-native";
-import { isWeb } from "@/constants/platform";
+import { FloatingScrollView, FloatingSurface } from "@/components/ui/floating";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
 
@@ -172,42 +171,37 @@ function computePosition({
   return { x, y, actualPlacement };
 }
 
-interface SharedDropdownContentProps {
-  collapsable: false;
-  testID?: string;
-  style: StyleProp<ViewStyle>;
-}
-
 function renderDropdownSurface(input: {
-  isWebSurface: boolean;
-  sharedProps: SharedDropdownContentProps;
+  frameStyle: StyleProp<ViewStyle>;
+  testID?: string;
+  surfaceStyle: StyleProp<ViewStyle>;
   scrollable: boolean;
   scrollViewportStyle: StyleProp<ViewStyle>;
   content: ReactElement;
   onExited: () => void;
 }): ReactElement {
-  const { isWebSurface, sharedProps, scrollable, scrollViewportStyle, content, onExited } = input;
+  const { frameStyle, testID, surfaceStyle, scrollable, scrollViewportStyle, content, onExited } =
+    input;
 
   const body = scrollable ? (
-    <ScrollView
+    <FloatingScrollView
       bounces={false}
       showsVerticalScrollIndicator
       style={scrollViewportStyle}
       contentContainerStyle={DROPDOWN_SCROLL_CONTENT_STYLE}
     >
       {content}
-    </ScrollView>
+    </FloatingScrollView>
   ) : (
     content
   );
 
-  if (isWebSurface) {
-    return <View {...sharedProps}>{body}</View>;
-  }
-
   return (
-    <Animated.View
-      {...sharedProps}
+    <FloatingSurface
+      collapsable={false}
+      testID={testID}
+      style={surfaceStyle}
+      frameStyle={frameStyle}
       entering={contentEntering}
       exiting={contentExiting.withCallback((finished) => {
         "worklet";
@@ -217,7 +211,7 @@ function renderDropdownSurface(input: {
       })}
     >
       {body}
-    </Animated.View>
+    </FloatingSurface>
   );
 }
 
@@ -513,7 +507,8 @@ export function DropdownMenuContent({
     [],
   );
 
-  const contentStyle = useMemo(() => {
+  const surfaceStyle = styles.content;
+  const frameStyle = useMemo(() => {
     const { width: screenWidth } = Dimensions.get("window");
     const resolvedWidthStyle: ViewStyle = fullWidth
       ? { width: screenWidth - horizontalPadding * 2 }
@@ -523,7 +518,6 @@ export function DropdownMenuContent({
           ...(typeof maxWidth === "number" ? { maxWidth } : null),
         };
     return [
-      styles.content,
       resolvedWidthStyle,
       {
         position: "absolute" as const,
@@ -543,14 +537,6 @@ export function DropdownMenuContent({
     actualPlacement,
     align,
   ]);
-  const sharedContentProps = useMemo(
-    () => ({
-      collapsable: false as const,
-      testID,
-      style: contentStyle,
-    }),
-    [testID, contentStyle],
-  );
   const scrollViewportStyle = useMemo(
     () => [webScrollbarStyle, visibleContentSize ? { height: visibleContentSize.height } : null],
     [visibleContentSize, webScrollbarStyle],
@@ -583,8 +569,9 @@ export function DropdownMenuContent({
         />
         {!closing
           ? renderDropdownSurface({
-              isWebSurface: isWeb,
-              sharedProps: sharedContentProps,
+              frameStyle,
+              testID,
+              surfaceStyle,
               scrollable,
               scrollViewportStyle,
               content,

packages/app/src/components/ui/floating.tsx

@@ -0,0 +1,63 @@
+import { forwardRef, useMemo, type ComponentProps, type ReactElement, type ReactNode } from "react";
+import {
+  ScrollView,
+  StyleSheet,
+  type ScrollViewProps,
+  type StyleProp,
+  type View,
+  type ViewStyle,
+} from "react-native";
+import Animated from "react-native-reanimated";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
+
+export interface FloatingSurfaceProps extends Omit<ComponentProps<typeof Animated.View>, "style"> {
+  frameStyle?: StyleProp<ViewStyle>;
+  style?: StyleProp<ViewStyle>;
+}
+
+export const FloatingSurface = forwardRef<View, FloatingSurfaceProps>(function FloatingSurface(
+  { frameStyle, style, ...props },
+  ref,
+): ReactElement {
+  const inlineFrameStyle = useMemo(() => {
+    const flattened = StyleSheet.flatten(frameStyle);
+    return flattened ? inlineUnistylesStyle(flattened) : undefined;
+  }, [frameStyle]);
+  const surfaceStyle = useMemo(() => [style, inlineFrameStyle], [inlineFrameStyle, style]);
+  return <Animated.View {...props} ref={ref} style={surfaceStyle} />;
+});
+
+export interface FloatingScrollViewProps {
+  bounces?: boolean;
+  children: ReactNode;
+  contentContainerStyle?: StyleProp<ViewStyle>;
+  keyboardShouldPersistTaps?: ScrollViewProps["keyboardShouldPersistTaps"];
+  showsVerticalScrollIndicator?: boolean;
+  style?: StyleProp<ViewStyle>;
+}
+
+export function FloatingScrollView({
+  bounces,
+  children,
+  contentContainerStyle,
+  keyboardShouldPersistTaps,
+  showsVerticalScrollIndicator,
+  style,
+}: FloatingScrollViewProps): ReactElement {
+  const inlineStyle = useMemo(() => {
+    const flattened = StyleSheet.flatten(style);
+    return flattened ? inlineUnistylesStyle(flattened) : undefined;
+  }, [style]);
+
+  return (
+    <ScrollView
+      bounces={bounces}
+      contentContainerStyle={contentContainerStyle}
+      keyboardShouldPersistTaps={keyboardShouldPersistTaps}
+      showsVerticalScrollIndicator={showsVerticalScrollIndicator}
+      style={inlineStyle}
+    >
+      {children}
+    </ScrollView>
+  );
+}

packages/app/src/components/ui/tooltip.tsx

@@ -25,9 +25,10 @@ import {
 } from "react-native";
 import { Portal } from "@gorhom/portal";
 import { useBottomSheetModalInternal } from "@gorhom/bottom-sheet";
-import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
+import { FadeIn, FadeOut } from "react-native-reanimated";
 import { StyleSheet } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
+import { FloatingSurface } from "@/components/ui/floating";
 import { isWeb } from "@/constants/platform";
 
 type Side = "top" | "bottom" | "left" | "right";
@@ -494,19 +495,18 @@ export function TooltipContent({
     [],
   );
 
-  const contentStyle = useMemo(
+  const frameStyle = useMemo(
     () => [
-      styles.content,
-      { maxWidth },
-      style,
       {
         position: "absolute" as const,
         top: position?.y ?? -9999,
         left: position?.x ?? -9999,
+        maxWidth,
       },
     ],
-    [maxWidth, style, position?.x, position?.y],
+    [maxWidth, position?.x, position?.y],
   );
+  const contentStyle = useMemo(() => [styles.content, style], [style]);
 
   const handleDismiss = useCallback(() => ctx.setOpen(false), [ctx]);
 
@@ -519,7 +519,7 @@ export function TooltipContent({
     return (
       <Portal hostName={bottomSheetInternal?.hostName}>
         <View pointerEvents="none" style={styles.portalOverlay}>
-          <Animated.View
+          <FloatingSurface
             pointerEvents="none"
             entering={FadeIn.duration(80)}
             exiting={FadeOut.duration(80)}
@@ -527,9 +527,10 @@ export function TooltipContent({
             testID={testID}
             onLayout={handleLayout}
             style={contentStyle}
+            frameStyle={frameStyle}
           >
             {children}
-          </Animated.View>
+          </FloatingSurface>
         </View>
       </Portal>
     );
@@ -544,7 +545,7 @@ export function TooltipContent({
       onRequestClose={handleDismiss}
     >
       <Pressable style={styles.overlay} onPress={handleDismiss}>
-        <Animated.View
+        <FloatingSurface
           pointerEvents="none"
           entering={FadeIn.duration(80)}
           exiting={FadeOut.duration(80)}
@@ -552,9 +553,10 @@ export function TooltipContent({
           testID={testID}
           onLayout={handleLayout}
           style={contentStyle}
+          frameStyle={frameStyle}
         >
           {children}
-        </Animated.View>
+        </FloatingSurface>
       </Pressable>
     </Modal>
   );

packages/app/src/components/web-desktop-scrollbar.tsx

@@ -1,17 +1,20 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   PanResponder,
-  View,
+  type GestureResponderEvent,
   type LayoutChangeEvent,
   type NativeScrollEvent,
   type NativeSyntheticEvent,
+  type ViewStyle,
+  View,
 } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { isWeb as platformIsWeb } from "@/constants/platform";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import {
   computeScrollOffsetFromDragDelta,
   computeVerticalScrollbarGeometry,
 } from "./web-desktop-scrollbar.math";
-import { isWeb as platformIsWeb } from "@/constants/platform";
 
 const METRICS_EPSILON = 0.5;
 const HANDLE_WIDTH_IDLE = 6;
@@ -27,6 +30,15 @@ const HANDLE_WIDTH_TRANSITION_DURATION_MS = 240;
 const HANDLE_SCROLL_VISIBILITY_MS = 1200;
 const HANDLE_SCROLL_ACTIVE_MS = 110;
 
+interface WebPointerStyle {
+  cursor?: "grab" | "grabbing";
+  touchAction?: "none";
+  userSelect?: "none";
+  transitionProperty?: string;
+  transitionDuration?: string;
+  transitionTimingFunction?: string;
+}
+
 interface PointerLikeEvent {
   clientY?: number;
   pageY?: number;
@@ -59,6 +71,13 @@ function areMetricsEqual(a: ScrollbarMetrics, b: ScrollbarMetrics): boolean {
   );
 }
 
+interface WebDesktopScrollbarOverlayProps {
+  enabled: boolean;
+  metrics: ScrollbarMetrics;
+  onScrollToOffset: (offset: number) => void;
+  inverted?: boolean;
+}
+
 export function useWebDesktopScrollbarMetrics() {
   const [metrics, setMetrics] = useState<ScrollbarMetrics>({
     offset: 0,
@@ -115,13 +134,6 @@ export function useWebDesktopScrollbarMetrics() {
   };
 }
 
-interface WebDesktopScrollbarOverlayProps {
-  enabled: boolean;
-  metrics: ScrollbarMetrics;
-  onScrollToOffset: (offset: number) => void;
-  inverted?: boolean;
-}
-
 export function WebDesktopScrollbarOverlay({
   enabled,
   metrics,
@@ -273,8 +285,12 @@ export function WebDesktopScrollbarOverlay({
       onStartShouldSetPanResponder: () => true,
       onMoveShouldSetPanResponder: () => true,
       onPanResponderTerminationRequest: () => false,
-      onPanResponderGrant: () => {
+      onPanResponderGrant: (event: GestureResponderEvent) => {
+        const clientY = readClientY(event);
         dragStartOffsetRef.current = normalizedOffsetRef.current;
+        if (clientY !== null) {
+          dragStartClientYRef.current = clientY;
+        }
         setIsDragging(true);
       },
       onPanResponderMove: (_event, gestureState) => {
@@ -362,20 +378,19 @@ export function WebDesktopScrollbarOverlay({
   const thumbRegionStyle = useMemo(
     () => [
       styles.thumbRegion,
-      {
-        top: 0,
+      inlineUnistylesStyle({
         height: thumbRegionHeight,
         transform: [{ translateY: thumbRegionOffset }],
-      },
+      }),
       platformIsWeb &&
-        ({
+        inlineUnistylesStyle({
           cursor: handleCursor,
           touchAction: "none",
           userSelect: "none",
           transitionProperty: "transform",
           transitionDuration: `${handleTravelDurationMs}ms`,
           transitionTimingFunction: "linear",
-        } as object),
+        } satisfies WebPointerStyle as unknown as ViewStyle),
     ],
     [thumbRegionHeight, thumbRegionOffset, handleCursor, handleTravelDurationMs],
   );
@@ -383,19 +398,19 @@ export function WebDesktopScrollbarOverlay({
   const handleStyle = useMemo(
     () => [
       styles.handle,
-      {
+      inlineUnistylesStyle({
         marginTop: handleInsetTop,
         height: geometry.handleSize,
         width: handleWidth,
         backgroundColor: handleColor,
         opacity: handleOpacity,
-      },
+      }),
       platformIsWeb &&
-        ({
+        inlineUnistylesStyle({
           transitionProperty: "opacity, width, background-color",
           transitionDuration: `${HANDLE_FADE_DURATION_MS}ms, ${HANDLE_WIDTH_TRANSITION_DURATION_MS}ms, ${HANDLE_FADE_DURATION_MS}ms`,
           transitionTimingFunction: "ease-out, cubic-bezier(0.22, 0.75, 0.2, 1), ease-out",
-        } as object),
+        } satisfies WebPointerStyle as unknown as ViewStyle),
     ],
     [handleInsetTop, geometry.handleSize, handleWidth, handleColor, handleOpacity],
   );
@@ -413,8 +428,6 @@ export function WebDesktopScrollbarOverlay({
         {...(platformIsWeb
           ? ({
               onPointerDown: startWebDrag,
-              onPointerEnter: handleGrabHoverIn,
-              onPointerLeave: handleGrabHoverOut,
               onMouseEnter: handleGrabHoverIn,
               onMouseLeave: handleGrabHoverOut,
             } as object)
@@ -446,5 +459,6 @@ const styles = StyleSheet.create(() => ({
     position: "absolute",
     right: -3,
     width: HANDLE_GRAB_WIDTH,
+    top: 0,
   },
 }));

packages/app/src/components/workspace-hover-card.tsx

@@ -9,7 +9,7 @@ import {
   type ReactNode,
 } from "react";
 import { Dimensions, Text, View } from "react-native";
-import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
+import { FadeIn, FadeOut } from "react-native-reanimated";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { CircleCheck, CircleDot, CircleX, ExternalLink } from "lucide-react-native";
 import { GitHubIcon } from "@/components/icons/github-icon";
@@ -24,6 +24,7 @@ import { openExternalUrl } from "@/utils/open-external-url";
 import { PrBadge } from "@/components/sidebar-workspace-list";
 import { useHoverSafeZone } from "@/hooks/use-hover-safe-zone";
 import { useIsCompactFormFactor } from "@/constants/layout";
+import { FloatingSurface } from "@/components/ui/floating";
 import { isWeb } from "@/constants/platform";
 
 interface Rect {
@@ -254,23 +255,19 @@ function WorkspaceHoverCardContent({
     [],
   );
 
-  const cardStyle = useMemo(
-    () => [
-      styles.card,
-      {
-        width: HOVER_CARD_WIDTH,
-        position: "absolute" as const,
-        top: position?.y ?? -9999,
-        left: position?.x ?? -9999,
-      },
-    ],
+  const frameStyle = useMemo(
+    () => ({
+      position: "absolute" as const,
+      top: position?.y ?? -9999,
+      left: position?.x ?? -9999,
+    }),
     [position?.x, position?.y],
   );
 
   return (
     <Portal hostName={bottomSheetInternal?.hostName}>
       <View pointerEvents="box-none" style={styles.portalOverlay}>
-        <Animated.View
+        <FloatingSurface
           ref={contentRef}
           entering={FadeIn.duration(80)}
           exiting={FadeOut.duration(80)}
@@ -279,7 +276,8 @@ function WorkspaceHoverCardContent({
           accessibilityRole="menu"
           accessibilityLabel="Workspace scripts"
           testID="workspace-hover-card"
-          style={cardStyle}
+          style={styles.card}
+          frameStyle={frameStyle}
         >
           <View style={styles.cardHeader}>
             <Text style={styles.cardTitle} numberOfLines={1} testID="hover-card-workspace-name">
@@ -303,7 +301,7 @@ function WorkspaceHoverCardContent({
               <ChecksSummaryPressable checks={prHint.checks} url={prHint.url} />
             </>
           ) : null}
-        </Animated.View>
+        </FloatingSurface>
       </View>
     </Portal>
   );
@@ -441,6 +439,7 @@ const styles = StyleSheet.create((theme) => ({
     borderColor: theme.colors.borderAccent,
     borderRadius: theme.borderRadius.lg,
     paddingTop: theme.spacing[2],
+    width: HOVER_CARD_WIDTH,
     shadowColor: "#000",
     shadowOffset: { width: 0, height: 4 },
     shadowOpacity: 0.2,

packages/app/src/components/workspace-setup-dialog.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Image, Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { createNameId } from "mnemonic-id";
-import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Composer } from "@/components/composer";
 import { useToast } from "@/contexts/toast-context";
 import { useAgentInputDraft } from "@/hooks/use-agent-input-draft";
@@ -374,14 +374,18 @@ export function WorkspaceSetupDialog() {
     [iconSource, placeholderInitial, workspaceTitle],
   );
 
+  const sheetHeader = useMemo<SheetHeader>(
+    () => ({ title: "Create workspace", subtitle: subtitleContent }),
+    [subtitleContent],
+  );
+
   if (!pendingWorkspaceSetup || !sourceDirectory) {
     return null;
   }
 
   return (
     <AdaptiveModalSheet
-      title="Create workspace"
-      subtitle={subtitleContent}
+      header={sheetHeader}
       visible={true}
       onClose={handleClose}
       snapPoints={SNAP_POINTS}

packages/app/src/data/acp-provider-catalog.ts

@@ -135,6 +135,15 @@ const CATALOG_DATA = [
     installLink: "https://docs.langchain.com/oss/javascript/deepagents/overview",
     command: ["npx", "-y", "deepagents-acp@0.1.7"],
   },
+  {
+    id: "deepseek-tui",
+    title: "DeepSeek TUI",
+    description: "Terminal coding agent for DeepSeek V4",
+    version: "0.8.39",
+    iconId: "deepseek-tui",
+    installLink: "https://github.com/Hmbown/DeepSeek-TUI",
+    command: ["deepseek", "serve", "--acp"],
+  },
   {
     id: "dimcode",
     title: "DimCode",
@@ -240,6 +249,15 @@ const CATALOG_DATA = [
     installLink: "https://kilo.ai/docs/code-with-ai/platforms/cli",
     command: ["kilo", "acp"],
   },
+  {
+    id: "kiro",
+    title: "Kiro CLI",
+    description: "Amazon's AI coding agent with native ACP support",
+    version: "manual",
+    iconId: null,
+    installLink: "https://kiro.dev/docs/cli/acp/",
+    command: ["kiro-cli", "acp"],
+  },
   {
     id: "kimi",
     title: "Kimi CLI",

packages/app/src/desktop/components/desktop-updates-section.tsx

@@ -5,7 +5,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { settingsStyles } from "@/styles/settings";
 import { SettingsSection } from "@/screens/settings/settings-section";
 import { ArrowUpRight, Copy, FileText, Activity } from "lucide-react-native";
-import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
 import { openExternalUrl } from "@/utils/open-external-url";
@@ -127,7 +127,7 @@ function DaemonLogsModal({ visible, onClose, daemonLogs }: DaemonLogsModalProps)
     <AdaptiveModalSheet
       visible={visible}
       onClose={onClose}
-      title="Daemon logs"
+      header={DAEMON_LOGS_HEADER}
       testID="managed-daemon-logs-dialog"
       snapPoints={LOGS_MODAL_SNAP_POINTS}
     >
@@ -158,7 +158,7 @@ function DaemonCliStatusModal({
     <AdaptiveModalSheet
       visible={visible}
       onClose={onClose}
-      title="Daemon status"
+      header={DAEMON_STATUS_HEADER}
       testID="daemon-cli-status-dialog"
       snapPoints={CLI_STATUS_MODAL_SNAP_POINTS}
     >
@@ -512,3 +512,5 @@ const LOADING_CARD_STYLE = [settingsStyles.card, styles.loadingCard];
 const ROW_WITH_BORDER_STYLE = [settingsStyles.row, settingsStyles.rowBorder];
 const LOGS_MODAL_SNAP_POINTS = ["70%", "92%"];
 const CLI_STATUS_MODAL_SNAP_POINTS = ["60%", "85%"];
+const DAEMON_LOGS_HEADER: SheetHeader = { title: "Daemon logs" };
+const DAEMON_STATUS_HEADER: SheetHeader = { title: "Daemon status" };

packages/app/src/desktop/components/pair-device-modal.tsx

@@ -1,4 +1,4 @@
-import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { PairDeviceSection } from "@/desktop/components/pair-device-section";
 
 export interface PairDeviceModalProps {
@@ -8,11 +8,12 @@ export interface PairDeviceModalProps {
 }
 
 const SNAP_POINTS: string[] = ["82%", "94%"];
+const PAIR_DEVICE_HEADER: SheetHeader = { title: "Pair a device" };
 
 export function PairDeviceModal({ visible, onClose, testID }: PairDeviceModalProps) {
   return (
     <AdaptiveModalSheet
-      title="Pair a device"
+      header={PAIR_DEVICE_HEADER}
       visible={visible}
       onClose={onClose}
       snapPoints={SNAP_POINTS}

packages/app/src/git/actions-split-button.tsx

@@ -17,6 +17,7 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { Shortcut } from "@/components/ui/shortcut";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { useToast } from "@/contexts/toast-context";
 import type { GitAction, GitActions } from "@/git/policy";
@@ -110,18 +111,20 @@ export function GitActionsSplitButton({ gitActions, hideLabels }: GitActionsSpli
   const primaryPressableStyle = useCallback(
     ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.splitButtonPrimary,
-      (Boolean(hovered) || pressed) && styles.splitButtonPrimaryHovered,
+      (Boolean(hovered) || pressed) &&
+        inlineUnistylesStyle({ backgroundColor: theme.colors.surface2 }),
       primaryDisabled && styles.splitButtonPrimaryDisabled,
     ],
-    [primaryDisabled],
+    [primaryDisabled, theme.colors.surface2],
   );
 
   const caretTriggerStyle = useCallback(
     ({ hovered, pressed, open }: { hovered: boolean; pressed: boolean; open: boolean }) => [
       styles.splitButtonCaret,
-      (hovered || pressed || open) && styles.splitButtonCaretHovered,
+      (hovered || pressed || open) &&
+        inlineUnistylesStyle({ backgroundColor: theme.colors.surface2 }),
     ],
-    [],
+    [theme.colors.surface2],
   );
 
   return (
@@ -230,9 +233,6 @@ const styles = StyleSheet.create((theme) => ({
     justifyContent: "center",
     position: "relative",
   },
-  splitButtonPrimaryHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
   splitButtonPrimaryDisabled: {
     opacity: 0.6,
   },
@@ -258,9 +258,6 @@ const styles = StyleSheet.create((theme) => ({
     borderLeftWidth: theme.borderWidth[1],
     borderLeftColor: theme.colors.borderAccent,
   },
-  splitButtonCaretHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
   iconButton: {
     width: 32,
     height: 32,

packages/app/src/git/diff-pane.tsx

@@ -78,6 +78,7 @@ import { lineNumberGutterWidth } from "@/components/code-insets";
 import { useWebScrollViewScrollbar } from "@/components/use-web-scrollbar";
 import { GitActionsSplitButton } from "@/git/actions-split-button";
 import { useGitActions } from "@/git/use-actions";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { usePanelStore } from "@/stores/panel-store";
 import { buildWorkspaceExplorerStateKey } from "@/hooks/use-file-explorer-actions";
 import {
@@ -113,25 +114,6 @@ function fileHeaderPressableStyle({ pressed }: PressableStateCallbackType) {
   return [styles.fileHeader, pressed && styles.fileHeaderPressed];
 }
 
-function diffModeTriggerStyle({
-  hovered,
-  pressed,
-  open,
-}: PressableStateCallbackType & { hovered?: boolean; open?: boolean }) {
-  return [
-    styles.diffModeTrigger,
-    Boolean(hovered) && styles.diffModeTriggerHovered,
-    (pressed || Boolean(open)) && styles.diffModeTriggerPressed,
-  ];
-}
-
-function expandAllButtonStyle({
-  hovered,
-  pressed,
-}: PressableStateCallbackType & { hovered?: boolean }) {
-  return [styles.expandAllButton, (Boolean(hovered) || pressed) && styles.diffStatusRowHovered];
-}
-
 interface HighlightedTextProps {
   tokens: HighlightToken[];
   wrapLines?: boolean;
@@ -274,7 +256,12 @@ function DiffGutterCell({
   style?: StyleProp<ViewStyle>;
 }) {
   const containerStyle = useMemo(
-    () => [styles.gutterCell, lineTypeBackground(type), { width: gutterWidth }, style],
+    () => [
+      styles.gutterCell,
+      lineTypeBackground(type),
+      inlineUnistylesStyle({ width: gutterWidth }),
+      style,
+    ],
     [type, gutterWidth, style],
   );
   const textStyle = useMemo(
@@ -544,7 +531,10 @@ function InlineReviewThreadContent({
 }) {
   const threadState = getInlineReviewThreadState({ reviewTarget, reviewActions });
   const height = reservedHeight ?? threadState?.height ?? 0;
-  const placeholderStyle = useMemo<ViewStyle>(() => ({ minHeight: height }), [height]);
+  const placeholderStyle = useMemo<ViewStyle>(
+    () => inlineUnistylesStyle({ minHeight: height }),
+    [height],
+  );
   if (height === 0) {
     return null;
   }
@@ -580,7 +570,11 @@ function InlineReviewGutterSpacer({
   const threadState = getInlineReviewThreadState({ reviewTarget, reviewActions });
   const height = reservedHeight ?? threadState?.height ?? 0;
   const spacerStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [styles.inlineReviewGutterSpacer, { width: gutterWidth, minHeight: height }, style],
+    () => [
+      styles.inlineReviewGutterSpacer,
+      inlineUnistylesStyle({ width: gutterWidth, minHeight: height }),
+      style,
+    ],
     [gutterWidth, height, style],
   );
   if (height === 0) {
@@ -604,10 +598,13 @@ function InlineReviewRow({
   const threadState = getInlineReviewThreadState({ reviewTarget, reviewActions });
   const height = reservedHeight ?? threadState?.height ?? 0;
   const gutterSpacerStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [styles.inlineReviewGutterSpacer, { width: gutterWidth }],
+    () => [styles.inlineReviewGutterSpacer, inlineUnistylesStyle({ width: gutterWidth })],
     [gutterWidth],
   );
-  const placeholderStyle = useMemo<ViewStyle>(() => ({ minHeight: height }), [height]);
+  const placeholderStyle = useMemo<ViewStyle>(
+    () => inlineUnistylesStyle({ minHeight: height }),
+    [height],
+  );
   if (height === 0) {
     return null;
   }
@@ -656,7 +653,10 @@ function SplitDiffColumn({
     [showDivider],
   );
   const linesContainerRowStyle = useMemo(
-    () => [styles.linesContainer, scrollWidth > 0 && { minWidth: scrollWidth }],
+    () => [
+      styles.linesContainer,
+      scrollWidth > 0 && inlineUnistylesStyle({ minWidth: scrollWidth }),
+    ],
     [scrollWidth],
   );
 
@@ -916,7 +916,10 @@ function DiffFileBody({
 
   const availableWidth = bodyWidth > 0 ? bodyWidth : scrollViewWidth;
   const linesContainerRowStyle = useMemo(
-    () => [styles.linesContainer, availableWidth > 0 && { minWidth: availableWidth }],
+    () => [
+      styles.linesContainer,
+      availableWidth > 0 && inlineUnistylesStyle({ minWidth: availableWidth }),
+    ],
     [availableWidth],
   );
 
@@ -1062,7 +1065,7 @@ interface GitDiffPaneProps {
 }
 
 type PressableStyleFn = (
-  state: PressableStateCallbackType & { hovered?: boolean },
+  state: PressableStateCallbackType & { hovered?: boolean; open?: boolean },
 ) => StyleProp<ViewStyle>;
 
 interface DiffLayoutToggleGroupProps {
@@ -1436,14 +1439,30 @@ function computePrErrorMessage(
   return prPayloadError?.message ?? null;
 }
 
+function buildDiffModeTriggerStyle(surfaceColor: string): PressableStyleFn {
+  return ({ hovered, pressed, open }) => [
+    styles.diffModeTrigger,
+    (Boolean(hovered) || pressed || Boolean(open)) &&
+      inlineUnistylesStyle({ backgroundColor: surfaceColor }),
+  ];
+}
+
+function buildExpandAllButtonStyle(surfaceColor: string): PressableStyleFn {
+  return ({ hovered, pressed }) => [
+    styles.expandAllButton,
+    (Boolean(hovered) || pressed) && inlineUnistylesStyle({ backgroundColor: surfaceColor }),
+  ];
+}
+
 function buildToggleButtonStyle(
   selected: boolean,
   baseStyles: StyleProp<ViewStyle> | StyleProp<ViewStyle>[],
+  surfaceColor: string,
 ): PressableStyleFn {
   return ({ hovered, pressed }) => [
     baseStyles,
-    selected && styles.toggleButtonSelected,
-    (Boolean(hovered) || pressed) && styles.diffStatusRowHovered,
+    (selected || Boolean(hovered) || pressed) &&
+      inlineUnistylesStyle({ backgroundColor: surfaceColor }),
   ];
 }
 
@@ -1494,32 +1513,50 @@ export function GitDiffPane({
     handleLayoutChange("split");
   }, [handleLayoutChange]);
 
+  const controlSurfaceColor = theme.colors.surface2;
+  const diffModeTriggerStyle = useMemo(
+    () => buildDiffModeTriggerStyle(controlSurfaceColor),
+    [controlSurfaceColor],
+  );
+
   const unifiedToggleStyle = useMemo(
     () =>
-      buildToggleButtonStyle(changesPreferences.layout === "unified", [
-        styles.toggleButton,
-        styles.toggleButtonGroupStart,
-      ]),
-    [changesPreferences.layout],
+      buildToggleButtonStyle(
+        changesPreferences.layout === "unified",
+        [styles.toggleButton, styles.toggleButtonGroupStart],
+        controlSurfaceColor,
+      ),
+    [changesPreferences.layout, controlSurfaceColor],
   );
 
   const splitToggleStyle = useMemo(
     () =>
-      buildToggleButtonStyle(changesPreferences.layout === "split", [
-        styles.toggleButton,
-        styles.toggleButtonGroupEnd,
-      ]),
-    [changesPreferences.layout],
+      buildToggleButtonStyle(
+        changesPreferences.layout === "split",
+        [styles.toggleButton, styles.toggleButtonGroupEnd],
+        controlSurfaceColor,
+      ),
+    [changesPreferences.layout, controlSurfaceColor],
   );
 
   const hideWhitespaceToggleStyle = useMemo(
-    () => buildToggleButtonStyle(changesPreferences.hideWhitespace, styles.expandAllButton),
-    [changesPreferences.hideWhitespace],
+    () =>
+      buildToggleButtonStyle(
+        changesPreferences.hideWhitespace,
+        styles.expandAllButton,
+        controlSurfaceColor,
+      ),
+    [changesPreferences.hideWhitespace, controlSurfaceColor],
   );
 
   const wrapLinesToggleStyle = useMemo(
-    () => buildToggleButtonStyle(wrapLines, styles.expandAllButton),
-    [wrapLines],
+    () => buildToggleButtonStyle(wrapLines, styles.expandAllButton, controlSurfaceColor),
+    [wrapLines, controlSurfaceColor],
+  );
+
+  const expandAllToggleStyle = useMemo(
+    () => buildExpandAllButtonStyle(controlSurfaceColor),
+    [controlSurfaceColor],
   );
 
   const {
@@ -2046,7 +2083,7 @@ export function GitDiffPane({
                   allExpanded={allExpanded}
                   isMobile={isMobile}
                   wrapLinesToggleStyle={wrapLinesToggleStyle}
-                  expandAllToggleStyle={expandAllButtonStyle}
+                  expandAllToggleStyle={expandAllToggleStyle}
                   onToggleWrapLines={handleToggleWrapLines}
                   onToggleExpandAll={handleToggleExpandAll}
                 />

packages/app/src/hooks/use-acp-provider-catalog.test.ts

@@ -26,7 +26,7 @@ describe("ACP provider catalog", () => {
   });
 
   it("bundles SVG icons for catalog entries that declare an icon", () => {
-    const entriesWithIcons = ACP_PROVIDER_CATALOG.filter((entry) => entry.id !== "hermes");
+    const entriesWithIcons = ACP_PROVIDER_CATALOG.filter((entry) => entry.iconSvg !== null);
 
     expect(entriesWithIcons.length).toBeGreaterThan(0);
     for (const entry of entriesWithIcons) {
@@ -37,8 +37,10 @@ describe("ACP provider catalog", () => {
   it("uses PATH commands for entries that were binary distributions upstream", () => {
     expect(findProvider("amp-acp").command).toEqual(["amp-acp"]);
     expect(findProvider("cursor").command).toEqual(["cursor-agent", "acp"]);
+    expect(findProvider("deepseek-tui").command).toEqual(["deepseek", "serve", "--acp"]);
     expect(findProvider("goose").command).toEqual(["goose", "acp"]);
     expect(findProvider("junie").command).toEqual(["junie", "--acp", "true"]);
+    expect(findProvider("kiro").command).toEqual(["kiro-cli", "acp"]);
     expect(findProvider("poolside").command).toEqual(["pool", "acp"]);
   });