Add Antigravity CLI to ACP catalog

2026-11-07 08:54:42 +00:00 · 2026-05-20 10:57:29 +07:00
188 changed files with 2006 additions and 8542 deletions
@@ -1,11 +0,0 @@
---
-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.
@@ -1,11 +0,0 @@
---
-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.
@@ -1 +0,0 @@
-../../.agents/skills/release-beta
@@ -1 +0,0 @@
-../../.agents/skills/release-stable
@@ -1,83 +1,5 @@
 # Changelog

-## 0.1.81 - 2026-05-24
-
-### Added
-
- **Paseo can now be installed as a web app from supported browsers** ([#1144](https://github.com/getpaseo/paseo/pull/1144))
- **Pi extension dialogs now appear as Paseo permission prompts** ([#1134](https://github.com/getpaseo/paseo/pull/1134) by [@yuruiz](https://github.com/yuruiz))
- Added community links and a home button to the sidebar
-
-### Improved
-
- **Mobile terminals load faster and restore existing output more smoothly** ([#1147](https://github.com/getpaseo/paseo/pull/1147))
- Copying assistant messages preserves formatting
- Agent metadata fallback failures now log each provider attempt for easier debugging
-
-### Fixed
-
- Android: slash command suggestions stay interactive when opened from the composer
- macOS: Alt+letter shortcuts work again
- Terminal panes no longer flicker during resize
- OpenCode MCP servers are injected once instead of being connected twice
- Import session no longer shows empty sessions
- Worktree archive status no longer reports false unpushed commits ([#1158](https://github.com/getpaseo/paseo/pull/1158))
- The `/exit`, `/quit`, and `/q` slash command aliases now show as one row
- Shortcut chord badges are readable in light mode
- Segmented controls show their track under every segment
- Sheet header search text is readable in dark mode
-
-## 0.1.80 - 2026-05-21
-
-### Fixed
-
- Opening dropdown menus no longer crashes on mobile
-
-## 0.1.79 - 2026-05-21
-
-### Added
-
- **Pi has been revamped with first-class support**
-  - Runs through your installed Pi CLI, so your Pi extensions and configuration carry over
-  - Pi agents can call Paseo tools when you have the Pi MCP extension installed
-  - Import a Pi session you started in the terminal
-  - Copy Pi's resume command from any agent to continue the session in your terminal
-  - Windows: Pi sessions match correctly across symlinked and junctioned workspace paths
- **New home screen with quick tiles for adding a project, importing a session, setting up providers, and pairing a device**
- **Create an agent directly into a fresh worktree that auto-archives when the run finishes**
- **Set a custom system prompt that applies to every agent you start**
- **Rename workspaces, terminals, and agent tabs** ([#531](https://github.com/getpaseo/paseo/pull/531))
- **DeepSeek TUI in the ACP provider catalog** ([#1096](https://github.com/getpaseo/paseo/pull/1096))
- **Kiro CLI in the ACP provider catalog** (by [@huhusmang](https://github.com/huhusmang))
- Catalog providers show their icons in the model picker ([#1098](https://github.com/getpaseo/paseo/pull/1098))
- Custom environment variables passed when creating an agent now reach the agent process ([#1112](https://github.com/getpaseo/paseo/pull/1112))
- NixOS module supports the public TLS option for self-hosted relays ([#1106](https://github.com/getpaseo/paseo/pull/1106) by [@yzx9](https://github.com/yzx9))
-
-### Improved
-
- **Stale host connections recover automatically without a manual refresh**
- Paseo opens to the workspace you were on last time you used it ([#1101](https://github.com/getpaseo/paseo/pull/1101))
- Workspaces remember which editor you opened them in
- Outdated daemons now suggest an upgrade when they receive a command they don't understand
- Voice mode is hidden while an agent is running
- Agent file-link tooltips show the full resolved file path ([#1088](https://github.com/getpaseo/paseo/pull/1088))
- Workspace git status refreshes less aggressively in the background ([#1102](https://github.com/getpaseo/paseo/pull/1102))
-
-### Fixed
-
- macOS desktop no longer freezes after the display wakes from sleep ([#745](https://github.com/getpaseo/paseo/pull/745))
- Windows: Codex picks up the Microsoft Store install correctly ([#1020](https://github.com/getpaseo/paseo/pull/1020) by [@32r4](https://github.com/32r4))
- Workspace selection survives a daemon restart ([#1111](https://github.com/getpaseo/paseo/pull/1111))
- Cursor agents wait for slash commands to load before listing them ([#1099](https://github.com/getpaseo/paseo/pull/1099) by [@chrisbanes](https://github.com/chrisbanes))
- Codex sub-agents keep running through transient child process errors (by [@xy-plus](https://github.com/xy-plus))
- iPad terminals send Ctrl+C correctly from a hardware keyboard (by [@samatar26](https://github.com/samatar26))
- Git filenames with non-ASCII characters render correctly (by [@samatar26](https://github.com/samatar26))
- Paste shortcuts work on Dvorak keyboard layouts (by [@qin-nz](https://github.com/qin-nz))
- Claude file links resolve correctly for projects whose paths need SDK encoding
- Duplicate Claude result text no longer appears in chat ([#1095](https://github.com/getpaseo/paseo/pull/1095))
- Dynamic UI styles no longer leak CSS rules across the page ([#1103](https://github.com/getpaseo/paseo/pull/1103))
- Relay handshakes reject sessions that try to change encryption keys mid-flight ([#1037](https://github.com/getpaseo/paseo/pull/1037) by [@joaosa](https://github.com/joaosa))
-
 ## 0.1.78 - 2026-05-18

 ### Improved
@@ -758,7 +680,7 @@

 ### Added

- Pi (pi.dev) agent provider — connect Pi as a new agent type with thinking levels and tool call support
+- Pi (pi.dev) agent provider — connect Pi as a new ACP-based agent type with thinking levels and tool call support
 - Copilot agent provider re-enabled after ACP compatibility fixes
 - `paseo .` and `paseo <path>` open the desktop app with the given project, similar to `code .`
 - Provider-declared features system — providers can expose dynamic toggles and selects that the app renders automatically. First consumer: Codex fast mode
@@ -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, GitHub Copilot, OpenCode, and Pi.
+**Supported agents:** Claude Code, Codex, and OpenCode.

 ## Repository map

@@ -32,7 +32,6 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/design.md](docs/design.md)                               | Theme tokens — colors, fonts, spacing, radii, icons                                                                            |
 | [docs/hover.md](docs/hover.md)                                 | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
 | [docs/unistyles.md](docs/unistyles.md)                         | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
-| [docs/floating-panels.md](docs/floating-panels.md)             | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
 | [docs/file-icons.md](docs/file-icons.md)                       | Material icon theme integration for the file explorer                                                                          |
 | [docs/providers.md](docs/providers.md)                         | Adding a new agent provider end-to-end                                                                                         |
 | [docs/custom-providers.md](docs/custom-providers.md)           | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
@@ -19,7 +19,7 @@
  </a>
 </p>

-<p align="center">One interface for Claude Code, Codex, Copilot, OpenCode, and Pi agents.</p>
+<p align="center">One interface for all your Claude Code, Codex and OpenCode 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, Copilot, OpenCode, and Pi through the same interface. Pick the right model for each job.
+- **Multi-provider:** Claude Code, Codex, and OpenCode 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,9 +49,7 @@ 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)

@@ -27,8 +27,6 @@ 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
@@ -38,10 +38,6 @@ 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
@@ -22,13 +22,13 @@ Your code never leaves your machine. Paseo is local-first.
            │  (Node.js)  │
            └──────┬──────┘
                   │
-      ┌────────────┼────────────┬────────────┬────────────┐
-      │            │            │            │            │
-┌─────▼─────┐ ┌───▼────┐ ┌──────▼─────┐ ┌────▼─────┐ ┌────▼────┐
-│  Claude   │ │ Codex  │ │  Copilot   │ │ OpenCode │ │   Pi    │
-│  Agent    │ │ Agent  │ │   Agent    │ │  Agent   │ │ Agent   │
-│  SDK      │ │ Server │ │    ACP     │ │          │ │         │
-└───────────┘ └────────┘ └────────────┘ └──────────┘ └─────────┘
+      ┌────────────┼────────────┐
+      │            │            │
+┌─────▼─────┐ ┌───▼────┐ ┌────▼─────┐
+│  Claude   │ │ Codex  │ │ OpenCode │
+│  Agent    │ │ Agent  │ │  Agent   │
+│  SDK      │ │ Server │ │          │
+└───────────┘ └────────┘ └──────────┘
 ```

 ## Components at a glance
@@ -146,8 +146,6 @@ 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:**
@@ -217,17 +215,16 @@ initializing → idle ⇄ running

 Each provider implements the `AgentClient` interface in `agent/agent-sdk-types.ts`. Provider implementations live in `agent/providers/`.

-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:
+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:

 | 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             | ACP wrapper (`acp-agent`)            | Provider-managed                                   |
+| Cursor / Copilot   | ACP wrapper (`acp-agent`)            | Provider-managed                                   |
 | Generic ACP        | ACP wrapper                          | Provider-managed                                   |
-| Pi                 | Local Pi RPC process                 | Provider-managed                                   |
+| Pi-direct          | Direct Anthropic API call            | Stateless                                          |
 | Mock load test     | In-process fake                      | In-memory                                          |

 All providers:
@@ -339,7 +339,7 @@ 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.
+Paseo also ships an in-app ACP provider catalog for common agents, including Google Antigravity CLI, 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

@@ -187,20 +187,6 @@ Point Playwright MCP at the running Expo web target. Under `npm run dev` (macOS/

 Do NOT use browser history (back/forward). Always navigate by clicking UI elements or using `browser_navigate` with the full URL — the app uses client-side routing and browser history breaks state.

-## App web deploys
-
-`packages/app` exports a single-page Expo web app and deploys the `dist/`
-directory to Cloudflare Pages with `npm run deploy:web --workspace=@getpaseo/app`.
-
-PWA install metadata lives in `packages/app/public/manifest.json` and is linked
-from `packages/app/public/index.html`. Keep the install icons in `public/` so
-Cloudflare serves them from stable root URLs after `expo export`.
-
-Do not add service-worker caching casually. Paseo is a live control surface for
-agents, and an aggressive service worker can strand installed users on stale web
-code. If offline behavior becomes a product requirement, add it deliberately
-with an update strategy and test the installed-app upgrade path.
-
 ## Expo troubleshooting

 ```bash
@@ -1,173 +0,0 @@
-# Floating Panels
-
-Anchored popovers — tooltips, hover cards, dropdowns, autocompletes — that visually
-float above an anchor element on iOS, Android, and web. This doc captures the
-non-obvious traps. It is **not** a tutorial; it assumes you have seen the
-canonical files and are trying to add or change one.
-
-## Canonical files
-
-| File                                     | Use case                                                       |
-| ---------------------------------------- | -------------------------------------------------------------- |
-| `components/ui/combobox.tsx`             | Anchored picker with search; mobile falls back to bottom sheet |
-| `components/ui/tooltip.tsx`              | Non-interactive hover/long-press tooltip                       |
-| `components/workspace-hover-card.tsx`    | Desktop-web hover card with measure + computePosition + Portal |
-| `components/ui/autocomplete-popover.tsx` | Inline slash-command autocomplete above a focused TextInput    |
-
-Each handles a different mix of concerns: combobox owns input focus, tooltip is
-non-interactive, hover-card is web-only desktop, autocomplete coexists with a
-focused TextInput. There is no shared "floating panel" primitive yet — when a
-fifth use case shows up we can revisit; until then prefer copying the closest
-file and trimming. The four gotchas below are what each of them re-learned.
-
-## Gotcha 1 — Android touch hit-test by parent bounds
-
-On Android, a child View whose bounds fall outside its parent's bounds renders
-correctly (with `overflow: visible`, the default) but **does not receive touch
-events**. `ViewGroup.dispatchTouchEvent` filters touches by the parent's hit
-rect first, then iterates children. A touch in the overflowing region never
-reaches the parent, let alone the child. iOS and web do not share this rule —
-iOS hit-test descends into overflowing children, web uses standard CSS pointer
-events. This is the bug that put autocomplete on this path: the popover was
-positioned `bottom: 100%` of its parent and worked on iOS/web for months;
-Android touches sailed straight through to the chat scroll view behind it.
-
-Two escape hatches in the codebase:
-
- **`Modal`** (combobox, tooltip on native) — opens a new Android window, so
-  hit-testing starts fresh in that window. Side effect: a Modal opening on
-  Android can detach the IME from an underlying TextInput. Fine for combobox
-  (it has its own input) and tooltip (no input). **Not** fine for autocomplete
-  (the composer's input must stay focused so the user keeps typing).
- **`<Portal>` from `@gorhom/portal`** (hover-card, autocomplete-popover) —
-  hoists the React subtree to a fixed mount point (`PortalHost name="root"` in
-  `app/_layout.tsx`) whose bounds cover the screen. Same window, same IME,
-  hit-test works because the new parent is full-screen. This is the right
-  default when you must keep IME attachment.
-
-Choose Modal vs Portal by whether you need the underlying input to keep its
-keyboard.
-
-## Gotcha 2 — Portal breaks lifecycle and coordinate-system inheritance
-
-A Portal escapes Android's hit-test, but it also escapes two things you were
-quietly relying on:
-
- **Lifecycle.** The portal'd subtree mounts at the app root, not inside your
-  component's natural ancestor chain. When the user navigates away, your
-  component may stay mounted (offscreen, in a tab) — the popover stays with it.
-  Gate `visible` on a screen-focus signal. For panes inside `agent-panel`, the
-  `isPaneFocused` prop already exists and flips on pane switches; pass
-  `visible={isYourOwnVisible && isPaneFocused}`. See
-  `composer.tsx:1604` and `autocomplete-popover.tsx`.
- **Transforms.** The composer is wrapped in a Reanimated `Animated.View` with
-  `translateY: -keyboardShift` (see `use-keyboard-shift-style.ts`). The chat
-  content has the same transform applied (`agent-panel.tsx:939`). They move
-  together because they share the SharedValue. A portal'd popover is at the
-  app root — it does not get that transform unless you apply it yourself.
-
-The fix for transforms is Gotcha 3.
-
-## Gotcha 3 — Reanimated transforms vs `measureInWindow`
-
-`measureInWindow` returns the view's _current_ screen position. In theory that
-includes Reanimated-applied transforms (Reanimated updates native view
-properties, and Android's `getLocationInWindow` reads transformed coords). In
-practice it's racy — the measurement may snapshot mid-animation, and on Android
-with Reanimated worklets the result is not always stable.
-
-Do not try to track the keyboard by re-measuring on every frame. Instead,
-**slave the popover's transform to the same SharedValue the composer uses**:
-
-1. Snapshot `openShift = shift.value` at the moment you measure the anchor.
-2. Apply `useAnimatedStyle(() => ({ transform: [{ translateY: openShift.value - shift.value }] }))`
-   to the popover wrapper.
-
-When `shift` equals `openShift`, the translate is 0 and the popover sits at
-the measured position. When the keyboard moves afterward, the delta translates
-the popover by exactly the amount the composer translates. They move in
-lockstep, no re-measurement needed. See `autocomplete-popover.tsx` —
-`openShift` / `shift` / `animatedTransformStyle`.
-
-Re-measure on `Keyboard.addListener('keyboardDidShow'|'keyboardDidHide')` only
-to refresh the snapshot if the keyboard was mid-transition when the popover
-opened.
-
-## Gotcha 4 — Status-bar offset for Portal-based positioning on Android
-
-On Android, `measureInWindow` returns coords **below** the status bar (the
-status bar is system-owned space). A Portal overlay positioned at `top: 0`
-inside the `PortalProvider` may start at the **top of the window** (above the
-status bar) depending on the wrapper chain. The result: position the popover
-at the measured `rect.y` and it sits `StatusBar.currentHeight` higher than the
-anchor on Android.
-
-Mirror what tooltip does: shift the measured rect down by the status bar height
-on Android only.
-
-```ts
-const statusBarOffset = Platform.OS === "android" ? (StatusBar.currentHeight ?? 0) : 0;
-setAnchorRect({ ...rect, y: rect.y + statusBarOffset });
-```
-
-See `tooltip.tsx` and `autocomplete-popover.tsx`. iOS and web do not need this.
-
-## Gotcha 5 — The two-measurement flash
-
-If your popover needs `top` (or `left`) computed from both:
-
- the anchor's screen position (`anchorRect` from `measureInWindow`), **and**
- the popover's own size (`contentSize` from `onLayout`),
-
-then a naïve implementation will flash through three positions on every open:
-
-1. **Frame 1** — render with `top: -9999` (or any placeholder) while waiting
-   for either measurement. Wrapper has no `width`, so the inner content lays
-   out at its natural (often narrow) intrinsic width.
-2. **Frame 2** — `anchorRect` lands. Wrapper now has `width: anchorRect.width`.
-   But the stale `onLayout` from frame 1 has already set `contentSize` to the
-   narrow-width dimensions. `top = anchorRect.y - wrongHeight - gap` — visible
-   at the wrong spot.
-3. **Frame 3** — real `onLayout` fires with the correct width. `contentSize`
-   updates. Position snaps to the right place.
-
-The visible jump in frame 2 is the flash. Two pieces solve it, and you need
-both:
-
- **Do not mount the floating content until `anchorRect` is set.** Return
-  `null` until then. This prevents the bad-width onLayout from happening at
-  all.
- **Once `anchorRect` is set but `contentSize` isn't, render the wrapper with
-  the final width but `opacity: 0`.** The first visible paint is at the
-  correct position. This is the combobox pattern —
-  `shouldHideDesktopContent` at `combobox.tsx:481, 876`. **Do not** use
-  `top: -9999` as the placeholder; the layout work still happens at -9999 and
-  any subsequent state-flash is visible when you flip back.
-
-The "render invisible to measure, then reveal" pattern is the canonical
-solution to chicken-and-egg positioning in this codebase. Reach for it before
-anything fancier.
-
-## Recipe for a new anchored panel
-
-Before you write a new one, ask:
-
-1. **Can the underlying input lose its keyboard?** If yes, use Modal (simpler).
-   If no, use Portal.
-2. **Does the panel need to dismiss on screen change?** Almost always yes —
-   gate `visible` on an upstream focus prop (`isPaneFocused` or similar).
-3. **Does the panel sit above something that moves with the keyboard?** If
-   yes, slave a Reanimated transform to the same SharedValue (Gotcha 3).
-   If no, you can probably skip the transform entirely.
-4. **Will the panel's content height vary?** If yes, you need both
-   `anchorRect` and `contentSize` for positioning → apply Gotcha 5 (return
-   null until anchor, then opacity-0 until contentSize). If no — content has
-   a known fixed max height — you might be able to use bottom-anchored
-   positioning (`bottom: windowHeight - anchor.y + gap`) and skip the
-   `contentSize` round-trip entirely. **But only if the height is genuinely
-   bounded** — autocomplete's inner detail card escapes the 220-cap
-   container, which is why bottom-anchored looked clean but rendered
-   wrong. Verify before you commit.
-5. **Are you on Android with Portal?** Add the status-bar offset (Gotcha 4).
-
-Then copy the closest canonical file and trim.
@@ -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, Copilot, OpenCode, Pi). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/server/src/shared/messages.ts:198`).
+- **Provider** — Agent backend (Claude Code, Codex, OpenCode). 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).
@@ -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
+/opt/homebrew/bin/timeout 420s npx vitest run <file> --maxWorkers=1 --minWorkers=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`
- `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`
+- `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`
@@ -24,10 +24,6 @@ Pi MCP support depends on the open-source `pi-mcp-adapter` extension being loade

 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`.

-Pi RPC extension UI dialog requests (`select`, `input`, `editor`, `confirm`) are bridged into Paseo question permissions and answered with `extension_ui_response`. Fire-and-forget extension UI requests such as notifications are intentionally ignored by the provider adapter unless Paseo grows first-class UI for them.
-
-OpenCode MCP injection is dynamic and session-scoped. Call OpenCode's `mcp.add` endpoint with the MCP server config and do not follow it with `mcp.connect`; `connect` only toggles MCP servers already present in OpenCode's own config. New OpenCode versions return `McpServerNotFoundError`/404 for `connect` after a dynamic add because the server is not config-backed, while older versions silently swallowed the same missing-config path.
-
 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.

 ---
@@ -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**: silent release candidates. Betas don't touch the changelog, don't move the website, and don't publish npm or production mobile builds.
+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.

 ## Standard release (patch)

@@ -51,11 +51,10 @@ 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.
- **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.
+- **Do create a changelog entry for betas.** The beta entry is temporary and gets updated in place until promotion.

 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
@@ -265,15 +264,18 @@ 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` 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.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 ownership

@@ -357,7 +359,7 @@ Entries within each section (Added, Improved, Fixed) are ordered by user impact:

 ## Pre-release sanity check

-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.
+Before cutting any release (beta or stable), run a Codex review of the diff as a last line of defence against shipping bugs.

 Load the `paseo` skill and launch a **Codex 5.4** agent with a prompt like:

@@ -373,19 +375,15 @@ The agent's job is a deep sanity check, not a full code review. If it flags anyt

 ## Changelog scope

-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.
+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.

 ## 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
@@ -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/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`                                  |
+| 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`                                  |

 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).

@@ -4,17 +4,15 @@ This app uses [`react-native-unistyles` v3](https://www.unistyl.es/) for theme-a

 That model is powerful, but it has sharp edges. Use this note when adding theme-dependent styles.

-## STOP — `useUnistyles()` Is Banned
+## STOP — `useUnistyles()` Is Forbidden

-**Do not call `useUnistyles()`. Anywhere. New code MUST NOT add a call; existing call sites are tolerated only because nobody has rewritten them yet and will be converted as they are touched.** The library authors themselves [strongly advise against it](https://www.unistyl.es/v3/references/use-unistyles):
+**Do not call `useUnistyles()` unless every alternative below has been ruled out and you can explain in a code comment why.** The library authors themselves [strongly advise against it](https://www.unistyl.es/v3/references/use-unistyles):

 > We strongly recommend **not using** this hook, as it will re-render your component on every change. This hook was created to simplify the migration process and should only be used when other methods fail.

-We have hit this gotcha repeatedly in Paseo. The hook subscribes the component to **every** Unistyles runtime change (theme, breakpoint, insets, color scheme, scale) and returns a fresh object reference each call. That means a periodic lockstep re-render of warm subtrees (agent streams, panels, sidebars) even when nothing the user can see has changed — confirmed in profiling, with `theme` as the only changed input every cycle. It also breaks every downstream `useMemo`/`memo` boundary that includes a derived theme value.
+We have hit this gotcha repeatedly in Paseo. It manifests as periodic, lockstep re-renders of warm subtrees (agent streams, panels, sidebars) even when nothing the user can see has changed — confirmed in profiling: `AgentStreamView` re-rendering constantly with `theme` showing as the only changed input on every render. The hook subscribes the component to **all** Unistyles runtime changes (theme, breakpoint, insets, color scheme, scale) and returns a fresh object reference each call, which also breaks every downstream `useMemo`/`memo` boundary that includes a derived theme value.

-Reviewers MUST reject PRs that introduce a new `useUnistyles()` call. There is no last-resort carveout. If you cannot solve a case with the alternatives below, file an issue and stop — do not paper over it with the hook.
-
-Use these alternatives in order:
+Before reaching for `useUnistyles()`, work down this list of alternatives in order:

 ### 1. `StyleSheet.create((theme) => ...)` — default

@@ -48,9 +46,31 @@ const ThemedBlur = withUnistyles(BlurView);

 (Mind the `> *` child-selector leak documented further down.)

-### 4. There is no "last resort"
+### 4. Lift the read into a tiny leaf component

-There is no escape hatch. If none of (1)–(3) fit, the problem is upstream — fix it there or file an issue. The hook is not on the table.
+If only one prop in a large component needs a theme value at runtime, extract a small leaf component that calls `useUnistyles()` and accept its re-renders in isolation. Never let a whole stream / panel / sidebar / virtualized list subscribe.
+
+### 5. (Last resort) `useUnistyles()`
+
+Only acceptable when both of:
+
+- (a) The value is consumed by a 3rd-party library that cannot be wrapped with `withUnistyles` (per the upstream "When to use it?" list), AND
+- (b) The component is small, leaf-level, and not on a hot render path.
+
+If you add a new `useUnistyles()` call, leave a comment on the line explaining which of (a)/(b) applies and why each higher-priority alternative was ruled out.
+
+### Hot-path forbidden list
+
+Do not introduce `useUnistyles()` in or above any of these subtrees — re-renders here are observably expensive:
+
+- `AgentStreamView` and anything it renders (message rows, tool calls, plan card, todo list, activity log, compaction marker, copy buttons)
+- `AgentPanel` body (`packages/app/src/panels/agent-panel.tsx`)
+- `Composer` and `MessageInput`
+- `WorkspaceScreen` shell, `WorkspaceDesktopTabsRow`, deck wrapper
+- `LeftSidebar` row items, `SidebarWorkspaceList`, `CommandCenter`
+- Anything inside a virtualized list (`@tanstack/react-virtual`, `FlashList`)
+
+Reviewers must reject PRs that add `useUnistyles()` calls in these areas without a written justification matching the last-resort criteria above.

 ## How Updates Propagate

@@ -60,34 +80,6 @@ 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.
@@ -124,17 +124,6 @@ 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 {
@@ -264,8 +253,6 @@ 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 = {
@@ -1 +1 @@
-sha256-H18zIrryRN+tfQA68vfbWHNMN1mOxhO4PAWcZ4yuNSc=
+sha256-vNhmXjWV1wf17JHVX6tpTz4CKeCE7hpyBLj8nzPVUH0=
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.81",
+  "version": "0.1.78",
  "private": true,
  "description": "Paseo: voice-controlled development environment with OpenAI Realtime API",
  "keywords": [
@@ -181,7 +181,7 @@ test.describe("Client slash commands", () => {
      page,
      { title: "Slash quit autocomplete e2e" },
      async ({ agent, title }) => {
-        await selectClientSlashCommand(page, "/qu", "/exit");
+        await selectClientSlashCommand(page, "/qu", "/quit");
        await expectWorkspaceTabHidden(page, agent.id);
        await expectAgentArchivedInSessions(page, title);
      },
@@ -1,14 +1,13 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.1.81",
+  "version": "0.1.78",
  "private": true,
  "main": "index.ts",
  "scripts": {
    "start": "cross-env APP_VARIANT=development expo start",
-    "build:terminal-webview": "node ./scripts/build-terminal-webview-html.mjs",
    "reset-project": "node ./scripts/reset-project.js",
    "build:workspace-deps": "npm run build --workspace=@getpaseo/highlight && npm run build --workspace=@getpaseo/expo-two-way-audio",
-    "eas-build-post-install": "npm run build:workspace-deps && npm run build:terminal-webview",
+    "eas-build-post-install": "npm run build:workspace-deps",
    "android": "npm run android:development",
    "android:development": "cross-env APP_VARIANT=development expo prebuild --platform android --non-interactive && cross-env APP_VARIANT=development expo run:android --variant=debug",
    "android:production": "cross-env APP_VARIANT=production expo prebuild --platform android --non-interactive && cross-env APP_VARIANT=production expo run:android --variant=release",
@@ -42,15 +41,15 @@
    "@react-navigation/native": "^7.1.8",
    "@tanstack/react-query": "^5.90.11",
    "@tanstack/react-virtual": "^3.13.21",
-    "@xterm/addon-clipboard": "^0.3.0-beta.213",
-    "@xterm/addon-fit": "^0.12.0-beta.213",
-    "@xterm/addon-image": "^0.10.0-beta.213",
-    "@xterm/addon-ligatures": "^0.11.0-beta.213",
-    "@xterm/addon-search": "^0.17.0-beta.213",
-    "@xterm/addon-unicode11": "^0.10.0-beta.213",
-    "@xterm/addon-web-links": "^0.13.0-beta.213",
-    "@xterm/addon-webgl": "^0.20.0-beta.212",
-    "@xterm/xterm": "^6.1.0-beta.213",
+    "@xterm/addon-clipboard": "^0.2.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/addon-image": "^0.9.0",
+    "@xterm/addon-ligatures": "^0.10.0",
+    "@xterm/addon-search": "^0.16.0",
+    "@xterm/addon-unicode11": "^0.9.0",
+    "@xterm/addon-web-links": "^0.12.0",
+    "@xterm/addon-webgl": "^0.19.0",
+    "@xterm/xterm": "^6.0.0",
    "buffer": "^6.0.3",
    "expo": "^54.0.18",
    "expo-asset": "~12.0.12",
@@ -76,7 +75,6 @@
    "expo-updates": "~29.0.12",
    "fast-deep-equal": "^3.1.3",
    "lucide-react-native": "^0.546.0",
-    "markdown-it": "^10.0.0",
    "mnemonic-id": "^3.2.7",
    "qrcode": "^1.5.4",
    "react": "19.1.0",
@@ -87,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.35.5",
+    "react-native-nitro-modules": "0.33.8",
    "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.2.4",
+    "react-native-unistyles": "^3.0.15",
    "react-native-web": "~0.21.0",
    "react-native-webview": "^13.16.0",
    "react-native-worklets": "0.5.1",
@@ -104,13 +102,11 @@
  "devDependencies": {
    "@playwright/test": "^1.56.1",
    "@testing-library/react": "^16.3.2",
-    "@types/markdown-it": "^14.1.2",
    "@types/qrcode": "^1.5.6",
    "@types/react": "~19.2.0",
    "@types/ws": "^8.18.1",
-    "@vitest/browser": "^4.1.7",
-    "@vitest/browser-playwright": "^4.1.7",
-    "@xterm/headless": "^6.1.0-beta.213",
+    "@vitest/browser": "^3.2.4",
+    "@xterm/headless": "^6.0.0",
    "dotenv": "^17.2.3",
    "eas-cli": "^16.24.1",
    "eslint": "^9.25.0",
@@ -119,7 +115,7 @@
    "material-icon-theme": "^5.32.0",
    "playwright": "^1.56.1",
    "typescript": "~5.9.2",
-    "vitest": "^4.1.6",
+    "vitest": "^3.2.4",
    "wrangler": "^4.75.0",
    "ws": "^8.20.0"
  }
@@ -3,17 +3,10 @@
  <head>
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="robots" content="noindex,nofollow" />
-    <meta name="theme-color" content="#181B1A" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-title" content="Paseo" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1, shrink-to-fit=no, viewport-fit=cover"
    />
-    <link rel="manifest" href="/manifest.json" />
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
    <title>%WEB_TITLE%</title>
    <!-- The `react-native-web` recommended style reset: https://necolas.github.io/react-native-web/docs/setup/#root-element -->
    <style id="expo-reset">
@@ -1,27 +0,0 @@
-{
-  "id": "/",
-  "name": "Paseo",
-  "short_name": "Paseo",
-  "description": "Monitor and control local AI coding agents from anywhere.",
-  "start_url": "/",
-  "scope": "/",
-  "display": "standalone",
-  "orientation": "portrait",
-  "theme_color": "#181B1A",
-  "background_color": "#181B1A",
-  "categories": ["developer", "productivity", "utilities"],
-  "icons": [
-    {
-      "src": "/pwa-icon-192.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "any maskable"
-    },
-    {
-      "src": "/pwa-icon-512.png",
-      "sizes": "512x512",
-      "type": "image/png",
-      "purpose": "any maskable"
-    }
-  ]
-}
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
@@ -1,89 +0,0 @@
-import esbuild from "esbuild";
-import fs from "node:fs/promises";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const appRoot = path.resolve(__dirname, "..");
-const repoRoot = path.resolve(appRoot, "../..");
-const entry = path.join(appRoot, "src/terminal/webview/terminal-emulator-webview-entry.ts");
-const output = path.join(appRoot, "src/terminal/webview/terminal-emulator-webview-html.ts");
-
-async function resolveTsPath(basePath) {
-  const candidates = [
-    basePath,
-    `${basePath}.ts`,
-    `${basePath}.tsx`,
-    `${basePath}.js`,
-    `${basePath}.jsx`,
-    path.join(basePath, "index.ts"),
-    path.join(basePath, "index.tsx"),
-    path.join(basePath, "index.js"),
-    path.join(basePath, "index.jsx"),
-  ];
-  for (const candidate of candidates) {
-    try {
-      const stat = await fs.stat(candidate);
-      if (stat.isFile()) return candidate;
-    } catch {
-      // try next candidate
-    }
-  }
-  return basePath;
-}
-
-const aliasPlugin = {
-  name: "paseo-alias",
-  setup(build) {
-    build.onResolve({ filter: /^@\// }, async (args) => ({
-      path: await resolveTsPath(path.join(appRoot, "src", args.path.slice(2))),
-    }));
-    build.onResolve({ filter: /^@server\// }, async (args) => ({
-      path: await resolveTsPath(
-        path.join(repoRoot, "packages/server/src", args.path.slice("@server/".length)),
-      ),
-    }));
-  },
-};
-
-const result = await esbuild.build({
-  entryPoints: [entry],
-  bundle: true,
-  write: false,
-  format: "iife",
-  platform: "browser",
-  target: ["ios15", "chrome100"],
-  loader: {
-    ".css": "text",
-  },
-  plugins: [aliasPlugin],
-  logLevel: "info",
-});
-
-const js = result.outputFiles[0]?.text;
-if (!js) {
-  throw new Error("terminal webview bundle produced no JavaScript");
-}
-
-const html = `<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
-    />
-  </head>
-  <body>
-    <script>${js}</script>
-  </body>
-</html>`;
-
-const contents = `// Generated by packages/app/scripts/build-terminal-webview-html.mjs.
-// Do not edit by hand.
-
-export const terminalEmulatorWebViewHtml = ${JSON.stringify(html)};
-`;
-
-await fs.writeFile(output, contents);
-console.log(`Wrote ${path.relative(repoRoot, output)} (${html.length} bytes)`);
@@ -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 { redirectMock, state } = vi.hoisted(() => {
+const { navigateToWorkspaceMock, redirectMock, state } = vi.hoisted(() => {
  const hoistedState = {
    pathname: "/",
    bootstrapState: {
@@ -23,6 +23,7 @@ const { redirectMock, state } = vi.hoisted(() => {
  };

  return {
+    navigateToWorkspaceMock: vi.fn(),
    redirectMock: vi.fn(),
    state: hoistedState,
  };
@@ -50,6 +51,7 @@ vi.mock("@/screens/startup-splash-screen", () => ({
 }));

 vi.mock("@/stores/navigation-active-workspace-store", () => ({
+  navigateToWorkspace: navigateToWorkspaceMock,
  useIsLastWorkspaceSelectionHydrated: () => state.isWorkspaceSelectionLoaded,
  useLastWorkspaceSelection: () => state.workspaceSelection,
 }));
@@ -70,6 +72,7 @@ describe("Index route startup navigation", () => {
    state.anyOnlineHostServerId = null;
    state.isWorkspaceSelectionLoaded = true;
    state.workspaceSelection = null;
+    navigateToWorkspaceMock.mockReset();
    redirectMock.mockReset();

    container = document.createElement("div");
@@ -105,6 +108,7 @@ describe("Index route startup navigation", () => {
    await renderIndex();

    expect(container.querySelector("[data-testid='startup-splash']")).not.toBeNull();
+    expect(navigateToWorkspaceMock).not.toHaveBeenCalled();
    expect(redirectMock).not.toHaveBeenCalled();
  });

@@ -114,8 +118,11 @@ describe("Index route startup navigation", () => {

    await renderIndex();

-    expect(redirectMock).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
-    expect(container.querySelector("[data-testid='redirect']")).not.toBeNull();
+    expect(navigateToWorkspaceMock).toHaveBeenCalledWith("server-1", "workspace-a", {
+      currentPathname: "/",
+    });
+    expect(redirectMock).not.toHaveBeenCalled();
+    expect(container.querySelector("[data-testid='startup-splash']")).not.toBeNull();
  });

  it("restores the persisted workspace even when the first online host is different", async () => {
@@ -124,7 +131,10 @@ describe("Index route startup navigation", () => {

    await renderIndex();

-    expect(redirectMock).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
+    expect(navigateToWorkspaceMock).toHaveBeenCalledWith("server-1", "workspace-a", {
+      currentPathname: "/",
+    });
+    expect(redirectMock).not.toHaveBeenCalled();
  });

  it("navigates to the host root when no persisted workspace exists", async () => {
@@ -7,11 +7,11 @@ import {
  resolveStartupWorkspaceSelection,
 } from "@/app/host-runtime-bootstrap";
 import {
+  navigateToWorkspace,
  useIsLastWorkspaceSelectionHydrated,
  useLastWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
-import { buildHostWorkspaceRoute } from "@/utils/host-routes";

 const isDesktop = shouldUseDesktopDaemon();

@@ -37,15 +37,17 @@ export default function Index() {
    hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
  });

+  React.useEffect(() => {
+    if (!startupWorkspaceSelection) {
+      return;
+    }
+    navigateToWorkspace(startupWorkspaceSelection.serverId, startupWorkspaceSelection.workspaceId, {
+      currentPathname: pathname,
+    });
+  }, [pathname, startupWorkspaceSelection]);
+
  if (startupWorkspaceSelection) {
-    return (
-      <Redirect
-        href={buildHostWorkspaceRoute(
-          startupWorkspaceSelection.serverId,
-          startupWorkspaceSelection.workspaceId,
-        )}
-      />
-    );
+    return <StartupSplashScreen bootstrapState={isDesktop ? bootstrapState : undefined} />;
  }

  if (redirectRoute) {
@@ -5,6 +5,8 @@ export const ACP_PROVIDER_ICON_SVGS = {
    '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">\n  <circle cx="8" cy="8" r="7" stroke="currentColor" stroke-width="1.5"/>\n  <path d="M5.5 10.5L8 4L10.5 10.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>\n  <line x1="6.25" y1="8.75" x2="9.75" y2="8.75" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/>\n</svg>\n',
  "amp-acp":
    '<svg width="16" height="16" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M13.9197 13.61L17.3816 26.566L14.242 27.4049L11.2645 16.2643L0.119926 13.2906L0.957817 10.15L13.9197 13.61Z" fill="currentColor"/>\n<path d="M13.7391 16.0892L4.88169 24.9056L2.58872 22.6019L11.4461 13.7865L13.7391 16.0892Z" fill="currentColor"/>\n<path d="M18.9386 8.58315L22.4005 21.5392L19.2609 22.3781L16.2833 11.2374L5.13879 8.26381L5.97668 5.12318L18.9386 8.58315Z" fill="currentColor"/>\n<path d="M23.9803 3.55632L27.4422 16.5124L24.3025 17.3512L21.325 6.21062L10.1805 3.23698L11.0183 0.0963593L23.9803 3.55632Z" fill="currentColor"/>\n</svg>\n',
+  antigravity:
+    '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">\n  <path d="M8 1.5L13.75 14.5H11.45L10.2 11.45H5.75L4.55 14.5H2.25L8 1.5ZM6.5 9.55H9.45L8 5.95L6.5 9.55Z" fill="currentColor"/>\n  <path d="M2.25 7.9C2.25 5.1 4.55 2.85 7.4 2.85C10.75 2.85 13.35 5.65 13.35 8.9C13.35 11.4 11.35 13.15 9.1 13.15" stroke="currentColor" stroke-width="1.1" stroke-linecap="round"/>\n</svg>\n',
  auggie:
    '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16">\n  <path fill="currentColor" d="M9.972 13.193h2.577q.187 0 .277-.09t.091-.294V10.47q0-.324.133-.59.135-.27.36-.424a1 1 0 0 1 .099-.06 1 1 0 0 1-.1-.058 1.1 1.1 0 0 1-.359-.424 1.3 1.3 0 0 1-.133-.59v-2.33q0-.202-.091-.293t-.277-.089H9.972a.38.38 0 0 1-.294-.124.4.4 0 0 1-.108-.281q.002-.176.131-.293a.46.46 0 0 1 .313-.111h2.775c.36 0 .642.097.836.288q.293.29.294.832V8.24q0 .39.152.562.148.168.555.178a.4.4 0 0 1 .27.128.41.41 0 0 1 .104.287.44.44 0 0 1-.1.282.34.34 0 0 1-.277.132c-.266.006-.452.066-.55.177q-.151.174-.152.573v2.318c0 .235-.043.44-.128.607a.85.85 0 0 1-.389.387 1.3 1.3 0 0 1-.534.124V14h-2.854a.45.45 0 0 1-.315-.118.38.38 0 0 1-.129-.286q0-.164.109-.282a.38.38 0 0 1 .293-.123zM1.103 9.108a.4.4 0 0 1 .276-.128q.4-.008.55-.177.15-.173.151-.562V5.923q.002-.543.294-.832c.195-.191.477-.288.836-.288h2.775q.188 0 .313.111a.37.37 0 0 1 .131.293.4.4 0 0 1-.108.281.38.38 0 0 1-.293.123H3.45q-.186 0-.277.09t-.092.292v2.33c0 .213-.044.413-.133.59a1.1 1.1 0 0 1-.359.424 1 1 0 0 1-.1.059 1 1 0 0 1 .1.059q.225.156.359.423t.133.59v2.34q0 .203.092.293.088.09.277.089h2.577a.38.38 0 0 1 .294.123q.108.12.108.281a.38.38 0 0 1-.13.286.45.45 0 0 1-.314.118l-2.775-.003a1.4 1.4 0 0 1-.613-.126.87.87 0 0 1-.388-.387 1.34 1.34 0 0 1-.129-.608v-2.318q0-.4-.151-.572-.151-.168-.55-.177a.35.35 0 0 1-.278-.132.42.42 0 0 1-.102-.28q0-.173.103-.287"/>\n  <path fill="currentColor" d="M5.437 10.36a.986.986 0 0 1-.994-.975c0-.538.446-.976.994-.976s.994.438.994.976a.986.986 0 0 1-.994.976M10.562 8.41c.548 0 .994.437.994.975a.986.986 0 0 1-.994.976.986.986 0 0 1-.994-.976c0-.538.446-.976.994-.976M8.74 2c.37 0 .446.15.446.275v.034q0 .034-.009.201-.01.162-.017.549-.018.378-.044 1.06c0 .106-.065.233-.375.233-.311 0-.376-.126-.376-.23l-.07-1.835v-.003c0-.13.078-.284.446-.284M7.256 2c.369 0 .446.15.446.275v.034q0 .034-.01.201-.007.162-.017.549-.017.378-.043 1.06c0 .106-.065.233-.376.233-.31 0-.375-.126-.375-.23l-.07-1.835v-.003C6.81 2.154 6.887 2 7.256 2"/>\n</svg>\n',
  autohand:
@@ -7,7 +7,6 @@ import {
  type AssistantFileLinkContext,
  type DirectorySuggestionEntry,
  type DirectorySuggestionResult,
-  type GetDirectorySuggestions,
 } from "./resolver";

 const CONTEXT: AssistantFileLinkContext = {
@@ -21,7 +20,7 @@ function resolvedSuggestions(
 }

 function suggestionsFromMap(entriesByQuery: Record<string, DirectorySuggestionEntry[]>): {
-  getDirectorySuggestions: GetDirectorySuggestions;
+  getDirectorySuggestions: ReturnType<typeof vi.fn>;
  searches: Array<{
    query: string;
    cwd: string;
@@ -35,7 +34,7 @@ function suggestionsFromMap(entriesByQuery: Record<string, DirectorySuggestionEn
    matchMode: "suffix";
    limit: number;
  }> = [];
-  const getDirectorySuggestions = vi.fn<GetDirectorySuggestions>(
+  const getDirectorySuggestions = vi.fn(
    async (input: {
      query: string;
      cwd: string;
@@ -193,7 +192,7 @@ describe("fetchDaemonResolution", () => {
  });

  it("throws a typed unresolved error when the daemon throws", async () => {
-    const getDirectorySuggestions = vi.fn<GetDirectorySuggestions>(async () => {
+    const getDirectorySuggestions = vi.fn(async () => {
      throw new Error("daemon unavailable");
    });

@@ -5,7 +5,6 @@ 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";
@@ -64,15 +63,15 @@ function createQueryClient(): QueryClient {
  });
 }

-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?: {
+    show: ReturnType<typeof vi.fn>;
+    copied: ReturnType<typeof vi.fn>;
+    error: ReturnType<typeof vi.fn>;
  };
-}
-
-function createWrapper(input: { client: TestClient; openedFiles: OpenedFile[]; toast?: ToastApi }) {
+}) {
  const queryClient = createQueryClient();
  return function Wrapper({ children }: { children: ReactNode }) {
    const openWorkspaceFile = useCallback(
@@ -119,7 +118,7 @@ describe("useFileLink", () => {
            serverId: "server-1",
            workspaceRoot: "/Users/test/project",
            onOpenWorkspaceFile: () => {},
-            toast: createToast(),
+            toast: { show: vi.fn(), copied: vi.fn(), error: vi.fn() },
          },
          children,
        ),
@@ -146,7 +145,7 @@ describe("useFileLink", () => {
      .mockResolvedValueOnce(resolvedSuggestions([]))
      .mockResolvedValueOnce(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
    const openedFiles: OpenedFile[] = [];
-    const toast = createToast();
+    const toast = { show: vi.fn(), copied: vi.fn(), error: vi.fn() };
    const { result } = renderHook(() => useFileLink(SOURCE), {
      wrapper: createWrapper({
        client: { getDirectorySuggestions },
@@ -57,41 +57,33 @@ function createAgent(overrides: Partial<Agent> = {}): Agent {
 }

 describe("resolveClientSlashCommand", () => {
-  it("declares the exact canonical client commands with their aliases", () => {
-    expect(
-      CLIENT_SLASH_COMMANDS.map((command) => [
-        command.name,
-        [...command.aliases],
-        command.execution,
-      ]),
-    ).toEqual([
-      ["exit", ["quit", "q"], "immediate"],
-      ["clear", ["new"], "immediate"],
+  it("declares the exact client commands that execute immediately", () => {
+    expect(CLIENT_SLASH_COMMANDS.map((command) => [command.name, command.execution])).toEqual([
+      ["quit", "immediate"],
+      ["exit", "immediate"],
+      ["q", "immediate"],
+      ["clear", "immediate"],
+      ["new", "immediate"],
    ]);
  });

-  it("resolves canonical names and aliases after trimming", () => {
+  it("resolves exact client commands after trimming", () => {
    expect(resolveClientSlashCommand({ text: " /quit ", hasAttachments: false })).toMatchObject({
-      name: "exit",
      kind: "archive-agent",
      execution: "immediate",
    });
-    expect(resolveClientSlashCommand({ text: "/exit", hasAttachments: false })).toMatchObject({
-      name: "exit",
-      kind: "archive-agent",
-    });
-    expect(resolveClientSlashCommand({ text: "/q", hasAttachments: false })).toMatchObject({
-      name: "exit",
-      kind: "archive-agent",
-    });
-    expect(resolveClientSlashCommand({ text: "/clear", hasAttachments: false })).toMatchObject({
-      name: "clear",
-      kind: "replace-agent-with-draft",
-    });
-    expect(resolveClientSlashCommand({ text: "/new", hasAttachments: false })).toMatchObject({
-      name: "clear",
-      kind: "replace-agent-with-draft",
-    });
+    expect(resolveClientSlashCommand({ text: "/exit", hasAttachments: false })?.kind).toBe(
+      "archive-agent",
+    );
+    expect(resolveClientSlashCommand({ text: "/q", hasAttachments: false })?.kind).toBe(
+      "archive-agent",
+    );
+    expect(resolveClientSlashCommand({ text: "/clear", hasAttachments: false })?.kind).toBe(
+      "replace-agent-with-draft",
+    );
+    expect(resolveClientSlashCommand({ text: "/new", hasAttachments: false })?.kind).toBe(
+      "replace-agent-with-draft",
+    );
  });

  it("leaves provider commands, arguments, ordinary messages, and attachment submits alone", () => {
@@ -6,7 +6,6 @@ export type ClientSlashCommandExecution = "immediate" | "insert";

 export interface ClientSlashCommand {
  name: string;
-  aliases: readonly string[];
  description: string;
  argumentHint: string;
  kind: ClientSlashCommandKind;
@@ -14,9 +13,22 @@ export interface ClientSlashCommand {
 }

 export const CLIENT_SLASH_COMMANDS: readonly ClientSlashCommand[] = [
+  {
+    name: "quit",
+    description: "Archive the current agent",
+    argumentHint: "",
+    kind: "archive-agent",
+    execution: "immediate",
+  },
  {
    name: "exit",
-    aliases: ["quit", "q"],
+    description: "Archive the current agent",
+    argumentHint: "",
+    kind: "archive-agent",
+    execution: "immediate",
+  },
+  {
+    name: "q",
    description: "Archive the current agent",
    argumentHint: "",
    kind: "archive-agent",
@@ -24,7 +36,13 @@ export const CLIENT_SLASH_COMMANDS: readonly ClientSlashCommand[] = [
  },
  {
    name: "clear",
-    aliases: ["new"],
+    description: "Archive this agent and start a fresh draft",
+    argumentHint: "",
+    kind: "replace-agent-with-draft",
+    execution: "immediate",
+  },
+  {
+    name: "new",
    description: "Archive this agent and start a fresh draft",
    argumentHint: "",
    kind: "replace-agent-with-draft",
@@ -32,13 +50,7 @@ export const CLIENT_SLASH_COMMANDS: readonly ClientSlashCommand[] = [
  },
 ];

-const COMMAND_BY_NAME = new Map<string, ClientSlashCommand>();
-for (const command of CLIENT_SLASH_COMMANDS) {
-  COMMAND_BY_NAME.set(command.name, command);
-  for (const alias of command.aliases) {
-    COMMAND_BY_NAME.set(alias, command);
-  }
-}
+const COMMAND_BY_NAME = new Map(CLIENT_SLASH_COMMANDS.map((command) => [command.name, command]));

 export function resolveClientSlashCommand(input: {
  text: string;
@@ -3,7 +3,7 @@ import type { ReactNode, Ref } from "react";
 import { createPortal } from "react-dom";
 import { Modal, Pressable, ScrollView, Text, TextInput, View } from "react-native";
 import type { TextInputProps } from "react-native";
-import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { getOverlayRoot, OVERLAY_Z } from "../lib/overlay-root";
 import {
@@ -205,9 +205,6 @@ const styles = StyleSheet.create((theme) => ({
  adaptiveInputOutline: {
    outlineColor: theme.colors.accent,
  },
-  adaptiveInputText: {
-    color: theme.colors.foreground,
-  },
  adaptiveInputPlaceholder: {
    color: theme.colors.foregroundMuted,
  },
@@ -240,43 +237,38 @@ export type AdaptiveTextInputProps = TextInputProps & {
 // 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
-//
-// Text color and placeholder color are owned by this leaf — not the caller.
-// `@gorhom/bottom-sheet` mounts header subtrees before the sheet is visible
-// under whatever theme is active at mount time, then keeps them mounted across
-// theme changes; any caller that paints color via `StyleSheet.create((theme) =>
-// ...)` from outside this leaf ends up with stale colors in dark mode (see
-// docs/unistyles.md "Hidden Sheet Content"). withUnistyles wraps the actual
-// TextInput so theme-driven re-renders land on the wrapper.
-const ThemedTextInput = withUnistyles(TextInput, (theme) => ({
-  placeholderTextColor: theme.colors.foregroundMuted,
-}));
-const ThemedBottomSheetTextInput = withUnistyles(BottomSheetTextInput, (theme) => ({
-  placeholderTextColor: theme.colors.foregroundMuted,
-}));
-
 export const AdaptiveTextInput = forwardRef<TextInput, AdaptiveTextInputProps>(
  function AdaptiveTextInputInner(props, ref) {
    const isMobile = useIsCompactFormFactor();
-    const { value: _value, initialValue, resetKey, defaultValue, style, ...inputProps } = props;
-    // Leaf-owned color goes LAST so callers cannot override it with a stale
-    // theme read. Outline color is theme-aware on web :focus-visible.
+    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,
-      style: [styles.adaptiveInputOutline, style, styles.adaptiveInputText],
+      placeholderTextColor: placeholderTextColor ?? styles.adaptiveInputPlaceholder.color,
+      style: [styles.adaptiveInputOutline, style],
    };

    if (isMobile && isNative) {
      return (
-        <ThemedBottomSheetTextInput
+        <BottomSheetTextInput
          key={resetKey}
          ref={ref as unknown as Ref<never>}
          {...textInputProps}
        />
      );
    }
-    return <ThemedTextInput key={resetKey} ref={ref} {...textInputProps} />;
+    return <TextInput key={resetKey} ref={ref} {...textInputProps} />;
  },
 );

@@ -352,6 +344,7 @@ export function SheetHeaderView({
            // @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}
@@ -407,6 +400,7 @@ export function InlineHeaderView({ header }: { header: SheetHeader }) {
            // @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}
@@ -8,7 +8,7 @@ import {
  type PressableStateCallbackType,
 } from "react-native";
 import { memo, useCallback, useEffect, useMemo, useRef, type ReactNode } from "react";
-import { Home, Plus, Settings } from "lucide-react-native";
+import { 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,8 +106,6 @@ 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 }],
@@ -1,66 +0,0 @@
-import { useCallback } from "react";
-import { View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { Heart } from "lucide-react-native";
-import { Button } from "@/components/ui/button";
-import { GitHubIcon } from "@/components/icons/github-icon";
-import { DiscordIcon } from "@/components/icons/discord-icon";
-import { openExternalUrl } from "@/utils/open-external-url";
-
-const renderGitHubIcon = (color: string) => <GitHubIcon color={color} size={14} />;
-const renderDiscordIcon = (color: string) => <DiscordIcon color={color} size={14} />;
-
-export function CommunityLinks() {
-  const handleOpenGitHub = useCallback(() => {
-    void openExternalUrl("https://github.com/getpaseo/paseo");
-  }, []);
-
-  const handleOpenSponsor = useCallback(() => {
-    void openExternalUrl("https://github.com/sponsors/boudra");
-  }, []);
-
-  const handleOpenDiscord = useCallback(() => {
-    void openExternalUrl("https://discord.gg/jz8T2uahpH");
-  }, []);
-
-  return (
-    <View style={styles.row}>
-      <Button
-        variant="ghost"
-        size="sm"
-        leftIcon={renderGitHubIcon}
-        onPress={handleOpenGitHub}
-        testID="community-links-github-star"
-      >
-        Star
-      </Button>
-      <Button
-        variant="ghost"
-        size="sm"
-        leftIcon={Heart}
-        onPress={handleOpenSponsor}
-        testID="community-links-sponsor"
-      >
-        Sponsor
-      </Button>
-      <Button
-        variant="ghost"
-        size="sm"
-        leftIcon={renderDiscordIcon}
-        onPress={handleOpenDiscord}
-        testID="community-links-discord"
-      >
-        Community
-      </Button>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create(() => ({
-  row: {
-    flexDirection: "row",
-    justifyContent: "center",
-    alignItems: "center",
-    gap: 0,
-  },
-}));
@@ -62,7 +62,7 @@ import { useToast } from "@/contexts/toast-context";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { Shortcut } from "@/components/ui/shortcut";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
-import { AutocompletePopover } from "@/components/ui/autocomplete-popover";
+import { Autocomplete } from "@/components/ui/autocomplete";
 import { useAgentAutocomplete } from "@/hooks/use-agent-autocomplete";
 import {
  useHostRuntimeAgentDirectoryStatus,
@@ -256,6 +256,25 @@ function renderQueueList(args: RenderQueueListArgs): ReactElement | null {
  );
 }

+function renderAutocompletePopover(
+  autocomplete: ReturnType<typeof useAgentAutocomplete>,
+): ReactElement | null {
+  if (!autocomplete.isVisible) return null;
+  return (
+    <View style={styles.autocompletePopover} pointerEvents="box-none">
+      <Autocomplete
+        options={autocomplete.options}
+        selectedIndex={autocomplete.selectedIndex}
+        isLoading={autocomplete.isLoading}
+        errorMessage={autocomplete.errorMessage}
+        loadingText={autocomplete.loadingText}
+        emptyText={autocomplete.emptyText}
+        onSelect={autocomplete.onSelectOption}
+      />
+    </View>
+  );
+}
+
 interface RenderComposerAttachmentPillArgs {
  attachment: ComposerAttachment;
  index: number;
@@ -1570,7 +1589,10 @@ export function Composer({
    [handleEditQueuedMessage, handleSendQueuedNow, queuedMessages],
  );

-  const messageInputContainerRef = useRef<View>(null);
+  const autocompletePopover = useMemo(
+    () => renderAutocompletePopover(autocomplete),
+    [autocomplete],
+  );

  const isSubmitBusy = isProcessing || isSubmitLoading;
  const messageInputAutoFocus = autoFocus && isDesktopWebBreakpoint;
@@ -1592,18 +1614,8 @@ export function Composer({
          {queueList}
          {sendErrorNode}

-          <View ref={messageInputContainerRef} style={styles.messageInputContainer}>
-            <AutocompletePopover
-              visible={autocomplete.isVisible && isPaneFocused}
-              anchorRef={messageInputContainerRef}
-              options={autocomplete.options}
-              selectedIndex={autocomplete.selectedIndex}
-              onSelect={autocomplete.onSelectOption}
-              isLoading={autocomplete.isLoading}
-              errorMessage={autocomplete.errorMessage}
-              loadingText={autocomplete.loadingText}
-              emptyText={autocomplete.emptyText}
-            />
+          <View style={styles.messageInputContainer}>
+            {autocompletePopover}

            {/* MessageInput handles everything: text, dictation, attachments, all buttons */}
            <StableMessageInput
@@ -1700,6 +1712,14 @@ const styles = StyleSheet.create((theme: Theme) => ({
    width: "100%",
    gap: theme.spacing[3],
  },
+  autocompletePopover: {
+    position: "absolute",
+    left: 0,
+    right: 0,
+    bottom: "100%",
+    marginBottom: theme.spacing[3],
+    zIndex: 30,
+  },
  cancelButton: {
    width: 28,
    height: 28,
@@ -5,7 +5,6 @@ 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";

@@ -96,27 +95,20 @@ export function DiffViewer({
  const outerScrollStyle = React.useMemo(
    () => [
      styles.verticalScroll,
-      maxHeight !== undefined && inlineUnistylesStyle({ maxHeight }),
+      maxHeight !== undefined && { maxHeight },
      fillAvailableHeight && styles.fillHeight,
      webScrollbarStyle,
    ],
    [maxHeight, fillAvailableHeight, webScrollbarStyle],
  );
  const linesContainerStyle = React.useMemo(
-    () => [
-      styles.linesContainer,
-      scrollViewWidth > 0 && inlineUnistylesStyle({ minWidth: scrollViewWidth }),
-    ],
+    () => [styles.linesContainer, scrollViewWidth > 0 && { 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 (
@@ -126,39 +118,29 @@ export function DiffViewer({
    );
  }

-  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 = (
+  return (
    <ScrollView
      style={outerScrollStyle}
-      contentContainerStyle={webVerticalContentStyle}
+      contentContainerStyle={styles.verticalContent}
      nestedScrollEnabled
      showsVerticalScrollIndicator
    >
-      {horizontalScroll}
+      <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>
    </ScrollView>
  );
-
-  return content;
 }

 const styles = StyleSheet.create((theme) => {
@@ -17,7 +17,6 @@ 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";
@@ -121,10 +120,7 @@ const CodeLine = React.memo(function CodeLine({
  gutterWidth,
  highlighted,
 }: CodeLineProps) {
-  const gutterStyle = useMemo(
-    () => [codeLineStyles.gutter, inlineUnistylesStyle({ width: gutterWidth })],
-    [gutterWidth],
-  );
+  const gutterStyle = useMemo(() => [codeLineStyles.gutter, { width: gutterWidth }], [gutterWidth]);
  const lineStyle = useMemo(
    () => [codeLineStyles.line, highlighted && codeLineStyles.highlightedLine],
    [highlighted],
@@ -1,14 +0,0 @@
-import Svg, { Path } from "react-native-svg";
-
-interface DiscordIconProps {
-  size?: number;
-  color?: string;
-}
-
-export function DiscordIcon({ size = 16, color = "currentColor" }: DiscordIconProps) {
-  return (
-    <Svg width={size} height={size} viewBox="0 0 24 24" fill={color}>
-      <Path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z" />
-    </Svg>
-  );
-}
@@ -1,5 +1,5 @@
 import { router, usePathname } from "expo-router";
-import { FolderPlus, Home, MessagesSquare, Settings, X } from "lucide-react-native";
+import { FolderPlus, MessagesSquare, Settings, X } from "lucide-react-native";
 import {
  type Dispatch,
  memo,
@@ -58,7 +58,6 @@ import { resolveActiveHost } from "@/utils/active-host";
 import { formatConnectionStatus } from "@/utils/daemons";
 import { useWindowControlsPadding } from "@/utils/desktop-window";
 import {
-  buildHostOpenProjectRoute,
  buildHostSessionsRoute,
  buildSettingsRoute,
  mapPathnameToServer,
@@ -95,7 +94,6 @@ interface SidebarSharedProps {
  handleRefresh: () => void;
  handleHostSelect: (nextServerId: string) => void;
  handleOpenProject: () => void;
-  handleHome: () => void;
  handleSettings: () => void;
  renderHostOption: (input: {
    option: ComboboxOption;
@@ -225,17 +223,6 @@ export const LeftSidebar = memo(function LeftSidebar({
    router.push(buildSettingsRoute());
  }, []);

-  const handleHomeMobile = useCallback(() => {
-    if (!activeServerId) return;
-    showMobileAgent();
-    router.push(buildHostOpenProjectRoute(activeServerId));
-  }, [activeServerId, showMobileAgent]);
-
-  const handleHomeDesktop = useCallback(() => {
-    if (!activeServerId) return;
-    router.push(buildHostOpenProjectRoute(activeServerId));
-  }, [activeServerId]);
-
  const handleViewMoreNavigate = useCallback(() => {
    if (!activeServerId) {
      return;
@@ -285,7 +272,6 @@ export const LeftSidebar = memo(function LeftSidebar({
        isOpen={isOpen}
        closeToAgent={showMobileAgent}
        handleOpenProject={handleOpenProjectMobile}
-        handleHome={handleHomeMobile}
        handleSettings={handleSettingsMobile}
        handleViewMoreNavigate={handleViewMoreNavigate}
      />
@@ -298,7 +284,6 @@ export const LeftSidebar = memo(function LeftSidebar({
      insetsTop={insets.top}
      isOpen={isOpen}
      handleOpenProject={handleOpenProjectDesktop}
-      handleHome={handleHomeDesktop}
      handleSettings={handleSettingsDesktop}
      handleViewMore={handleViewMoreNavigate}
    />
@@ -429,7 +414,6 @@ function SidebarFooter({
  handleHostSelect,
  renderHostOption,
  handleOpenProject,
-  handleHome,
  handleSettings,
 }: {
  theme: SidebarTheme;
@@ -443,7 +427,6 @@ function SidebarFooter({
  handleHostSelect: (nextServerId: string) => void;
  renderHostOption: SidebarSharedProps["renderHostOption"];
  handleOpenProject: () => void;
-  handleHome: () => void;
  handleSettings: () => void;
 }) {
  const newAgentKeys = useShortcutKeys("new-agent");
@@ -473,13 +456,6 @@ function SidebarFooter({
            <AddProjectTooltipContent newAgentKeys={newAgentKeys} />
          </TooltipContent>
        </Tooltip>
-        <FooterIconButton
-          onPress={handleHome}
-          testID="sidebar-home"
-          accessibilityLabel="Home"
-          icon={Home}
-          theme={theme}
-        />
        <FooterIconButton
          onPress={handleSettings}
          testID="sidebar-settings"
@@ -525,7 +501,6 @@ function MobileSidebar({
  handleHostSelect,
  renderHostOption,
  handleOpenProject,
-  handleHome,
  handleSettings,
  insetsTop,
  insetsBottom,
@@ -754,7 +729,6 @@ function MobileSidebar({
              handleHostSelect={handleHostSelect}
              renderHostOption={renderHostOption}
              handleOpenProject={handleOpenProject}
-              handleHome={handleHome}
              handleSettings={handleSettings}
            />
          </View>
@@ -784,7 +758,6 @@ function DesktopSidebar({
  handleHostSelect,
  renderHostOption,
  handleOpenProject,
-  handleHome,
  handleSettings,
  insetsTop,
  isOpen,
@@ -898,7 +871,6 @@ function DesktopSidebar({
          handleHostSelect={handleHostSelect}
          renderHostOption={renderHostOption}
          handleOpenProject={handleOpenProject}
-          handleHome={handleHome}
          handleSettings={handleSettings}
        />

@@ -62,6 +62,7 @@ import Animated, {
 import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
 import { createMarkdownStyles } from "@/styles/markdown-styles";
 import { Fonts } from "@/constants/theme";
+import * as Clipboard from "expo-clipboard";
 import type { TodoEntry, UserMessageImageAttachment } from "@/types/stream";
 import type { AgentAttachment } from "@server/shared/messages";
 import type { ToolCallDetail } from "@server/server/agent/agent-sdk-types";
@@ -72,7 +73,6 @@ 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";
-import { writeMarkdownToRichClipboard } from "@/utils/rich-clipboard";
 import {
  getAssistantImageLoadStateFromMetadata,
  getAssistantImageMetadata,
@@ -1117,7 +1117,7 @@ export const TurnCopyButton = memo(function TurnCopyButton({
      return;
    }

-    await writeMarkdownToRichClipboard(content);
+    await Clipboard.setStringAsync(content);
    setCopied(true);

    if (copyTimeoutRef.current) {
@@ -1,532 +0,0 @@
-import {
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useMemo,
-  useRef,
-  useState,
-  type ComponentProps,
-  type Ref,
-} from "react";
-import { StyleSheet, View, type StyleProp, type ViewStyle } from "react-native";
-import { WebView, type WebViewMessageEvent } from "react-native-webview";
-import type { ITheme } from "@xterm/xterm";
-import type { TerminalState } from "@server/shared/messages";
-import type { TerminalInputModeState } from "@server/shared/terminal-input-mode";
-import type { TerminalOutputData } from "../terminal/runtime/terminal-emulator-runtime";
-import { terminalEmulatorWebViewHtml } from "../terminal/webview/terminal-emulator-webview-html";
-import type { PendingTerminalModifiers } from "../utils/terminal-keys";
-import type { TerminalRendererReadyChange } from "../utils/terminal-renderer-readiness";
-import { openExternalUrl } from "../utils/open-external-url";
-
-export interface TerminalEmulatorHandle {
-  writeOutput: (data: TerminalOutputData) => void;
-  restoreOutput: (data: TerminalOutputData) => void;
-  renderSnapshot: (state: TerminalState | null) => void;
-  clear: () => void;
-}
-
-interface TerminalEmulatorProps {
-  dom?: unknown;
-  ref: Ref<TerminalEmulatorHandle>;
-  streamKey: string;
-  testId?: string;
-  xtermTheme?: ITheme;
-  scrollbackLines: number;
-  swipeGesturesEnabled?: boolean;
-  onSwipeLeft?: () => void;
-  onSwipeRight?: () => void;
-  initialSnapshot?: TerminalState | null;
-  onInput?: (data: string) => Promise<void> | void;
-  onResize?: (input: { rows: number; cols: number }) => Promise<void> | void;
-  onTerminalKey?: (input: {
-    key: string;
-    ctrl: boolean;
-    shift: boolean;
-    alt: boolean;
-    meta: boolean;
-  }) => Promise<void> | void;
-  onPendingModifiersConsumed?: () => Promise<void> | void;
-  onInputModeChange?: (state: TerminalInputModeState) => Promise<void> | void;
-  onRendererReadyChange?: (change: TerminalRendererReadyChange) => void;
-  pendingModifiers?: PendingTerminalModifiers;
-  focusRequestToken?: number;
-  resizeRequestToken?: number;
-}
-
-type BridgeInboundMessage =
-  | {
-      type: "mount";
-      streamKey: string;
-      initialSnapshot: TerminalState | null;
-      scrollbackLines: number;
-      theme: ITheme;
-      pendingModifiers: PendingTerminalModifiers;
-      swipeGesturesEnabled: boolean;
-    }
-  | { type: "unmount"; streamKey: string }
-  | { type: "writeOutput"; streamKey: string; text: string }
-  | { type: "restoreOutput"; streamKey: string; text: string }
-  | { type: "renderSnapshot"; streamKey: string; state: TerminalState | null }
-  | { type: "clear"; streamKey: string }
-  | { type: "focus"; streamKey: string }
-  | { type: "resize"; streamKey: string }
-  | { type: "setTheme"; streamKey: string; theme: ITheme }
-  | { type: "setScrollback"; streamKey: string; lines: number }
-  | { type: "setPendingModifiers"; streamKey: string; pendingModifiers: PendingTerminalModifiers }
-  | { type: "setSwipeGesturesEnabled"; streamKey: string; enabled: boolean };
-
-type BridgeOutboundMessage =
-  | { type: "bridgeReady" }
-  | { type: "rendererReady"; streamKey: string; isReady: boolean }
-  | { type: "input"; streamKey: string; data: string }
-  | { type: "resize"; streamKey: string; rows: number; cols: number }
-  | {
-      type: "terminalKey";
-      streamKey: string;
-      key: string;
-      ctrl: boolean;
-      shift: boolean;
-      alt: boolean;
-      meta: boolean;
-    }
-  | { type: "pendingModifiersConsumed"; streamKey: string }
-  | { type: "inputModeChange"; streamKey: string; state: TerminalInputModeState }
-  | { type: "openExternalUrl"; streamKey: string; url: string }
-  | { type: "swipeLeft"; streamKey: string }
-  | { type: "swipeRight"; streamKey: string }
-  | { type: "debug"; message: string; details?: unknown };
-
-const TERMINAL_WEBVIEW_SOURCE = { html: terminalEmulatorWebViewHtml };
-const TERMINAL_WEBVIEW_ORIGIN_WHITELIST = ["*"];
-const BRIDGE_READY_TIMEOUT_MS = 2_500;
-const RENDERER_READY_TIMEOUT_MS = 2_500;
-type WebViewProps = ComponentProps<typeof WebView>;
-
-function buildThemeKey(theme: ITheme): string {
-  return JSON.stringify(theme);
-}
-
-function serializeForInjectedJavaScript(message: BridgeInboundMessage): string {
-  return JSON.stringify(message).replace(/<\/script/gi, "<\\/script");
-}
-
-function createMountMessage(input: {
-  streamKey: string;
-  initialSnapshot: TerminalState | null;
-  scrollbackLines: number;
-  theme: ITheme;
-  pendingModifiers: PendingTerminalModifiers;
-  swipeGesturesEnabled: boolean;
-}): BridgeInboundMessage {
-  return {
-    type: "mount",
-    streamKey: input.streamKey,
-    initialSnapshot: input.initialSnapshot,
-    scrollbackLines: input.scrollbackLines,
-    theme: input.theme,
-    pendingModifiers: input.pendingModifiers,
-    swipeGesturesEnabled: input.swipeGesturesEnabled,
-  };
-}
-
-export default function TerminalEmulator({
-  ref,
-  streamKey,
-  testId = "terminal-surface",
-  xtermTheme = {
-    background: "#0b0b0b",
-    foreground: "#e6e6e6",
-    cursor: "#e6e6e6",
-  },
-  scrollbackLines,
-  swipeGesturesEnabled = false,
-  onSwipeLeft,
-  onSwipeRight,
-  initialSnapshot = null,
-  onInput,
-  onResize,
-  onTerminalKey,
-  onPendingModifiersConsumed,
-  onInputModeChange,
-  onRendererReadyChange,
-  pendingModifiers = { ctrl: false, shift: false, alt: false },
-  focusRequestToken = 0,
-  resizeRequestToken = 0,
-}: TerminalEmulatorProps) {
-  const webViewRef = useRef<WebView>(null);
-  const [webViewEpoch, setWebViewEpoch] = useState(0);
-  const [bridgeReadyVersion, setBridgeReadyVersion] = useState(0);
-  const bridgeReadyRef = useRef(false);
-  const bridgeReadyVersionRef = useRef(0);
-  const rendererReadyVersionRef = useRef(0);
-  const pendingMessagesRef = useRef<BridgeInboundMessage[]>([]);
-  const outputDecoderRef = useRef(new TextDecoder());
-  const mountedStreamKeyRef = useRef<string | null>(null);
-  const bridgeReadyTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const rendererReadyTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const mountConfigRef = useRef({
-    streamKey,
-    initialSnapshot,
-    scrollbackLines,
-    theme: xtermTheme,
-    pendingModifiers,
-    swipeGesturesEnabled,
-  });
-  mountConfigRef.current = {
-    streamKey,
-    initialSnapshot,
-    scrollbackLines,
-    theme: xtermTheme,
-    pendingModifiers,
-    swipeGesturesEnabled,
-  };
-  const callbacksRef = useRef({
-    onInput,
-    onResize,
-    onTerminalKey,
-    onPendingModifiersConsumed,
-    onInputModeChange,
-    onRendererReadyChange,
-    onSwipeLeft,
-    onSwipeRight,
-  });
-  callbacksRef.current = {
-    onInput,
-    onResize,
-    onTerminalKey,
-    onPendingModifiersConsumed,
-    onInputModeChange,
-    onRendererReadyChange,
-    onSwipeLeft,
-    onSwipeRight,
-  };
-
-  const clearBridgeReadyTimeout = useCallback(() => {
-    if (bridgeReadyTimeoutRef.current === null) return;
-    clearTimeout(bridgeReadyTimeoutRef.current);
-    bridgeReadyTimeoutRef.current = null;
-  }, []);
-
-  const clearRendererReadyTimeout = useCallback(() => {
-    if (rendererReadyTimeoutRef.current === null) return;
-    clearTimeout(rendererReadyTimeoutRef.current);
-    rendererReadyTimeoutRef.current = null;
-  }, []);
-
-  const resetWebViewDocument = useCallback(() => {
-    clearBridgeReadyTimeout();
-    clearRendererReadyTimeout();
-    bridgeReadyRef.current = false;
-    pendingMessagesRef.current = [];
-    mountedStreamKeyRef.current = null;
-    callbacksRef.current.onRendererReadyChange?.({ streamKey, isReady: false });
-    setWebViewEpoch((value) => value + 1);
-  }, [clearBridgeReadyTimeout, clearRendererReadyTimeout, streamKey]);
-
-  const scheduleBridgeReadyWatchdog = useCallback(() => {
-    clearBridgeReadyTimeout();
-    const expectedBridgeReadyVersion = bridgeReadyVersionRef.current;
-    bridgeReadyTimeoutRef.current = setTimeout(() => {
-      bridgeReadyTimeoutRef.current = null;
-      if (bridgeReadyVersionRef.current !== expectedBridgeReadyVersion || bridgeReadyRef.current) {
-        return;
-      }
-      resetWebViewDocument();
-    }, BRIDGE_READY_TIMEOUT_MS);
-  }, [clearBridgeReadyTimeout, resetWebViewDocument]);
-
-  const scheduleRendererReadyWatchdog = useCallback(() => {
-    clearRendererReadyTimeout();
-    const expectedRendererReadyVersion = rendererReadyVersionRef.current;
-    rendererReadyTimeoutRef.current = setTimeout(() => {
-      rendererReadyTimeoutRef.current = null;
-      if (
-        rendererReadyVersionRef.current !== expectedRendererReadyVersion ||
-        mountedStreamKeyRef.current === streamKey
-      ) {
-        return;
-      }
-      resetWebViewDocument();
-    }, RENDERER_READY_TIMEOUT_MS);
-  }, [clearRendererReadyTimeout, resetWebViewDocument, streamKey]);
-
-  const flushPendingMessages = useCallback(() => {
-    if (!bridgeReadyRef.current || !webViewRef.current) return;
-    const pending = pendingMessagesRef.current.splice(0);
-    for (const message of pending) {
-      const payload = serializeForInjectedJavaScript(message);
-      webViewRef.current.injectJavaScript(
-        `window.__PASEO_TERMINAL_WEBVIEW_RECEIVE__ && window.__PASEO_TERMINAL_WEBVIEW_RECEIVE__(${payload}); true;`,
-      );
-    }
-  }, []);
-
-  const sendToWebView = useCallback((message: BridgeInboundMessage) => {
-    if (!bridgeReadyRef.current || !webViewRef.current) {
-      pendingMessagesRef.current.push(message);
-      return;
-    }
-    const payload = serializeForInjectedJavaScript(message);
-    webViewRef.current.injectJavaScript(
-      `window.__PASEO_TERMINAL_WEBVIEW_RECEIVE__ && window.__PASEO_TERMINAL_WEBVIEW_RECEIVE__(${payload}); true;`,
-    );
-  }, []);
-
-  useImperativeHandle(
-    ref,
-    (): TerminalEmulatorHandle => ({
-      writeOutput: (data: TerminalOutputData) => {
-        const output = outputDecoderRef.current.decode(data, { stream: true });
-        if (output.length === 0) {
-          return;
-        }
-        sendToWebView({ type: "writeOutput", streamKey, text: output });
-      },
-      restoreOutput: (data: TerminalOutputData) => {
-        outputDecoderRef.current.decode();
-        const text = outputDecoderRef.current.decode(data, { stream: false });
-        if (text.length === 0) {
-          return;
-        }
-        sendToWebView({ type: "restoreOutput", streamKey, text });
-      },
-      renderSnapshot: (state: TerminalState | null) => {
-        outputDecoderRef.current.decode();
-        sendToWebView({ type: "renderSnapshot", streamKey, state });
-      },
-      clear: () => {
-        outputDecoderRef.current.decode();
-        sendToWebView({ type: "clear", streamKey });
-      },
-    }),
-    [sendToWebView, streamKey],
-  );
-
-  useEffect(() => {
-    outputDecoderRef.current.decode();
-  }, [streamKey]);
-
-  useEffect(() => {
-    if (bridgeReadyVersion <= 0) return;
-    const mountMessage = createMountMessage(mountConfigRef.current);
-    mountedStreamKeyRef.current = streamKey;
-    sendToWebView(mountMessage);
-    flushPendingMessages();
-    scheduleRendererReadyWatchdog();
-  }, [
-    bridgeReadyVersion,
-    flushPendingMessages,
-    scheduleRendererReadyWatchdog,
-    sendToWebView,
-    streamKey,
-  ]);
-
-  const themeKey = useMemo(() => buildThemeKey(xtermTheme), [xtermTheme]);
-  useEffect(() => {
-    if (!mountedStreamKeyRef.current) return;
-    sendToWebView({ type: "setTheme", streamKey, theme: xtermTheme });
-  }, [sendToWebView, streamKey, themeKey, xtermTheme]);
-
-  useEffect(() => {
-    if (!mountedStreamKeyRef.current) return;
-    sendToWebView({ type: "setScrollback", streamKey, lines: scrollbackLines });
-  }, [scrollbackLines, sendToWebView, streamKey]);
-
-  useEffect(() => {
-    if (!mountedStreamKeyRef.current) return;
-    sendToWebView({ type: "setPendingModifiers", streamKey, pendingModifiers });
-  }, [pendingModifiers, sendToWebView, streamKey]);
-
-  useEffect(() => {
-    if (!mountedStreamKeyRef.current) return;
-    sendToWebView({ type: "setSwipeGesturesEnabled", streamKey, enabled: swipeGesturesEnabled });
-  }, [sendToWebView, streamKey, swipeGesturesEnabled]);
-
-  useEffect(() => {
-    if (focusRequestToken <= 0) return;
-    sendToWebView({ type: "resize", streamKey });
-    sendToWebView({ type: "focus", streamKey });
-    webViewRef.current?.requestFocus();
-  }, [focusRequestToken, sendToWebView, streamKey]);
-
-  useEffect(() => {
-    if (resizeRequestToken <= 0) return;
-    sendToWebView({ type: "resize", streamKey });
-  }, [resizeRequestToken, sendToWebView, streamKey]);
-
-  useEffect(() => {
-    return () => {
-      if (mountedStreamKeyRef.current) {
-        const previousStreamKey = mountedStreamKeyRef.current;
-        callbacksRef.current.onRendererReadyChange?.({
-          streamKey: previousStreamKey,
-          isReady: false,
-        });
-        sendToWebView({ type: "unmount", streamKey: previousStreamKey });
-      }
-      bridgeReadyRef.current = false;
-      pendingMessagesRef.current = [];
-      mountedStreamKeyRef.current = null;
-      clearBridgeReadyTimeout();
-      clearRendererReadyTimeout();
-    };
-  }, [clearBridgeReadyTimeout, clearRendererReadyTimeout, sendToWebView]);
-
-  const handleLifecycleMessage = useCallback(
-    (message: BridgeOutboundMessage): boolean => {
-      if (message.type === "bridgeReady") {
-        bridgeReadyRef.current = true;
-        bridgeReadyVersionRef.current += 1;
-        clearBridgeReadyTimeout();
-        setBridgeReadyVersion((value) => value + 1);
-        return true;
-      }
-      if (message.type === "rendererReady") {
-        mountedStreamKeyRef.current = message.isReady ? message.streamKey : null;
-        if (message.isReady) {
-          rendererReadyVersionRef.current += 1;
-          clearRendererReadyTimeout();
-        }
-        callbacksRef.current.onRendererReadyChange?.({
-          streamKey: message.streamKey,
-          isReady: message.isReady,
-        });
-        return true;
-      }
-      return false;
-    },
-    [clearBridgeReadyTimeout, clearRendererReadyTimeout],
-  );
-
-  const handleTerminalMessage = useCallback(
-    (
-      message: Exclude<BridgeOutboundMessage, { type: "bridgeReady" } | { type: "rendererReady" }>,
-    ) => {
-      switch (message.type) {
-        case "input":
-          callbacksRef.current.onInput?.(message.data);
-          break;
-        case "resize":
-          callbacksRef.current.onResize?.({ rows: message.rows, cols: message.cols });
-          break;
-        case "terminalKey":
-          callbacksRef.current.onTerminalKey?.({
-            key: message.key,
-            ctrl: message.ctrl,
-            shift: message.shift,
-            alt: message.alt,
-            meta: message.meta,
-          });
-          break;
-        case "pendingModifiersConsumed":
-          callbacksRef.current.onPendingModifiersConsumed?.();
-          break;
-        case "inputModeChange":
-          callbacksRef.current.onInputModeChange?.(message.state);
-          break;
-        case "openExternalUrl":
-          void openExternalUrl(message.url);
-          break;
-        case "swipeLeft":
-          callbacksRef.current.onSwipeLeft?.();
-          break;
-        case "swipeRight":
-          callbacksRef.current.onSwipeRight?.();
-          break;
-        case "debug":
-          break;
-      }
-    },
-    [],
-  );
-
-  const handleMessage = useCallback(
-    (event: WebViewMessageEvent) => {
-      let message: BridgeOutboundMessage;
-      try {
-        message = JSON.parse(event.nativeEvent.data) as BridgeOutboundMessage;
-      } catch {
-        return;
-      }
-
-      if (message.type === "bridgeReady" || message.type === "rendererReady") {
-        handleLifecycleMessage(message);
-        return;
-      }
-      handleTerminalMessage(message);
-    },
-    [handleLifecycleMessage, handleTerminalMessage],
-  );
-
-  const handleLoadStart = useCallback<NonNullable<WebViewProps["onLoadStart"]>>(() => {
-    bridgeReadyRef.current = false;
-    mountedStreamKeyRef.current = null;
-    scheduleBridgeReadyWatchdog();
-  }, [scheduleBridgeReadyWatchdog]);
-
-  const handleContentProcessDidTerminate = useCallback<
-    NonNullable<WebViewProps["onContentProcessDidTerminate"]>
-  >(() => {
-    resetWebViewDocument();
-  }, [resetWebViewDocument]);
-
-  const handleRenderProcessGone = useCallback<
-    NonNullable<WebViewProps["onRenderProcessGone"]>
-  >(() => {
-    resetWebViewDocument();
-  }, [resetWebViewDocument]);
-
-  const webViewStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [styles.webView, { backgroundColor: xtermTheme.background ?? "#0b0b0b" }],
-    [xtermTheme.background],
-  );
-
-  return (
-    <View style={styles.root} testID={testId}>
-      <WebView
-        key={webViewEpoch}
-        ref={webViewRef}
-        source={TERMINAL_WEBVIEW_SOURCE}
-        style={webViewStyle}
-        containerStyle={styles.webViewContainer}
-        originWhitelist={TERMINAL_WEBVIEW_ORIGIN_WHITELIST}
-        scrollEnabled
-        nestedScrollEnabled
-        bounces={false}
-        overScrollMode="never"
-        keyboardDisplayRequiresUserAction={false}
-        automaticallyAdjustContentInsets={false}
-        contentInsetAdjustmentBehavior="never"
-        textInteractionEnabled={false}
-        allowsLinkPreview={false}
-        setSupportMultipleWindows={false}
-        setBuiltInZoomControls={false}
-        setDisplayZoomControls={false}
-        textZoom={100}
-        onMessage={handleMessage}
-        onLoadStart={handleLoadStart}
-        onContentProcessDidTerminate={handleContentProcessDidTerminate}
-        onRenderProcessGone={handleRenderProcessGone}
-      />
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  root: {
-    flex: 1,
-    minHeight: 0,
-    minWidth: 0,
-    overflow: "hidden",
-    backgroundColor: "#0b0b0b",
-  },
-  webView: {
-    flex: 1,
-    backgroundColor: "#0b0b0b",
-  },
-  webViewContainer: {
-    flex: 1,
-    backgroundColor: "#0b0b0b",
-  },
-});
@@ -19,10 +19,7 @@ import type { ITheme } from "@xterm/xterm";
 import type { TerminalState } from "@server/shared/messages";
 import type { TerminalInputModeState } from "@server/shared/terminal-input-mode";
 import type { PendingTerminalModifiers } from "../utils/terminal-keys";
-import {
-  TerminalEmulatorRuntime,
-  type TerminalOutputData,
-} from "../terminal/runtime/terminal-emulator-runtime";
+import { TerminalEmulatorRuntime } from "../terminal/runtime/terminal-emulator-runtime";
 import type { TerminalRendererReadyChange } from "../utils/terminal-renderer-readiness";
 import { openExternalUrl } from "../utils/open-external-url";
 import { focusWithRetries } from "../utils/web-focus";
@@ -32,8 +29,7 @@ import {
 } from "./web-desktop-scrollbar.math";

 export interface TerminalEmulatorHandle {
-  writeOutput: (data: TerminalOutputData) => void;
-  restoreOutput: (data: TerminalOutputData) => void;
+  writeOutput: (text: string) => void;
  renderSnapshot: (state: TerminalState | null) => void;
  clear: () => void;
 }
@@ -258,12 +254,8 @@ export default function TerminalEmulator({
    domBridgeRef,
    (): DOMImperativeFactory => ({
      writeOutput: (...args) => {
-        const data = args[0];
-        if (data instanceof Uint8Array) runtimeRef.current?.write({ data });
-      },
-      restoreOutput: (...args) => {
-        const data = args[0];
-        if (data instanceof Uint8Array) runtimeRef.current?.restoreOutput({ data });
+        const text = args[0];
+        if (typeof text === "string") runtimeRef.current?.write({ text });
      },
      renderSnapshot: (...args) => {
        const state = args[0];
@@ -282,11 +274,8 @@ export default function TerminalEmulator({
  useImperativeHandle(
    ref,
    (): TerminalEmulatorHandle => ({
-      writeOutput: (data: TerminalOutputData) => {
-        runtimeRef.current?.write({ data });
-      },
-      restoreOutput: (data: TerminalOutputData) => {
-        runtimeRef.current?.restoreOutput({ data });
+      writeOutput: (text: string) => {
+        runtimeRef.current?.write({ text });
      },
      renderSnapshot: (state: TerminalState | null) => {
        runtimeRef.current?.renderSnapshot({ state });
@@ -25,9 +25,7 @@ import {
  TerminalStreamController,
  type TerminalStreamControllerStatus,
 } from "@/terminal/runtime/terminal-stream-controller";
-import { resolveTerminalRestoreOptions } from "@/terminal/runtime/terminal-restore-options";
 import { usePanelStore } from "@/stores/panel-store";
-import { useSessionStore } from "@/stores/session-store";
 import { toXtermTheme } from "@/utils/to-xterm-theme";
 import TerminalEmulator, { type TerminalEmulatorHandle } from "./terminal-emulator";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -173,9 +171,6 @@ export function TerminalPane({

  const client = useHostRuntimeClient(serverId);
  const isConnected = useHostRuntimeIsConnected(serverId);
-  const supportsTerminalRestoreModes = useSessionStore(
-    (state) => state.sessions[serverId]?.serverInfo?.features?.["terminal-restore-modes"] === true,
-  );

  const scopeKey = useMemo(() => terminalScopeKey({ serverId, cwd }), [serverId, cwd]);
  const terminalStreamKey = useMemo(() => `${scopeKey}:${terminalId}`, [scopeKey, terminalId]);
@@ -359,18 +354,11 @@ export function TerminalPane({
    const controller = new TerminalStreamController({
      client,
      getPreferredSize: () => measuredTerminalSizeRef.current,
-      onOutput: ({ terminalId: outputTerminalId, data }) => {
+      onOutput: ({ terminalId: outputTerminalId, text }) => {
        if (!isWorkspaceFocused || terminalIdRef.current !== outputTerminalId) {
          return;
        }
-        emulatorRef.current?.writeOutput(data);
-      },
-      onRestore: ({ terminalId: restoreTerminalId, data }) => {
-        workspaceTerminalSession.snapshots.clear({ terminalId: restoreTerminalId });
-        if (!isWorkspaceFocused || terminalIdRef.current !== restoreTerminalId) {
-          return;
-        }
-        emulatorRef.current?.restoreOutput(data);
+        emulatorRef.current?.writeOutput(text);
      },
      onSnapshot: ({ terminalId: snapshotTerminalId, state }) => {
        workspaceTerminalSession.snapshots.set({ terminalId: snapshotTerminalId, state });
@@ -379,12 +367,6 @@ export function TerminalPane({
        }
        emulatorRef.current?.renderSnapshot(state);
      },
-      getRestoreOptions: () => {
-        return resolveTerminalRestoreOptions({
-          supportsTerminalRestoreModes,
-          size: measuredTerminalSizeRef.current,
-        });
-      },
      onStatusChange: handleStreamControllerStatus,
    });

@@ -404,7 +386,6 @@ export function TerminalPane({
    handleStreamControllerStatus,
    isConnected,
    isWorkspaceFocused,
-    supportsTerminalRestoreModes,
    workspaceTerminalSession.snapshots,
  ]);

@@ -13,7 +13,6 @@ 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";
@@ -80,7 +79,7 @@ function useDetailStyles(
  const codeVerticalScrollStyle = useMemo(
    () => [
      styles.codeVerticalScroll,
-      resolvedMaxHeight !== undefined && inlineUnistylesStyle({ maxHeight: resolvedMaxHeight }),
+      resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
      shouldFill && styles.fillHeight,
      webScrollbarStyle,
    ],
@@ -89,7 +88,7 @@ function useDetailStyles(
  const scrollAreaFillStyle = useMemo(
    () => [
      styles.scrollArea,
-      resolvedMaxHeight !== undefined && inlineUnistylesStyle({ maxHeight: resolvedMaxHeight }),
+      resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
      shouldFill && styles.fillHeight,
      webScrollbarStyle,
    ],
@@ -98,7 +97,7 @@ function useDetailStyles(
  const scrollAreaStyle = useMemo(
    () => [
      styles.scrollArea,
-      resolvedMaxHeight !== undefined && inlineUnistylesStyle({ maxHeight: resolvedMaxHeight }),
+      resolvedMaxHeight !== undefined && { maxHeight: resolvedMaxHeight },
      webScrollbarStyle,
    ],
    [resolvedMaxHeight, webScrollbarStyle],
@@ -1,176 +0,0 @@
-import { useCallback, useEffect, useMemo, useState, type ReactElement } from "react";
-import { Keyboard, Platform, StatusBar, View, type LayoutChangeEvent } from "react-native";
-import { Portal } from "@gorhom/portal";
-import Animated, {
-  useAnimatedStyle,
-  useDerivedValue,
-  useSharedValue,
-} from "react-native-reanimated";
-import { useReanimatedKeyboardAnimation } from "react-native-keyboard-controller";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet } from "react-native-unistyles";
-import { Autocomplete, type AutocompleteOption } from "@/components/ui/autocomplete";
-import { SPACING } from "@/styles/theme";
-import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
-
-const OFFSET_FROM_ANCHOR = SPACING[3];
-
-interface Rect {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-function measureElement(element: View): Promise<Rect> {
-  return new Promise((resolve) => {
-    element.measureInWindow((x, y, width, height) => {
-      resolve({ x, y, width, height });
-    });
-  });
-}
-
-interface AutocompletePopoverProps {
-  visible: boolean;
-  anchorRef: React.RefObject<View | null>;
-  options: readonly AutocompleteOption[];
-  selectedIndex: number;
-  onSelect: (option: AutocompleteOption) => void;
-  isLoading?: boolean;
-  errorMessage?: string;
-  loadingText?: string;
-  emptyText?: string;
-}
-
-export function AutocompletePopover({
-  visible,
-  anchorRef,
-  options,
-  selectedIndex,
-  onSelect,
-  isLoading,
-  errorMessage,
-  loadingText,
-  emptyText,
-}: AutocompletePopoverProps): ReactElement | null {
-  const [anchorRect, setAnchorRect] = useState<Rect | null>(null);
-  const [contentSize, setContentSize] = useState<{ width: number; height: number } | null>(null);
-  const insets = useSafeAreaInsets();
-
-  const { height: rawKeyboardHeight } = useReanimatedKeyboardAnimation();
-  const bottomInsetSV = useSharedValue(insets.bottom);
-  useEffect(() => {
-    bottomInsetSV.value = insets.bottom;
-  }, [bottomInsetSV, insets.bottom]);
-
-  // Same shift formula as useKeyboardShiftStyle({mode: "translate"}), so the popover
-  // tracks the composer's keyboard translate in lockstep.
-  const shift = useDerivedValue(() =>
-    Math.max(0, Math.abs(rawKeyboardHeight.value) - bottomInsetSV.value),
-  );
-  // Snapshot of `shift` at the moment we measured the anchor. Translate applied to the
-  // popover is `openShift - shift`, so when shift == openShift the popover sits at the
-  // measured position; when keyboard moves the popover translates with the composer.
-  const openShift = useSharedValue(0);
-
-  useEffect(() => {
-    if (!visible) {
-      setAnchorRect(null);
-      setContentSize(null);
-      return;
-    }
-    let cancelled = false;
-    // measureInWindow on Android returns coords below the status bar, while the Portal
-    // overlay starts at the top of the window. Mirror tooltip.tsx and shift the rect
-    // down by the status bar height to keep both in the same coord system.
-    const statusBarOffset = Platform.OS === "android" ? (StatusBar.currentHeight ?? 0) : 0;
-    const remeasure = () => {
-      const element = anchorRef.current;
-      if (!element) return;
-      void measureElement(element).then((rect) => {
-        if (cancelled) return undefined;
-        setAnchorRect({ ...rect, y: rect.y + statusBarOffset });
-        openShift.value = shift.value;
-        return undefined;
-      });
-    };
-
-    remeasure();
-    const subscriptions = (["keyboardDidShow", "keyboardDidHide"] as const).map((event) =>
-      Keyboard.addListener(event, () => requestAnimationFrame(remeasure)),
-    );
-
-    return () => {
-      cancelled = true;
-      for (const sub of subscriptions) sub.remove();
-    };
-  }, [visible, anchorRef, openShift, shift]);
-
-  const handleLayout = useCallback((event: LayoutChangeEvent) => {
-    const { width, height } = event.nativeEvent.layout;
-    setContentSize({ width, height });
-  }, []);
-
-  const baseStyle = useMemo(() => {
-    if (!anchorRect) return null;
-    if (!contentSize) {
-      // Have the anchor, waiting on the popover's own height. Render with the
-      // final width so the inner Autocomplete lays out at its final size, but
-      // stay invisible — the first visible paint will already be at the correct
-      // top. Mirrors combobox.tsx `shouldHideDesktopContent`. See
-      // docs/floating-panels.md "the two-measurement flash".
-      return inlineUnistylesStyle({
-        position: "absolute" as const,
-        top: 0,
-        left: anchorRect.x,
-        width: anchorRect.width,
-        opacity: 0,
-      });
-    }
-    return inlineUnistylesStyle({
-      position: "absolute" as const,
-      top: anchorRect.y - contentSize.height - OFFSET_FROM_ANCHOR,
-      left: anchorRect.x,
-      width: anchorRect.width,
-    });
-  }, [anchorRect, contentSize]);
-
-  const animatedTransformStyle = useAnimatedStyle(() => ({
-    transform: [{ translateY: openShift.value - shift.value }],
-  }));
-
-  const composedStyle = useMemo(
-    () => [baseStyle, animatedTransformStyle],
-    [baseStyle, animatedTransformStyle],
-  );
-
-  if (!visible || !anchorRect || !baseStyle) return null;
-
-  return (
-    <Portal>
-      <View style={styles.overlay} pointerEvents="box-none">
-        <Animated.View style={composedStyle} onLayout={handleLayout}>
-          <Autocomplete
-            options={options}
-            selectedIndex={selectedIndex}
-            onSelect={onSelect}
-            isLoading={isLoading}
-            errorMessage={errorMessage}
-            loadingText={loadingText}
-            emptyText={emptyText}
-          />
-        </Animated.View>
-      </View>
-    </Portal>
-  );
-}
-
-const styles = StyleSheet.create(() => ({
-  overlay: {
-    position: "absolute",
-    top: 0,
-    right: 0,
-    bottom: 0,
-    left: 0,
-  },
-}));
@@ -20,8 +20,6 @@ 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";
@@ -58,7 +56,6 @@ import {
  SheetHeaderView,
  type SheetHeader,
 } from "@/components/adaptive-modal-sheet";
-import { FloatingSurface } from "@/components/ui/floating";

 const IS_WEB = isWeb;

@@ -194,6 +191,7 @@ export function SearchInput({
          // @ts-expect-error - outlineStyle is web-only
          style={SEARCH_INPUT_STYLE}
          placeholder={placeholder}
+          placeholderTextColor={theme.colors.foregroundMuted}
          initialValue={value}
          resetKey={resetKey}
          value={value}
@@ -860,7 +858,7 @@ interface DesktopContainerStyleInput {
  availableHeight: number | undefined;
 }

-function buildDesktopFrameStyle(input: DesktopContainerStyleInput): StyleProp<ViewStyle> {
+function buildDesktopContainerStyle(input: DesktopContainerStyleInput) {
  const {
    desktopMinWidth,
    referenceWidth,
@@ -879,6 +877,7 @@ function buildDesktopFrameStyle(input: DesktopContainerStyleInput): StyleProp<Vi
      ? { maxHeight: Math.min(availableHeight, desktopFixedHeight ?? 400) }
      : null;
  return [
+    styles.desktopContainer,
    {
      position: "absolute" as const,
      minWidth: desktopMinWidth ?? referenceWidth ?? 200,
@@ -1071,7 +1070,7 @@ interface DesktopBodyProps {
  handleClose: () => void;
  refs: ReturnType<typeof useFloating>["refs"];
  shouldUseDesktopFade: boolean;
-  desktopFrameStyle: StyleProp<ViewStyle>;
+  desktopContainerStyle: unknown;
  handleDesktopContentLayout: (event: LayoutChangeEvent) => void;
  header: SheetHeader | undefined;
  stickyHeader: ReactNode;
@@ -1192,12 +1191,11 @@ function DesktopComboboxBody(props: DesktopBodyProps): ReactElement {
    >
      <View ref={props.refs.setOffsetParent} collapsable={false} style={styles.desktopOverlay}>
        <Pressable style={styles.desktopBackdrop} onPress={props.handleClose} />
-        <FloatingSurface
+        <Animated.View
          testID="combobox-desktop-container"
          entering={props.shouldUseDesktopFade ? FadeIn.duration(100) : undefined}
          exiting={props.shouldUseDesktopFade ? FadeOut.duration(100) : undefined}
-          style={styles.desktopContainer}
-          frameStyle={props.desktopFrameStyle}
+          style={props.desktopContainerStyle as never}
          ref={props.refs.setFloating}
          collapsable={false}
          onLayout={props.handleDesktopContentLayout}
@@ -1229,7 +1227,7 @@ function DesktopComboboxBody(props: DesktopBodyProps): ReactElement {
              renderOption={props.renderOption}
            />
          )}
-        </FloatingSurface>
+        </Animated.View>
      </View>
    </Modal>
  );
@@ -1494,9 +1492,9 @@ export function Combobox({
    [theme.colors.palette.zinc],
  );

-  const desktopFrameStyle = useMemo(
+  const desktopContainerStyle = useMemo(
    () =>
-      buildDesktopFrameStyle({
+      buildDesktopContainerStyle({
        desktopMinWidth,
        referenceWidth,
        desktopFixedHeight,
@@ -1563,7 +1561,7 @@ export function Combobox({
      handleClose={handleClose}
      refs={refs}
      shouldUseDesktopFade={shouldUseDesktopFade}
-      desktopFrameStyle={desktopFrameStyle}
+      desktopContainerStyle={desktopContainerStyle}
      handleDesktopContentLayout={handleDesktopContentLayout}
      header={header}
      stickyHeader={stickyHeader}
@@ -18,6 +18,7 @@ import {
  Modal,
  Platform,
  Pressable,
+  ScrollView,
  StatusBar,
  Text,
  View,
@@ -27,7 +28,7 @@ import {
  type StyleProp,
  type ViewStyle,
 } from "react-native";
-import { FadeIn, FadeOut } from "react-native-reanimated";
+import Animated, { 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";
@@ -37,7 +38,6 @@ 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 frameStyle = useMemo(() => {
+  const animatedContentStyle = useMemo(() => {
    const { width: screenWidth } = Dimensions.get("window");
    const resolvedWidthStyle: ViewStyle = fullWidth
      ? { width: screenWidth - horizontalPadding * 2 }
@@ -508,6 +508,7 @@ export function ContextMenuContent({
          ...(typeof maxWidth === "number" ? { maxWidth } : null),
        };
    return [
+      styles.content,
      resolvedWidthStyle,
      {
        position: "absolute" as const,
@@ -565,24 +566,23 @@ export function ContextMenuContent({
          onPress={handleClose}
          testID={testID ? `${testID}-backdrop` : undefined}
        />
-        <FloatingSurface
+        <Animated.View
          entering={FadeIn.duration(100)}
          exiting={FadeOut.duration(100)}
          collapsable={false}
          testID={testID}
          onLayout={handleContentLayout}
-          style={styles.content}
-          frameStyle={frameStyle}
+          style={animatedContentStyle}
        >
-          <FloatingScrollView
+          <ScrollView
            bounces={false}
            showsVerticalScrollIndicator
            style={webScrollbarStyle}
            contentContainerStyle={SCROLL_CONTENT_CONTAINER_STYLE}
          >
            {children}
-          </FloatingScrollView>
-        </FloatingSurface>
+          </ScrollView>
+        </Animated.View>
      </View>
    </Modal>
  );
@@ -14,6 +14,7 @@ import {
  ActivityIndicator,
  Modal,
  Pressable,
+  ScrollView,
  Text,
  View,
  Dimensions,
@@ -24,10 +25,10 @@ import {
  type ViewStyle,
  type StyleProp,
 } from "react-native";
-import { Keyframe, runOnJS } from "react-native-reanimated";
+import Animated, { Keyframe, runOnJS } from "react-native-reanimated";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { Check, CheckCircle } from "lucide-react-native";
-import { FloatingScrollView, FloatingSurface } from "@/components/ui/floating";
+import { isWeb } from "@/constants/platform";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";

@@ -171,37 +172,42 @@ function computePosition({
  return { x, y, actualPlacement };
 }

-function renderDropdownSurface(input: {
-  frameStyle: StyleProp<ViewStyle>;
+interface SharedDropdownContentProps {
+  collapsable: false;
  testID?: string;
-  surfaceStyle: StyleProp<ViewStyle>;
+  style: StyleProp<ViewStyle>;
+}
+
+function renderDropdownSurface(input: {
+  isWebSurface: boolean;
+  sharedProps: SharedDropdownContentProps;
  scrollable: boolean;
  scrollViewportStyle: StyleProp<ViewStyle>;
  content: ReactElement;
  onExited: () => void;
 }): ReactElement {
-  const { frameStyle, testID, surfaceStyle, scrollable, scrollViewportStyle, content, onExited } =
-    input;
+  const { isWebSurface, sharedProps, scrollable, scrollViewportStyle, content, onExited } = input;

  const body = scrollable ? (
-    <FloatingScrollView
+    <ScrollView
      bounces={false}
      showsVerticalScrollIndicator
      style={scrollViewportStyle}
      contentContainerStyle={DROPDOWN_SCROLL_CONTENT_STYLE}
    >
      {content}
-    </FloatingScrollView>
+    </ScrollView>
  ) : (
    content
  );

+  if (isWebSurface) {
+    return <View {...sharedProps}>{body}</View>;
+  }
+
  return (
-    <FloatingSurface
-      collapsable={false}
-      testID={testID}
-      style={surfaceStyle}
-      frameStyle={frameStyle}
+    <Animated.View
+      {...sharedProps}
      entering={contentEntering}
      exiting={contentExiting.withCallback((finished) => {
        "worklet";
@@ -211,7 +217,7 @@ function renderDropdownSurface(input: {
      })}
    >
      {body}
-    </FloatingSurface>
+    </Animated.View>
  );
 }

@@ -507,8 +513,7 @@ export function DropdownMenuContent({
    [],
  );

-  const surfaceStyle = styles.content;
-  const frameStyle = useMemo(() => {
+  const contentStyle = useMemo(() => {
    const { width: screenWidth } = Dimensions.get("window");
    const resolvedWidthStyle: ViewStyle = fullWidth
      ? { width: screenWidth - horizontalPadding * 2 }
@@ -518,6 +523,7 @@ export function DropdownMenuContent({
          ...(typeof maxWidth === "number" ? { maxWidth } : null),
        };
    return [
+      styles.content,
      resolvedWidthStyle,
      {
        position: "absolute" as const,
@@ -537,6 +543,14 @@ 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],
@@ -569,9 +583,8 @@ export function DropdownMenuContent({
        />
        {!closing
          ? renderDropdownSurface({
-              frameStyle,
-              testID,
-              surfaceStyle,
+              isWebSurface: isWeb,
+              sharedProps: sharedContentProps,
              scrollable,
              scrollViewportStyle,
              content,
@@ -1,63 +0,0 @@
-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>
-  );
-}
@@ -142,6 +142,7 @@ const styles = StyleSheet.create((theme) => ({
  container: {
    flexDirection: "row",
    alignItems: "stretch",
+    maxWidth: "100%",
    backgroundColor: theme.colors.surface2,
    borderRadius: theme.borderRadius.lg,
    gap: 2,
@@ -4,6 +4,23 @@ import { StyleSheet } from "react-native-unistyles";
 import { formatShortcut, type ShortcutKey } from "@/utils/format-shortcut";
 import { getShortcutOs } from "@/utils/shortcut-platform";

+function colorWithOpacity(color: string, opacity: number): string {
+  const hex = color.trim();
+  if (/^#[0-9a-fA-F]{3}$/.test(hex)) {
+    const r = Number.parseInt(hex[1] + hex[1], 16);
+    const g = Number.parseInt(hex[2] + hex[2], 16);
+    const b = Number.parseInt(hex[3] + hex[3], 16);
+    return `rgba(${r}, ${g}, ${b}, ${opacity})`;
+  }
+  if (/^#[0-9a-fA-F]{6}$/.test(hex)) {
+    const r = Number.parseInt(hex.slice(1, 3), 16);
+    const g = Number.parseInt(hex.slice(3, 5), 16);
+    const b = Number.parseInt(hex.slice(5, 7), 16);
+    return `rgba(${r}, ${g}, ${b}, ${opacity})`;
+  }
+  return `rgba(255, 255, 255, ${opacity})`;
+}
+
 export function Shortcut({
  keys,
  chord,
@@ -53,7 +70,7 @@ const styles = StyleSheet.create((theme) => ({
    paddingHorizontal: theme.spacing[1],
    paddingVertical: 2,
    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface2,
+    backgroundColor: colorWithOpacity(theme.colors.foreground, 0.05),
    borderWidth: 0,
  },
  sequence: {
@@ -65,6 +82,6 @@ const styles = StyleSheet.create((theme) => ({
  text: {
    fontSize: theme.fontSize.xs,
    fontWeight: theme.fontWeight.normal,
-    color: theme.colors.foregroundMuted,
+    color: colorWithOpacity(theme.colors.foreground, 0.6),
  },
 }));
@@ -25,10 +25,9 @@ import {
 } from "react-native";
 import { Portal } from "@gorhom/portal";
 import { useBottomSheetModalInternal } from "@gorhom/bottom-sheet";
-import { FadeIn, FadeOut } from "react-native-reanimated";
+import Animated, { 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";
@@ -495,18 +494,19 @@ export function TooltipContent({
    [],
  );

-  const frameStyle = useMemo(
+  const contentStyle = useMemo(
    () => [
+      styles.content,
+      { maxWidth },
+      style,
      {
        position: "absolute" as const,
        top: position?.y ?? -9999,
        left: position?.x ?? -9999,
-        maxWidth,
      },
    ],
-    [maxWidth, position?.x, position?.y],
+    [maxWidth, style, 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}>
-          <FloatingSurface
+          <Animated.View
            pointerEvents="none"
            entering={FadeIn.duration(80)}
            exiting={FadeOut.duration(80)}
@@ -527,10 +527,9 @@ export function TooltipContent({
            testID={testID}
            onLayout={handleLayout}
            style={contentStyle}
-            frameStyle={frameStyle}
          >
            {children}
-          </FloatingSurface>
+          </Animated.View>
        </View>
      </Portal>
    );
@@ -545,7 +544,7 @@ export function TooltipContent({
      onRequestClose={handleDismiss}
    >
      <Pressable style={styles.overlay} onPress={handleDismiss}>
-        <FloatingSurface
+        <Animated.View
          pointerEvents="none"
          entering={FadeIn.duration(80)}
          exiting={FadeOut.duration(80)}
@@ -553,10 +552,9 @@ export function TooltipContent({
          testID={testID}
          onLayout={handleLayout}
          style={contentStyle}
-          frameStyle={frameStyle}
        >
          {children}
-        </FloatingSurface>
+        </Animated.View>
      </Pressable>
    </Modal>
  );
@@ -1,20 +1,17 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
  PanResponder,
-  type GestureResponderEvent,
+  View,
  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;
@@ -30,15 +27,6 @@ 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;
@@ -71,13 +59,6 @@ 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,
@@ -134,6 +115,13 @@ export function useWebDesktopScrollbarMetrics() {
  };
 }

+interface WebDesktopScrollbarOverlayProps {
+  enabled: boolean;
+  metrics: ScrollbarMetrics;
+  onScrollToOffset: (offset: number) => void;
+  inverted?: boolean;
+}
+
 export function WebDesktopScrollbarOverlay({
  enabled,
  metrics,
@@ -285,12 +273,8 @@ export function WebDesktopScrollbarOverlay({
      onStartShouldSetPanResponder: () => true,
      onMoveShouldSetPanResponder: () => true,
      onPanResponderTerminationRequest: () => false,
-      onPanResponderGrant: (event: GestureResponderEvent) => {
-        const clientY = readClientY(event);
+      onPanResponderGrant: () => {
        dragStartOffsetRef.current = normalizedOffsetRef.current;
-        if (clientY !== null) {
-          dragStartClientYRef.current = clientY;
-        }
        setIsDragging(true);
      },
      onPanResponderMove: (_event, gestureState) => {
@@ -378,19 +362,20 @@ export function WebDesktopScrollbarOverlay({
  const thumbRegionStyle = useMemo(
    () => [
      styles.thumbRegion,
-      inlineUnistylesStyle({
+      {
+        top: 0,
        height: thumbRegionHeight,
        transform: [{ translateY: thumbRegionOffset }],
-      }),
+      },
      platformIsWeb &&
-        inlineUnistylesStyle({
+        ({
          cursor: handleCursor,
          touchAction: "none",
          userSelect: "none",
          transitionProperty: "transform",
          transitionDuration: `${handleTravelDurationMs}ms`,
          transitionTimingFunction: "linear",
-        } satisfies WebPointerStyle as unknown as ViewStyle),
+        } as object),
    ],
    [thumbRegionHeight, thumbRegionOffset, handleCursor, handleTravelDurationMs],
  );
@@ -398,19 +383,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",
-        } satisfies WebPointerStyle as unknown as ViewStyle),
+        } as object),
    ],
    [handleInsetTop, geometry.handleSize, handleWidth, handleColor, handleOpacity],
  );
@@ -428,6 +413,8 @@ export function WebDesktopScrollbarOverlay({
        {...(platformIsWeb
          ? ({
              onPointerDown: startWebDrag,
+              onPointerEnter: handleGrabHoverIn,
+              onPointerLeave: handleGrabHoverOut,
              onMouseEnter: handleGrabHoverIn,
              onMouseLeave: handleGrabHoverOut,
            } as object)
@@ -459,6 +446,5 @@ const styles = StyleSheet.create(() => ({
    position: "absolute",
    right: -3,
    width: HANDLE_GRAB_WIDTH,
-    top: 0,
  },
 }));
@@ -9,7 +9,7 @@ import {
  type ReactNode,
 } from "react";
 import { Dimensions, Text, View } from "react-native";
-import { FadeIn, FadeOut } from "react-native-reanimated";
+import Animated, { 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,7 +24,6 @@ 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 {
@@ -255,19 +254,23 @@ function WorkspaceHoverCardContent({
    [],
  );

-  const frameStyle = useMemo(
-    () => ({
-      position: "absolute" as const,
-      top: position?.y ?? -9999,
-      left: position?.x ?? -9999,
-    }),
+  const cardStyle = useMemo(
+    () => [
+      styles.card,
+      {
+        width: HOVER_CARD_WIDTH,
+        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}>
-        <FloatingSurface
+        <Animated.View
          ref={contentRef}
          entering={FadeIn.duration(80)}
          exiting={FadeOut.duration(80)}
@@ -276,8 +279,7 @@ function WorkspaceHoverCardContent({
          accessibilityRole="menu"
          accessibilityLabel="Workspace scripts"
          testID="workspace-hover-card"
-          style={styles.card}
-          frameStyle={frameStyle}
+          style={cardStyle}
        >
          <View style={styles.cardHeader}>
            <Text style={styles.cardTitle} numberOfLines={1} testID="hover-card-workspace-name">
@@ -301,7 +303,7 @@ function WorkspaceHoverCardContent({
              <ChecksSummaryPressable checks={prHint.checks} url={prHint.url} />
            </>
          ) : null}
-        </FloatingSurface>
+        </Animated.View>
      </View>
    </Portal>
  );
@@ -439,7 +441,6 @@ 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,
@@ -31,6 +31,15 @@ const CATALOG_DATA = [
    installLink: "https://github.com/tao12345666333/amp-acp",
    command: ["amp-acp"],
  },
+  {
+    id: "antigravity",
+    title: "Google Antigravity CLI",
+    description: "Terminal-first surface to interact with Antigravity agents",
+    version: "1.0.0",
+    iconId: "antigravity",
+    installLink: "https://www.antigravity.google/product/antigravity-cli",
+    command: ["paseo", "acp", "antigravity"],
+  },
  {
    id: "auggie",
    title: "Auggie CLI",
@@ -17,7 +17,6 @@ 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";
@@ -111,20 +110,18 @@ export function GitActionsSplitButton({ gitActions, hideLabels }: GitActionsSpli
  const primaryPressableStyle = useCallback(
    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
      styles.splitButtonPrimary,
-      (Boolean(hovered) || pressed) &&
-        inlineUnistylesStyle({ backgroundColor: theme.colors.surface2 }),
+      (Boolean(hovered) || pressed) && styles.splitButtonPrimaryHovered,
      primaryDisabled && styles.splitButtonPrimaryDisabled,
    ],
-    [primaryDisabled, theme.colors.surface2],
+    [primaryDisabled],
  );

  const caretTriggerStyle = useCallback(
    ({ hovered, pressed, open }: { hovered: boolean; pressed: boolean; open: boolean }) => [
      styles.splitButtonCaret,
-      (hovered || pressed || open) &&
-        inlineUnistylesStyle({ backgroundColor: theme.colors.surface2 }),
+      (hovered || pressed || open) && styles.splitButtonCaretHovered,
    ],
-    [theme.colors.surface2],
+    [],
  );

  return (
@@ -233,6 +230,9 @@ const styles = StyleSheet.create((theme) => ({
    justifyContent: "center",
    position: "relative",
  },
+  splitButtonPrimaryHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
  splitButtonPrimaryDisabled: {
    opacity: 0.6,
  },
@@ -258,6 +258,9 @@ const styles = StyleSheet.create((theme) => ({
    borderLeftWidth: theme.borderWidth[1],
    borderLeftColor: theme.colors.borderAccent,
  },
+  splitButtonCaretHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
  iconButton: {
    width: 32,
    height: 32,
@@ -78,7 +78,6 @@ 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 {
@@ -114,6 +113,25 @@ 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;
@@ -256,12 +274,7 @@ function DiffGutterCell({
  style?: StyleProp<ViewStyle>;
 }) {
  const containerStyle = useMemo(
-    () => [
-      styles.gutterCell,
-      lineTypeBackground(type),
-      inlineUnistylesStyle({ width: gutterWidth }),
-      style,
-    ],
+    () => [styles.gutterCell, lineTypeBackground(type), { width: gutterWidth }, style],
    [type, gutterWidth, style],
  );
  const textStyle = useMemo(
@@ -531,10 +544,7 @@ function InlineReviewThreadContent({
 }) {
  const threadState = getInlineReviewThreadState({ reviewTarget, reviewActions });
  const height = reservedHeight ?? threadState?.height ?? 0;
-  const placeholderStyle = useMemo<ViewStyle>(
-    () => inlineUnistylesStyle({ minHeight: height }),
-    [height],
-  );
+  const placeholderStyle = useMemo<ViewStyle>(() => ({ minHeight: height }), [height]);
  if (height === 0) {
    return null;
  }
@@ -570,11 +580,7 @@ function InlineReviewGutterSpacer({
  const threadState = getInlineReviewThreadState({ reviewTarget, reviewActions });
  const height = reservedHeight ?? threadState?.height ?? 0;
  const spacerStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [
-      styles.inlineReviewGutterSpacer,
-      inlineUnistylesStyle({ width: gutterWidth, minHeight: height }),
-      style,
-    ],
+    () => [styles.inlineReviewGutterSpacer, { width: gutterWidth, minHeight: height }, style],
    [gutterWidth, height, style],
  );
  if (height === 0) {
@@ -598,13 +604,10 @@ function InlineReviewRow({
  const threadState = getInlineReviewThreadState({ reviewTarget, reviewActions });
  const height = reservedHeight ?? threadState?.height ?? 0;
  const gutterSpacerStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [styles.inlineReviewGutterSpacer, inlineUnistylesStyle({ width: gutterWidth })],
+    () => [styles.inlineReviewGutterSpacer, { width: gutterWidth }],
    [gutterWidth],
  );
-  const placeholderStyle = useMemo<ViewStyle>(
-    () => inlineUnistylesStyle({ minHeight: height }),
-    [height],
-  );
+  const placeholderStyle = useMemo<ViewStyle>(() => ({ minHeight: height }), [height]);
  if (height === 0) {
    return null;
  }
@@ -653,10 +656,7 @@ function SplitDiffColumn({
    [showDivider],
  );
  const linesContainerRowStyle = useMemo(
-    () => [
-      styles.linesContainer,
-      scrollWidth > 0 && inlineUnistylesStyle({ minWidth: scrollWidth }),
-    ],
+    () => [styles.linesContainer, scrollWidth > 0 && { minWidth: scrollWidth }],
    [scrollWidth],
  );

@@ -916,10 +916,7 @@ function DiffFileBody({

  const availableWidth = bodyWidth > 0 ? bodyWidth : scrollViewWidth;
  const linesContainerRowStyle = useMemo(
-    () => [
-      styles.linesContainer,
-      availableWidth > 0 && inlineUnistylesStyle({ minWidth: availableWidth }),
-    ],
+    () => [styles.linesContainer, availableWidth > 0 && { minWidth: availableWidth }],
    [availableWidth],
  );

@@ -1065,7 +1062,7 @@ interface GitDiffPaneProps {
 }

 type PressableStyleFn = (
-  state: PressableStateCallbackType & { hovered?: boolean; open?: boolean },
+  state: PressableStateCallbackType & { hovered?: boolean },
 ) => StyleProp<ViewStyle>;

 interface DiffLayoutToggleGroupProps {
@@ -1439,30 +1436,14 @@ 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 || Boolean(hovered) || pressed) &&
-      inlineUnistylesStyle({ backgroundColor: surfaceColor }),
+    selected && styles.toggleButtonSelected,
+    (Boolean(hovered) || pressed) && styles.diffStatusRowHovered,
  ];
 }

@@ -1513,50 +1494,32 @@ 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],
-        controlSurfaceColor,
-      ),
-    [changesPreferences.layout, controlSurfaceColor],
+      buildToggleButtonStyle(changesPreferences.layout === "unified", [
+        styles.toggleButton,
+        styles.toggleButtonGroupStart,
+      ]),
+    [changesPreferences.layout],
  );

  const splitToggleStyle = useMemo(
    () =>
-      buildToggleButtonStyle(
-        changesPreferences.layout === "split",
-        [styles.toggleButton, styles.toggleButtonGroupEnd],
-        controlSurfaceColor,
-      ),
-    [changesPreferences.layout, controlSurfaceColor],
+      buildToggleButtonStyle(changesPreferences.layout === "split", [
+        styles.toggleButton,
+        styles.toggleButtonGroupEnd,
+      ]),
+    [changesPreferences.layout],
  );

  const hideWhitespaceToggleStyle = useMemo(
-    () =>
-      buildToggleButtonStyle(
-        changesPreferences.hideWhitespace,
-        styles.expandAllButton,
-        controlSurfaceColor,
-      ),
-    [changesPreferences.hideWhitespace, controlSurfaceColor],
+    () => buildToggleButtonStyle(changesPreferences.hideWhitespace, styles.expandAllButton),
+    [changesPreferences.hideWhitespace],
  );

  const wrapLinesToggleStyle = useMemo(
-    () => buildToggleButtonStyle(wrapLines, styles.expandAllButton, controlSurfaceColor),
-    [wrapLines, controlSurfaceColor],
-  );
-
-  const expandAllToggleStyle = useMemo(
-    () => buildExpandAllButtonStyle(controlSurfaceColor),
-    [controlSurfaceColor],
+    () => buildToggleButtonStyle(wrapLines, styles.expandAllButton),
+    [wrapLines],
  );

  const {
@@ -2083,7 +2046,7 @@ export function GitDiffPane({
                  allExpanded={allExpanded}
                  isMobile={isMobile}
                  wrapLinesToggleStyle={wrapLinesToggleStyle}
-                  expandAllToggleStyle={expandAllToggleStyle}
+                  expandAllToggleStyle={expandAllButtonStyle}
                  onToggleWrapLines={handleToggleWrapLines}
                  onToggleExpandAll={handleToggleExpandAll}
                />
@@ -36,6 +36,7 @@ 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("antigravity").command).toEqual(["paseo", "acp", "antigravity"]);
    expect(findProvider("cursor").command).toEqual(["cursor-agent", "acp"]);
    expect(findProvider("deepseek-tui").command).toEqual(["deepseek", "serve", "--acp"]);
    expect(findProvider("goose").command).toEqual(["goose", "acp"]);
@@ -58,6 +59,14 @@ describe("ACP provider catalog", () => {
    });
  });

+  it("bundles the Antigravity catalog metadata and icon", () => {
+    const provider = findProvider("antigravity");
+
+    expect(provider.description).toBe("Terminal-first surface to interact with Antigravity agents");
+    expect(provider.installLink).toBe("https://www.antigravity.google/product/antigravity-cli");
+    expect(provider.iconSvg).toContain("<svg");
+  });
+
  it("preserves provider env in the daemon config patch", () => {
    const patch = buildAcpProviderConfigPatch(findProvider("auggie"));

@@ -324,13 +324,9 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
            ),
            ...providerCommands,
          ];
-      const matches = availableCommands.filter((entry) => {
-        if (entry.source === "provider") {
-          return entry.command.name.toLowerCase().includes(filterLower);
-        }
-        const candidates = [entry.command.name, ...entry.command.aliases];
-        return candidates.some((candidate) => candidate.toLowerCase().includes(filterLower));
-      });
+      const matches = availableCommands.filter((entry) =>
+        entry.command.name.toLowerCase().includes(filterLower),
+      );
      const orderedMatches = orderAutocompleteOptions(matches);
      return orderedMatches.map(mapCommandToOption);
    }
@@ -10,7 +10,7 @@ import {
  clearCommandCenterFocusRestoreElement,
  takeCommandCenterFocusRestoreElement,
 } from "@/utils/command-center-focus-restore";
-import { buildHostOpenProjectRoute, buildSettingsRoute } from "@/utils/host-routes";
+import { buildSettingsRoute } from "@/utils/host-routes";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { chordStringToShortcutKeys } from "@/keyboard/shortcut-string";
 import { getBindingIdForAction, getDefaultKeysForAction } from "@/keyboard/keyboard-shortcuts";
@@ -52,10 +52,10 @@ function sortAgents(left: AggregatedAgent, right: AggregatedAgent): number {
 interface CommandCenterActionDefinition {
  id: string;
  title: string;
-  icon?: "plus" | "settings" | "home";
+  icon?: "plus" | "settings";
  actionId?: string;
  keywords: string[];
-  routeKind: "settings" | "home" | "none";
+  routeKind: "settings" | "none";
 }

 const COMMAND_CENTER_ACTIONS: readonly CommandCenterActionDefinition[] = [
@@ -67,13 +67,6 @@ const COMMAND_CENTER_ACTIONS: readonly CommandCenterActionDefinition[] = [
    keywords: ["open", "project", "folder", "workspace", "repo"],
    routeKind: "none",
  },
-  {
-    id: "home",
-    title: "Home",
-    icon: "home",
-    keywords: ["home", "start", "import", "session", "pair", "device", "providers"],
-    routeKind: "home",
-  },
  {
    id: "settings",
    title: "Settings",
@@ -96,7 +89,7 @@ export interface CommandCenterActionItem {
  kind: "action";
  id: string;
  title: string;
-  icon?: "plus" | "settings" | "home";
+  icon?: "plus" | "settings";
  route?: Href;
  shortcutKeys?: ShortcutKey[][];
 }
@@ -162,32 +155,21 @@ export function useCommandCenter() {
    return buildSettingsRoute();
  }, []);

-  const homeRoute = useMemo<Href | undefined>(() => {
-    if (!routeActiveServerId) return undefined;
-    return buildHostOpenProjectRoute(routeActiveServerId) as Href;
-  }, [routeActiveServerId]);
-
  const actionItems = useMemo(() => {
    if (!open) {
      return EMPTY_ACTION_ITEMS;
    }
-    return COMMAND_CENTER_ACTIONS.filter((action) => {
-      if (action.routeKind === "home" && !homeRoute) return false;
-      return matchesActionQuery(query, action);
-    }).map<CommandCenterActionItem>((action) => {
-      let route: Href | undefined;
-      if (action.routeKind === "settings") route = settingsRoute;
-      else if (action.routeKind === "home") route = homeRoute;
-      return {
-        kind: "action",
-        id: action.id,
-        title: action.title,
-        icon: action.icon,
-        route,
-        shortcutKeys: resolveActionShortcutKeys(action.actionId, overrides),
-      };
-    });
-  }, [open, query, settingsRoute, homeRoute, overrides]);
+    return COMMAND_CENTER_ACTIONS.filter((action) =>
+      matchesActionQuery(query, action),
+    ).map<CommandCenterActionItem>((action) => ({
+      kind: "action",
+      id: action.id,
+      title: action.title,
+      icon: action.icon,
+      route: action.routeKind === "settings" ? settingsRoute : undefined,
+      shortcutKeys: resolveActionShortcutKeys(action.actionId, overrides),
+    }));
+  }, [open, query, settingsRoute, overrides]);

  const items = useMemo(() => {
    if (!open) {
@@ -2,7 +2,6 @@

 import { act, renderHook, waitFor } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import type { ToastApi } from "@/components/toast-host";
 import { useSessionStore } from "@/stores/session-store";
 import { TIMELINE_FETCH_PAGE_SIZE } from "@/timeline/timeline-fetch-policy";
 import { useLoadOlderAgentHistory } from "./use-load-older-agent-history";
@@ -10,19 +9,7 @@ import { useLoadOlderAgentHistory } from "./use-load-older-agent-history";
 const serverId = "server-1";
 const agentId = "agent-1";

-type FetchAgentTimeline = (agentId: string, request: unknown) => Promise<void>;
-
-function createToast(): ToastApi {
-  return {
-    show: vi.fn<ToastApi["show"]>(),
-    copied: vi.fn<ToastApi["copied"]>(),
-    error: vi.fn<ToastApi["error"]>(),
-  };
-}
-
-function makeClient(
-  fetchAgentTimeline: FetchAgentTimeline = vi.fn<FetchAgentTimeline>().mockResolvedValue(undefined),
-) {
+function makeClient(fetchAgentTimeline = vi.fn().mockResolvedValue(undefined)) {
  return { fetchAgentTimeline };
 }

@@ -30,7 +17,7 @@ function initialize(input?: {
  cursor?: { epoch: string; startSeq: number; endSeq: number };
  hasOlder?: boolean;
  inFlight?: boolean;
-  fetchAgentTimeline?: FetchAgentTimeline;
+  fetchAgentTimeline?: ReturnType<typeof vi.fn>;
 }) {
  const client = makeClient(input?.fetchAgentTimeline);
  useSessionStore.getState().initializeSession(serverId, client as never);
@@ -82,7 +69,7 @@ describe("useLoadOlderAgentHistory", () => {
  });

  it("dedupes concurrent older-page requests", () => {
-    const fetchAgentTimeline = vi.fn<FetchAgentTimeline>(
+    const fetchAgentTimeline = vi.fn(
      () =>
        new Promise<void>((resolve) => {
          setTimeout(resolve, 20);
@@ -133,9 +120,9 @@ describe("useLoadOlderAgentHistory", () => {
    const client = initialize({
      cursor: { epoch: "epoch-1", startSeq: 10, endSeq: 20 },
      hasOlder: true,
-      fetchAgentTimeline: vi.fn<FetchAgentTimeline>().mockRejectedValue(error),
+      fetchAgentTimeline: vi.fn().mockRejectedValue(error),
    });
-    const toast = createToast();
+    const toast = { show: vi.fn(), copied: vi.fn(), error: vi.fn() };
    const { result } = renderHook(() => useLoadOlderAgentHistory({ serverId, agentId, toast }));

    act(() => {
@@ -272,12 +272,6 @@ describe("keyboard-shortcuts", () => {
      context: { isMac: false },
      action: "sidebar.toggle.both",
    },
-    {
-      name: "matches Dvorak logical Cmd+. to toggle both sidebars on macOS",
-      event: { key: ".", code: "KeyE", metaKey: true },
-      context: { isMac: true },
-      action: "sidebar.toggle.both",
-    },
    {
      name: "routes Mod+D to message-input action outside terminal",
      event: { key: "d", code: "KeyD", metaKey: true },
@@ -300,49 +294,6 @@ describe("keyboard-shortcuts", () => {
      preventDefault: false,
      stopPropagation: false,
    },
-    // macOS rewrites event.key when Option is held (Option+T -> "†",
-    // Option+[ -> "“", Option+Shift+W -> "„", etc.). Every Alt-bound
-    // letter / bracket shortcut must still resolve.
-    {
-      name: "matches Cmd+Alt+T to cycle theme on macOS when Option substitutes event.key",
-      event: { key: "\u2020", code: "KeyT", metaKey: true, altKey: true },
-      context: { isMac: true },
-      action: "theme.cycle",
-    },
-    {
-      name: "matches Alt+Shift+[ to previous tab on macOS when Option substitutes event.key",
-      event: { key: "\u201D", code: "BracketLeft", altKey: true, shiftKey: true },
-      context: { isMac: true },
-      action: "workspace.tab.navigate.relative",
-      payload: { delta: -1 },
-    },
-    {
-      name: "matches Alt+Shift+] to next tab on macOS when Option substitutes event.key",
-      event: { key: "\u2019", code: "BracketRight", altKey: true, shiftKey: true },
-      context: { isMac: true },
-      action: "workspace.tab.navigate.relative",
-      payload: { delta: 1 },
-    },
-    {
-      name: "matches Alt+[ to previous workspace on macOS web when Option substitutes event.key",
-      event: { key: "\u201C", code: "BracketLeft", altKey: true },
-      context: { isMac: true, isDesktop: false },
-      action: "workspace.navigate.relative",
-      payload: { delta: -1 },
-    },
-    {
-      name: "matches Alt+] to next workspace on macOS web when Option substitutes event.key",
-      event: { key: "\u2018", code: "BracketRight", altKey: true },
-      context: { isMac: true, isDesktop: false },
-      action: "workspace.navigate.relative",
-      payload: { delta: 1 },
-    },
-    {
-      name: "matches Alt+Shift+W to close current tab on macOS web when Option substitutes event.key",
-      event: { key: "\u201E", code: "KeyW", altKey: true, shiftKey: true },
-      context: { isMac: true, isDesktop: false },
-      action: "workspace.tab.close.current",
-    },
  ];

  it.each(matchingCases)(
@@ -439,19 +390,6 @@ describe("keyboard-shortcuts", () => {
      event: { key: " ", code: "Space" },
      context: { focusScope: "message-input" },
    },
-    {
-      name: "keeps Dvorak Cmd+V available for paste in message input",
-      event: { key: "v", code: "Period", metaKey: true },
-      context: { isMac: true, isDesktop: true, focusScope: "message-input" },
-    },
-    // Sanity: the macOS Option-substitution fallback must still respect
-    // modifier checks — pressing Option+T alone (no Cmd) must not trigger
-    // the Cmd+Alt+T theme-cycle binding.
-    {
-      name: "does not cycle theme on macOS when Cmd is missing (Alt+T alone)",
-      event: { key: "\u2020", code: "KeyT", altKey: true },
-      context: { isMac: true },
-    },
  ];

  it.each(nonMatchingCases)("$name", ({ event, context }) => {
@@ -1020,24 +1020,6 @@ function parseDigit(event: KeyboardEvent): number | null {
  return null;
 }

-function matchesKeyOrCode(combo: KeyCombo, event: KeyboardEvent): boolean {
-  if (combo.key === undefined) {
-    return event.code === combo.code;
-  }
-  const eventKey = event.key.toLowerCase();
-  if (eventKey === combo.key) return true;
-  if (combo.shift === true && combo.shiftedKey !== undefined && eventKey === combo.shiftedKey) {
-    return true;
-  }
-  // macOS rewrites event.key when Option is held (Option+T -> "†",
-  // Option+[ -> "“"), so Alt-bound letter / bracket bindings can only
-  // match by event.code. Stay key-first for non-Alt bindings so Dvorak
-  // keeps its logical-character matching (e.g. Cmd+V on physical Period
-  // must paste, not trigger Cmd+.).
-  if (combo.alt === true && event.code === combo.code) return true;
-  return combo.codeFallback === true && event.code === combo.code;
-}
-
 function matchesCombo(combo: KeyCombo, event: KeyboardEvent, isMac: boolean): boolean {
  if (combo.mod) {
    if (isMac) {
@@ -1058,7 +1040,10 @@ function matchesCombo(combo: KeyCombo, event: KeyboardEvent, isMac: boolean): bo
  if (combo.code === "Digit") {
    return parseDigit(event) !== null;
  }
-  return matchesKeyOrCode(combo, event);
+
+  const codeMatch = event.code === combo.code;
+  const keyMatch = combo.key !== undefined && event.key.toLowerCase() === combo.key.toLowerCase();
+  return codeMatch || keyMatch;
 }

 function matchesWhen(when: ShortcutWhen | undefined, context: KeyboardShortcutContext): boolean {
@@ -3,8 +3,6 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 export interface KeyCombo {
  code: string;
  key?: string;
-  shiftedKey?: string;
-  codeFallback?: boolean;
  meta?: true;
  ctrl?: true;
  alt?: true;
@@ -16,8 +14,6 @@ export interface KeyCombo {
 interface KeyMapping {
  code: string;
  key?: string;
-  shiftedKey?: string;
-  codeFallback?: boolean;
 }

 const KEY_MAP: Record<string, KeyMapping> = {};
@@ -30,28 +26,18 @@ for (let i = 0; i < 26; i++) {
 for (let i = 0; i <= 9; i++) {
  KEY_MAP[String(i)] = { code: `Digit${i}`, key: String(i) };
 }
-KEY_MAP["1"].shiftedKey = "!";
-KEY_MAP["2"].shiftedKey = "@";
-KEY_MAP["3"].shiftedKey = "#";
-KEY_MAP["4"].shiftedKey = "$";
-KEY_MAP["5"].shiftedKey = "%";
-KEY_MAP["6"].shiftedKey = "^";
-KEY_MAP["7"].shiftedKey = "&";
-KEY_MAP["8"].shiftedKey = "*";
-KEY_MAP["9"].shiftedKey = "(";
-KEY_MAP["0"].shiftedKey = ")";

 KEY_MAP["Digit"] = { code: "Digit" };
-KEY_MAP["\\"] = { code: "Backslash", key: "\\", shiftedKey: "|" };
-KEY_MAP["["] = { code: "BracketLeft", key: "[", shiftedKey: "{" };
-KEY_MAP["]"] = { code: "BracketRight", key: "]", shiftedKey: "}" };
-KEY_MAP[","] = { code: "Comma", key: ",", shiftedKey: "<" };
-KEY_MAP["."] = { code: "Period", key: ".", shiftedKey: ">" };
-KEY_MAP["`"] = { code: "Backquote", key: "`", shiftedKey: "~" };
-KEY_MAP["/"] = { code: "Slash", key: "/", shiftedKey: "?" };
+KEY_MAP["\\"] = { code: "Backslash" };
+KEY_MAP["["] = { code: "BracketLeft", key: "[" };
+KEY_MAP["]"] = { code: "BracketRight", key: "]" };
+KEY_MAP[","] = { code: "Comma", key: "," };
+KEY_MAP["."] = { code: "Period", key: "." };
+KEY_MAP["`"] = { code: "Backquote", key: "`" };
+KEY_MAP["/"] = { code: "Slash" };
 KEY_MAP["?"] = { code: "Slash", key: "?" };
-KEY_MAP["Space"] = { code: "Space", key: " ", codeFallback: true };
-KEY_MAP["Enter"] = { code: "Enter", key: "Enter", codeFallback: true };
+KEY_MAP["Space"] = { code: "Space", key: " " };
+KEY_MAP["Enter"] = { code: "Enter", key: "Enter" };
 KEY_MAP["Backspace"] = { code: "Backspace" };
 KEY_MAP["Escape"] = { code: "Escape" };
 KEY_MAP["ArrowLeft"] = { code: "ArrowLeft" };
@@ -124,12 +110,6 @@ export function parseShortcutString(s: string): KeyCombo {
  combo.code = mapping.code;
  if (mapping.key !== undefined) {
    combo.key = mapping.key;
-    if (mapping.shiftedKey !== undefined) {
-      combo.shiftedKey = mapping.shiftedKey;
-    }
-    if (mapping.codeFallback === true) {
-      combo.codeFallback = true;
-    }
  }

  return combo;
@@ -3,7 +3,6 @@ import "@/test/window-local-storage";
 import { act, fireEvent, render, renderHook, cleanup } from "@testing-library/react";
 import React from "react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { useReviewDraftStore, type ReviewDraftComment } from "./store";
 import { buildReviewableDiffTargetKey, type ReviewableDiffTarget } from "@/utils/diff-layout";
 import {
@@ -276,7 +275,7 @@ describe("git diff inline review helpers", () => {
        viewportWidth: 320,
        pinToViewport: true,
      }),
-    ).toEqual([{ position: "sticky", left: 0 }, inlineUnistylesStyle({ width: 320 })]);
+    ).toEqual([{ position: "sticky", left: 0 }, { width: 320 }]);
  });

  it("keeps the gutter add-comment target accessible and clicking opens the editor", () => {
@@ -15,7 +15,6 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { Button } from "@/components/ui/button";
 import { Shortcut } from "@/components/ui/shortcut";
 import { isWeb } from "@/constants/platform";
-import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { useWorkspaceFocusRestoration } from "@/workspace/focus";
 import { useReviewDraftComments, useReviewDraftStore, type ReviewDraftComment } from "./store";
@@ -392,7 +391,7 @@ export function InlineReviewThread({
    () => [
      styles.threadContainer,
      getInlineReviewThreadViewportStyle({ viewportWidth, pinToViewport }),
-      inlineUnistylesStyle({ minHeight: height }),
+      { minHeight: height },
    ],
    [viewportWidth, pinToViewport, height],
  );
@@ -479,8 +478,7 @@ export function getInlineReviewThreadViewportStyle({
  viewportWidth?: number;
  pinToViewport: boolean;
 }): StyleProp<ViewStyle> {
-  const widthStyle =
-    viewportWidth && viewportWidth > 0 ? inlineUnistylesStyle({ width: viewportWidth }) : null;
+  const widthStyle = viewportWidth && viewportWidth > 0 ? { width: viewportWidth } : null;
  if (!pinToViewport || !isWeb) {
    return widthStyle;
  }
@@ -76,10 +76,6 @@ class FakeDaemonClient {
    return { rttMs: 0 };
  }

-  async checkLiveness(): Promise<{ rttMs: number }> {
-    return this.ping();
-  }
-
  setReconnectEnabled(_enabled: boolean): void {}

  setConnectionState(next: ConnectionState): void {
@@ -624,85 +620,6 @@ describe("HostRuntimeController", () => {
    expect((initialClient as unknown as FakeDaemonClient | null)?.closeCalls).toBe(1);
  });

-  it("uses liveness probes instead of session RPC timeouts for active connection health", async () => {
-    const relay: HostConnection = {
-      id: "relay:relay.paseo.sh:443",
-      type: "relay",
-      relayEndpoint: "relay.paseo.sh:443",
-      useTls: true,
-      daemonPublicKeyB64: "pk_test",
-    };
-    const host = makeHost({
-      connections: [relay],
-      preferredConnectionId: relay.id,
-    });
-    const clients: FakeDaemonClient[] = [];
-    const controller = new HostRuntimeController({
-      host,
-      deps: makeDeps({ [relay.id]: 12 }, clients),
-    });
-
-    await controller.start({ autoProbe: false });
-    expect(controller.getSnapshot().connectionStatus).toBe("online");
-
-    const activeClient = controller.getSnapshot().client as unknown as FakeDaemonClient;
-    activeClient.ping = async () => {
-      throw new Error("Timeout waiting for message (5000ms)");
-    };
-    activeClient.checkLiveness = async () => ({ rttMs: 11 });
-    clearProbeBackoff(controller);
-
-    await controller.runProbeCycleNow();
-
-    const snapshot = controller.getSnapshot();
-    expect(snapshot.probeByConnectionId.get(relay.id)).toEqual({
-      status: "available",
-      latencyMs: 11,
-    });
-    expect(snapshot.connectionStatus).toBe("online");
-  });
-
-  it("backs off inactive connection probes while a host is online", async () => {
-    const host = makeHost({ preferredConnectionId: "direct:lan:6767" });
-    const clients: FakeDaemonClient[] = [];
-    const latencies: Record<string, number | Error> = {
-      "direct:lan:6767": 10,
-      "relay:relay.paseo.sh:443": 50,
-    };
-    const controller = new HostRuntimeController({
-      host,
-      deps: makeDeps(latencies, clients),
-    });
-
-    await controller.start({ autoProbe: false });
-    expect(controller.getSnapshot().activeConnectionId).toBe("direct:lan:6767");
-    const initialClientCount = clients.length;
-    const initialRelayProbe = controller
-      .getSnapshot()
-      .probeByConnectionId.get("relay:relay.paseo.sh:443");
-
-    latencies["direct:lan:6767"] = 12;
-    latencies["relay:relay.paseo.sh:443"] = 25;
-    const lastProbedAt = (
-      controller as unknown as {
-        connectionLastProbedAt: Map<string, number>;
-      }
-    ).connectionLastProbedAt;
-    const now = performance.now();
-    lastProbedAt.set("direct:lan:6767", now - 60_000);
-    lastProbedAt.set("relay:relay.paseo.sh:443", now - 60_000);
-
-    await controller.runProbeCycleNow();
-
-    const snapshot = controller.getSnapshot();
-    expect(clients.length).toBe(initialClientCount);
-    expect(snapshot.probeByConnectionId.get("direct:lan:6767")).toEqual({
-      status: "available",
-      latencyMs: 12,
-    });
-    expect(snapshot.probeByConnectionId.get("relay:relay.paseo.sh:443")).toEqual(initialRelayProbe);
-  });
-
  it("switches only after the faster alternative wins consecutive probes", async () => {
    const host = makeHost({ preferredConnectionId: "direct:lan:6767" });
    const clients: FakeDaemonClient[] = [];
@@ -142,7 +142,6 @@ export interface HostRuntimeStartOptions {
 const PROBE_TICK_MS = 2_000;
 const PROBE_STEADY_MS = 10_000;
 const PROBE_MAX_BACKOFF_MS = 30_000;
-const PROBE_INACTIVE_WHILE_ONLINE_MS = 120_000;
 const ADAPTIVE_SWITCH_THRESHOLD_MS = 40;
 const ADAPTIVE_SWITCH_CONSECUTIVE_PROBES = 3;
 const DEFAULT_AGENT_DIRECTORY_PAGE_LIMIT = 200;
@@ -435,15 +434,11 @@ function findConnectionById(host: HostProfile, connectionId: string | null): Hos
 function probeIntervalForConnection(
  firstSeenAt: number,
  isActiveOnline: boolean,
-  hasActiveOnlineConnection: boolean,
  now: number,
 ): number {
  if (isActiveOnline) {
    return PROBE_STEADY_MS;
  }
-  if (hasActiveOnlineConnection) {
-    return PROBE_INACTIVE_WHILE_ONLINE_MS;
-  }
  const age = now - firstSeenAt;
  if (age < 10_000) return 2_000;
  if (age < 30_000) return 5_000;
@@ -707,7 +702,6 @@ export class HostRuntimeController {
    const now = performance.now();
    const isOnline = this.snapshot.connectionStatus === "online";
    const activeConnectionId = this.snapshot.activeConnectionId;
-    const hasActiveOnlineConnection = isOnline && activeConnectionId !== null;

    const connectionsToProbe = this.host.connections.filter((connection) => {
      const lastProbed = this.connectionLastProbedAt.get(connection.id);
@@ -716,12 +710,7 @@ export class HostRuntimeController {
      }
      const firstSeen = this.connectionFirstSeenAt.get(connection.id) ?? now;
      const isActiveOnline = isOnline && connection.id === activeConnectionId;
-      const interval = probeIntervalForConnection(
-        firstSeen,
-        isActiveOnline,
-        hasActiveOnlineConnection,
-        now,
-      );
+      const interval = probeIntervalForConnection(firstSeen, isActiveOnline, now);
      return now - lastProbed >= interval;
    });

@@ -910,7 +899,7 @@ export class HostRuntimeController {
            const activated = await maybeActivateFirstAvailable(connection.id, connectedClient);
            shouldCloseClient = shouldCloseClient && !activated;

-            const { rttMs } = await connectedClient.checkLiveness({ timeoutMs: 5000 });
+            const { rttMs } = await connectedClient.ping({ timeoutMs: 5000 });
            if (!this.isCurrentProbeRequest(requestVersion)) {
              return;
            }
@@ -1,13 +1,14 @@
-import { useCallback, useEffect, useState, type ComponentType } from "react";
-import { View, Text, Pressable } from "react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { useRouter } from "expo-router";
-import { FolderOpen, Inbox, Plug, Smartphone } from "lucide-react-native";
+import { useCallback, useEffect, useState } from "react";
+import { View, Text } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { FolderOpen, Smartphone } from "lucide-react-native";
 import { PaseoLogo } from "@/components/icons/paseo-logo";
-import { CommunityLinks } from "@/components/community-links";
+import { Button } from "@/components/ui/button";
 import { MenuHeader } from "@/components/headers/menu-header";
 import { useOpenProjectPicker } from "@/hooks/use-open-project-picker";
 import { usePanelStore } from "@/stores/panel-store";
+import { useSessionStore } from "@/stores/session-store";
+import { useHasWorkspaces } from "@/stores/session-store-hooks";
 import {
  useIsCompactFormFactor,
  HEADER_INNER_HEIGHT,
@@ -17,21 +18,14 @@ import {
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
 import { useIsLocalDaemon } from "@/hooks/use-is-local-daemon";
 import { PairDeviceModal } from "@/desktop/components/pair-device-modal";
-import { buildHostAgentDetailRoute, buildSettingsHostRoute } from "@/utils/host-routes";
-import { ImportSessionSheet } from "@/components/import-session-sheet";
-import { useHostRuntimeClient } from "@/runtime/host-runtime";
-import { useOpenProject } from "@/hooks/use-open-project";
-import type { Href } from "expo-router";

 export function OpenProjectScreen({ serverId }: { serverId: string }) {
-  const router = useRouter();
  const openDesktopAgentList = usePanelStore((s) => s.openDesktopAgentList);
  const openProjectPicker = useOpenProjectPicker(serverId);
+  const hasHydrated = useSessionStore((s) => s.sessions[serverId]?.hasHydratedWorkspaces ?? false);
+  const hasProjects = useHasWorkspaces(serverId);
  const isLocalDaemon = useIsLocalDaemon(serverId);
-  const client = useHostRuntimeClient(serverId);
-  const openProject = useOpenProject(serverId);
  const [isPairDeviceOpen, setIsPairDeviceOpen] = useState(false);
-  const [isImportSheetOpen, setIsImportSheetOpen] = useState(false);

  const isCompactLayout = useIsCompactFormFactor();

@@ -48,128 +42,52 @@ export function OpenProjectScreen({ serverId }: { serverId: string }) {
  const handleOpenPairDevice = useCallback(() => setIsPairDeviceOpen(true), []);
  const handleClosePairDevice = useCallback(() => setIsPairDeviceOpen(false), []);

-  const handleOpenImportSession = useCallback(() => setIsImportSheetOpen(true), []);
-  const handleCloseImportSession = useCallback(() => setIsImportSheetOpen(false), []);
-
-  const handleImported = useCallback(
-    (agent: { id: string; cwd: string }) => {
-      void (async () => {
-        await openProject(agent.cwd);
-        router.push(buildHostAgentDetailRoute(serverId, agent.id) as Href);
-      })();
-    },
-    [openProject, router, serverId],
-  );
-
-  const handleOpenProviders = useCallback(() => {
-    router.push(buildSettingsHostRoute(serverId));
-  }, [router, serverId]);
-
  return (
    <View style={styles.container}>
      <MenuHeader borderless />
      <View style={styles.content}>
        <TitlebarDragRegion />
        <View style={styles.logo}>
-          <PaseoLogo size={52} />
+          <PaseoLogo size={56} />
        </View>
-        <View style={styles.tiles}>
-          <HomeTile
-            icon={FolderOpen}
-            title="Add a project"
-            description="Open a folder on your machine"
+        <View style={styles.headingGroup}>
+          <Text style={styles.heading}>What shall we build today?</Text>
+          {hasHydrated && !hasProjects ? (
+            <Text style={styles.subtitle}>
+              Add a project folder to start running agents on your codebase
+            </Text>
+          ) : null}
+        </View>
+        <View style={styles.cta}>
+          <Button
+            variant="default"
+            leftIcon={FolderOpen}
            onPress={handleOpenPicker}
            testID="open-project-submit"
-            accent
-          />
-          <HomeTile
-            icon={Inbox}
-            title="Import session"
-            description="Bring in recent external CLI sessions"
-            onPress={handleOpenImportSession}
-            testID="open-project-import-session"
-          />
-          <HomeTile
-            icon={Plug}
-            title="Setup providers"
-            description="Configure Claude Code, Codex, and more"
-            onPress={handleOpenProviders}
-            testID="open-project-setup-providers"
-          />
+          >
+            Add a project
+          </Button>
          {isLocalDaemon ? (
-            <HomeTile
-              icon={Smartphone}
-              title="Pair device"
-              description="Connect your phone to this daemon"
+            <Button
+              variant="outline"
+              leftIcon={Smartphone}
              onPress={handleOpenPairDevice}
              testID="open-project-pair-device"
-            />
+            >
+              Pair device
+            </Button>
          ) : null}
        </View>
-      </View>
-      <View style={styles.communityRow}>
-        <CommunityLinks />
      </View>
      <PairDeviceModal
        visible={isPairDeviceOpen}
        onClose={handleClosePairDevice}
        testID="open-project-pair-device-modal"
      />
-      <ImportSessionSheet
-        visible={isImportSheetOpen}
-        client={client}
-        serverId={serverId}
-        onClose={handleCloseImportSession}
-        onImported={handleImported}
-      />
    </View>
  );
 }

-interface HomeTileProps {
-  icon: ComponentType<{ size: number; color: string }>;
-  title: string;
-  description: string;
-  onPress: () => void;
-  testID?: string;
-  accent?: boolean;
-}
-
-function HomeTile({ icon: Icon, title, description, onPress, testID, accent }: HomeTileProps) {
-  // useUnistyles is acceptable here: leaf component, off the hot path (home screen renders once).
-  const { theme } = useUnistyles();
-  const [hovered, setHovered] = useState(false);
-  const handleHoverIn = useCallback(() => setHovered(true), []);
-  const handleHoverOut = useCallback(() => setHovered(false), []);
-
-  const iconColor = accent ? theme.colors.accent : theme.colors.foregroundMuted;
-
-  const pressableStyle = useCallback(
-    ({ pressed }: { pressed: boolean }) => [
-      styles.tile,
-      hovered && styles.tileHovered,
-      pressed && styles.tilePressed,
-    ],
-    [hovered],
-  );
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onHoverIn={handleHoverIn}
-      onHoverOut={handleHoverOut}
-      testID={testID}
-      style={pressableStyle}
-    >
-      <Icon size={20} color={iconColor} />
-      <View style={styles.tileText}>
-        <Text style={styles.tileTitle}>{title}</Text>
-        <Text style={styles.tileDescription}>{description}</Text>
-      </View>
-    </Pressable>
-  );
-}
-
 const styles = StyleSheet.create((theme) => ({
  container: {
    flex: 1,
@@ -179,11 +97,10 @@ const styles = StyleSheet.create((theme) => ({
  content: {
    position: "relative",
    flex: 1,
-    justifyContent: { xs: "flex-start", md: "center" },
+    justifyContent: "center",
    alignItems: "center",
    gap: 0,
    padding: theme.spacing[6],
-    paddingTop: { xs: theme.spacing[12], md: theme.spacing[6] },
    paddingBottom: {
      xs: HEADER_INNER_HEIGHT_MOBILE + HEADER_TOP_PADDING_MOBILE + theme.spacing[6],
      md: HEADER_INNER_HEIGHT + theme.spacing[6],
@@ -192,56 +109,25 @@ const styles = StyleSheet.create((theme) => ({
  logo: {
    marginBottom: theme.spacing[8],
  },
-  tiles: {
-    marginTop: { xs: theme.spacing[6], md: theme.spacing[12] },
-    width: "100%",
-    maxWidth: 452,
-    flexDirection: "row",
-    flexWrap: "wrap",
-    justifyContent: "flex-start",
-    gap: theme.spacing[3],
-  },
-  tile: {
-    width: { xs: "100%", md: 220 },
-    minHeight: { xs: 0, md: 132 },
-    padding: theme.spacing[4],
-    backgroundColor: theme.colors.surface1,
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    borderRadius: theme.borderRadius.xl,
-    gap: theme.spacing[3],
-  },
-  tileHovered: {
-    backgroundColor: theme.colors.surface2,
-    borderColor: theme.colors.borderAccent,
-  },
-  tilePressed: {
-    opacity: 0.85,
-  },
-  tileText: {
-    gap: theme.spacing[1],
-  },
-  tileTitle: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.normal,
-  },
-  tileDescription: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    lineHeight: 18,
-  },
-  communityRow: {
-    position: "absolute",
-    left: 0,
-    right: 0,
-    bottom: {
-      xs: HEADER_INNER_HEIGHT_MOBILE + HEADER_TOP_PADDING_MOBILE + theme.spacing[2],
-      md: HEADER_INNER_HEIGHT + theme.spacing[2],
-    },
-    flexDirection: "row",
-    justifyContent: "center",
+  headingGroup: {
    alignItems: "center",
-    gap: 0,
+    gap: theme.spacing[3],
+  },
+  cta: {
+    marginTop: theme.spacing[12],
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  heading: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize["2xl"],
+    fontWeight: theme.fontWeight.normal,
+    textAlign: "center",
+  },
+  subtitle: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.base,
+    textAlign: "center",
  },
 }));
@@ -56,7 +56,6 @@ import { AddHostModal } from "@/components/add-host-modal";
 import { PairLinkModal } from "@/components/pair-link-modal";
 import { KeyboardShortcutsSection } from "@/screens/settings/keyboard-shortcuts-section";
 import { Button } from "@/components/ui/button";
-import { CommunityLinks } from "@/components/community-links";
 import { SegmentedControl } from "@/components/ui/segmented-control";
 import {
  DropdownMenu,
@@ -458,9 +457,6 @@ function AboutSection({ appVersionText, isDesktopApp }: AboutSectionProps) {
        </View>
        {isDesktopApp ? <DesktopAppUpdateRow /> : null}
      </View>
-      <View style={styles.aboutCommunity}>
-        <CommunityLinks />
-      </View>
    </SettingsSection>
  );
 }
@@ -1271,9 +1267,6 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.xs,
    marginTop: theme.spacing[1],
  },
-  aboutCommunity: {
-    marginTop: theme.spacing[4],
-  },
  aboutUpdateActions: {
    flexDirection: "row",
    alignItems: "center",
@@ -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 { ImportSessionSheet } from "@/components/import-session-sheet";
+import { WorkspaceImportSheet } from "@/screens/workspace/workspace-import-sheet";

 const { theme } = vi.hoisted(() => ({
  theme: {
@@ -61,21 +61,9 @@ 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": "import-session-loading-spinner" }),
+    React.createElement("span", { "data-testid": "workspace-import-loading-spinner" }),
 }));

 vi.mock("@/components/ui/segmented-control", () => ({
@@ -112,19 +100,18 @@ vi.mock("@/components/ui/segmented-control", () => ({
 vi.mock("@/components/adaptive-modal-sheet", () => ({
  AdaptiveModalSheet: ({
    visible,
-    header,
+    title,
    children,
    testID,
  }: {
    visible: boolean;
-    header?: { title: string; actions?: ReactNode };
+    title: string;
    children: ReactNode;
    testID?: string;
  }) =>
    visible ? (
      <section data-testid={testID}>
-        <h1>{header?.title}</h1>
-        {header?.actions}
+        <h1>{title}</h1>
        {children}
      </section>
    ) : null,
@@ -159,8 +146,6 @@ 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;
@@ -183,18 +168,15 @@ function renderSheet(
    },
  });

-  const cwd = options && "cwd" in options ? (options.cwd ?? undefined) : "/repo/paseo";
-
  return render(
    <QueryClientProvider client={queryClient}>
-      <ImportSessionSheet
+      <WorkspaceImportSheet
        visible={options?.visible ?? true}
        client={client}
        serverId="server-1"
-        cwd={cwd}
+        workspaceDirectory="/repo/paseo"
        onClose={options?.onClose ?? vi.fn()}
        onImportedAgent={options?.onImportedAgent ?? vi.fn()}
-        onImported={options?.onImported}
      />
    </QueryClientProvider>,
  );
@@ -272,7 +254,7 @@ function createSnapshotEntry(
  };
 }

-describe("ImportSessionSheet", () => {
+describe("WorkspaceImportSheet", () => {
  afterEach(() => {
    cleanup();
    vi.clearAllMocks();
@@ -438,11 +420,11 @@ describe("ImportSessionSheet", () => {
    function TestSheet({ visible }: { visible: boolean }) {
      return (
        <QueryClientProvider client={queryClient}>
-          <ImportSessionSheet
+          <WorkspaceImportSheet
            visible={visible}
            client={client}
            serverId="server-1"
-            cwd="/repo/paseo"
+            workspaceDirectory="/repo/paseo"
            onClose={vi.fn()}
            onImportedAgent={vi.fn()}
          />
@@ -490,7 +472,7 @@ describe("ImportSessionSheet", () => {
      },
    );

-    fireEvent.click(await screen.findByTestId("import-session-session-claude-provider-thread-1"));
+    fireEvent.click(await screen.findByTestId("workspace-import-session-claude-provider-thread-1"));

    await waitFor(() => {
      expect(importAgent).toHaveBeenCalledWith({
@@ -526,7 +508,7 @@ describe("ImportSessionSheet", () => {
      },
    );

-    fireEvent.click(await screen.findByTestId("import-session-session-claude-provider-thread-1"));
+    fireEvent.click(await screen.findByTestId("workspace-import-session-claude-provider-thread-1"));

    await screen.findByText("Could not import selected session.");
    expect(importAgent).toHaveBeenCalledWith({
@@ -672,12 +654,12 @@ describe("ImportSessionSheet", () => {
    await screen.findByText("Session claude");
    await screen.findByText("Session codex");

-    fireEvent.click(screen.getByTestId("import-session-filter-codex"));
+    fireEvent.click(screen.getByTestId("workspace-import-filter-codex"));

    screen.getByText("Session codex");
    expect(screen.queryByText("Session claude")).toBeNull();

-    fireEvent.click(screen.getByTestId("import-session-filter-all"));
+    fireEvent.click(screen.getByTestId("workspace-import-filter-all"));

    screen.getByText("Session claude");
    screen.getByText("Session codex");
@@ -709,8 +691,8 @@ describe("ImportSessionSheet", () => {
    await waitFor(() => {
      expect(fetchRecentProviderSessions).toHaveBeenCalled();
    });
-    expect(screen.queryByTestId("import-session-filters")).toBeNull();
-    expect(screen.queryByTestId("import-session-filter-all")).toBeNull();
+    expect(screen.queryByTestId("workspace-import-filters")).toBeNull();
+    expect(screen.queryByTestId("workspace-import-filter-all")).toBeNull();
  });

  it("shows a no-importable-providers message when snapshot has no enabled importable providers", async () => {
@@ -738,119 +720,4 @@ describe("ImportSessionSheet", () => {
    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);
-    });
-  });
 });
@@ -4,7 +4,6 @@ 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, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
@@ -14,6 +13,7 @@ import { formatTimeAgo } from "@/utils/time";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";

 const IMPORTABLE_PROVIDER_IDS: Set<string> = new Set(IMPORTABLE_PROVIDERS);
+const IMPORT_SESSION_HEADER: SheetHeader = { title: "Import session" };
 const PER_PROVIDER_LIMIT = 15;
 const IMPORT_SHEET_SNAP_POINTS = ["70%", "92%"];
 const DISABLED_ACCESSIBILITY_STATE = { disabled: true };
@@ -24,16 +24,13 @@ type RecentProviderSessionsClient = Pick<
  "fetchRecentProviderSessions" | "importAgent"
 >;

-type ImportedAgent = Awaited<ReturnType<RecentProviderSessionsClient["importAgent"]>>;
-
-interface ImportSessionSheetProps {
+interface WorkspaceImportSheetProps {
  visible: boolean;
  client: RecentProviderSessionsClient | null;
  serverId: string | null;
-  cwd?: string | null;
+  workspaceDirectory: string | null;
  onClose: () => void;
-  onImportedAgent?: (agentId: string) => void;
-  onImported?: (agent: ImportedAgent) => void;
+  onImportedAgent: (agentId: string) => void;
 }

 type RecentSessionsResponse = Awaited<
@@ -86,20 +83,20 @@ function buildSessionsQueriesConfig(args: {
  sessionsQueryRoot: ReadonlyArray<string | null>;
  visible: boolean;
  client: RecentProviderSessionsClient | null;
-  cwd: string | null | undefined;
+  workspaceDirectory: string | null;
 }): SessionsQueryConfig[] {
-  const { providersToFetch, sessionsQueryRoot, visible, client, cwd } = args;
+  const { providersToFetch, sessionsQueryRoot, visible, client, workspaceDirectory } = args;
  if (providersToFetch === null) return [];
-  const enabled = visible && Boolean(client);
+  const enabled = visible && Boolean(client && workspaceDirectory);
  return providersToFetch.map((provider) => ({
    queryKey: [...sessionsQueryRoot, provider],
    enabled,
    queryFn: async () => {
-      if (!client) {
+      if (!client || !workspaceDirectory) {
        throw new Error("Host is not connected");
      }
      return await client.fetchRecentProviderSessions({
-        ...(cwd ? { cwd } : {}),
+        cwd: workspaceDirectory,
        providers: [provider],
        limit: PER_PROVIDER_LIMIT,
      });
@@ -175,6 +172,8 @@ interface SheetStatusMessagesProps {
  allQueriesErrored: boolean;
  erroredProviderLabels: ReadonlyArray<string>;
  importErrored: boolean;
+  showEmptyState: boolean;
+  allAlreadyImported: boolean;
 }

 function SheetStatusMessages({
@@ -185,10 +184,12 @@ function SheetStatusMessages({
  allQueriesErrored,
  erroredProviderLabels,
  importErrored,
+  showEmptyState,
+  allAlreadyImported,
 }: SheetStatusMessagesProps) {
  const { theme } = useUnistyles();
  if (!isClientReady) {
-    return <Text style={styles.statusText}>Connect to a host to import sessions</Text>;
+    return <Text style={styles.statusText}>Connect to a workspace to import sessions</Text>;
  }
  if (isSnapshotUnsupported) {
    return <Text style={styles.statusText}>Update the host to import sessions.</Text>;
@@ -215,117 +216,45 @@ 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: "import-session-filter-all" },
+    { value: ALL_FILTER_VALUE, label: "All", testID: "workspace-import-filter-all" },
  ];
  for (const provider of providers) {
    const ProviderIcon = getProviderIcon(provider);
    options.push({
      value: provider,
      label: providerLabelById.get(provider) ?? provider,
-      testID: `import-session-filter-${provider}`,
+      testID: `workspace-import-filter-${provider}`,
      icon: ({ color, size }) => <ProviderIcon color={color} size={size} />,
    });
  }
  return options;
 }

-function ImportSessionSheetRow({
+function WorkspaceImportSheetRow({
  entry,
  disabled,
  importing,
-  showCwd,
  onImportSession,
 }: {
  entry: FetchRecentProviderSessionEntry;
  disabled: boolean;
  importing: boolean;
-  showCwd: boolean;
  onImportSession: (entry: FetchRecentProviderSessionEntry) => void;
 }) {
  const { theme } = useUnistyles();
@@ -356,7 +285,7 @@ function ImportSessionSheetRow({
      accessibilityRole="button"
      accessibilityState={accessibilityState}
      style={pressableStyle}
-      testID={`import-session-session-${entry.providerId}-${entry.providerHandleId}`}
+      testID={`workspace-import-session-${entry.providerId}-${entry.providerHandleId}`}
    >
      <View style={styles.rowIconWrap}>
        <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
@@ -371,25 +300,19 @@ function ImportSessionSheetRow({
        <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 ImportSessionSheet({
+export function WorkspaceImportSheet({
  visible,
  client,
  serverId,
-  cwd,
+  workspaceDirectory,
  onClose,
  onImportedAgent,
-  onImported,
-}: ImportSessionSheetProps) {
+}: WorkspaceImportSheetProps) {
  const queryClient = useQueryClient();

  const { entries: snapshotEntries, supportsSnapshot } = useProvidersSnapshot(serverId, {
@@ -407,8 +330,8 @@ export function ImportSessionSheet({
  );

  const sessionsQueryRoot = useMemo(
-    () => ["recent-provider-sessions", cwd ?? null] as const,
-    [cwd],
+    () => ["recent-provider-sessions", workspaceDirectory] as const,
+    [workspaceDirectory],
  );

  const queriesConfig = useMemo(
@@ -418,9 +341,9 @@ export function ImportSessionSheet({
        sessionsQueryRoot,
        visible,
        client,
-        cwd,
+        workspaceDirectory,
      }),
-    [providersToFetch, sessionsQueryRoot, visible, client, cwd],
+    [providersToFetch, sessionsQueryRoot, visible, client, workspaceDirectory],
  );

  const queries = useQueries({ queries: queriesConfig });
@@ -456,25 +379,20 @@ export function ImportSessionSheet({

  const importMutation = useMutation({
    mutationFn: async (entry: FetchRecentProviderSessionEntry) => {
-      if (!client) {
+      if (!client || !workspaceDirectory) {
        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: effectiveCwd,
+        cwd: workspaceDirectory,
      });
      return agent;
    },
    onSuccess: async (agent) => {
      await queryClient.invalidateQueries({ queryKey: sessionsQueryRoot });
      onClose();
-      onImportedAgent?.(agent.id);
-      onImported?.(agent);
+      onImportedAgent(agent.id);
    },
  });

@@ -495,20 +413,6 @@ export function ImportSessionSheet({
    [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;
@@ -519,25 +423,21 @@ export function ImportSessionSheet({
  const allQueriesErrored = isQueryingProviders && queries.every((query) => query.isError);
  const allQueriesSettled =
    isQueryingProviders && queries.every((query) => !query.isLoading && !query.isPending);
-  const { showEmptyState, emptyStateTitle } = computeEmptyState({
-    isLoadingSessions,
-    allQueriesErrored,
-    isQueryingProviders,
-    allQueriesSettled,
-    selectedProvider,
-    aggregatedCount: aggregatedEntries.length,
-    visibleCount: visibleEntries.length,
-    totalAlreadyImportedCount,
-    providerLabelById,
-  });
+  const showEmptyState =
+    !isLoadingSessions &&
+    !allQueriesErrored &&
+    isQueryingProviders &&
+    allQueriesSettled &&
+    aggregatedEntries.length === 0;
+  const allAlreadyImported = showEmptyState && totalAlreadyImportedCount > 0;
  const showFilter = filterProviders.length > 1;

  return (
    <AdaptiveModalSheet
      visible={visible}
      onClose={onClose}
-      header={header}
-      testID="import-session-sheet"
+      header={IMPORT_SESSION_HEADER}
+      testID="workspace-import-sheet"
      desktopMaxWidth={560}
      snapPoints={IMPORT_SHEET_SNAP_POINTS}
    >
@@ -548,7 +448,7 @@ export function ImportSessionSheet({
          contentContainerStyle={styles.filterRow}
        >
          <SegmentedControl
-            testID="import-session-filters"
+            testID="workspace-import-filters"
            size="sm"
            options={filterOptions}
            value={selectedProvider}
@@ -557,29 +457,29 @@ export function ImportSessionSheet({
        </ScrollView>
      ) : null}
      <SheetStatusMessages
-        isClientReady={Boolean(client)}
+        isClientReady={Boolean(client && workspaceDirectory)}
        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) => (
-            <ImportSessionSheetRow
+            <WorkspaceImportSheetRow
              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>
  );
 }
@@ -639,10 +539,6 @@ 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",
@@ -653,34 +549,4 @@ 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",
-  },
 }));
@@ -59,7 +59,7 @@ import { SourceControlPanelIcon } from "@/components/icons/source-control-panel-
 import { WorkspaceGitActions } from "@/git/workspace-actions";
 import { WorkspaceOpenInEditorButton } from "@/screens/workspace/workspace-open-in-editor-button";
 import { WorkspaceScriptsButton } from "@/screens/workspace/workspace-scripts-button";
-import { ImportSessionSheet } from "@/components/import-session-sheet";
+import { WorkspaceImportSheet } from "@/screens/workspace/workspace-import-sheet";
 import { ExplorerSidebarAnimationProvider } from "@/contexts/explorer-sidebar-animation-context";
 import { useToast } from "@/contexts/toast-context";
 import { useExplorerOpenGesture } from "@/hooks/use-explorer-open-gesture";
@@ -714,12 +714,13 @@ const MobileMountedTabSlot = memo(function MobileMountedTabSlot({
    [buildPaneContentModel, paneId, tabDescriptor],
  );

-  const slotStyle = isVisible
-    ? styles.mobileMountedTabSlotVisible
-    : styles.mobileMountedTabSlotHidden;
+  const slotStyle = useMemo(
+    () => ({ display: isVisible ? ("flex" as const) : ("none" as const), flex: 1 }),
+    [isVisible],
+  );

  return (
-    <View style={slotStyle} pointerEvents={isVisible ? "auto" : "none"}>
+    <View style={slotStyle}>
      <WorkspacePaneContent
        content={content}
        isWorkspaceFocused={isWorkspaceFocused}
@@ -2853,7 +2854,7 @@ function WorkspaceScreenContent({
  const focusedPaneTabIds = useMemo(() => tabs.map((tab) => tab.tabId), [tabs]);
  const focusedPaneTabDescriptorMap = useStableTabDescriptorMap(tabs);
  const { mountedTabIds: mountedFocusedPaneTabIdsSet } = useMountedTabSet({
-    activeTabId,
+    activeTabId: activeTabDescriptor?.tabId ?? null,
    allTabIds: focusedPaneTabIds,
    cap: 3,
  });
@@ -3357,11 +3358,11 @@ function WorkspaceScreenContent({
              />
            ) : null}
          </View>
-          <ImportSessionSheet
+          <WorkspaceImportSheet
            visible={isImportSheetVisible}
            client={client}
            serverId={normalizedServerId}
-            cwd={workspaceDirectory}
+            workspaceDirectory={workspaceDirectory}
            onClose={closeImportSheet}
            onImportedAgent={handleImportedAgent}
          />
@@ -3653,15 +3654,6 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
    minHeight: 0,
    backgroundColor: theme.colors.surface0,
-    position: "relative",
-  },
-  mobileMountedTabSlotVisible: {
-    ...StyleSheet.absoluteFillObject,
-    opacity: 1,
-  },
-  mobileMountedTabSlotHidden: {
-    ...StyleSheet.absoluteFillObject,
-    opacity: 0,
  },
  contentPlaceholder: {
    flex: 1,
@@ -1,8 +0,0 @@
-/**
- * Native does not use Unistyles' web CSS registry, and native Unistyles treats
- * any `unistyles_*` key as a registered style hash. The web marker would crash
- * native ref binding, so native keeps these dynamic styles as plain RN styles.
- */
-export function inlineUnistylesStyle<TStyle extends object>(style: TStyle): TStyle {
-  return style;
-}
@@ -1,3 +0,0 @@
-export function inlineUnistylesStyle<TStyle extends object>(style: TStyle): TStyle {
-  return style;
-}
@@ -1,23 +0,0 @@
-const UNISTYLES_INLINE_STYLE_KEY = "unistyles_inline_style";
-
-/**
- * Forces a style object through Unistyles' inline/animated-style lane.
- *
- * Unistyles web sends ordinary style objects to the CSS registry. Styles that
- * look like animated styles stay in React Native's style array instead. Use
- * this only for high-churn values, such as measured dimensions, drag
- * transforms, and pressed/hovered state.
- */
-export function inlineUnistylesStyle<TStyle extends object>(style: TStyle): TStyle {
-  if (!Object.isExtensible(style) || UNISTYLES_INLINE_STYLE_KEY in style) {
-    return style;
-  }
-
-  Object.defineProperty(style, UNISTYLES_INLINE_STYLE_KEY, {
-    value: {},
-    enumerable: true,
-    configurable: true,
-  });
-
-  return style;
-}
@@ -135,8 +135,6 @@ function queryRowIds(): string[] {
  ).map((node) => node.getAttribute("data-testid")?.replace("subagents-section-row-", "") ?? "");
 }

-type SubagentAction = (id: string) => void;
-
 describe("SubagentsSection", () => {
  let container: HTMLElement | null = null;
  let root: Root | null = null;
@@ -171,9 +169,9 @@ describe("SubagentsSection", () => {

  function render(
    rows: SubagentRow[],
-    onOpenSubagent: SubagentAction = vi.fn<SubagentAction>(),
-    onArchiveSubagent: SubagentAction = vi.fn<SubagentAction>(),
-  ): SubagentAction {
+    onOpenSubagent: ReturnType<typeof vi.fn> = vi.fn(),
+    onArchiveSubagent: ReturnType<typeof vi.fn> = vi.fn(),
+  ): ReturnType<typeof vi.fn> {
    act(() => {
      root?.render(
        <SubagentsSection
@@ -1,7 +1,7 @@
 import { page } from "@vitest/browser/context";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { TerminalInputModeState } from "@server/shared/terminal-input-mode";
-import { encodeTerminalOutput, TerminalEmulatorRuntime } from "./terminal-emulator-runtime";
+import { TerminalEmulatorRuntime } from "./terminal-emulator-runtime";

 vi.mock("@xterm/addon-webgl", () => ({
  WebglAddon: class WebglAddon {
@@ -49,10 +49,6 @@ function nextFrame(): Promise<void> {
  });
 }

-function terminalOutput(text: string): Uint8Array {
-  return encodeTerminalOutput(text);
-}
-
 async function waitFor(input: { predicate: () => boolean; timeoutMs?: number }): Promise<void> {
  const startedAt = performance.now();
  const timeoutMs = input.timeoutMs ?? 2_000;
@@ -257,7 +253,7 @@ describe("terminal emulator runtime in a real browser", () => {

    expect(mounted.terminalKeys).toEqual([]);

-    mounted.runtime.write({ data: terminalOutput("\x1b[>7u") });
+    mounted.runtime.write({ text: "\x1b[>7u" });
    await waitFor({
      predicate: () =>
        mounted.inputModeChanges.some(
@@ -283,7 +279,7 @@ describe("terminal emulator runtime in a real browser", () => {
    ]);

    mounted.terminalKeys.length = 0;
-    mounted.runtime.write({ data: terminalOutput("\x1b[=0;0u\x1b[?9001h") });
+    mounted.runtime.write({ text: "\x1b[=0;0u\x1b[?9001h" });
    await waitFor({
      predicate: () =>
        mounted.inputModeChanges.some(
@@ -325,7 +321,7 @@ describe("terminal emulator runtime in a real browser", () => {

    await waitFor({ predicate: () => mounted.sizes.length > 0 });

-    mounted.runtime.write({ data: terminalOutput(bytes) });
+    mounted.runtime.write({ text: bytes });
    await nextFrame();
    await nextFrame();

@@ -75,10 +75,10 @@ vi.mock("@xterm/xterm", () => ({
  },
 }));

-import { encodeTerminalOutput, TerminalEmulatorRuntime } from "./terminal-emulator-runtime";
+import { TerminalEmulatorRuntime } from "./terminal-emulator-runtime";

 interface StubTerminal {
-  write: (data: string | Uint8Array, callback?: () => void) => void;
+  write: (text: string, callback?: () => void) => void;
  reset: () => void;
  resize?: (cols: number, rows: number) => void;
  focus: () => void;
@@ -102,8 +102,8 @@ function createRuntimeWithTerminal(): {
  let resetCalls = 0;

  const terminal: StubTerminal & { resetCalls: number } = {
-    write: (data: string | Uint8Array, callback?: () => void) => {
-      writeTexts.push(decodeTerminalOutput(data));
+    write: (text: string, callback?: () => void) => {
+      writeTexts.push(text);
      if (callback) {
        writeCallbacks.push(callback);
      }
@@ -131,17 +131,6 @@ function createRuntimeWithTerminal(): {
  };
 }

-function terminalOutput(text: string): Uint8Array {
-  return encodeTerminalOutput(text);
-}
-
-function decodeTerminalOutput(data: string | Uint8Array): string {
-  if (typeof data === "string") {
-    return data;
-  }
-  return new TextDecoder().decode(data);
-}
-
 describe("terminal-emulator-runtime", () => {
  const originalWindow = (globalThis as { window?: unknown }).window;

@@ -162,7 +151,7 @@ describe("terminal-emulator-runtime", () => {
    const committed: string[] = [];

    runtime.write({
-      data: terminalOutput("first"),
+      text: "first",
      onCommitted: () => {
        committed.push("first");
      },
@@ -173,7 +162,7 @@ describe("terminal-emulator-runtime", () => {
      },
    });
    runtime.write({
-      data: terminalOutput("second"),
+      text: "second",
      onCommitted: () => {
        committed.push("second");
      },
@@ -199,7 +188,7 @@ describe("terminal-emulator-runtime", () => {
    const onCommitted = vi.fn();

    runtime.write({
-      data: terminalOutput("stuck"),
+      text: "stuck",
      onCommitted,
    });

@@ -219,7 +208,7 @@ describe("terminal-emulator-runtime", () => {
      },
    });

-    runtime.write({ data: terminalOutput("\x1b[>7u") });
+    runtime.write({ text: "\x1b[>7u" });
    runtime.renderSnapshot({
      state: {
        rows: 2,
@@ -245,13 +234,13 @@ describe("terminal-emulator-runtime", () => {
    const committed: string[] = [];

    runtime.write({
-      data: terminalOutput("first"),
+      text: "first",
      onCommitted: () => {
        committed.push("first");
      },
    });
    runtime.write({
-      data: terminalOutput("second"),
+      text: "second",
      onCommitted: () => {
        committed.push("second");
      },
@@ -273,11 +262,11 @@ describe("terminal-emulator-runtime", () => {
    const onCommittedB = vi.fn();

    runtime.write({
-      data: terminalOutput("a"),
+      text: "a",
      onCommitted: onCommittedA,
    });
    runtime.write({
-      data: terminalOutput("b"),
+      text: "b",
      onCommitted: onCommittedB,
    });

@@ -312,15 +301,6 @@ describe("terminal-emulator-runtime", () => {
    expect(writeTexts[0]).toContain("hi");
  });

-  it("restores server-rendered ANSI snapshots through the snapshot write path", () => {
-    const { runtime, terminal, writeTexts } = createRuntimeWithTerminal();
-
-    runtime.restoreOutput({ data: terminalOutput("restored screen") });
-
-    expect(terminal.resetCalls).toBe(0);
-    expect(writeTexts).toEqual(["\u001bcrestored screen"]);
-  });
-
  it("forces a refit when resize is requested", () => {
    const runtime = new TerminalEmulatorRuntime();
    const fitAndEmitResize = vi.fn();
@@ -24,8 +24,6 @@ import {
 } from "@/utils/terminal-keys";
 import { renderTerminalSnapshotToAnsi } from "./terminal-snapshot";

-export type TerminalOutputData = Uint8Array;
-
 export interface TerminalEmulatorRuntimeMountInput {
  root: HTMLDivElement;
  host: HTMLDivElement;
@@ -69,7 +67,7 @@ interface TerminalEmulatorRuntimeDisposables {

 interface TerminalOutputOperation {
  type: "write" | "clear" | "snapshot";
-  data: TerminalOutputData;
+  text: string;
  rows?: number;
  cols?: number;
  suppressInput?: boolean;
@@ -98,23 +96,7 @@ const isAppleHandheld =
 const DEFAULT_TOUCH_SCROLL_LINE_HEIGHT_PX = 18;
 const FIT_TIMEOUT_DELAYS_MS = [0, 16, 48, 120, 250, 500, 1_000, 2_000];
 const OUTPUT_OPERATION_TIMEOUT_MS = 5_000;
-const EMPTY_TERMINAL_OUTPUT = new Uint8Array(0);
-const RESET_TERMINAL_OUTPUT = new Uint8Array([0x1b, 0x63]);
-const terminalOutputEncoder = new TextEncoder();
-
-export function encodeTerminalOutput(text: string): TerminalOutputData {
-  return terminalOutputEncoder.encode(text);
-}
-
-function prependTerminalOutput(
-  prefix: TerminalOutputData,
-  data: TerminalOutputData,
-): TerminalOutputData {
-  const output = new Uint8Array(prefix.length + data.length);
-  output.set(prefix, 0);
-  output.set(data, prefix.length);
-  return output;
-}
+const RESET_TERMINAL_ANSI = "\u001bc";

 const DEFAULT_TERMINAL_FONT_FAMILY = [
  // Prefer common developer fonts, with Nerd Font variants for prompt/TUI glyphs.
@@ -158,7 +140,6 @@ export class TerminalEmulatorRuntime {
  private outputOperations: TerminalOutputOperation[] = [];
  private inFlightOutputOperation: TerminalOutputOperation | null = null;
  private inFlightOutputOperationTimeout: ReturnType<typeof setTimeout> | null = null;
-  private readonly inputModeDecoder = new TextDecoder();
  private suppressInput = false;
  private readonly inputModeTracker = new TerminalInputModeTracker();
  private lastInputModeState: TerminalInputModeState = this.inputModeTracker.getState();
@@ -197,13 +178,14 @@ export class TerminalEmulatorRuntime {
      convertEol: false,
      cursorBlink: true,
      cursorStyle: "bar",
+      customGlyphs: true,
      fontFamily: DEFAULT_TERMINAL_FONT_FAMILY,
      fontSize: 13,
      lineHeight: 1.0,
      macOptionIsMeta: true,
      minimumContrastRatio: 1,
      rescaleOverlappingGlyphs: true,
-      scrollbar: {
+      overviewRuler: {
        width: 8,
      },
      scrollback: input.scrollback,
@@ -547,18 +529,14 @@ export class TerminalEmulatorRuntime {
    };
  }

-  write(input: {
-    data: TerminalOutputData;
-    suppressInput?: boolean;
-    onCommitted?: () => void;
-  }): void {
-    if (input.data.length === 0) {
+  write(input: { text: string; suppressInput?: boolean; onCommitted?: () => void }): void {
+    if (input.text.length === 0) {
      input.onCommitted?.();
      return;
    }
    this.outputOperations.push({
      type: "write",
-      data: input.data,
+      text: input.text,
      suppressInput: input.suppressInput ?? false,
      ...(input.onCommitted ? { onCommitted: input.onCommitted } : {}),
    });
@@ -568,7 +546,7 @@ export class TerminalEmulatorRuntime {
  clear(input?: { onCommitted?: () => void }): void {
    this.outputOperations.push({
      type: "clear",
-      data: EMPTY_TERMINAL_OUTPUT,
+      text: "",
      suppressInput: false,
      ...(input?.onCommitted ? { onCommitted: input.onCommitted } : {}),
    });
@@ -580,25 +558,11 @@ export class TerminalEmulatorRuntime {
      this.clear(input);
      return;
    }
-    this.restoreOutput({
-      data: encodeTerminalOutput(renderTerminalSnapshotToAnsi(input.state)),
-      rows: input.state.rows,
-      cols: input.state.cols,
-      ...(input.onCommitted ? { onCommitted: input.onCommitted } : {}),
-    });
-  }
-
-  restoreOutput(input: {
-    data: TerminalOutputData;
-    rows?: number;
-    cols?: number;
-    onCommitted?: () => void;
-  }): void {
    this.outputOperations.push({
      type: "snapshot",
-      data: prependTerminalOutput(RESET_TERMINAL_OUTPUT, input.data),
-      rows: input.rows,
-      cols: input.cols,
+      text: `${RESET_TERMINAL_ANSI}${renderTerminalSnapshotToAnsi(input.state)}`,
+      rows: input.state.rows,
+      cols: input.state.cols,
      suppressInput: true,
      ...(input.onCommitted ? { onCommitted: input.onCommitted } : {}),
    });
@@ -680,7 +644,6 @@ export class TerminalEmulatorRuntime {
    this.fitAndEmitResize = null;
    this.lastSize = null;
    this.suppressInput = false;
-    this.inputModeDecoder.decode();
    this.inputModeTracker.reset();
    this.emitInputModeChange();
  }
@@ -702,7 +665,7 @@ export class TerminalEmulatorRuntime {

    this.inFlightOutputOperation = operation;
    const previousSuppressInput = this.suppressInput;
-    if (operation.suppressInput) {
+    if (operation.type === "write") {
      this.suppressInput = Boolean(operation.suppressInput);
    }
    const finalizeOperation = (expectedOperation: TerminalOutputOperation) => {
@@ -717,7 +680,6 @@ export class TerminalEmulatorRuntime {
    };

    if (operation.type === "clear") {
-      this.inputModeDecoder.decode();
      this.inputModeTracker.reset();
      this.emitInputModeChange();
      terminal.reset();
@@ -726,7 +688,6 @@ export class TerminalEmulatorRuntime {
    }

    if (operation.type === "snapshot") {
-      this.inputModeDecoder.decode();
      this.inputModeTracker.reset();
      this.emitInputModeChange();
      try {
@@ -743,9 +704,8 @@ export class TerminalEmulatorRuntime {
      }
    }

-    const data = operation.data;
+    const text = operation.text;
    if (operation.type === "write") {
-      const text = this.inputModeDecoder.decode(data, { stream: true });
      const result = this.inputModeTracker.feed(text);
      if (result.changed) {
        this.emitInputModeChange();
@@ -756,7 +716,7 @@ export class TerminalEmulatorRuntime {
    }, OUTPUT_OPERATION_TIMEOUT_MS);

    try {
-      terminal.write(data, () => {
+      terminal.write(text, () => {
        finalizeOperation(operation);
      });
    } catch {
@@ -1,39 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { resolveTerminalRestoreOptions } from "./terminal-restore-options";
-
-describe("terminal restore options", () => {
-  it("omits restore options for daemons without terminal restore modes", () => {
-    expect(
-      resolveTerminalRestoreOptions({
-        supportsTerminalRestoreModes: false,
-        size: { rows: 24, cols: 80 },
-      }),
-    ).toBeUndefined();
-  });
-
-  it("requests visible snapshot restore with bounded scrollback for capable daemons", () => {
-    expect(
-      resolveTerminalRestoreOptions({
-        supportsTerminalRestoreModes: true,
-        size: { rows: 24, cols: 80 },
-      }),
-    ).toEqual({
-      mode: "visible-snapshot",
-      scrollbackLines: 200,
-      size: { rows: 24, cols: 80 },
-    });
-  });
-
-  it("omits size until the terminal has been measured", () => {
-    expect(
-      resolveTerminalRestoreOptions({
-        supportsTerminalRestoreModes: true,
-        size: null,
-      }),
-    ).toEqual({
-      mode: "visible-snapshot",
-      scrollbackLines: 200,
-    });
-  });
-});
@@ -1,22 +0,0 @@
-import type { SubscribeTerminalRequest } from "@server/shared/messages";
-
-export const TERMINAL_VISIBLE_RESTORE_SCROLLBACK_LINES = 200;
-
-export interface ResolveTerminalRestoreOptionsInput {
-  supportsTerminalRestoreModes: boolean;
-  size: { rows: number; cols: number } | null;
-}
-
-export function resolveTerminalRestoreOptions(
-  input: ResolveTerminalRestoreOptionsInput,
-): SubscribeTerminalRequest["restore"] | undefined {
-  if (!input.supportsTerminalRestoreModes) {
-    return undefined;
-  }
-
-  return {
-    mode: "visible-snapshot",
-    scrollbackLines: TERMINAL_VISIBLE_RESTORE_SCROLLBACK_LINES,
-    ...(input.size ? { size: input.size } : {}),
-  };
-}
@@ -1 +1,205 @@
-export { renderTerminalSnapshotToAnsi } from "@server/shared/terminal-snapshot";
+import type { TerminalCell, TerminalState } from "@server/shared/messages";
+
+interface TerminalStyle {
+  fg: number | undefined;
+  bg: number | undefined;
+  fgMode: number | undefined;
+  bgMode: number | undefined;
+  bold: boolean;
+  italic: boolean;
+  underline: boolean;
+  dim: boolean;
+  inverse: boolean;
+  strikethrough: boolean;
+}
+
+const DEFAULT_STYLE: TerminalStyle = {
+  fg: undefined,
+  bg: undefined,
+  fgMode: undefined,
+  bgMode: undefined,
+  bold: false,
+  italic: false,
+  underline: false,
+  dim: false,
+  inverse: false,
+  strikethrough: false,
+};
+
+export function renderTerminalSnapshotToAnsi(state: TerminalState): string {
+  const rows = [...state.scrollback, ...state.grid];
+  const lines: string[] = ["\u001b[?7l"];
+
+  for (let rowIndex = 0; rowIndex < rows.length; rowIndex += 1) {
+    const row = rows[rowIndex] ?? [];
+    lines.push(renderTerminalRow(row));
+    if (rowIndex < rows.length - 1) {
+      lines.push("\r\n");
+    }
+  }
+
+  lines.push("\u001b[0m");
+  const cursorPresentationAnsi = renderCursorPresentationToAnsi(state.cursor);
+  if (cursorPresentationAnsi) {
+    lines.push(cursorPresentationAnsi);
+  }
+  lines.push(`\u001b[${state.cursor.row + 1};${state.cursor.col + 1}H`);
+  lines.push(state.cursor.hidden ? "\u001b[?25l" : "\u001b[?25h");
+  lines.push("\u001b[?7h");
+  return lines.join("");
+}
+
+function renderCursorPresentationToAnsi(cursor: TerminalState["cursor"]): string | null {
+  if (!cursor.style) {
+    return null;
+  }
+
+  const cursorStyleCode = (() => {
+    if (cursor.style === "block") {
+      return cursor.blink === false ? 2 : 1;
+    }
+    if (cursor.style === "underline") {
+      return cursor.blink === false ? 4 : 3;
+    }
+    return cursor.blink === false ? 6 : 5;
+  })();
+
+  return `\u001b[${cursorStyleCode} q`;
+}
+
+function renderTerminalRow(row: TerminalCell[]): string {
+  const output: string[] = [];
+  const length = getTerminalRowLength(row);
+  let previousStyle = DEFAULT_STYLE;
+
+  for (let index = 0; index < length; index += 1) {
+    const cell = row[index] ?? { char: " " };
+    const nextStyle = getTerminalStyle(cell);
+    if (!terminalStylesEqual(previousStyle, nextStyle)) {
+      output.push(styleToAnsi(nextStyle));
+      previousStyle = nextStyle;
+    }
+    output.push(cell.char || " ");
+  }
+
+  if (!terminalStylesEqual(previousStyle, DEFAULT_STYLE)) {
+    output.push("\u001b[0m");
+  }
+
+  return output.join("");
+}
+
+function getTerminalRowLength(row: TerminalCell[]): number {
+  for (let index = row.length - 1; index >= 0; index -= 1) {
+    const cell = row[index];
+    if (!cell) {
+      continue;
+    }
+    if (cell.char !== " ") {
+      return index + 1;
+    }
+    if (
+      cell.fg !== undefined ||
+      cell.bg !== undefined ||
+      cell.fgMode !== undefined ||
+      cell.bgMode !== undefined ||
+      cell.bold ||
+      cell.italic ||
+      cell.underline ||
+      cell.dim ||
+      cell.inverse ||
+      cell.strikethrough
+    ) {
+      return index + 1;
+    }
+  }
+  return 0;
+}
+
+function getTerminalStyle(cell: TerminalCell): TerminalStyle {
+  return {
+    fg: cell.fg,
+    bg: cell.bg,
+    fgMode: cell.fgMode,
+    bgMode: cell.bgMode,
+    bold: Boolean(cell.bold),
+    italic: Boolean(cell.italic),
+    underline: Boolean(cell.underline),
+    dim: Boolean(cell.dim),
+    inverse: Boolean(cell.inverse),
+    strikethrough: Boolean(cell.strikethrough),
+  };
+}
+
+function terminalStylesEqual(left: TerminalStyle, right: TerminalStyle): boolean {
+  return (
+    left.fg === right.fg &&
+    left.bg === right.bg &&
+    left.fgMode === right.fgMode &&
+    left.bgMode === right.bgMode &&
+    left.bold === right.bold &&
+    left.italic === right.italic &&
+    left.underline === right.underline &&
+    left.dim === right.dim &&
+    left.inverse === right.inverse &&
+    left.strikethrough === right.strikethrough
+  );
+}
+
+function styleToAnsi(style: TerminalStyle): string {
+  const codes = ["0"];
+
+  if (style.bold) {
+    codes.push("1");
+  }
+  if (style.dim) {
+    codes.push("2");
+  }
+  if (style.italic) {
+    codes.push("3");
+  }
+  if (style.underline) {
+    codes.push("4");
+  }
+  if (style.inverse) {
+    codes.push("7");
+  }
+  if (style.strikethrough) {
+    codes.push("9");
+  }
+
+  if (style.fg !== undefined && style.fgMode !== undefined) {
+    codes.push(...colorToSgr(style.fgMode, style.fg, false));
+  }
+
+  if (style.bg !== undefined && style.bgMode !== undefined) {
+    codes.push(...colorToSgr(style.bgMode, style.bg, true));
+  }
+
+  return `\u001b[${codes.join(";")}m`;
+}
+
+function colorToSgr(mode: number, value: number, background: boolean): string[] {
+  if (mode === 1) {
+    if (value >= 8) {
+      return [String((background ? 100 : 90) + (value - 8))];
+    }
+    return [String((background ? 40 : 30) + value)];
+  }
+
+  if (mode === 2) {
+    return [background ? "48" : "38", "5", String(value)];
+  }
+
+  if (mode === 3) {
+    return [
+      background ? "48" : "38",
+      "2",
+      String((value >> 16) & 0xff),
+      String((value >> 8) & 0xff),
+      String(value & 0xff),
+    ];
+  }
+
+  return [];
+}
@@ -14,36 +14,19 @@ interface TerminalSnapshot {
  cursor: { row: number; col: number };
 }

-function terminalCellText(cell: { char: string }): string {
-  return cell.char;
-}
-
-function terminalRowText(row: Array<{ char: string }>): string {
-  return row.map(terminalCellText).join("");
-}
-
-function terminalSnapshotText(state: TerminalSnapshot): string {
-  return state.grid.map(terminalRowText).join("\n");
-}
-
-function terminalOutput(text: string): Uint8Array {
-  return new TextEncoder().encode(text);
-}
-
 type TerminalStreamEvent =
  | { terminalId: string; type: "output"; data: Uint8Array }
-  | { terminalId: string; type: "snapshot"; state: TerminalSnapshot }
-  | { terminalId: string; type: "restore"; data: Uint8Array };
+  | { terminalId: string; type: "snapshot"; state: TerminalSnapshot };

 class FakeTerminalStreamClient implements TerminalStreamControllerClient {
  private readonly listeners = new Set<(event: TerminalStreamEvent) => void>();
-  public subscribeCalls: Array<{ terminalId: string; options?: unknown }> = [];
+  public subscribeCalls: string[] = [];
  public unsubscribeCalls: string[] = [];
  public resizeCalls: Array<{ terminalId: string; rows: number; cols: number }> = [];
  public nextSubscribeResults: Array<{ terminalId: string; error?: string | null }> = [];

-  async subscribeTerminal(terminalId: string, options?: unknown) {
-    this.subscribeCalls.push({ terminalId, ...(options ? { options } : {}) });
+  async subscribeTerminal(terminalId: string) {
+    this.subscribeCalls.push(terminalId);
    const result = this.nextSubscribeResults.shift();
    if (!result) {
      throw new Error("Missing fake subscribe result");
@@ -78,8 +61,7 @@ class FakeTerminalStreamClient implements TerminalStreamControllerClient {

 function createHarness(input?: { client?: FakeTerminalStreamClient }) {
  const client = input?.client ?? new FakeTerminalStreamClient();
-  const outputs: Array<{ terminalId: string; data: Uint8Array }> = [];
-  const restores: Array<{ terminalId: string; data: Uint8Array }> = [];
+  const outputs: Array<{ terminalId: string; text: string }> = [];
  const snapshots: Array<{ terminalId: string; text: string }> = [];
  const statuses: TerminalStreamControllerStatus[] = [];
  const controller = new TerminalStreamController({
@@ -88,13 +70,10 @@ function createHarness(input?: { client?: FakeTerminalStreamClient }) {
    onOutput: (output) => {
      outputs.push(output);
    },
-    onRestore: (restore) => {
-      restores.push(restore);
-    },
    onSnapshot: ({ terminalId, state }) => {
      snapshots.push({
        terminalId,
-        text: terminalSnapshotText(state),
+        text: state.grid.map((row) => row.map((cell) => cell.char).join("")).join("\n"),
      });
    },
    onStatusChange: (status) => {
@@ -102,7 +81,7 @@ function createHarness(input?: { client?: FakeTerminalStreamClient }) {
    },
  });

-  return { client, controller, outputs, restores, snapshots, statuses };
+  return { client, controller, outputs, snapshots, statuses };
 }

 async function flushAsyncWork(): Promise<void> {
@@ -129,18 +108,16 @@ describe("terminal-stream-controller", () => {
        cursor: { row: 0, col: 5 },
      },
    });
-    const outputData = terminalOutput(" world");
    harness.client.emit({
      terminalId: "term-1",
      type: "output",
-      data: outputData,
+      data: new TextEncoder().encode(" world"),
    });

-    expect(harness.client.subscribeCalls).toEqual([{ terminalId: "term-1" }]);
+    expect(harness.client.subscribeCalls).toEqual(["term-1"]);
    expect(harness.client.resizeCalls).toEqual([{ terminalId: "term-1", rows: 24, cols: 80 }]);
    expect(harness.snapshots).toEqual([{ terminalId: "term-1", text: "hello" }]);
-    expect(harness.outputs[0]?.data).toBe(outputData);
-    expect(harness.outputs).toEqual([{ terminalId: "term-1", data: terminalOutput(" world") }]);
+    expect(harness.outputs).toEqual([{ terminalId: "term-1", text: " world" }]);
    expect(harness.statuses.at(-1)).toEqual({
      terminalId: "term-1",
      isAttaching: false,
@@ -158,7 +135,7 @@ describe("terminal-stream-controller", () => {
    harness.controller.setTerminal({ terminalId: "term-1" });
    await flushAsyncWork();

-    expect(harness.client.subscribeCalls).toEqual([{ terminalId: "term-1" }]);
+    expect(harness.client.subscribeCalls).toEqual(["term-1"]);
    expect(harness.statuses.at(-1)).toEqual({
      terminalId: "term-1",
      isAttaching: false,
@@ -175,7 +152,7 @@ describe("terminal-stream-controller", () => {
    harness.controller.handleTerminalExit({ terminalId: "term-1" });
    await flushAsyncWork();

-    expect(harness.client.subscribeCalls).toEqual([{ terminalId: "term-1" }]);
+    expect(harness.client.subscribeCalls).toEqual(["term-1"]);
    expect(harness.statuses.at(-1)).toEqual({
      terminalId: "term-1",
      isAttaching: false,
@@ -183,55 +160,6 @@ describe("terminal-stream-controller", () => {
    });
  });

-  it("requests configured restore options and forwards restore output", async () => {
-    const client = new FakeTerminalStreamClient();
-    const harness = createHarness({ client });
-    client.nextSubscribeResults.push({ terminalId: "term-1", error: null });
-    const controller = new TerminalStreamController({
-      client,
-      getPreferredSize: () => ({ rows: 24, cols: 80 }),
-      getRestoreOptions: () => ({
-        mode: "visible-snapshot",
-        scrollbackLines: 200,
-        size: { rows: 24, cols: 80 },
-      }),
-      onOutput: (output) => harness.outputs.push(output),
-      onRestore: (restore) => harness.restores.push(restore),
-      onSnapshot: ({ terminalId, state }) => {
-        harness.snapshots.push({
-          terminalId,
-          text: terminalSnapshotText(state),
-        });
-      },
-    });
-
-    controller.setTerminal({ terminalId: "term-1" });
-    await flushAsyncWork();
-    const restoreData = terminalOutput("restored");
-    client.emit({
-      terminalId: "term-1",
-      type: "restore",
-      data: restoreData,
-    });
-    controller.dispose();
-
-    expect(client.subscribeCalls).toEqual([
-      {
-        terminalId: "term-1",
-        options: {
-          restore: {
-            mode: "visible-snapshot",
-            scrollbackLines: 200,
-            size: { rows: 24, cols: 80 },
-          },
-        },
-      },
-    ]);
-    expect(harness.restores[0]?.data).toBe(restoreData);
-    expect(harness.restores).toEqual([{ terminalId: "term-1", data: terminalOutput("restored") }]);
-    expect(harness.outputs).toEqual([]);
-  });
-
  it("unsubscribes when switching terminals and on dispose", async () => {
    const harness = createHarness();
    harness.client.nextSubscribeResults.push({ terminalId: "term-1", error: null });
@@ -1,11 +1,7 @@
-import type { SubscribeTerminalRequest, TerminalState } from "@server/shared/messages";
-import type { TerminalOutputData } from "./terminal-emulator-runtime";
+import type { TerminalState } from "@server/shared/messages";

 export interface TerminalStreamControllerClient {
-  subscribeTerminal: (
-    terminalId: string,
-    options?: { restore?: SubscribeTerminalRequest["restore"] },
-  ) => Promise<{
+  subscribeTerminal: (terminalId: string) => Promise<{
    terminalId: string;
    error?: string | null;
  }>;
@@ -18,8 +14,7 @@ export interface TerminalStreamControllerClient {
    handler: (
      event:
        | { terminalId: string; type: "output"; data: Uint8Array }
-        | { terminalId: string; type: "snapshot"; state: TerminalState }
-        | { terminalId: string; type: "restore"; data: Uint8Array },
+        | { terminalId: string; type: "snapshot"; state: TerminalState },
    ) => void,
  ) => () => void;
 }
@@ -38,16 +33,15 @@ export interface TerminalStreamControllerStatus {
 export interface TerminalStreamControllerOptions {
  client: TerminalStreamControllerClient;
  getPreferredSize: () => TerminalStreamControllerSize | null;
-  onOutput: (input: { terminalId: string; data: TerminalOutputData }) => void;
+  onOutput: (input: { terminalId: string; text: string }) => void;
  onSnapshot: (input: { terminalId: string; state: TerminalState }) => void;
-  onRestore?: (input: { terminalId: string; data: TerminalOutputData }) => void;
-  getRestoreOptions?: () => SubscribeTerminalRequest["restore"] | undefined;
  onStatusChange?: (status: TerminalStreamControllerStatus) => void;
 }

 const TERMINAL_EXITED_ERROR = "Terminal exited";

 export class TerminalStreamController {
+  private readonly decoder = new TextDecoder();
  private readonly unsubscribeStreamEvents: () => void;
  private terminalId: string | null = null;
  private disposed = false;
@@ -58,17 +52,13 @@ export class TerminalStreamController {
        return;
      }
      if (event.type === "snapshot") {
+        this.decoder.decode();
        this.options.onSnapshot({ terminalId: event.terminalId, state: event.state });
        return;
      }
-      if (event.type === "restore") {
-        if (event.data.length > 0) {
-          this.options.onRestore?.({ terminalId: event.terminalId, data: event.data });
-        }
-        return;
-      }
-      if (event.data.length > 0) {
-        this.options.onOutput({ terminalId: event.terminalId, data: event.data });
+      const text = this.decoder.decode(event.data, { stream: true });
+      if (text.length > 0) {
+        this.options.onOutput({ terminalId: event.terminalId, text });
      }
    });
  }
@@ -80,6 +70,7 @@ export class TerminalStreamController {
    const nextTerminalId = input.terminalId;
    const previousTerminalId = this.terminalId;
    this.terminalId = nextTerminalId;
+    this.decoder.decode();
    if (previousTerminalId) {
      this.options.client.unsubscribeTerminal(previousTerminalId);
    }
@@ -87,10 +78,9 @@ export class TerminalStreamController {
      this.options.onStatusChange?.({ terminalId: null, isAttaching: false, error: null });
      return;
    }
-    const restore = this.options.getRestoreOptions?.();
    this.options.onStatusChange?.({ terminalId: nextTerminalId, isAttaching: true, error: null });
    void this.options.client
-      .subscribeTerminal(nextTerminalId, restore ? { restore } : undefined)
+      .subscribeTerminal(nextTerminalId)
      .then((payload) => {
        if (this.disposed || this.terminalId !== nextTerminalId) {
          return;
@@ -136,6 +126,7 @@ export class TerminalStreamController {
    if (this.disposed || input.terminalId !== this.terminalId) {
      return;
    }
+    this.decoder.decode();
    this.terminalId = null;
    this.options.onStatusChange?.({
      terminalId: input.terminalId,
@@ -149,6 +140,7 @@ export class TerminalStreamController {
      return;
    }
    this.disposed = true;
+    this.decoder.decode();
    const terminalId = this.terminalId;
    this.terminalId = null;
    if (terminalId) {
@@ -1,308 +0,0 @@
-import type { ITheme } from "@xterm/xterm";
-import xtermCss from "@xterm/xterm/css/xterm.css";
-import type { TerminalState } from "@server/shared/messages";
-import type { TerminalInputModeState } from "@server/shared/terminal-input-mode";
-import type { PendingTerminalModifiers } from "@/utils/terminal-keys";
-import {
-  encodeTerminalOutput,
-  TerminalEmulatorRuntime,
-} from "../runtime/terminal-emulator-runtime";
-
-interface MountMessage {
-  type: "mount";
-  streamKey: string;
-  initialSnapshot: TerminalState | null;
-  scrollbackLines: number;
-  theme: ITheme;
-  pendingModifiers: PendingTerminalModifiers;
-  swipeGesturesEnabled: boolean;
-}
-
-type InboundMessage =
-  | MountMessage
-  | { type: "unmount"; streamKey: string }
-  | { type: "writeOutput"; streamKey: string; text: string }
-  | { type: "restoreOutput"; streamKey: string; text: string }
-  | { type: "renderSnapshot"; streamKey: string; state: TerminalState | null }
-  | { type: "clear"; streamKey: string }
-  | { type: "focus"; streamKey: string }
-  | { type: "resize"; streamKey: string }
-  | { type: "setTheme"; streamKey: string; theme: ITheme }
-  | { type: "setScrollback"; streamKey: string; lines: number }
-  | { type: "setPendingModifiers"; streamKey: string; pendingModifiers: PendingTerminalModifiers }
-  | { type: "setSwipeGesturesEnabled"; streamKey: string; enabled: boolean };
-
-type OutboundMessage =
-  | { type: "bridgeReady" }
-  | { type: "rendererReady"; streamKey: string; isReady: boolean }
-  | { type: "input"; streamKey: string; data: string }
-  | { type: "resize"; streamKey: string; rows: number; cols: number }
-  | {
-      type: "terminalKey";
-      streamKey: string;
-      key: string;
-      ctrl: boolean;
-      shift: boolean;
-      alt: boolean;
-      meta: boolean;
-    }
-  | { type: "pendingModifiersConsumed"; streamKey: string }
-  | { type: "inputModeChange"; streamKey: string; state: TerminalInputModeState }
-  | { type: "openExternalUrl"; streamKey: string; url: string }
-  | { type: "swipeLeft"; streamKey: string }
-  | { type: "swipeRight"; streamKey: string }
-  | { type: "debug"; message: string; details?: unknown };
-
-declare global {
-  interface Window {
-    ReactNativeWebView?: {
-      postMessage?: (data: string) => void;
-    };
-    __PASEO_TERMINAL_WEBVIEW_RECEIVE__?: (message: InboundMessage) => void;
-  }
-}
-
-const sendToNative = (message: OutboundMessage): void => {
-  window.ReactNativeWebView?.postMessage?.(JSON.stringify(message));
-};
-
-const installStyles = (): void => {
-  const style = document.createElement("style");
-  style.textContent = `
-${xtermCss}
-html,
-body,
-#terminal-root {
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-  overscroll-behavior: none;
-  background: #0b0b0b;
-}
-#terminal-root {
-  display: flex;
-  min-width: 0;
-  min-height: 0;
-}
-#terminal-host {
-  flex: 1;
-  min-width: 0;
-  min-height: 0;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-[data-terminal-scrollbar-root="true"] .xterm-viewport {
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-}
-[data-terminal-scrollbar-root="true"] .xterm-viewport::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-}
-`;
-  document.head.appendChild(style);
-};
-
-class TerminalWebViewBridge {
-  private runtime: TerminalEmulatorRuntime | null = null;
-  private streamKey: string | null = null;
-  private swipeGesturesEnabled = false;
-  private trackingSwipe = false;
-  private activePointerId: number | null = null;
-  private startX = 0;
-  private startY = 0;
-  private firedSwipe = false;
-
-  constructor(
-    private readonly root: HTMLDivElement,
-    private readonly host: HTMLDivElement,
-  ) {
-    this.root.addEventListener("pointerdown", this.handlePointerDown, { passive: true });
-    this.root.addEventListener("pointermove", this.handlePointerMove, { passive: false });
-    this.root.addEventListener("pointerup", this.handlePointerUp, { passive: true });
-    this.root.addEventListener("pointercancel", this.handlePointerUp, { passive: true });
-  }
-
-  receive = (message: InboundMessage): void => {
-    try {
-      this.receiveUnsafe(message);
-    } catch (error) {
-      sendToNative({
-        type: "debug",
-        message: "terminal webview receive failed",
-        details: error instanceof Error ? { message: error.message, stack: error.stack } : error,
-      });
-    }
-  };
-
-  private receiveUnsafe(message: InboundMessage): void {
-    if (message.type === "mount") {
-      this.mount(message);
-      return;
-    }
-    if (message.type === "unmount") {
-      this.unmount(message.streamKey);
-      return;
-    }
-    if (!this.matches(message.streamKey)) {
-      return;
-    }
-    this.receiveMounted(message);
-  }
-
-  private receiveMounted(
-    message: Exclude<InboundMessage, MountMessage | { type: "unmount" }>,
-  ): void {
-    switch (message.type) {
-      case "writeOutput":
-        this.runtime?.write({ data: encodeTerminalOutput(message.text) });
-        break;
-      case "restoreOutput":
-        this.runtime?.restoreOutput({ data: encodeTerminalOutput(message.text) });
-        break;
-      case "renderSnapshot":
-        this.runtime?.renderSnapshot({ state: message.state });
-        break;
-      case "clear":
-        this.runtime?.clear();
-        break;
-      case "focus":
-        this.runtime?.focus();
-        break;
-      case "resize":
-        this.runtime?.resize({ force: true });
-        break;
-      case "setTheme":
-        this.runtime?.setTheme({ theme: message.theme });
-        break;
-      case "setScrollback":
-        this.runtime?.setScrollback({ lines: message.lines });
-        break;
-      case "setPendingModifiers":
-        this.runtime?.setPendingModifiers({ pendingModifiers: message.pendingModifiers });
-        break;
-      case "setSwipeGesturesEnabled":
-        this.swipeGesturesEnabled = message.enabled;
-        break;
-    }
-  }
-
-  private mount(message: MountMessage): void {
-    this.unmount(this.streamKey);
-    this.streamKey = message.streamKey;
-    this.swipeGesturesEnabled = message.swipeGesturesEnabled;
-    document.body.style.backgroundColor = message.theme.background ?? "#0b0b0b";
-
-    const runtime = new TerminalEmulatorRuntime();
-    this.runtime = runtime;
-    runtime.setCallbacks({
-      callbacks: {
-        onInput: (data) => sendToNative({ type: "input", streamKey: message.streamKey, data }),
-        onResize: ({ rows, cols }) =>
-          sendToNative({ type: "resize", streamKey: message.streamKey, rows, cols }),
-        onTerminalKey: (input) =>
-          sendToNative({ type: "terminalKey", streamKey: message.streamKey, ...input }),
-        onPendingModifiersConsumed: () =>
-          sendToNative({ type: "pendingModifiersConsumed", streamKey: message.streamKey }),
-        onInputModeChange: (state) =>
-          sendToNative({ type: "inputModeChange", streamKey: message.streamKey, state }),
-        onOpenExternalUrl: (url) =>
-          sendToNative({ type: "openExternalUrl", streamKey: message.streamKey, url }),
-      },
-    });
-    runtime.setPendingModifiers({ pendingModifiers: message.pendingModifiers });
-    runtime.mount({
-      root: this.root,
-      host: this.host,
-      initialSnapshot: message.initialSnapshot,
-      scrollback: message.scrollbackLines,
-      theme: message.theme,
-    });
-    sendToNative({ type: "rendererReady", streamKey: message.streamKey, isReady: true });
-  }
-
-  private unmount(streamKey: string | null): void {
-    if (!this.runtime) {
-      return;
-    }
-    const previousStreamKey = this.streamKey;
-    this.runtime.unmount();
-    this.runtime = null;
-    this.streamKey = null;
-    if (previousStreamKey && (!streamKey || streamKey === previousStreamKey)) {
-      sendToNative({ type: "rendererReady", streamKey: previousStreamKey, isReady: false });
-    }
-  }
-
-  private matches(streamKey: string): boolean {
-    return this.streamKey === streamKey;
-  }
-
-  private handlePointerDown = (event: PointerEvent): void => {
-    if (!this.swipeGesturesEnabled || !event.isPrimary) {
-      return;
-    }
-    this.trackingSwipe = true;
-    this.firedSwipe = false;
-    this.activePointerId = event.pointerId;
-    this.startX = event.clientX;
-    this.startY = event.clientY;
-  };
-
-  private handlePointerMove = (event: PointerEvent): void => {
-    if (!this.trackingSwipe || this.firedSwipe || !this.streamKey) {
-      return;
-    }
-    if (this.activePointerId !== null && event.pointerId !== this.activePointerId) {
-      return;
-    }
-
-    const dx = event.clientX - this.startX;
-    const dy = event.clientY - this.startY;
-    const absDx = Math.abs(dx);
-    const absDy = Math.abs(dy);
-    if (absDy >= 12 && absDy > absDx) {
-      this.resetSwipe();
-      return;
-    }
-    if (absDx < 22 || (absDy !== 0 && absDx / absDy < 1.2)) {
-      return;
-    }
-
-    this.firedSwipe = true;
-    sendToNative({ type: dx > 0 ? "swipeRight" : "swipeLeft", streamKey: this.streamKey });
-    if (event.cancelable) event.preventDefault();
-  };
-
-  private handlePointerUp = (event: PointerEvent): void => {
-    if (this.activePointerId !== null && event.pointerId !== this.activePointerId) {
-      return;
-    }
-    this.resetSwipe();
-  };
-
-  private resetSwipe(): void {
-    this.trackingSwipe = false;
-    this.activePointerId = null;
-    this.startX = 0;
-    this.startY = 0;
-    this.firedSwipe = false;
-  }
-}
-
-installStyles();
-
-const root = document.createElement("div");
-root.id = "terminal-root";
-root.dataset.terminalScrollbarRoot = "true";
-const host = document.createElement("div");
-host.id = "terminal-host";
-root.appendChild(host);
-document.body.appendChild(root);
-
-const bridge = new TerminalWebViewBridge(root, host);
-window.__PASEO_TERMINAL_WEBVIEW_RECEIVE__ = bridge.receive;
-sendToNative({ type: "bridgeReady" });
@@ -17,9 +17,6 @@ export const PROVIDER_COMMAND_TEMPLATES: Record<
  claude: {
    resume: "claude --resume {sessionId}",
  },
-  pi: {
-    resume: "pi --session {sessionId}",
-  },
 };

 function renderTemplate(template: string, vars: Record<string, string>): string {
@@ -1,97 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  createMarkdownClipboardContent,
-  type RichClipboardWriter,
-  writeMarkdownToRichClipboard,
-} from "./rich-clipboard";
-
-const { setStringAsyncMock } = vi.hoisted(() => ({
-  setStringAsyncMock: vi.fn(async () => true),
-}));
-
-vi.mock("expo-clipboard", () => ({
-  setStringAsync: setStringAsyncMock,
-}));
-
-beforeEach(() => {
-  setStringAsyncMock.mockClear();
-});
-
-describe("createMarkdownClipboardContent", () => {
-  it("renders markdown structures to clipboard html", () => {
-    const markdown = [
-      "# Heading",
-      "",
-      "| Name | Value |",
-      "| --- | --- |",
-      "| One | Two |",
-      "",
-      "- Parent",
-      "  - Child",
-      "",
-      "```ts",
-      "const value = 1;",
-      "```",
-    ].join("\n");
-
-    const content = createMarkdownClipboardContent(markdown);
-
-    expect(content.plainText).toBe(markdown);
-    expect(content.html).toContain("<h1>Heading</h1>");
-    expect(content.html).toContain("<table>");
-    expect(content.html).toContain("<ul>");
-    expect(content.html).toContain('class="language-ts"');
-  });
-
-  it("escapes raw html instead of placing it on the rich clipboard", () => {
-    const content = createMarkdownClipboardContent(
-      '<script>alert("x")</script>\n\n[jump](javascript:alert("x"))',
-    );
-
-    expect(content.html).not.toContain("<script>");
-    expect(content.html).not.toContain('href="javascript:');
-    expect(content.html).toContain("&lt;script&gt;");
-  });
-});
-
-describe("writeMarkdownToRichClipboard", () => {
-  it("writes plain text and html when a rich clipboard writer is available", async () => {
-    const markdown = "- item";
-    const writes: Array<Parameters<RichClipboardWriter["write"]>[0]> = [];
-    const richWriter: RichClipboardWriter = {
-      supportsHtml: () => true,
-      write: async (data) => {
-        writes.push(data);
-      },
-    };
-
-    await writeMarkdownToRichClipboard(markdown, {
-      richWriter,
-      writePlainText: setStringAsyncMock,
-    });
-
-    const written = writes[0];
-    if (!written) {
-      throw new Error("Expected rich clipboard data to be written");
-    }
-    await expect(written["text/plain"].text()).resolves.toBe(markdown);
-    await expect(written["text/html"].text()).resolves.toContain("<li>item</li>");
-    expect(setStringAsyncMock).not.toHaveBeenCalled();
-  });
-
-  it("falls back to plain text when rich clipboard writing fails", async () => {
-    const richWriter: RichClipboardWriter = {
-      supportsHtml: () => true,
-      write: async () => {
-        throw new Error("clipboard denied");
-      },
-    };
-
-    await writeMarkdownToRichClipboard("**bold**", {
-      richWriter,
-      writePlainText: setStringAsyncMock,
-    });
-
-    expect(setStringAsyncMock).toHaveBeenCalledWith("**bold**");
-  });
-});
@@ -1,81 +0,0 @@
-import * as Clipboard from "expo-clipboard";
-import MarkdownIt from "markdown-it";
-import { isWeb } from "@/constants/platform";
-
-const markdownRenderer = new MarkdownIt({
-  html: false,
-  linkify: true,
-  typographer: true,
-});
-
-type ClipboardMimeType = "text/plain" | "text/html";
-
-export interface MarkdownClipboardContent {
-  plainText: string;
-  html: string;
-}
-
-export interface RichClipboardWriter {
-  supportsHtml: () => boolean;
-  write: (data: Record<ClipboardMimeType, Blob>) => Promise<void>;
-}
-
-export interface MarkdownClipboardEnvironment {
-  richWriter?: RichClipboardWriter | null;
-  writePlainText: (text: string) => Promise<unknown>;
-}
-
-export function createMarkdownClipboardContent(markdown: string): MarkdownClipboardContent {
-  return {
-    plainText: markdown,
-    html: `<meta charset="utf-8">${markdownRenderer.render(markdown)}`,
-  };
-}
-
-export async function writeMarkdownToRichClipboard(
-  markdown: string,
-  environment: MarkdownClipboardEnvironment = getDefaultMarkdownClipboardEnvironment(),
-): Promise<void> {
-  if (environment.richWriter?.supportsHtml()) {
-    const content = createMarkdownClipboardContent(markdown);
-    try {
-      await environment.richWriter.write({
-        "text/plain": new Blob([content.plainText], { type: "text/plain" }),
-        "text/html": new Blob([content.html], { type: "text/html" }),
-      });
-      return;
-    } catch {
-      // Fall through to the plain-text path. Some webviews expose rich clipboard
-      // APIs but deny writes depending on focus, permissions, or browser policy.
-    }
-  }
-
-  await environment.writePlainText(markdown);
-}
-
-function getDefaultMarkdownClipboardEnvironment(): MarkdownClipboardEnvironment {
-  return {
-    richWriter: getWebRichClipboardWriter(),
-    writePlainText: (text) => Clipboard.setStringAsync(text),
-  };
-}
-
-function getWebRichClipboardWriter(): RichClipboardWriter | null {
-  if (!isWeb) {
-    return null;
-  }
-  if (typeof navigator === "undefined" || typeof navigator.clipboard?.write !== "function") {
-    return null;
-  }
-  if (typeof ClipboardItem === "undefined") {
-    return null;
-  }
-
-  return {
-    supportsHtml: () =>
-      typeof ClipboardItem.supports !== "function" || ClipboardItem.supports("text/html"),
-    write: async (data) => {
-      await navigator.clipboard.write([new ClipboardItem(data)]);
-    },
-  };
-}
@@ -1,5 +1,4 @@
 import { defineConfig, configDefaults } from "vitest/config";
-import { playwright } from "@vitest/browser-playwright";
 import path from "path";
 import fs from "fs";

@@ -34,7 +33,7 @@ export default defineConfig({
          include: ["src/**/*.browser.{test,spec}.{ts,tsx}"],
          browser: {
            enabled: true,
-            provider: playwright(),
+            provider: "playwright",
            headless: true,
            connectTimeout: 180_000,
            instances: [{ browser: "chromium" }],
@@ -50,7 +49,11 @@ export default defineConfig({
     * keeps `process.send` intact so the app tests can boot before hitting the intentional failures.
     */
    pool: "forks",
-    maxWorkers: 2,
+    poolOptions: {
+      forks: {
+        maxForks: 2,
+      },
+    },
    server: {
      deps: {
        fallbackCJS: true,
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.1.81",
+  "version": "0.1.78",
  "description": "Paseo CLI - control your AI coding agents from the command line",
  "bin": {
    "paseo": "bin/paseo"
@@ -23,8 +23,9 @@
    "test:e2e:lifecycle": "npx tsx tests/e2e/agent-lifecycle.test.ts"
  },
  "dependencies": {
+    "@agentclientprotocol/sdk": "^0.17.1",
    "@clack/prompts": "^1.0.0",
-    "@getpaseo/server": "0.1.81",
+    "@getpaseo/server": "0.1.78",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -37,7 +38,7 @@
    "@types/ws": "^8.5.8",
    "tsx": "^4.6.0",
    "typescript": "^5.2.2",
-    "vitest": "^4.1.6",
+    "vitest": "^3.2.4",
    "zx": "^8.8.5"
  }
 }
--- a/Show More
+++ b/Show More