feat(subagents): connect fleet MCP delegation to app and parent completion

Parented creation enters the relationship owner before resource admission. Initial run evidence drives one qualified completion consumer, while ordinary bound conversations own their directory demand and workspace selectors. Preserve manager-owned archive lifecycles and verify managed callbacks through the parent capability.
feat(subagents): retain fleet membership and origin through app navigation
2026-10-21 08:42:39 +00:00 · 2026-10-20 17:41:52 +02:00 · 2026-10-20 15:09:50 +02:00 · 2026-10-20 13:23:04 +02:00 · 2026-10-20 12:15:51 +02:00 · 2026-10-20 10:57:13 +02:00
581 changed files with 37126 additions and 12467 deletions
@@ -93,6 +93,10 @@ jobs:
        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
        run: npm run lint

+      - name: Test lint rules
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
+        run: node --test scripts/oxlint/paseo-plugin.test.mjs
+
      - name: Build relay
        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
        run: npm run build:relay
@@ -5,6 +5,7 @@
  },
  "ignorePatterns": [".dev/**"],
  "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
+  "jsPlugins": ["./scripts/oxlint/paseo-plugin.mjs"],
  "categories": {
    "correctness": "error",
    "suspicious": "error",
@@ -356,6 +357,117 @@
        "no-restricted-imports": "off"
      }
    },
+    {
+      "files": ["packages/app/src/**/*.{ts,tsx}"],
+      "rules": {
+        "paseo/no-raw-pressable": "error"
+      }
+    },
+    // Press feedback is owned by the primitives in components/ui. Raw pressable burn-down:
+    // 94 files. They may only leave this list.
+    {
+      "files": [
+        "packages/app/src/components/ui/**/*.{ts,tsx}",
+        "packages/app/src/**/*.{test,spec}.{ts,tsx}",
+        "packages/app/src/agent-profiles/settings/agent-profile-appearance-field.tsx",
+        "packages/app/src/agent-skills/selection-sheet.tsx",
+        "packages/app/src/agent-stream/chat-outline/rail.web.tsx",
+        "packages/app/src/agent-stream/view.tsx",
+        "packages/app/src/app/pair-scan.tsx",
+        "packages/app/src/changelog/internal/changelog-sheet.tsx",
+        "packages/app/src/command-center/command-center.tsx",
+        "packages/app/src/components/adaptive-modal-sheet.tsx",
+        "packages/app/src/components/add-host-method-modal.tsx",
+        "packages/app/src/components/add-host-modal.tsx",
+        "packages/app/src/components/add-project-flow.tsx",
+        "packages/app/src/components/add-remote-ssh-host-modal.tsx",
+        "packages/app/src/components/agent-list.tsx",
+        "packages/app/src/components/app-diagnostic-sheet.tsx",
+        "packages/app/src/components/attachment-lightbox.tsx",
+        "packages/app/src/components/attachment-pill.tsx",
+        "packages/app/src/components/combined-model-selector.tsx",
+        "packages/app/src/components/compact-explorer-sidebar.tsx",
+        "packages/app/src/components/context-window-meter.tsx",
+        "packages/app/src/components/desktop/window-controls.tsx",
+        "packages/app/src/components/dictation-controls.tsx",
+        "packages/app/src/components/download-toast.tsx",
+        "packages/app/src/components/file-explorer-pane.tsx",
+        "packages/app/src/components/headers/back-header.tsx",
+        "packages/app/src/components/highlighted-code-block.tsx",
+        "packages/app/src/components/hosts/host-filter.tsx",
+        "packages/app/src/components/hosts/host-picker.tsx",
+        "packages/app/src/components/import-session-sheet.tsx",
+        "packages/app/src/components/left-sidebar.tsx",
+        "packages/app/src/components/markdown/fence/mermaid/host.native.tsx",
+        "packages/app/src/components/markdown/fence/mermaid/host.web.tsx",
+        "packages/app/src/components/message.tsx",
+        "packages/app/src/components/model-browser.tsx",
+        "packages/app/src/components/plan-card.tsx",
+        "packages/app/src/components/provider-diagnostic-sheet.tsx",
+        "packages/app/src/components/question-form-card.tsx",
+        "packages/app/src/components/realtime-voice-overlay.tsx",
+        "packages/app/src/components/schedules/schedule-row.tsx",
+        "packages/app/src/components/settings/collapsible-row.tsx",
+        "packages/app/src/components/settings/headings/settings-info-tip.tsx",
+        "packages/app/src/components/sidebar-callout.tsx",
+        "packages/app/src/components/sidebar-resize-handle.tsx",
+        "packages/app/src/components/sidebar-workspace-list.tsx",
+        "packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx",
+        "packages/app/src/components/sidebar/sidebar-header-row.tsx",
+        "packages/app/src/components/sidebar/sidebar-section-header.tsx",
+        "packages/app/src/components/sidebar/sidebar-status-list.tsx",
+        "packages/app/src/components/sidebar/workspace-meta-row/index.tsx",
+        "packages/app/src/components/terminal-copy-paste-actions.tsx",
+        "packages/app/src/components/terminal-emulator-native-grid.native.tsx",
+        "packages/app/src/components/terminal-pane.tsx",
+        "packages/app/src/components/toast-host.tsx",
+        "packages/app/src/components/tool-call-sheet.tsx",
+        "packages/app/src/components/welcome-screen.tsx",
+        "packages/app/src/components/workspace-hover-card.tsx",
+        "packages/app/src/components/zoomable-viewport/toolbar.tsx",
+        "packages/app/src/composer/agent-controls/index.tsx",
+        "packages/app/src/composer/diff-stat-pill.tsx",
+        "packages/app/src/composer/dock/internal/background.native.tsx",
+        "packages/app/src/composer/draft/import-pill.tsx",
+        "packages/app/src/composer/index.tsx",
+        "packages/app/src/composer/tracks.tsx",
+        "packages/app/src/desktop/browser/pane/index.electron.tsx",
+        "packages/app/src/git/actions-split-button.tsx",
+        "packages/app/src/git/commits-section/commit-row.tsx",
+        "packages/app/src/git/commits-section/commits-section.tsx",
+        "packages/app/src/git/diff-pane.tsx",
+        "packages/app/src/git/forges/gitlab.view.tsx",
+        "packages/app/src/git/pull-request-panel/checks-section.tsx",
+        "packages/app/src/git/pull-request-panel/pane.tsx",
+        "packages/app/src/git/pull-request-panel/section-kit.tsx",
+        "packages/app/src/hosts/host-chooser.tsx",
+        "packages/app/src/mobile-panels/presentation.tsx",
+        "packages/app/src/panels/new-tab-panel.tsx",
+        "packages/app/src/panels/setup-panel.tsx",
+        "packages/app/src/plugins/buttons/view.tsx",
+        "packages/app/src/review/surface.tsx",
+        "packages/app/src/screens/open-project-screen.tsx",
+        "packages/app/src/screens/project-settings-screen.tsx",
+        "packages/app/src/screens/projects-screen.tsx",
+        "packages/app/src/screens/settings-screen.tsx",
+        "packages/app/src/screens/settings/host-appearance-section.tsx",
+        "packages/app/src/screens/settings/host-page.tsx",
+        "packages/app/src/screens/settings/providers-section.tsx",
+        "packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx",
+        "packages/app/src/screens/workspace/scripts/workspace-scripts-button.tsx",
+        "packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx",
+        "packages/app/src/screens/workspace/workspace-tab-presentation.tsx",
+        "packages/app/src/tool-calls/detail-level/overview/sheet.tsx",
+        "packages/app/src/usage/sidebar-item.tsx",
+        "packages/app/src/usage/window-bar.tsx",
+        "packages/app/src/workspace-labels/manager-modal.tsx",
+        "packages/app/src/workspace-labels/swatch.tsx",
+        "packages/app/src/workspace/open-in-editor/button.tsx"
+      ],
+      "rules": {
+        "paseo/no-raw-pressable": "off"
+      }
+    },
    {
      "files": ["**/e2e/**/fixtures.ts"],
      "rules": {
@@ -1,8 +1,8 @@
 # Changelog

-## 0.12.0-beta.3 - 2026-10-18
+## 0.12.0 - 2026-10-19

-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and close to 100 fixes.
+Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.

 **Before upgrading:** `paseo run --background` is deprecated in favor of `--no-wait`, and `paseo permit allow` and `deny` now exit non-zero when the daemon doesn't confirm within 15 seconds

@@ -29,9 +29,10 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Changed Settings on phones to large tiles grouped into App and Host ([#7129](https://github.com/getpaseo/paseo/pull/7129))
 - Changed Command Center to rank workspaces and agents by match and then recency, and to show timestamps, project icons, and highlighted matches ([#7277](https://github.com/getpaseo/paseo/pull/7277))
 - Added each Paseo subagent's model, thinking, mode, and context under its title in the subagents list ([#7290](https://github.com/getpaseo/paseo/pull/7290))
+- Made subagent rows in the Subagents panel taller on phones, and gave their archive and detach buttons the standard press highlight ([#7364](https://github.com/getpaseo/paseo/pull/7364))
 - Changed Paseo tool calls in chats to lead with the action and its context, such as Send message · the first line of the prompt ([#7283](https://github.com/getpaseo/paseo/pull/7283))
 - Changed the New workspace form on phones to full-width fields, with Import session in the header ([#7239](https://github.com/getpaseo/paseo/pull/7239))
- Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8), [#7342](https://github.com/getpaseo/paseo/pull/7342))
 - Made reopening the sidebar about 45% faster ([#7157](https://github.com/getpaseo/paseo/pull/7157))
 - Made projects and workspaces load faster after the app reconnects ([#7242](https://github.com/getpaseo/paseo/pull/7242))
 - Changed messages one agent sends another through the CLI or MCP to steer its running turn instead of interrupting it ([#5164](https://github.com/getpaseo/paseo/pull/5164) by [@derwells](https://github.com/derwells))
@@ -46,6 +47,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed `paseo plugin reload` failing with a 60-second timeout while the reload was still running ([#6306](https://github.com/getpaseo/paseo/pull/6306) by [@Mtuchel](https://github.com/Mtuchel))
 - Fixed follow-ups sent while a plugin ACP agent runs failing with "Provider does not support prompt.steer" ([#7270](https://github.com/getpaseo/paseo/pull/7270) by [@simonepri](https://github.com/simonepri))
 - Fixed Find showing no matches for prompt text drawn by a timeline plugin ([#7253](https://github.com/getpaseo/paseo/pull/7253) by [@a-grasso](https://github.com/a-grasso))
+- Fixed late-loading composer plugin pills covering Copy and Fork after reopening a chat ([#7341](https://github.com/getpaseo/paseo/pull/7341) by [@sholiday](https://github.com/sholiday))

 ### Fixed

@@ -59,6 +61,8 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed an incomplete font name in Appearance breaking the app's styling ([#6695](https://github.com/getpaseo/paseo/pull/6695))
 - Fixed the Linux desktop window never appearing when the hidden window renders no frames ([#6726](https://github.com/getpaseo/paseo/pull/6726) by [@EhEo](https://github.com/EhEo))
 - Fixed opening another agent or workspace stalling while a different agent on the same host is streaming ([#7074](https://github.com/getpaseo/paseo/pull/7074) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed the project's New workspace button choosing the first host instead of the active workspace's host ([#7308](https://github.com/getpaseo/paseo/pull/7308))
+- Fixed the composer staying focused after switching tabs with keyboard shortcuts in touch browsers ([#7352](https://github.com/getpaseo/paseo/pull/7352))
 - Fixed the daemon running out of memory when several directory searches overlap on a large folder tree ([#7265](https://github.com/getpaseo/paseo/pull/7265))
 - Fixed dragging the Explorer edge stuttering with several panes open ([#7284](https://github.com/getpaseo/paseo/pull/7284) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Fixed agent creation showing an error and a retry draft when the provider rejected the first prompt ([#6379](https://github.com/getpaseo/paseo/pull/6379))
@@ -68,6 +72,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed parent agents missing the finish notification when a child finished its first turn very quickly ([#6008](https://github.com/getpaseo/paseo/pull/6008) by [@ahmet-izgi](https://github.com/ahmet-izgi))
 - Fixed parent agents being told a child finished when its task was stopped or reloaded ([#6660](https://github.com/getpaseo/paseo/pull/6660) by [@Mar-garet](https://github.com/Mar-garet))
 - Fixed Codex chats containing U+2028 or U+2029 failing to reopen on Node 24 ([#5999](https://github.com/getpaseo/paseo/pull/5999) by [@grahameger](https://github.com/grahameger), [@jtsang4](https://github.com/jtsang4), [@kotusenka](https://github.com/kotusenka))
+- Fixed resumed Codex goals appearing idle and refusing Stop after a continuation ([#7339](https://github.com/getpaseo/paseo/pull/7339) by [@hemaaanth](https://github.com/hemaaanth))
 - Fixed Add Project directory search hanging the daemon on macOS when it entered `~/Library` ([#5789](https://github.com/getpaseo/paseo/pull/5789) by [@lardissone](https://github.com/lardissone))
 - Fixed New workspace failing with "Invalid mode" when the saved mode isn't offered by the provider ([#5847](https://github.com/getpaseo/paseo/pull/5847) by [@mcowger](https://github.com/mcowger))
 - Fixed answering multi-select OpenCode v2 questions failing with "Invalid answer" ([#6149](https://github.com/getpaseo/paseo/pull/6149) by [@gammons](https://github.com/gammons))
@@ -99,9 +104,13 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed a service newly added to `paseo.json` failing to start until the daemon restarted ([#6542](https://github.com/getpaseo/paseo/pull/6542))
 - Fixed workspace service URLs returning 502 when the service listens only on IPv6 localhost ([#6753](https://github.com/getpaseo/paseo/pull/6753) by [@marcelocastrobarbosa](https://github.com/marcelocastrobarbosa))
 - Fixed terminals that could not be closed when their command was missing or exited immediately ([#6792](https://github.com/getpaseo/paseo/pull/6792) by [@KiraPC](https://github.com/KiraPC))
- Fixed CJK terminal text gaining spaces between characters after returning to a workspace ([#6452](https://github.com/getpaseo/paseo/pull/6452) by [@jasonhnd](https://github.com/jasonhnd), [@liujin0506](https://github.com/liujin0506), [@seob717](https://github.com/seob717))
+- Fixed MCP terminal key commands typing arrow and modifier key names instead of sending the keys ([#7343](https://github.com/getpaseo/paseo/pull/7343) by [@Aling33](https://github.com/Aling33))
+- Fixed CJK text gaining spaces between characters after returning to a workspace in the native terminal ([#6452](https://github.com/getpaseo/paseo/pull/6452) by [@jasonhnd](https://github.com/jasonhnd), [@liujin0506](https://github.com/liujin0506), [@seob717](https://github.com/seob717))
 - Fixed copying Korean text from the terminal on iOS and Android adding spaces between characters or dropping the first one ([#7254](https://github.com/getpaseo/paseo/pull/7254), [#7260](https://github.com/getpaseo/paseo/pull/7260) by [@helloimdevman](https://github.com/helloimdevman))
+- Fixed long-pressing a Korean word in the terminal on iOS and Android selecting only one character instead of the whole word ([#7353](https://github.com/getpaseo/paseo/pull/7353))
 - Fixed the self-hosted web app failing to connect through a reverse proxy on port 80 or 443 ([#6638](https://github.com/getpaseo/paseo/pull/6638) by [@kiawin](https://github.com/kiawin))
+- Fixed the Hub connection never reconnecting after a silent network failure ([#7315](https://github.com/getpaseo/paseo/pull/7315))
+- Fixed remote connections failing on slow networks when another resolved address is unreachable ([#7336](https://github.com/getpaseo/paseo/pull/7336))
 - Fixed assistant file links with spaces or non-ASCII characters failing with ENOENT ([#6520](https://github.com/getpaseo/paseo/pull/6520) by [@apple-ouyang](https://github.com/apple-ouyang), [@sunshinehomeyu-blip](https://github.com/sunshinehomeyu-blip))
 - Fixed local images in agent replies failing to load when their path contains spaces or non-ASCII characters ([#6877](https://github.com/getpaseo/paseo/pull/6877))
 - Fixed Markdown file previews not showing images referenced by relative paths ([#6750](https://github.com/getpaseo/paseo/pull/6750) by [@apple-ouyang](https://github.com/apple-ouyang))
@@ -158,7 +167,10 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed `nix build .#desktop` running out of memory on Macs with less than 15 GB of RAM ([#6537](https://github.com/getpaseo/paseo/pull/6537) by [@truelecter](https://github.com/truelecter))
 - Fixed usage providers changing places after Refresh all ([#6947](https://github.com/getpaseo/paseo/pull/6947) by [@sleroq](https://github.com/sleroq))
 - Fixed usage cards losing their last values and showing "Updated" when a refresh fails ([#7246](https://github.com/getpaseo/paseo/pull/7246))
+- Fixed Usage merging distinct Cursor accounts into one card ([#7344](https://github.com/getpaseo/paseo/pull/7344))
 - Fixed the OpenCode Go usage icon being nearly invisible on dark themes ([#6362](https://github.com/getpaseo/paseo/pull/6362) by [@az33zy](https://github.com/az33zy))
+- Fixed generic icons for Devin, Hermes, Kiro, and Antigravity in provider lists ([#7330](https://github.com/getpaseo/paseo/pull/7330) by [@OMEG-Lu](https://github.com/OMEG-Lu), [@kevenhu001-cyber](https://github.com/kevenhu001-cyber))
+- Fixed sidebar setup buttons overflowing the card with long translated labels ([#7312](https://github.com/getpaseo/paseo/pull/7312) by [@gentslava](https://github.com/gentslava))

 ## 0.11.4 - 2026-10-15

@@ -46,6 +46,7 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/rpc-namespacing.md](docs/rpc-namespacing.md)                   | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
 | [docs/protocol-compatibility.md](docs/protocol-compatibility.md)     | Why app/daemon versions drift, protocol vs feature contract, capability gating, COMPAT tagging                                 |
 | [docs/protocol-validation.md](docs/protocol-validation.md)           | zod-aot generated inbound WebSocket validation, patched compiler regressions, schema-purity rules                              |
+| [docs/connected-hosts.md](docs/connected-hosts.md)                   | Daemon-owned host registrations, routed SDK scopes, identity and authority boundaries                                          |
 | [docs/permissions.md](docs/permissions.md)                           | Semantic daemon permissions, principals, credentials, pairing invitations, and Hub authority                                   |
 | [docs/terminal-performance.md](docs/terminal-performance.md)         | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
 | [docs/agent-stream-performance.md](docs/agent-stream-performance.md) | Assistant text pipeline — coalescing window, paced reveal, why arrival lumps are smoothed at render                            |
@@ -4,6 +4,9 @@ Paseo is a client-server system for monitoring and controlling local AI coding a

 Your code never leaves your machine. Paseo is local-first.

+Daemon-owned outbound connections and routed API scope ownership are described in
+[Connected hosts](connected-hosts.md).
+
 ## System overview

 ```
@@ -0,0 +1,83 @@
+# Connected hosts
+
+A saved host belongs to the daemon that stores it. The app's saved connections remain a separate list.
+Connect A to B through `paseo --host A host` or `paseo.hosts`. Consumers select B by its learned `serverId`; management uses the stable
+`registrationId` created before B is reachable.
+
+## Ownership and authority
+
+Credentials live in A's `hosts.json`, written atomically with mode `0600` on POSIX systems. Discovery returns a safe
+target description. Replacement inputs never come back through a read API. Keep this file private
+when collecting diagnostics or backing up daemon state.
+
+The authenticated producer owns its source key. Repeating an unchanged add returns the saved entry,
+including a user's disabled state. Changed input requires an explicit update. Display labels and
+access can be changed by users with `tunnel.manage`; connection and metadata changes require the
+producer or `access.manage`. Removing a producer-managed entry allows that producer to add it again.
+Disabling retains the opt-out.
+
+Each enabled registration owns one physical daemon link, shared by status monitoring and every
+routed API scope. Each scope owns an isolated virtual session on B. A derives its identity from the
+admitted origin session, producer, and logical SDK scope. B admits virtual sessions under the actual
+physical link principal, then intersects forwarded caller grants with that link's current authority.
+Changing or resuming a parent's grants closes its existing channels; reconnect re-admits demand with
+current authority. A routed API cannot select a second hop, and saving a host grants no reverse access.
+
+A producer that registers a host through a routed API is qualified on B as
+`route:<B principal>:<A serverId>:<A producer>`, with each component percent-encoded. This namespace belongs to the authenticated link
+principal. An ordinary direct B consumer does not become that producer by supplying a source key.
+The optional `server_info.sourceId` reports this producer identity separately from the authenticated admission principal.
+Trusted server plugins retain the authority of their runtime; they are not sandboxed by this feature.
+
+A managed child has a qualified `{serverId, agentId}` address on every host. The parent's daemon owns membership and lifecycle intent; a destination's parent pointer is metadata. Workspace comparisons include the server ID, so matching workspace strings on different hosts do not share lifecycle ownership. Preserve the archive policy in [agent lifecycle](agent-lifecycle.md). The first child snapshot carries the owner's ledger projection even while creation is pending, because tab placement runs before creation finishes. Explicit clearing survives list and disk-cache round trips; a parent pointer or label cannot recreate membership on a capable daemon.
+
+Retained app conversations bind their stores, queries, initialization and layout to origin authority as well as destination. Two routes to B therefore keep separate cached evidence and command capabilities. Provider catalog pushes belong to that same destination binding, including facts shown in the parent's track. Route restore remembers an origin ID, then reacquires current authority; persisted namespaces grant no access.
+
+Durable relationships retain a stable authority reference and creation ceiling, never live credentials or execution capabilities. Recovery must resolve current authority through its owner. Derived runtime sessions cannot authorize their own recovery. Execution-scoped admissions and non-owner durable references without a supported authority resolver fail explicitly; do not recover them through the daemon owner's MCP runtime.
+
+Before accepting new writes, the daemon adopts eligible pre-feature local parent labels into authoritative membership. The upgrade records its bounded candidates before qualifying agent metadata, then resumes those candidates after interruption. It never rescans later label edits. Existing membership, including forgotten entries, takes precedence; explicit null or qualified parent pointers do not establish legacy provenance. Adopted entries preserve the old daemon-owned local lifecycle, not an authenticated creator grant, and contain no creation recipe to replay. Recovery still resolves current owner authority within the retained self-only ceiling.
+
+Provider-owned subagents are descriptors and timelines in `ProviderSubagentStore`, not `AgentStorage` records. They retain their provider observation/cancellation path. Internal managed agents and execution-owned records are separate stored/runtime concepts and are excluded from adoption on both sides of the relationship.
+
+## Connections and recovery
+
+The shared Node connector owns the target grammar and each connection attempt, including a fresh
+SSH process. SSH reaches an already running daemon. The shared client connection lifecycle owns
+physical reconnect and keepalive; the registry retains configuration, identity acceptance, and recovery
+status. Unreachable registrations remain saved. Identity is pinned when discovered. Self and duplicate
+registrations remain inspectable; a changed destination requires explicit identity replacement.
+
+Both daemons advertise `connectedHosts`; the shared link additionally requires `hostMultiplexing`.
+A completes capability and pinned-identity checks on each physical recovery before admitting channels. There is no local fallback. An older daemon continues to serve existing local
+operations; requesting this feature gives update guidance.
+
+Disposing a routed API releases its observations and session. It does not remove the saved host or
+affect sibling API scopes. Disposing the origin cascades to its derived scopes. Observations restore
+through the usual owned-subscription contract. The ordinary client queues new requests while connecting
+within its existing deadline and rejects requests while disconnected. Connection loss clears old
+waiters and queued sends. Submitted requests with no response fail with `DaemonConnectionError`
+(`DAEMON_CONNECTION_LOST`), optional `outcome: "unknown"` and known `serverId`. Inspect the destination
+before retrying a mutation.
+Ordinary non-recoverable mutations are not automatically replayed. Existing acknowledged/idempotent
+creation recovery retains its request identity and resumes through the ordinary creation lifecycle. Multiplexing changes only the transport: ordinary permission
+RPC codes pass through unchanged, and connection/recovery behavior matches direct clients.
+
+Creation cancellation fences a reserved creation identity before admission. An admitted receipt can precede resource readiness and cannot be reported as canceled. Observe its current receipt and later changes through the ordinary SDK instead of replaying an uncertain prompt. Parent archive retains a pending obligation until cancellation or destination lifecycle confirmation; explicit forget removes local membership without claiming the destination changed.
+
+Run journals retain submission and provider-turn identity. Restarted nonterminal evidence is interrupted, and subsequent evidence must match that turn. Idle and reconnect do not prove completion. A storage failure retains observed evidence with pending durability; a later read retries persistence. Notification recovery must preserve checkpoint identity and this durability distinction.
+
+Text session envelopes carry a channel identifier. Binary routing adds an opcode, a bounded UTF-8
+channel identifier, and the original terminal or file-transfer bytes. It never converts those bytes to
+base64 JSON. The existing direct binary opcodes and 100 MiB message limit remain unchanged; routed
+payloads reserve space for the routing header inside that limit. Relay encryption retains its own
+existing frame limit.
+
+Host links cap saved registrations, simultaneous channels, handshake lifetime, frames, physical
+output, and aggregate queued bytes. Capacity checks use the actual escaped outer JSON or binary
+frame size. Awaitable output completes when the physical send completes. An overflowing channel
+closes without closing siblings or the saved link. Routed sessions release resources on disconnect;
+subscription demand is rebuilt by its owning client on reconnect.
+
+See the [SDK reference](../public-docs/sdk/reference.md#clienthosts),
+[CLI reference](../public-docs/cli.md#connected-hosts), and
+[plugin reference](../public-docs/plugins/reference.md#connected-hosts).
@@ -20,7 +20,7 @@ A semantic element used in three or more places is a primitive. One of a kind is

 Primitives live in `packages/app/src/components/ui/` and `packages/app/src/components/headers/`. Card and row layout live in `packages/app/src/styles/settings.ts`. Section structure lives in `packages/app/src/screens/settings/settings-section.tsx`.

-A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.
+A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A pressable wrapping an icon is wrong; the icon action is `<ToolbarButton>` (`packages/app/src/components/ui/pane-content-toolbar.tsx`), which owns the hitbox, the rounded `interactionHighlight` fill on hover and press, the compact size, and the tooltip. Rows on a menu surface are `<MenuItem>`, or `<ComposerTrackRow>` in a track panel; other rows are `<PressHighlight>` (`packages/app/src/components/ui/press-highlight.tsx`), which flashes on native the moment a finger lands. A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.

 Before adding a new component, read `components/ui/`. The primitive usually exists.

@@ -249,6 +249,7 @@ New status pills use `<StatusBadge>`. Identity, shortcut, and interactive link b

 - `fontWeight.medium` on row titles, body text, button labels, badge text, or `<SidebarCallout>` titles. Medium is reserved for the structural-label tier described in §3 — section labels, modal/sheet titles, dense metadata emphasis, and tight action labels. Anything else is `normal`. `<ScreenTitle>` is responsive `400/300` and is never overridden.
 - `<Pressable>` wrapping `<Text>` to make a button. `<Button>` exists.
+- Importing `Pressable` or a `Touchable*` outside `components/ui/`. A raw pressable has no standard press or hover feedback, so every one drifts. `paseo/no-raw-pressable` reports it; the files on its burn-down list in `.oxlintrc.json` may only leave it.
 - Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
 - A muted paragraph between a section header and its card. Section-level explanation is the header's `info` tooltip (§7).
 - A "Settings" CTA on a detail page. Detail pages are settings; settings is reached from the sidebar, the host entry, or a row's kebab menu.
@@ -11,7 +11,7 @@ contracts.

 ## Panel host contract

-Every desktop panel registers its supported `PaneHost` values and presentation. Launchers derive
+Every panel registers its supported `PaneHost` values and presentation. Launchers derive
 fixed-target labels and icons from that registration, filter by host, and never substitute one
 panel type for another. Tab moves reject unsupported destinations, and placement resolves only to
 a compatible pane.
@@ -21,7 +21,10 @@ so a pane’s + menu omits each while that pane already contains it. Closing one
 item available again. Other compatible tabs, including agents, terminals, files, and diffs,
 can move between Explorer and main panes.
 Keep panel implementations independent of either shell. `WorkspacePanelHost` owns mounting and
-retention, while each shell owns its tabs, focus, dragging, resizing, and shortcuts.
+retention. The shared Explorer owns its tab rail; its shared frame owns visibility, activity and
+close-gesture lifetime. Platform adapters own resizing and inset geometry.
+The host keeps three recently used tabs plus modified tabs; unmodified tabs beyond that budget
+can remount. Native retained content stays live, while web chat uses its existing deferred Freeze.

 ## Sheets

@@ -40,11 +43,11 @@ remounts its panel. Revealing a target that already has a sheet uncovers that sh
 ones above it, except ones holding unsaved work, which stay where they are. Opening a sheet as a tab
 dismisses the sheets above it, since the tab would sit under them. The stack is not persisted.

-Sheets are modal and cover the whole compact column, header included. A sheet's header is its drag
+Sheets are modal and cover the whole compact workspace, including the header and Explorer. A sheet's header is its drag
 handle, because the panel scrolls on its own and content panning would fight it. Its trailing rail
 holds icon buttons only (`SheetHeaderIconButton`): Open as tab is the full-screen glyph beside
 Close, so the title keeps its width. The sheets present
-from inside the compact column's `SheetHostScope`, so their panels read the navigator and every
+from the shared workspace's `SheetHostScope`, so their panels read the navigator and every
 workspace provider an ordinary pane has without a context bridge
 ([floating-panels.md Gotcha 6](floating-panels.md#gotcha-6--bottom-sheet-refs-are-not-lifecycle-truth)).

@@ -56,12 +59,16 @@ the sheet's tab into a pane, and edits the autosave has not started writing are
 ## Explorer sidebar

 `packages/app/src/workspace-tabs/explorer-sidebar.ts` owns show, hide, toggle, and view selection.
-On desktop, the shell is rendered outside the workspace split canvas so it divides the full
-workspace, including the header. It has its own persisted width and resize handle. Main-pane splits
+One Explorer host stays beside the center column across compact overlays and docks. Keep its
+providers and gesture roots at the same React position when width or appearance changes. The
+workspace route preserves panel ancestry during appearance updates. Appearance-dependent leaves
+subscribe to theme changes; the file editor reconfigures its existing editor theme compartment.
+Ordinary leaf routes retain the stack appearance policy.
+The shell is outside the workspace split canvas so it divides the full workspace, including the header. It has its own persisted width and resize handle. Main-pane splits
 never read or modify that width.

 `packages/app/src/workspace-tabs/open-supporting-view.ts` owns semantic Changes and pull-request
-opens. Compact and wide native layouts select the matching Explorer tab. Desktop Changes opens
+opens. Compact and wide native layouts select the matching workspace tab in Explorer. Desktop Changes opens
 follow the shared diff preference. Desktop pull requests use their Main panel, On the side, or
 Explorer sidebar setting. Automatic PR discovery follows that preference once per workspace without
 interrupting the user's work. Closing the tab opts that workspace out of future automatic opens,
@@ -76,18 +83,37 @@ literal `"explorer"` pane id and `explorerPaneIdByWorkspace` key for compatibili

 Explorer uses the shared workspace tab row and ordinary tab context menus. Files and Changes
 hide their close buttons through the panel manifest; close them from the tab context menu.
-Other tabs reveal the close control on hover. The + menu opens compatible panels in the dock and
-omits Agent and terminal profiles. Agents and terminals can still be dragged into Explorer.
+Other tabs reveal the close control on hover. The + menu opens compatible panels in the dock, including Agent and terminal profiles.
+Web also supports dragging agents and terminals into Explorer.
 Bulk-close actions apply only to the dock's tabs. Explorer tabs can be reordered and dragged
 between compatible panes, but the dock cannot be split or maximized. Selecting an Explorer tab
-does not change workspace focus.
+does not change workspace focus. Web dragging shares the workspace drag scope; compact layouts
+accept only reordering inside the source pane.

-Cmd+E shows or hides Explorer without changing its selected view. Compact layouts use the combined
-full-screen Explorer overlay for Changes, Files, and pull requests, and close it after a file opens. Compact Changes has no tree rail; its overview is the Jump to file action (`packages/app/src/git/jump-to-file/`), a sheet over the same changed-files tree the desktop rail renders.
-Wide native layouts without pane splits use the same combined content in a resizable inline dock;
-opening a file leaves that dock visible. Both presentations keep their selection in the panel store
-and reuse the layout store's per-workspace Explorer width. They do not create a second Explorer
-lifecycle.
+Cmd+E shows or hides Explorer without changing its selected view. All layouts use the same
+workspace tabs, launcher, and panel host. Below 600 points the shell is the swipeable Explorer
+overlay; at 600 points and above it reserves width beside the workspace. Native docking keeps its
+touch resize handle. Full workspace splits remain a separate web-only capability.
+
+The dock reserves at least 240 points and the workspace 360. App navigation yields when it cannot
+share the remaining width with both. This keeps a portrait tablet from rendering three unusably
+narrow columns; widening restores navigation without changing its saved open state.
+
+Compact panel gestures own overlay visibility; the workspace layout owns its tab selection and
+contents on every platform. Explicit pane destinations bypass compact sheet placement, so choosing
+a panel in Explorer's + menu keeps it there. Ordinary compact file and subagent look-ups still use
+the sheet policy. Resolving an existing main tab reveals center immediately; a new file sheet
+keeps Explorer underneath and closing the sheet uncovers it. Semantic navigation resolves the
+actual destination before revealing it, including deduplicated targets.
+
+Compact overlay selection and saved dock visibility are independent. Folding changes geometry,
+not either mode’s visibility intent. Native workspace retention remains one workspace; web retains
+up to ten with its existing inactive TTL.
+
+PR discovery belongs to the active workspace: split layouts discover while active, and other
+layouts discover while Explorer is active. The rail requests summary status; selected visible PR
+content also requests timeline data. Inactive consumers read cached data without request demand.
+Discovery uses ordinary PR tabs and their existing once-per-workspace close opt-out.

 ## Side pane

@@ -157,7 +157,9 @@ a small `withUnistyles` boundary without subscribing the route tree itself to
 every Unistyles runtime update.

 Navigators keep their identity across appearance changes. `ThemedStack` remounts
-each screen's content below the native stack when appearance tokens change; a
+each ordinary screen's content below the native stack when appearance tokens change.
+Workspace screens own retained panel lifetimes and update appearance at their
+leaves through `screenOwnedAppearance` ([Explorer](explorer-sidebar.md)). A
 keyed wrapper above a stack remounts the stack itself, and Android crashes when
 that happens while a FragmentManager transaction is running, which settings
 hydration at startup makes likely. A screen that mounts a nested navigator (the
@@ -32,7 +32,9 @@ The UI worklet owns transient motion:

 React publishes the active panel only when the canonical target and the UI-thread position agree at
 the final anchor. Retained content never observes gesture previews, progress, or an unsettled target.
-The gesture hosts stay mounted. Native worklets own overlay opacity and pointer events while
+The gesture hosts stay mounted. The Gesture Handler web patch keeps initially disabled hosts
+from capturing paragraph pointers; that capture confines browser selection to its starting paragraph.
+Native worklets own overlay opacity and pointer events while
 React owns settled panel activity and accessibility. Keep hidden native overlays laid out: collapsing
 their scroll ranges makes Android spring retained offsets back to zero during touch cancellation or
 release. Native panel hosts and their dependent draggable lists
@@ -31,6 +31,10 @@ A pairing invitation is neither. It is an expiring, single-use exchange that cre

 Agents and terminals use workspace authority. Both can execute code and mutate the workspace, so separate write permissions would claim an isolation boundary the daemon cannot enforce.

+Connected-host management uses `tunnel.manage`; source-owned connection and metadata replacement
+requires the producer or `access.manage`. Routed operations retain both caller and link authority,
+see [Connected hosts](connected-hosts.md#ownership-and-authority).
+
 Owner, operator, and viewer are UI presets expanded into explicit permissions. Do not persist them as roles. Adding a permission must not silently widen an existing principal.

 Permissions are additive allows. Missing authority denies the operation. Do not add deny precedence.
@@ -240,8 +240,9 @@ Do not put any other code modules in the plugin root.

 Shared files import contract helpers and types from `@getpaseo/plugin`. Server handler files import
 `PluginHandlerContext` from `@getpaseo/plugin/server`. Client files import Paseo UI from
-`@getpaseo/plugin/client/react-native`. Its `Icon` resolves a Lucide name using the client's installed icon
-set; an unknown name renders nothing so it cannot break the plugin surface.
+`@getpaseo/plugin/client/react-native`. Its `Icon` draws a Lucide name from the client's installed
+icon set, or any `PluginIcon` through its `icon` prop; an unknown name or unsafe SVG renders nothing
+so it cannot break the plugin surface.
 Its controlled modal keeps presentation metadata on `<Modal title="…" icon={…}>` and body UI in
 `<Modal.Content>`. Body layout, sheet-aware scrolling, and clipboard actions follow the
 [host UI contract](../public-docs/plugins/reference.md#host-ui).
@@ -332,7 +333,7 @@ created by plugin code. Paseo removes registered contributions, unmounts surface
 state, rejects pending RPCs, closes the plugin's daemon session, and stops the subprocess. Cleanup
 errors are logged and do not interrupt host teardown.

-Paseo owns the route, screen header, Lucide icon validation, close action, theme DTO, layout facts,
+Paseo owns the route, screen header, icon validation, close action, theme DTO, layout facts,
 and render error boundary. The contributed component owns the complete body below the header.
 The plugin owns the header's text through the screen's `title` (`resolvePluginScreenTitle` in
 `plugins/surface-contribution.ts`). A legacy `addSidebarItem` route (`/sidebar/<id>`) shows the
@@ -400,6 +401,25 @@ See the public [navigation fields](../public-docs/plugins/reference.md#screens-a
 and [external links and workspace browsers](../public-docs/plugins/reference.md#external-links-and-workspace-browsers)
 for the author-facing contract.

+### Plugin icons
+
+The [public reference](../public-docs/plugins/reference.md#icons) owns the author API: a contribution
+`icon` is a Lucide name, `{ svg }`, or a component.
+
+- `findSvgIconProblem` in the SDK root (`packages/plugin/src/icons.ts`) is the only SVG rule set.
+  The daemon applies it to provider and usage-source icon files; the app applies it to inline
+  icons. Change the rules there, never at a call site.
+- The app validates each icon once, at registration, through `parsePluginIcon` in
+  `packages/app/src/plugins/icons.ts`. Rendering trusts the stored icon.
+- That module is the only code that branches on the icon form. Surfaces draw with
+  `PluginIconView`, or take a stable component from `pluginIconComponent` when their slot expects
+  one. Lucide and SVG icons receive only size and color, so the host props a button passes to its
+  component icon never reach an SVG element.
+- Attachment sources take `PluginSerializableIcon`: composer drafts persist the source's icon with
+  each attachment, and a component cannot be stored.
+- The plugin compiler loads `.svg` imports as text, so `import icon from "./client/icon.svg"` is the
+  markup string.
+
 ## Lifecycle hooks

 Server entries register lifecycle observers with `server.on()` and request transforms with
@@ -491,15 +511,13 @@ provider implementation. The public [provider plugin guide](../public-docs/plugi
 owns author workflow, lifecycle, testing, and distribution guidance.

 `ProviderRegistration.icon` is a file path relative to the plugin directory, such as `icon.svg`.
-It must resolve inside that directory to a regular SVG file no larger than 64 KiB. The SVG must be
-self-contained: scripts, styles, `foreignObject`, event-handler attributes, JavaScript URLs, and
-external `href` or `xlink:href` references are rejected. Fragment references such as `#mark` are
-allowed. Paseo reads and sanitizes the file when the plugin starts; the string is never an inline
-SVG or URL.
+It must resolve inside that directory to a regular file that passes the shared SVG icon rules
+(see [Plugin icons](#plugin-icons)). Paseo reads and validates the file when the plugin starts; the
+string is never inline SVG or a URL.

 ## Usage sources

-Register a usage source from `index.server.ts` with `server.registerUsageSource()`. Import `UsageSourceRegistration` and normalization helpers from `@getpaseo/plugin/server/usage`. The plugin owns account discovery, harness labels, and credential-store reads; the daemon owns account grouping and the fetch cache. Agent popovers use only the agent's own login. The host-wide Usage modal falls back across an account's logins; any success shows usage only, and all failures show every login's labeled error and remedy. Follow the [usage source discovery contract](../public-docs/plugins/reference.md#usage-sources). The resolved launch environment crosses into the trusted, unsandboxed plugin subprocess for session discovery. Usage queries never run lifecycle hooks. Inputs are validated in the plugin process and remain daemon-side. `icon` uses the same sanitized SVG file rules as provider icons.
+Register a usage source from `index.server.ts` with `server.registerUsageSource()`. Import `UsageSourceRegistration` and normalization helpers from `@getpaseo/plugin/server/usage`. The plugin owns account discovery, harness labels, and credential-store reads; the daemon owns account grouping and the fetch cache. Agent popovers use only the agent's own login. The host-wide Usage modal falls back across an account's logins; any success shows usage only, and all failures show every login's labeled error and remedy. Follow the [usage source discovery contract](../public-docs/plugins/reference.md#usage-sources). The resolved launch environment crosses into the trusted, unsandboxed plugin subprocess for session discovery. Usage queries never run lifecycle hooks. Inputs are validated in the plugin process and remain daemon-side. `icon` uses the same SVG file rules as provider icons.

 The daemon calls discovery for `usage.list_reports`; the client gates this RPC on `server_info.features.usageSources`. The old `provider.usage.list` RPC maps discovered reports for older clients.

@@ -74,6 +74,14 @@ The adapter keys legacy slots by physical socket, so an old connection cannot re
 sibling's observation even when both use the same logical client ID. Optional wire IDs stay accepted
 for parsing compatibility; modern requests cannot select their subscription ID.

+Workspace setup details negotiate `workspace_setup_observation` with
+`server_info.features.workspaceSetupObservation`. Capable clients cannot request details through
+the legacy session event category. The setup panel owns a workspace-scoped observation while
+active and visible; directory metadata signals failures without requesting output. Older clients
+retain their legacy event delivery. A new app makes no setup event demand on older hosts and
+requires a host update to view details. Subscription-capable older hosts honor that absence of
+demand; broadcast-era hosts require an update before wire silence is guaranteed.
+
 ## Every shim is tagged and dated

 A shim that exists for old-app or old-daemon support carries a comment naming it, the version it arrived in, and when it can go:
@@ -95,7 +95,7 @@ Use OpenCode v2 execution events to trigger turn completion, with active-state a

 V2.0.4 also removed the activation endpoint that gated a cold location, and a cold location registers its config-derived commands, skills, and providers asynchronously. Wait until `plugin.list` returns a populated inventory before reading the catalog or commands; an empty inventory means the location is still warming. Fail when the readiness deadline expires, including when an inventory request stalls.

-Paseo installs its OpenCode tool bridge through `OPENCODE_CONFIG_CONTENT`. V1 accepts a plugin file; v2 silently skips configured files and requires a package directory with a server entry point. Both versions use the daemon's private loopback bridge for caller-scoped tools. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifacts contain no session data or secrets. V2 also needs this plugin when native Paseo tools are disabled: its prompt API has no structured-output format, so the plugin supplies a schema-validated final-answer tool.
+Paseo installs its OpenCode tool bridge through `OPENCODE_CONFIG_CONTENT`. V1 accepts a plugin file; v2 silently skips configured files and requires a package directory with a server entry point. Both versions use the daemon's private loopback bridge for caller-scoped tools. The global manifest must use agent-scoped schemas before a session is bound, because every bridge call executes in an agent session. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifacts contain no session data or secrets. V2 also needs this plugin when native Paseo tools are disabled: its prompt API has no structured-output format, so the plugin supplies a schema-validated final-answer tool.

 An agent with custom environment variables or user-configured MCP servers gets a dedicated OpenCode server. V2 supports session environment, but its MCP configuration remains location-scoped, so separate servers still prevent one agent from changing another agent's MCP setup. Configure custom MCP with `mcp.add`; do not follow it with `mcp.connect`, which only toggles config-backed servers.

@@ -193,7 +193,7 @@ Test suites in this repo are heavy. Running them in bulk freezes the machine, es
 - Playwright specs that exercise only the daemon import `daemonTest` from the shared fixtures so they do not create a browser context or page.
 - Helpers that create projects or workspaces own those records until cleanup. Their clients remove the daemon project on close, and an automatic fixture fails any test that still leaks a project record. Deleting only the temporary directory is not cleanup. Agent helpers pass the intended `workspaceId` through to agent creation; they never infer ownership from `cwd`.
 - Tests whose subject is daemon-global state, such as an empty history or daemon restart, start a dedicated host explicitly. Filenames and directories describe product behavior, never execution order or isolation mechanics.
- Global setup accepts Metro as ready only when `/status` returns `packager-status:running`, then fetches the document's scripts so the cold bundle compilation finishes before Playwright's per-test timeout starts. A generic TCP listener is not sufficient readiness evidence. The browser suite uses direct local daemon connections and does not start a relay.
+- Global setup accepts Metro as ready only when `/status` returns `packager-status:running`, then fetches the document's scripts so the cold bundle compilation finishes before Playwright's per-test timeout starts. A generic TCP listener is not sufficient readiness evidence. The browser suite uses direct local daemon connections and does not start a relay. Automated Metro launches set `EXPO_UNSTABLE_HEADLESS=1` so Expo does not download the native DevTools shell into temporary test homes; its read-only cache breaks teardown. Browser fixtures and the standalone Electron browser runner share the developer-toast dismissal helper while retaining console logs. A pointer click moves hover away from the tested control and stalls behind app modal backdrops.
 - The app Playwright harness boots on Windows as well as POSIX. Spawn Node entrypoints through `process.execPath`, not `npx` or `node_modules/.bin` shims: Node refuses to spawn `.cmd` or `.bat` without `shell: true`, and shell mode concatenates argv without escaping and sends kill signals to `cmd.exe` instead of the real child.
 - Teardown kills the process tree, because a Windows signal reaches only the direct child and leaves forked workers holding the listening port.
 - The `asdf`-backed local Elixir relay stays POSIX-only, so the `relay-deployment` Playwright project is unavailable on Windows.
@@ -0,0 +1,8 @@
+Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
+
+Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
+
+Added
+- Added background workspaces, hidden from the sidebar unless Show background is on
+
+Full notes: https://paseo.sh/changelog
@@ -0,0 +1,8 @@
+Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
+
+Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
+
+Added
+- Added background workspaces, hidden from the sidebar unless Show background is on
+
+Full notes: https://paseo.sh/changelog
@@ -0,0 +1,8 @@
+Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
+
+Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
+
+Added
+- Added background workspaces, hidden from the sidebar unless Show background is on
+
+Full notes: https://paseo.sh/changelog
@@ -0,0 +1,8 @@
+Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
+
+Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
+
+Added
+- Added background workspaces, hidden from the sidebar unless Show background is on
+
+Full notes: https://paseo.sh/changelog
@@ -45,6 +45,21 @@
        }
      );

+      checks = forAllSystems (
+        system:
+        let
+          pkgs = pkgsFor system;
+          packages = self.packages.${system};
+          license = (builtins.fromJSON (builtins.readFile ./package.json)).license;
+        in
+        {
+          license-metadata =
+            assert packages.paseo.meta.license.spdxId == license;
+            assert packages.desktop.meta.license.spdxId == license;
+            pkgs.runCommand "paseo-license-metadata" { } "touch $out";
+        }
+      );
+
      nixosModules.default = self.nixosModules.paseo;
      nixosModules.paseo =
        { pkgs, lib, ... }:
@@ -257,7 +257,7 @@ buildNpmPackage {
  meta = {
    description = "Paseo desktop app (Electron wrapper)";
    homepage = "https://github.com/getpaseo/paseo";
-    license = lib.licenses.agpl3Plus;
+    license = lib.licenses.asl20;
    mainProgram = "paseo-desktop";
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
@@ -1 +1 @@
-sha256-tSE4nb4E06GFZ8I9UEbo93nlPiAKtW00nkywgKQmMhI=
+sha256-7B/Zyo/DaHdd3PVq8Hn1HG+x+wLdZBVxgx/cbtaM/S8=
@@ -148,7 +148,7 @@ buildNpmPackage rec {
  meta = {
    description = "Self-hosted daemon for Claude Code, Codex, and OpenCode";
    homepage = "https://github.com/getpaseo/paseo";
-    license = lib.licenses.agpl3Plus;
+    license = lib.licenses.asl20;
    mainProgram = "paseo";
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.12.0-beta.3",
+  "version": "0.12.0",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -137,16 +137,21 @@
    "oxlint-tsgolint": "^0.22.1",
    "patch-package": "^8.0.1",
    "playwright": "^1.56.1",
+    "react-dom": "19.2.3",
    "typescript": "^5.9.3",
    "ws": "^8.20.0"
  },
  "overrides": {
    "@codemirror/language": "6.12.4",
    "@codemirror/view": "6.43.6",
+    "expo": "~57.0.30",
+    "expo-router": "~57.0.28",
    "lightningcss": "1.30.1",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
-    "react-native-reanimated": "4.3.1",
-    "react-native-worklets": "0.8.3"
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "react-native": "0.86.3",
+    "react-native-gesture-handler": "~2.32.0",
+    "react-native-reanimated": "4.5.1",
+    "react-native-worklets": "0.10.1"
  }
 }
@@ -171,6 +171,7 @@ export default {
      [
        "expo-build-properties",
        {
+          ios: { enableSceneSupport: true },
          android: {
            minSdkVersion: 29,
            kotlinVersion: "2.1.20",
@@ -2,48 +2,56 @@ import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { test, expect, type Page } from "../support/fixtures";
 import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
-import { openChangesPanel } from "../support/helpers/workspace-tabs";
+import { openChangesPanel, openChangesTreePanel } from "../support/helpers/workspace-tabs";

 function visibleComposer(page: Page) {
  return page.locator("textarea[data-composer-input]").filter({ visible: true }).first();
 }

-test("adds a changed file to the focused chat without replacing its composer draft", async ({
-  page,
-}) => {
-  const workspace = await seedMockAgentWorkspace({
-    repoPrefix: "add-file-to-chat-",
-    title: "Target chat",
-  });
-  const relativePath = "src/changed file.ts";
-
-  try {
-    await mkdir(path.join(workspace.cwd, "src"), { recursive: true });
-    await writeFile(path.join(workspace.cwd, relativePath), "export const changed = true;\n");
-    await workspace.client.checkoutRefresh(workspace.cwd);
-
-    await page.setViewportSize({ width: 1400, height: 900 });
-    await openAgentRoute(page, {
-      workspaceId: workspace.workspaceId,
-      agentId: workspace.agentId,
+for (const width of [1400, 390]) {
+  test(`adds a changed file to the focused chat without replacing its composer draft at ${width}px`, async ({
+    page,
+  }) => {
+    const workspace = await seedMockAgentWorkspace({
+      repoPrefix: "add-file-to-chat-",
+      title: "Target chat",
    });
+    const relativePath = "src/changed file.ts";

-    const agentComposer = visibleComposer(page);
-    await expect(agentComposer).toBeEditable({ timeout: 30_000 });
-    await agentComposer.fill("Preserve this thought");
+    try {
+      await mkdir(path.join(workspace.cwd, "src"), { recursive: true });
+      await writeFile(path.join(workspace.cwd, relativePath), "export const changed = true;\n");
+      await workspace.client.checkoutRefresh(workspace.cwd);

-    await openChangesPanel(page);
-    const changedFile = page.getByText("changed file.ts", { exact: true }).first();
-    await expect(changedFile).toBeVisible({ timeout: 30_000 });
-    await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
-    await page.getByTestId("diff-file-0-add-to-chat").click();
+      await page.setViewportSize({ width, height: 900 });
+      await openAgentRoute(page, {
+        workspaceId: workspace.workspaceId,
+        agentId: workspace.agentId,
+      });

-    const attachment = page.getByTestId("composer-workspace-file-attachment-pill");
-    await expect(attachment).toContainText("changed file.ts");
-    await expect(attachment).toContainText(relativePath);
-    await expect(agentComposer).toHaveValue("Preserve this thought");
-    await expect(agentComposer).toBeFocused();
-  } finally {
-    await workspace.cleanup();
-  }
-});
+      const agentComposer = visibleComposer(page);
+      await expect(agentComposer).toBeEditable({ timeout: 30_000 });
+      await agentComposer.fill("Preserve this thought");
+
+      if (width < 600) await openChangesTreePanel(page);
+      else await openChangesPanel(page);
+      const changedFile = page.getByTestId("diff-file-0-toggle");
+      await expect(changedFile).toBeVisible({ timeout: 30_000 });
+      await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+      await page.getByTestId("diff-file-0-add-to-chat").click();
+
+      const attachment = page.getByTestId("composer-workspace-file-attachment-pill");
+      if (width < 600)
+        await expect(
+          page.getByTestId("workspace-explorer-sidebar").filter({ visible: true }),
+        ).toHaveCount(0);
+      await expect(attachment).toContainText("changed file.ts");
+      await expect(attachment).toContainText(relativePath);
+      await expect(agentComposer).toHaveValue("Preserve this thought");
+      if (width >= 600) await expect(agentComposer).toBeFocused();
+      else await expect(agentComposer).toBeEditable();
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+}
@@ -833,13 +833,15 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
  await openWorkspaceChanges(page, workspace);
  await page.setViewportSize({ width: 480, height: 900 });

-  const compactChangesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
+  const compactChangesTab = page
+    .getByTestId("workspace-tab-changes_tree")
+    .filter({ visible: true });
  if (!(await compactChangesTab.isVisible())) {
    await page.getByTestId("workspace-explorer-toggle").first().click();
  }
  await expect(compactChangesTab).toBeVisible();
  await compactChangesTab.click();
-  const compactExplorer = page.getByTestId("explorer-content-area").filter({ visible: true });
+  const compactExplorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
  await expect(compactExplorer.getByTestId("changes-header")).toBeVisible();

  const actions = compactExplorer.getByTestId("changes-actions-menu-trigger");
@@ -876,6 +878,27 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
  ).toContainText("Scroll long lines");
 });

+test("compact Explorer renders inline hunks with a saved tree-only desktop preference", async ({
+  page,
+}) => {
+  const workspace = await createWorkspaceWithMountedTabDiff();
+  await page.addInitScript(
+    ({ key }) => {
+      localStorage.setItem(key, JSON.stringify({ inlineDiff: false, layout: "split" }));
+    },
+    { key: CHANGES_PREFERENCES_KEY },
+  );
+  const explorer = await openCompactChanges(page, workspace);
+  await expect(explorer.getByTestId("git-diff-canvas")).toBeVisible();
+  await expect(explorer.getByTestId("diff-file-0-toggle")).toBeVisible();
+  await explorer.getByTestId("diff-file-0-toggle").click({ button: "right" });
+  page.once("dialog", (dialog) => dialog.accept());
+  await page.getByTestId("diff-file-0-revert").click();
+  await expect
+    .poll(() => readFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), "utf8"))
+    .toBe(BEFORE);
+});
+
 test("compact Changes jumps to a file from the changed-files sheet", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff({ includeNestedFolders: true });
  await useUnwrappedDiffLines(page);
@@ -1674,10 +1697,10 @@ async function openCompactChanges(page: Page, workspace: DirtyWorkspace): Promis
  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
  await page.reload();
  await page.getByTestId("workspace-explorer-toggle").first().click();
-  const changesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
+  const changesTab = page.getByTestId("workspace-tab-changes_tree").filter({ visible: true });
  await expect(changesTab).toBeVisible({ timeout: 30_000 });
  await changesTab.click();
-  const explorer = page.getByTestId("explorer-content-area").filter({ visible: true });
+  const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
  await expect(explorer.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
  return explorer;
 }
@@ -0,0 +1,115 @@
+import { execFileSync } from "node:child_process";
+import { mkdtemp, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { test, expect, type Page } from "../support/fixtures";
+import { getServerId } from "../support/helpers/server-id";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { createTempGitRepo, resolveTempRoot } from "../support/helpers/workspace";
+import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
+
+// The compact toolbar flattens every git action into one menu, and the policy keeps the actions
+// it can promote to `primary` in `secondary` as well. A promoted action must still show once.
+const cleanupTasks: Array<() => Promise<void>> = [];
+
+test.afterEach(async () => {
+  for (const task of cleanupTasks.splice(0)) {
+    await task();
+  }
+});
+
+async function createRemoteRepo(prefix: string): Promise<string> {
+  const repo = await createTempGitRepo(prefix, {
+    withRemote: true,
+    files: [{ path: "src/app.ts", content: "export const app = 1;\n" }],
+  });
+  cleanupTasks.push(repo.cleanup);
+  // The helper puts the bare remote inside the checkout; keep it out of the status.
+  await writeFile(path.join(repo.path, ".git/info/exclude"), "remote.git/\n");
+  return repo.path;
+}
+
+async function registerWorkspace(repoPath: string): Promise<string> {
+  const client = await connectSeedClient();
+  cleanupTasks.push(async () => {
+    await client.close().catch(() => undefined);
+  });
+  const created = await client.createWorkspace({ source: { kind: "directory", path: repoPath } });
+  if (!created.workspace) {
+    throw new Error(created.error ?? `Failed to create workspace ${repoPath}`);
+  }
+  return created.workspace.id;
+}
+
+async function openCompactActionsMenu(page: Page, workspaceId: string) {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.goto(buildHostWorkspaceRoute(getServerId(), workspaceId));
+  await page.reload();
+  await page.getByTestId("workspace-explorer-toggle").first().click();
+  const changesTab = page.getByTestId("workspace-tab-changes_tree").filter({ visible: true });
+  await expect(changesTab).toBeVisible({ timeout: 30_000 });
+  await changesTab.click();
+  const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  await expect(explorer.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
+
+  const trigger = explorer.getByTestId("changes-actions-menu-trigger");
+  await expect(trigger).toBeVisible({ timeout: 30_000 });
+  await trigger.click();
+  const menu = page.getByTestId("changes-primary-cta-menu");
+  await expect(menu).toBeVisible();
+  return menu;
+}
+
+test("compact git actions menu lists a promoted Pull once", async ({ page }) => {
+  const repoPath = await createRemoteRepo("compact-menu-pull-");
+  cleanupTasks.push(async () => {
+    execFileSync("rm", ["-rf", repoPath]);
+  });
+
+  // Advance origin so the clean checkout is behind it and Pull is the promoted action.
+  const other = await mkdtemp(path.join(await resolveTempRoot(), "compact-menu-other-"));
+  cleanupTasks.push(async () => {
+    execFileSync("rm", ["-rf", other]);
+  });
+  execFileSync("git", ["clone", path.join(repoPath, "remote.git"), other], { stdio: "ignore" });
+  execFileSync("git", ["config", "user.email", "e2e@paseo.test"], { cwd: other, stdio: "ignore" });
+  execFileSync("git", ["config", "user.name", "Paseo E2E"], { cwd: other, stdio: "ignore" });
+  await writeFile(path.join(other, "src/incoming.ts"), "export const incoming = 1;\n");
+  execFileSync("git", ["add", "--all"], { cwd: other, stdio: "ignore" });
+  execFileSync("git", ["commit", "-m", "Incoming commit"], { cwd: other, stdio: "ignore" });
+  execFileSync("git", ["push", "origin", "main"], { cwd: other, stdio: "ignore" });
+  execFileSync("git", ["fetch", "origin"], { cwd: repoPath, stdio: "ignore" });
+
+  const workspaceId = await registerWorkspace(repoPath);
+  const menu = await openCompactActionsMenu(page, workspaceId);
+
+  await expect(menu.getByTestId("changes-menu-pull")).toHaveCount(1);
+  await expect(menu.getByRole("menuitem")).toHaveText([
+    "Pull",
+    "Push",
+    "Pull and push",
+    "Archive workspace",
+  ]);
+});
+
+test("compact git actions menu lists a promoted Push once", async ({ page }) => {
+  const repoPath = await createRemoteRepo("compact-menu-push-");
+  cleanupTasks.push(async () => {
+    execFileSync("rm", ["-rf", repoPath]);
+  });
+  const workspaceId = await registerWorkspace(repoPath);
+
+  // Commit so the clean checkout is ahead of origin and Push is the promoted action.
+  await writeFile(path.join(repoPath, "src/mine.ts"), "export const mine = 1;\n");
+  execFileSync("git", ["add", "--all"], { cwd: repoPath, stdio: "ignore" });
+  execFileSync("git", ["commit", "-m", "Local commit"], { cwd: repoPath, stdio: "ignore" });
+
+  const menu = await openCompactActionsMenu(page, workspaceId);
+
+  await expect(menu.getByTestId("changes-menu-push")).toHaveCount(1);
+  await expect(menu.getByRole("menuitem")).toHaveText([
+    "Push",
+    "Pull",
+    "Pull and push",
+    "Archive workspace",
+  ]);
+});
@@ -125,7 +125,7 @@ test("composer diff stat opens the compact explorer instead of a Changes tab", a
    });

    const closeExplorer = page
-      .getByTestId("explorer-header")
+      .getByTestId("workspace-explorer-sidebar")
      .getByRole("button", { name: "Close Explorer sidebar" });
    await expect(closeExplorer).not.toBeInViewport();

@@ -809,7 +809,7 @@ async function expectUnmatchedFeedback(page: Page) {
 }

 function compactReviewSurface(page: Page) {
-  return page.getByTestId("explorer-content-area").filter({ visible: true });
+  return page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
 }
 async function openCompactReviewExplorer(
  page: Page,
@@ -847,11 +847,15 @@ async function scrollReviewToLastLine(page: Page) {

 async function revealCompactChanges(page: Page) {
  await page.getByTestId("workspace-explorer-toggle").first().click();
-  await page.getByTestId("explorer-header").getByText("Changes", { exact: true }).click();
+  await page
+    .getByTestId("workspace-explorer-sidebar")
+    .getByTestId("workspace-tab-changes_tree")
+    .click();
  await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
 }
 async function expectReviewEditorBody(page: Page, body: string) {
-  await expect(page.getByRole("textbox", { name: "Review comment", exact: true })).toHaveValue(
-    body,
-  );
+  const editor = page.getByRole("textbox", { name: "Review comment", exact: true });
+  // A viewport resize starts the presentation handoff; exactly one editor must remain accessible.
+  await expect(editor).toHaveCount(1);
+  await expect(editor).toHaveValue(body);
 }
@@ -1,6 +1,7 @@
 import { expect, test, type Page } from "../support/fixtures";
 import {
  blurComposerInput,
+  roundTripComposerTabBeforePaint,
  composerLocator,
  enterComposerFullscreen,
  exitComposerFullscreen,
@@ -17,7 +18,6 @@ import {
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import { createMockIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
 import { seedWorkspace } from "../support/helpers/seed-client";
-import { switchComposerTabWithKeyboard } from "../support/helpers/composer";
 import {
  closeMobileAgentSidebar,
  closeMobileExplorer,
@@ -205,19 +205,21 @@ test.describe("touch screen wide enough for the desktop layout", () => {
        title: "Second touch chat",
      });
      await openWorkspaceWithAgents(page, [first, second]);
-      await composerLocator(page).fill("Keep this touch draft");
-      await expectComposerFocused(page);
-      // An external keyboard changes tabs without a pointer click blurring the
-      // editor first. The device still has a touch-primary focus policy.
-      await switchComposerTabWithKeyboard(page, "previous");
-      await expectComposerDraft(page, "");
-      await switchComposerTabWithKeyboard(page, "next");
-      await expectComposerDraft(page, "Keep this touch draft");
-      await expectComposerNotFocused(page);
-      await composerLocator(page).tap();
-      await expectComposerFocused(page);
-      await typeIntoFocusedComposer(page, " after return");
-      await expectComposerDraft(page, "Keep this touch draft after return");
+      // Repeat after an explicit edit so retained focus from an earlier visit is
+      // also dismissed when the same mounted editor becomes inactive again.
+      for (const draft of ["Keep this touch draft", "Edit this touch draft again"]) {
+        await composerLocator(page).fill(draft);
+        await expectComposerFocused(page);
+        // An external keyboard changes tabs without a pointer click blurring the
+        // editor first. The device still has a touch-primary focus policy.
+        await roundTripComposerTabBeforePaint(page, "Second touch chat");
+        await expectComposerDraft(page, draft);
+        await expectComposerNotFocused(page);
+        await composerLocator(page).tap();
+        await expectComposerFocused(page);
+        await typeIntoFocusedComposer(page, " after return");
+        await expectComposerDraft(page, `${draft} after return`);
+      }
    } finally {
      await workspace.cleanup();
    }
@@ -149,7 +149,7 @@ for (const layout of [
          await expect(details.getByText(/tokens$/)).toHaveCount(0);
          const account = usageCard(details, "login-journey:account");
          await expect(account.getByText("Session", { exact: true })).toBeVisible();
-          await expect(account.getByText("31%", { exact: true })).toBeVisible();
+          await expect(account.getByText("31% used", { exact: true })).toBeVisible();
          await qaScreenshot(page, `context-without-data-${layout.name}`);
          await layout.close(page);
        });
@@ -161,7 +161,7 @@ for (const layout of [
          await expect(details.getByText("32k / 128k tokens", { exact: true })).toBeVisible();
          await expect(details.getByText("No context data", { exact: true })).toHaveCount(0);
          await expect(
-            usageCard(details, "login-journey:account").getByText("31%", { exact: true }),
+            usageCard(details, "login-journey:account").getByText("31% used", { exact: true }),
          ).toBeVisible();
        });
      } finally {
@@ -0,0 +1,58 @@
+import { metroTest as test, expect } from "../support/fixtures";
+import { installDeveloperToastDismissal } from "../support/developer-ui.mjs";
+import type { Page } from "@playwright/test";
+
+async function showTransientDeveloperToast(page: Page, shadow: boolean) {
+  await page.evaluate((useShadow) => {
+    const toast = document.createElement("div");
+    toast.id = "error-toast";
+    document.body.append(toast);
+    const root = useShadow ? toast.attachShadow({ mode: "open" }) : toast;
+    const button = document.createElement("button");
+    button.style.cssText = "width:32px;height:32px";
+    button.addEventListener("click", () => button.remove());
+    root.append(button);
+  }, shadow);
+}
+
+async function openTransientDeveloperToast(page: Page) {
+  await page.setContent("<button>Continue</button>");
+  await showTransientDeveloperToast(page, false);
+  await installDeveloperToastDismissal(page);
+}
+
+async function navigateWithDeveloperToastDismissal(page: Page) {
+  await installDeveloperToastDismissal(page);
+  await page.goto("data:text/html,<button>Continue</button>");
+  await showTransientDeveloperToast(page, true);
+}
+
+async function inspectLayoutWhileToastDisappears(page: Page) {
+  const action = page.getByRole("button", { name: "Continue", exact: true });
+  const boxes = await Promise.all(Array.from({ length: 4 }, () => action.boundingBox()));
+  for (const box of boxes) expect(box).not.toBeNull();
+  await expect(page.locator("#error-toast").getByRole("button")).toHaveCount(0);
+  await action.click();
+}
+
+test("a disappearing developer toast does not stall concurrent layout checks", async ({ page }) => {
+  test.setTimeout(10000);
+  await openTransientDeveloperToast(page);
+  await inspectLayoutWhileToastDisappears(page);
+});
+
+test("developer toast dismissal survives navigation and observes Expo shadow-root updates", async ({
+  page,
+}) => {
+  test.setTimeout(10000);
+  await navigateWithDeveloperToastDismissal(page);
+  await inspectLayoutWhileToastDisappears(page);
+  await page.evaluate(() => {
+    const root = document.getElementById("error-toast")!.shadowRoot!;
+    const replacement = document.createElement("button");
+    replacement.style.cssText = "width:32px;height:32px";
+    replacement.addEventListener("click", () => replacement.remove());
+    root.append(replacement);
+  });
+  await inspectLayoutWhileToastDisappears(page);
+});
@@ -1,3 +1,7 @@
+import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
+import { writeFile } from "node:fs/promises";
+import { openFileFromExplorer } from "../support/helpers/file-explorer";
+import { openSettingsSection, clickSettingsBackToWorkspace } from "../support/helpers/settings";
 import { expect, test } from "../support/fixtures";
 import {
  gotoWorkspace,
@@ -136,10 +140,9 @@ test("Explorer keeps Files and Changes close actions in the context menu", async
      await explorer.getByRole("button", { name: "New tab", exact: true }).click();
      const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
      await expect(menu).toBeVisible();
-      await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(0);
+      await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(1);
      await expect(menu.getByRole("menuitem", { name: /^Files/ })).toHaveCount(0);
      await expect(menu.getByRole("menuitem", { name: /^Changes/ })).toHaveCount(0);
-      await expect(menu.getByText("Terminal profiles", { exact: true })).toHaveCount(0);
      await expect(menu.getByRole("menuitem", { name: /^Terminal/ })).toBeVisible();
      const entries = await menu.getByRole("menuitem").allTextContents();
      expect(entries.findIndex((entry) => entry.startsWith("Terminal"))).toBeLessThan(
@@ -191,13 +194,11 @@ test("Explorer keeps Files and Changes close actions in the context menu", async
  }
 });

-async function dragAgentIntoExplorer(
+async function dragTabIntoExplorer(
  page: Parameters<typeof ensureExplorerSidebar>[0],
-  agentId: string,
+  tabId: string,
 ) {
-  const source = page
-    .getByTestId("workspace-pane-main")
-    .getByTestId(`workspace-tab-agent_${agentId}`);
+  const source = page.getByTestId("workspace-pane-main").getByTestId(`workspace-tab-${tabId}`);
  const destination = explorerSidebar(page).getByTestId("workspace-tab-files");
  const sourceBox = await source.boundingBox();
  const destinationBox = await destination.boundingBox();
@@ -213,7 +214,7 @@ async function dragAgentIntoExplorer(
  await page.mouse.up();
 }

-test("agents can still be dragged into Explorer when absent from its + menu", async ({
+test("moves agents into Explorer and keeps the shared Agent launcher available", async ({
  page,
 }, testInfo) => {
  const workspace = await seedWorkspace({ repoPrefix: "explorer-agent-drag-" });
@@ -230,14 +231,13 @@ test("agents can still be dragged into Explorer when absent from its + menu", as
    });
    const main = page.getByTestId("workspace-pane-main");
    await expect(main.getByTestId(`workspace-tab-agent_${agent.id}`)).toBeVisible();
-    await dragAgentIntoExplorer(page, agent.id);
+    await dragTabIntoExplorer(page, `agent_${agent.id}`);
    await expect(explorer.getByTestId(`workspace-tab-agent_${agent.id}`)).toBeVisible();
    await expect(main.getByTestId(`workspace-tab-agent_${agent.id}`)).toHaveCount(0);
    await explorer.getByRole("button", { name: "New tab", exact: true }).click();
    const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
    await expect(menu).toBeVisible();
-    await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(0);
-    await expect(menu.getByText("Terminal profiles", { exact: true })).toHaveCount(0);
+    await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(1);
    await page.keyboard.press("Escape");
    await testInfo.attach("agent-in-explorer", {
      body: await page.screenshot(),
@@ -247,3 +247,273 @@ test("agents can still be dragged into Explorer when absent from its + menu", as
    await workspace.cleanup();
  }
 });
+
+test("tablet prototype keeps Explorer tabs when resizing down to a phone", async ({
+  page,
+}, testInfo) => {
+  const workspace = await seedWorkspace({ repoPrefix: "tablet-explorer-" });
+  try {
+    await page.setViewportSize({ width: 951, height: 669 });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await waitForWorkspaceTabsVisible(page);
+    await ensureExplorerSidebar(page);
+    await expect(
+      explorerSidebar(page).getByRole("button", { name: "Browse workspace files", exact: true }),
+    ).toBeVisible();
+    await page.screenshot({ path: testInfo.outputPath("tablet-951.png") });
+    await openExplorerAgentDraft(page);
+    await page.screenshot({ path: testInfo.outputPath("tablet-agent-draft.png") });
+    await page.setViewportSize({ width: 390, height: 844 });
+    await revealPhoneExplorer(page);
+    await expect(
+      explorerSidebar(page).getByRole("button", { name: "New tab", exact: true }),
+    ).toBeVisible();
+    await page.screenshot({ path: testInfo.outputPath("phone-shared-explorer.png") });
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+async function openExplorerAgentDraft(page: Parameters<typeof ensureExplorerSidebar>[0]) {
+  await explorerSidebar(page).getByRole("button", { name: "New tab", exact: true }).click();
+  await page.getByRole("menuitem", { name: /^Agent/ }).click();
+  await expect(explorerSidebar(page).getByRole("textbox").first()).toBeVisible();
+}
+
+async function revealPhoneExplorer(page: Parameters<typeof ensureExplorerSidebar>[0]) {
+  await page.getByRole("button", { name: "Open Explorer sidebar", exact: true }).click();
+  await expect(explorerSidebar(page)).toBeVisible();
+  await expect(
+    explorerSidebar(page).getByRole("button", { name: "Close Explorer sidebar", exact: true }),
+  ).toBeInViewport({ ratio: 1 });
+}
+
+async function cycleWorkspaceTheme(page: Parameters<typeof ensureExplorerSidebar>[0]) {
+  await page.keyboard.press("Control+Alt+t");
+}
+
+test("retains the Explorer host through appearance changes and folding", async ({ page }) => {
+  const workspace = await seedWorkspace({ repoPrefix: "explorer-lifetime-" });
+  try {
+    await gotoWorkspace(page, workspace.workspaceId);
+    const explorer = await ensureExplorerSidebar(page);
+    await openFilesPanel(page);
+    const host = await explorer.elementHandle();
+    if (!host) throw new Error("Explorer must be mounted before changing appearance");
+    const previousColor = await explorer.evaluate(
+      (element) => getComputedStyle(element).backgroundColor,
+    );
+    await cycleWorkspaceTheme(page);
+    await expect
+      .poll(() => explorer.evaluate((element) => getComputedStyle(element).backgroundColor))
+      .not.toBe(previousColor);
+    expect(await host.evaluate((element) => element.isConnected)).toBe(true);
+    await page.setViewportSize({ width: 390, height: 844 });
+    await ensureExplorerSidebar(page);
+    expect(await host.evaluate((element) => element.isConnected)).toBe(true);
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await expect(explorer).toBeVisible();
+    expect(await host.evaluate((element) => element.isConnected)).toBe(true);
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+async function reorderCompactExplorerTabs(page: Parameters<typeof ensureExplorerSidebar>[0]) {
+  const explorer = explorerSidebar(page);
+  const files = explorer.getByTestId("workspace-tab-files");
+  const changes = explorer.getByTestId("workspace-tab-changes_tree");
+  const source = await changes.boundingBox();
+  const target = await files.boundingBox();
+  if (!source || !target) throw new Error("Explorer tabs must be visible to reorder");
+  await page.mouse.move(source.x + source.width / 2, source.y + source.height / 2);
+  await page.mouse.down();
+  await page.mouse.move(source.x + source.width / 2 - 12, source.y + source.height / 2);
+  await page.mouse.move(target.x + 3, target.y + target.height / 2, { steps: 20 });
+  await page.mouse.up();
+  await expect
+    .poll(async () => {
+      const afterFiles = await files.boundingBox();
+      const afterChanges = await changes.boundingBox();
+      return Boolean(afterFiles && afterChanges && afterChanges.x < afterFiles.x);
+    })
+    .toBe(true);
+}
+
+test("reorders compact Explorer tabs with a pointer without changing selection", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "explorer-compact-drag-" });
+  try {
+    await gotoWorkspace(page, workspace.workspaceId);
+    await page.setViewportSize({ width: 390, height: 844 });
+    await openFilesPanel(page);
+    await reorderCompactExplorerTabs(page);
+    await expect(
+      explorerSidebar(page).getByRole("button", { name: "Browse workspace files", exact: true }),
+    ).toHaveAttribute("aria-selected", "true");
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+// Exercise appearance at its consumers while the real workspace navigator retains the panels.
+test("updates populated code and diff appearance without losing the editor instance or draft", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "explorer-populated-appearance-" });
+  const source = Array.from(
+    { length: 120 },
+    (_, index) => `export const line${index} = "retained ${index}";`,
+  ).join("\n");
+  try {
+    await writeFile(`${workspace.repoPath}/appearance.ts`, source);
+    await page.addInitScript(() => {
+      localStorage.setItem(
+        "@paseo:app-settings",
+        JSON.stringify({ codeFontSize: 13, theme: "light" }),
+      );
+      localStorage.setItem(
+        "@paseo:changes-preferences",
+        JSON.stringify({ inlineDiff: true, layout: "unified" }),
+      );
+    });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openFilesPanel(page);
+    await openFileFromExplorer(page, "appearance.ts");
+    const editor = page.getByTestId("file-source-editor").filter({ visible: true });
+    const text = editor.locator(".cm-content");
+    await expect(text).toBeVisible();
+    await text.fill(`${source}\n// unsaved local edit`);
+    const instance = await editor.elementHandle();
+    const scroller = editor.locator(".cm-scroller");
+    await scroller.evaluate((node) => {
+      node.scrollTop = 400;
+    });
+    const scrollBefore = await scroller.evaluate((node) => node.scrollTop);
+    await explorerSidebar(page).getByTestId("workspace-tab-changes_tree").click();
+    const diff = explorerSidebar(page).getByTestId("git-diff-canvas");
+    await expect(diff).toBeVisible();
+    await page.keyboard.press("Control+,");
+    await openSettingsSection(page, "appearance");
+    await page.getByLabel("Code font size", { exact: true }).fill("19");
+    await page.getByLabel("Code font size", { exact: true }).press("Tab");
+    await clickSettingsBackToWorkspace(page);
+    await expect(text).toHaveCSS("font-size", "19px");
+    expect(await instance!.evaluate((node) => node.isConnected)).toBe(true);
+    await expect(text).toContainText("unsaved local edit");
+    expect(await scroller.evaluate((node) => node.scrollTop)).toBe(scrollBefore);
+    await expect(diff).toHaveCSS("font-size", "19px");
+    await cycleWorkspaceTheme(page);
+    expect(await instance!.evaluate((node) => node.isConnected)).toBe(true);
+    await expect(text).toContainText("unsaved local edit");
+    await dragTabIntoExplorer(page, "file_appearance.ts");
+    await expect(explorerSidebar(page).getByTestId("file-source-editor")).toBeVisible();
+    const explorerEditor = await explorerSidebar(page)
+      .getByTestId("file-source-editor")
+      .elementHandle();
+    await text.fill(`${source}\n// retained Explorer edit`);
+    await page.setViewportSize({ width: 390, height: 844 });
+    await ensureExplorerSidebar(page);
+    await page.setViewportSize({ width: 1280, height: 900 });
+    expect(await explorerEditor!.evaluate((node) => node.isConnected)).toBe(true);
+    await expect(text).toContainText("retained Explorer edit");
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("retains populated Explorer chat and terminal attachments through appearance, hide and fold", async ({
+  page,
+}) => {
+  const workspace = await seedMockAgentWorkspace({
+    repoPrefix: "explorer-chat-appearance-",
+    title: "Retained chat",
+    initialPrompt: "Show the retention marker",
+    featureValues: {
+      mockAssistantResponse: "Explorer populated paragraph.\n\n```ts\nconst retained = 42;\n```",
+    },
+  });
+  const attaches: string[] = [];
+  page.on("websocket", (socket) =>
+    socket.on("framesent", (frame) => {
+      if (typeof frame.payload !== "string") return;
+      try {
+        const message = JSON.parse(frame.payload).message;
+        if (message?.type === "subscribe_terminal_request") attaches.push(message.terminalId);
+      } catch {
+        /* Binary terminal traffic is not a JSON request. */
+      }
+    }),
+  );
+  try {
+    await openAgentRoute(page, workspace);
+    await ensureExplorerSidebar(page);
+    await dragTabIntoExplorer(page, `agent_${workspace.agentId}`);
+    const explorer = explorerSidebar(page);
+    const paragraph = explorer.getByText("Explorer populated paragraph.", { exact: true });
+    await expect(paragraph).toBeVisible();
+    const composer = explorer.getByRole("textbox", { name: "Message agent..." });
+    await composer.fill("Unsubmitted Explorer draft");
+    const composerNode = await composer.elementHandle();
+    await page.keyboard.press("Control+,");
+    await openSettingsSection(page, "appearance");
+    await page.getByLabel("Content font size", { exact: true }).fill("20");
+    await page.getByLabel("Content font size", { exact: true }).press("Tab");
+    await clickSettingsBackToWorkspace(page);
+    await expect(paragraph).toHaveCSS("font-size", "20px");
+    expect(await composerNode!.evaluate((node) => node.isConnected)).toBe(true);
+    await expect(composer).toHaveValue("Unsubmitted Explorer draft");
+    const previousColor = await paragraph.evaluate((node) => getComputedStyle(node).color);
+    await cycleWorkspaceTheme(page);
+    await expect
+      .poll(() => paragraph.evaluate((node) => getComputedStyle(node).color))
+      .not.toBe(previousColor);
+    await explorer.getByRole("button", { name: "New tab", exact: true }).click();
+    await page
+      .getByRole("menuitem", { name: /^Terminal/ })
+      .first()
+      .click();
+    const terminal = explorer.getByTestId("terminal-surface");
+    await expect(terminal).toBeVisible();
+    await expect.poll(() => attaches.length).toBe(1);
+    const terminalNode = await terminal.elementHandle();
+    await page.getByTestId("workspace-explorer-toggle").first().click();
+    await ensureExplorerSidebar(page);
+    await page.setViewportSize({ width: 390, height: 844 });
+    await ensureExplorerSidebar(page);
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await cycleWorkspaceTheme(page);
+    expect(await terminalNode!.evaluate((node) => node.isConnected)).toBe(true);
+    expect(attaches).toHaveLength(1);
+    await explorer.getByTestId(`workspace-tab-agent_${workspace.agentId}`).click();
+    expect(await composerNode!.evaluate((node) => node.isConnected)).toBe(true);
+    await expect(composer).toHaveValue("Unsubmitted Explorer draft");
+    await expect(paragraph).toHaveCSS("font-size", "20px");
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("compact file sheets cover Explorer and return to its retained file list", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "explorer-sheet-layer-" });
+  try {
+    await writeFile(`${workspace.repoPath}/sheet-marker.txt`, "Explorer sheet marker\n");
+    await gotoWorkspace(page, workspace.workspaceId);
+    await page.setViewportSize({ width: 390, height: 844 });
+    const explorer = await ensureExplorerSidebar(page);
+    await openFilesPanel(page);
+    const host = await explorer.elementHandle();
+    await openFileFromExplorer(page, "sheet-marker.txt");
+    await expect(page.getByText("Explorer sheet marker", { exact: true })).toBeVisible();
+    // A real click also proves the sheet draws above the retained Explorer overlay.
+    await page.getByRole("button", { name: "Close", exact: true }).click();
+    await expect(page.getByText("Explorer sheet marker", { exact: true })).toHaveCount(0);
+    await expect(explorer.getByTestId("file-explorer-tree-scroll")).toBeVisible();
+    expect(await host!.evaluate((node) => node.isConnected)).toBe(true);
+  } finally {
+    await workspace.cleanup();
+  }
+});
@@ -247,9 +247,7 @@ test.describe("New workspace: fullscreen composer across the compact breakpoint"
      await expectNewWorkspaceDraft(page, `${draft} wide`);
    });

-    // Terminal mode and its prompt are screen state, and the shell remounts the screen
-    // at the breakpoint, so the terminal prompt's fullscreen is exercised on the phone
-    // layout only.
+    // Exercise the terminal prompt's fullscreen and compact launch sheet on the phone.
    await test.step("terminal: the prompt's fullscreen shows only exit and Launch", async () => {
      await resizeComposerViewport(page, "portrait");
      // The compact launch control opens a sheet, not the desktop menu.
@@ -5,10 +5,6 @@ import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
-import {
-  expectMobileAgentSidebarVisible,
-  openMobileAgentSidebar,
-} from "../support/helpers/sidebar";

 const PLUGIN_ID = "plugin-host-ui-e2e";

@@ -91,12 +87,6 @@ async function useCompactLayout(page: Page): Promise<void> {
  await page.setViewportSize({ width: 390, height: 844 });
 }

-async function reopenHostUiPluginFromCompactSidebar(page: Page): Promise<void> {
-  await openMobileAgentSidebar(page);
-  await expectMobileAgentSidebarVisible(page);
-  await page.getByRole("button", { name: "Host UI", exact: true }).click();
-}
-
 async function openPluginModal(page: Page): Promise<void> {
  await page.getByRole("button", { name: "Open plugin modal", exact: true }).click();
 }
@@ -158,7 +148,6 @@ test("plugin modal adapts its presentation and preserves host contexts", async (

    await test.step("compact layouts preserve host contexts inside a sheet", async () => {
      await useCompactLayout(page);
-      await reopenHostUiPluginFromCompactSidebar(page);
      await openPluginModal(page);
      await expectCompactPluginSheet(page);
      await savePluginIssue(page);
@@ -0,0 +1,138 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { Locator, TestInfo } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import { openCommandCenter } from "../support/helpers/command-center";
+import { gotoAppShell } from "../support/helpers/app";
+import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import { pluginRequirements } from "../support/helpers/plugin-fixture";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  switchWorkspaceViaSidebar,
+  waitForWorkspaceInSidebar,
+} from "../support/helpers/workspace-ui";
+
+const PLUGIN_ID = "plugin-icons-e2e";
+const SVG_PATH = "M4 12l5 5L20 6";
+
+const pluginClientSource = `import React from "react";
+import { Text, View } from "react-native";
+
+const checkIcon = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><path d="${SVG_PATH}" /></svg>';
+
+function BadgeIcon({ size, color }) {
+  return <View testID="plugin-component-icon" style={{ width: size, height: size, borderRadius: size / 2, backgroundColor: color }} />;
+}
+
+function Panel() {
+  return <View><Text>Plugin icon panel</Text></View>;
+}
+
+const panels = [
+  { id: "lucide", title: "Lucide icon panel", icon: "Scan" },
+  { id: "svg", title: "SVG icon panel", icon: { svg: checkIcon } },
+  { id: "component", title: "Component icon panel", icon: BadgeIcon },
+];
+
+export default function contribute(client) {
+  for (const panel of panels) {
+    client.addWorkspacePanel({ ...panel, context: "workspace", Component: Panel });
+    client.addCommandCenterItem({
+      id: panel.id,
+      title: "Open " + panel.title,
+      icon: panel.icon,
+      context: "workspace",
+      onSelect({ openPanel }) { openPanel(panel.id); },
+    });
+  }
+  return () => {};
+}`;
+
+function pluginTab(page: Page, panelId: string): Locator {
+  const identity = `${PLUGIN_ID.length}_${PLUGIN_ID}_${panelId.length}_${panelId}`;
+  return page.getByTestId(`workspace-tab-plugin_workspace_${identity}`).filter({ visible: true });
+}
+
+async function runCommand(page: Page, title: string): Promise<void> {
+  const panel = await openCommandCenter(page);
+  await panel.getByTestId("command-center-input").fill(title);
+  await panel.getByRole("button", { name: title, exact: true }).click();
+  await expect(panel).not.toBeVisible();
+}
+
+async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
+  const screenshot = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path: screenshot });
+  await testInfo.attach(name, { path: screenshot, contentType: "image/png" });
+}
+
+test.describe("plugin icons", () => {
+  test.describe.configure({ timeout: 180_000 });
+
+  test("renders a Lucide name, inline SVG, and a component", async ({ page }, testInfo) => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-icons-e2e-"));
+    const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+    const previous = await client.getDaemonConfig();
+    const workspace = await seedWorkspace({ repoPrefix: "plugin-icons-" });
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
+    );
+    await writeFile(path.join(directory, "index.client.tsx"), pluginClientSource);
+
+    try {
+      await client.patchDaemonConfig({ pluginsEnabled: true });
+      await client.installDirectoryPlugin(directory);
+      await page.setViewportSize({ width: 1280, height: 800 });
+      await gotoAppShell(page);
+      const target = { serverId: getServerId(), workspaceId: workspace.workspaceId };
+      await waitForWorkspaceInSidebar(page, target);
+      await switchWorkspaceViaSidebar({ page, ...target });
+
+      await test.step("Command Center rows draw each icon form", async () => {
+        const panel = await openCommandCenter(page);
+        await panel.getByTestId("command-center-input").fill("icon panel");
+        for (const title of ["Lucide icon panel", "SVG icon panel", "Component icon panel"]) {
+          await expect(
+            panel.getByRole("button", { name: `Open ${title}`, exact: true }),
+          ).toBeVisible();
+        }
+        await expect(
+          panel
+            .getByRole("button", { name: "Open SVG icon panel", exact: true })
+            .locator(`path[d="${SVG_PATH}"]`),
+        ).toBeVisible();
+        await expect(
+          panel
+            .getByRole("button", { name: "Open Component icon panel", exact: true })
+            .getByTestId("plugin-component-icon"),
+        ).toBeVisible();
+        await capture(page, testInfo, "command-center-icons");
+        await page.keyboard.press("Escape");
+      });
+
+      await test.step("workspace panel tabs draw each icon form", async () => {
+        await runCommand(page, "Open Lucide icon panel");
+        await runCommand(page, "Open SVG icon panel");
+        await runCommand(page, "Open Component icon panel");
+        await expect(pluginTab(page, "lucide").locator("svg")).toBeVisible();
+        await expect(pluginTab(page, "svg").locator(`path[d="${SVG_PATH}"]`)).toBeVisible();
+        await expect(
+          pluginTab(page, "component").getByTestId("plugin-component-icon"),
+        ).toBeVisible();
+        await capture(page, testInfo, "workspace-tab-icons");
+      });
+    } finally {
+      try {
+        await client.removePlugin(PLUGIN_ID);
+      } finally {
+        await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+        await workspace.cleanup();
+        await client.close();
+        await rm(directory, { recursive: true, force: true });
+      }
+    }
+  });
+});
@@ -2,10 +2,6 @@ import { copyPluginExample } from "../support/helpers/plugin-fixture";
 import { expect, test as base, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
-import {
-  openMobileAgentSidebar,
-  expectMobileAgentSidebarVisible,
-} from "../support/helpers/sidebar";

 async function openExample(page: Page, example: string) {
  await page.getByRole("button", { name: `Open ${example}`, exact: true }).click();
@@ -122,9 +118,7 @@ async function openWideExamples(page: Page) {

 async function openCompactExamples(page: Page) {
  await page.setViewportSize({ width: 390, height: 844 });
-  await openMobileAgentSidebar(page);
-  await expectMobileAgentSidebarVisible(page);
-  await page.getByRole("button", { name: "Modal examples", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Open Form", exact: true })).toBeVisible();
 }

 async function expectDeniedCopyFeedback(page: Page) {
@@ -0,0 +1,51 @@
+import { ACP_PROVIDER_ICON_SVGS } from "../../src/assets/acp-provider-icons";
+import { expect, test, type Page } from "../support/fixtures";
+import type { TestInfo } from "@playwright/test";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  findAcpCatalogProvider,
+  openAddProviderArea,
+  openSettingsHost,
+  openSettingsHostSection,
+} from "../support/helpers/settings";
+
+async function openProviderCatalog(page: Page) {
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openSettingsHost(page, getServerId());
+  await openSettingsHostSection(page, getServerId(), "providers");
+  await openAddProviderArea(page);
+}
+
+async function expectProviderArtwork(
+  page: Page,
+  testInfo: TestInfo,
+  id: "devin" | "hermes" | "kiro",
+  name: string,
+) {
+  await findAcpCatalogProvider(page, name);
+  // Catalog tiles have no semantic role; scope artwork to the named provider's tile.
+  const icon = page.getByTestId(`provider-catalog-tile-${id}`).locator("svg").first();
+  await expect(icon).toBeVisible();
+  // Provider artwork is 24px; the generic PackagePlus fallback is 20px.
+  await expect.soft(icon).toHaveAttribute("width", "24");
+  const expectedPaths = await page.evaluate((xml) => {
+    const document = new DOMParser().parseFromString(xml, "image/svg+xml");
+    return Array.from(document.querySelectorAll("path"), (path) => path.getAttribute("d")!);
+  }, ACP_PROVIDER_ICON_SVGS[id]);
+  await expect(icon.locator("path")).toHaveCount(expectedPaths.length);
+  for (const [index, path] of expectedPaths.entries()) {
+    await expect(icon.locator("path").nth(index)).toHaveAttribute("d", path);
+  }
+  await page.screenshot({ path: testInfo.outputPath(`${id}-catalog.png`) });
+}
+
+test("#7087: the provider catalog shows Devin, Hermes, and Kiro artwork", async ({
+  page,
+}, testInfo) => {
+  await openProviderCatalog(page);
+  await expectProviderArtwork(page, testInfo, "devin", "Devin CLI");
+  await expectProviderArtwork(page, testInfo, "hermes", "Hermes");
+  await expectProviderArtwork(page, testInfo, "kiro", "Kiro CLI");
+});
@@ -15,6 +15,7 @@ async function closeMenuSheet(page: Page): Promise<void> {

 test("project and workspace kebabs open action sheets on compact layouts", async ({ page }) => {
  const seeded = await seedWorkspace({ repoPrefix: "sidebar-mobile-menu-sheet-" });
+  const secondProject = await seedWorkspace({ repoPrefix: "sidebar-mobile-menu-filter-" });

  try {
    await gotoAppShell(page);
@@ -26,6 +27,7 @@ test("project and workspace kebabs open action sheets on compact layouts", async
      /^Grouping/,
      /^Title/,
      "Show",
+      "Project",
      "Show background",
    ]);
    await closeMenuSheet(page);
@@ -53,6 +55,7 @@ test("project and workspace kebabs open action sheets on compact layouts", async
    });
    await expect(page.getByText("Workspace actions", { exact: true })).toBeVisible();
  } finally {
+    await secondProject.cleanup();
    await seeded.cleanup();
  }
 });
@@ -624,7 +624,9 @@ test.describe("Half-screen desktop layout", () => {
    await expect(page.getByTestId("sidebar-settings")).not.toBeVisible();
  });

-  test("keeps app navigation beside the Explorer pane", async ({ page }) => {
+  test("yields app navigation to Explorer and restores it when Explorer closes", async ({
+    page,
+  }) => {
    const workspace = await seedWorkspace({ repoPrefix: "sidebar-half-screen-explorer-" });

    try {
@@ -636,7 +638,7 @@ test.describe("Half-screen desktop layout", () => {
      const explorerToggle = page.getByTestId("workspace-explorer-toggle").first();
      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toBeVisible();
      await expect(explorerToggle).toHaveAccessibleName("Close Explorer sidebar");
-      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
+      await expect(page.getByTestId("sidebar-global-new-workspace")).not.toBeVisible();
      await expect(page.getByTestId("workspace-explorer-sidebar")).toBeVisible();
      await expect(
        page
@@ -1,3 +1,16 @@
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { submitMessage } from "../support/helpers/composer";
+import { openSessions, clickSessionRow } from "../support/helpers/archive-tab";
+import {
+  seedFleetSubagents,
+  delegateFleetThroughMcp,
+  observeFleetRouteOwnership,
+  readFleetCompletion,
+  connectFleetDirectHost,
+  openFleetParentTrack,
+  readFleetAuthorityState,
+  expectFleetRouteUnavailable,
+} from "../support/helpers/subagents";
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
@@ -6,6 +19,8 @@ import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { openSubagentsTrack, seedParentWithSubagent } from "../support/helpers/subagents";

+test.use({ e2eInjectPaseoTools: true });
+
 const SETTINGS_KEY = "@paseo:app-settings";

 async function openParentInRightPane(page: Page, parentId: string, workspaceId: string) {
@@ -147,3 +162,167 @@ test("a preferred chat file link still opens beside its right-pane agent", async
    await workspace.cleanup();
  }
 });
+
+test("a fleet child retains its origin beside direct access through collision, catalog push, reload and revocation", async ({
+  page,
+}) => {
+  test.setTimeout(180_000);
+  const fleet = await seedFleetSubagents();
+  try {
+    const a = fleet.parent.serverId;
+    const b = fleet.destination.serverId;
+    await connectFleetDirectHost(page, fleet);
+    await openFleetParentTrack(page);
+    const rows = page.getByTestId(`subagents-track-row-${fleet.remote.id}`);
+    await expect(rows).toHaveCount(2);
+    const remote = rows.filter({ hasText: "Fleet child on B" });
+    await expect(remote).toBeVisible();
+    await expect(remote.getByTestId(`subagents-track-row-facts-${fleet.remote.id}`)).toHaveText(
+      "Ten second stream · Low · Load test",
+    );
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).direct.status)
+      .toBe("online");
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.catalogVersion)
+      .toBeGreaterThan(0);
+    const beforePush = await readFleetAuthorityState(page, a, b);
+    await fleet.direct.providers.refresh({ cwd: fleet.workspace.repoPath });
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.catalogVersion)
+      .toBeGreaterThan(beforePush.routed.catalogVersion);
+    await remote.click();
+    await expect(page).toHaveURL(
+      (url) => url.pathname.includes(`/h/${b}/workspace/`) && url.searchParams.get("origin") === a,
+    );
+    await submitMessage(page, "ROUTED_FLEET_PROMPT");
+    await expect
+      .poll(async () => (await fleet.remote.refresh())?.agent.lastUserMessageAt)
+      .not.toBeNull();
+    expect((await fleet.local.refresh())?.agent.lastUserMessageAt).toBeNull();
+    const routedUrl = page.url();
+    await page.reload();
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+    await fleet.remote.waitForFinish();
+    // Reopen direct B through ordinary history, then retain it beside the routed conversation.
+    await openSessions(page);
+    await clickSessionRow(page, "Fleet child on B");
+    await expect(page).toHaveURL(
+      (url) => url.pathname.includes(`/h/${b}/workspace/`) && !url.searchParams.has("origin"),
+    );
+    await openFleetParentTrack(page);
+    await page
+      .getByTestId(`subagents-track-row-${fleet.remote.id}`)
+      .filter({ hasText: "Fleet child on B" })
+      .click();
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).direct.status)
+      .toBe("online");
+    await fleet.disable();
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.status)
+      .not.toBe("online");
+    const withdrawn = await readFleetAuthorityState(page, a, b);
+    expect(withdrawn.direct.status).toBe("online");
+    await fleet.direct.providers.refresh({ cwd: fleet.workspace.repoPath });
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).direct.catalogVersion)
+      .toBeGreaterThan(withdrawn.direct.catalogVersion);
+    expect((await readFleetAuthorityState(page, a, b)).routed.catalogVersion).toBe(
+      withdrawn.routed.catalogVersion,
+    );
+    await page.reload();
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    expect((await fleet.local.refresh())?.agent.lastUserMessageAt).toBeNull();
+    // Direct B remains a separate usable authority; its newer evidence cannot refill A's withdrawn scope.
+    await page.goto(buildHostAgentDetailRoute(b, fleet.remote.id, fleet.workspace.workspaceId));
+    await submitMessage(page, "DIRECT_ONLY_AFTER_REVOCATION");
+    await expect(page.getByText("DIRECT_ONLY_AFTER_REVOCATION", { exact: true })).toBeVisible();
+    await page.goto(routedUrl);
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    await expectFleetRouteUnavailable(page, a, b);
+    await expect(page.getByText("DIRECT_ONLY_AFTER_REVOCATION", { exact: true })).toHaveCount(0);
+    const beforeRecovery = (await fleet.direct.agents.ref(fleet.remote.id).refresh())?.agent
+      .lastUserMessageAt;
+    await fleet.enable();
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.status)
+      .toBe("online");
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    await expect(page.getByText("DIRECT_ONLY_AFTER_REVOCATION", { exact: true })).toBeVisible();
+    await submitMessage(page, "AFTER_REENABLE_THROUGH_A");
+    await expect
+      .poll(
+        async () =>
+          (await fleet.direct.agents.ref(fleet.remote.id).refresh())?.agent.lastUserMessageAt,
+      )
+      .not.toBe(beforeRecovery);
+    expect((await fleet.local.refresh())?.agent.lastUserMessageAt).toBeNull();
+  } finally {
+    await fleet.close();
+  }
+});
+
+test("an agent delegates through MCP to self and B, opens both ordinary conversations and receives correlated completion", async ({
+  page,
+}) => {
+  test.setTimeout(180_000);
+  await page.setViewportSize({ width: 1400, height: 900 });
+  const counts = observeFleetRouteOwnership(page);
+  const fleet = await delegateFleetThroughMcp();
+  try {
+    await openAgentRoute(page, {
+      workspaceId: fleet.workspace.workspaceId,
+      agentId: fleet.parent.id,
+    });
+    console.log("Fleet ordinary parent ownership", await counts());
+    await openSubagentsTrack(page);
+    await expect(page.getByTestId(`subagents-track-row-${fleet.local.id}`)).toContainText(
+      "MCP child on A",
+    );
+    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.id}`)).toContainText(
+      "MCP child on B",
+    );
+    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.id}`)).toContainText(
+      "Fleet B",
+    );
+    await page.getByTestId(`subagents-track-row-${fleet.local.id}`).click();
+    await expect(page).toHaveURL((url) =>
+      url.pathname.includes(`/h/${fleet.local.serverId}/workspace/`),
+    );
+    await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+    await fleet.expectCompletion(fleet.local);
+    await submitMessage(page, "UI_MCP_FLEET_LOCAL");
+    await expect(page.getByText("UI_MCP_FLEET_LOCAL", { exact: true })).toBeVisible();
+    expect(
+      (await fleet.direct.agents.ref(fleet.local.id).refresh())?.agent.lastUserMessageAt,
+    ).toBeNull();
+    await page.getByTestId(`workspace-tab-agent_${fleet.parent.id}`).click();
+    await openSubagentsTrack(page);
+    await page.getByTestId(`subagents-track-row-${fleet.remote.id}`).click();
+    await expect(page).toHaveURL(
+      (url) =>
+        url.pathname.includes(`/h/${fleet.remote.serverId}/workspace/`) &&
+        url.searchParams.get("origin") === fleet.parent.serverId,
+    );
+    await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+    console.log("Fleet destination conversation ownership", await counts());
+    await fleet.expectCompletion(fleet.remote);
+    await submitMessage(page, "UI_MCP_FLEET_REMOTE");
+    await expect(page.getByText("UI_MCP_FLEET_REMOTE", { exact: true })).toBeVisible();
+    expect(
+      (await fleet.origin.agents.ref(fleet.remote.id).refresh())?.agent.lastUserMessageAt,
+    ).toBeNull();
+    await fleet.expectCompletion(fleet.local);
+    await fleet.expectCompletion(fleet.remote);
+    await openAgentRoute(page, {
+      workspaceId: fleet.workspace.workspaceId,
+      agentId: fleet.parent.id,
+    });
+    await readFleetCompletion(page, fleet.local);
+    await readFleetCompletion(page, fleet.remote);
+  } finally {
+    await fleet.close();
+  }
+});
@@ -266,14 +266,22 @@ test("keeps overview tool calls inline on desktop", async ({ page }) => {
  const agent = await createOverviewAgent(page, "Desktop overview tool calls");

  try {
+    const gate = await holdStreamAfterFirstCompletedToolCall(page, agent.agentId);
    await openOverviewAgent(page, agent);
    await agent.client.sendAgentMessage(agent.agentId, "Exercise desktop overview tool calls.");
+    await gate.waitForFirstCompleted();
    const group = page.getByTestId("tool-call-group").first();
    await expect(group).toBeVisible();

-    await group.click();
-    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
+    // Keep streaming layout changes out of the pointer-down/pointer-up interval.
+    const header = group.getByRole("button").first();
+    await header.click();
    await expect(group.getByTestId("tool-call-badge").first()).toBeVisible();
+    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
+
+    gate.release(1);
+    await expect.poll(() => group.getByTestId("tool-call-badge").count()).toBeGreaterThanOrEqual(2);
+    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
  } finally {
    await agent.cleanup();
  }
@@ -4,9 +4,10 @@ import path from "node:path";
 import type { Page } from "@playwright/test";
 import type { UsageReportEntry } from "@getpaseo/protocol/messages";
 import { expect, test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { addConnectedHostAndReload } from "../support/helpers/hosts";
 import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import { openSettingsSection } from "../support/helpers/settings";
 import { getServerId } from "../support/helpers/server-id";
 import { seedSidebarFooterPreferences } from "../support/helpers/sidebar-nav-settings";
 import {
@@ -131,7 +132,7 @@ async function refreshUsageAndWaitForReports(page: Page, usage: UsageReportsFixt
  await refreshAllUsage(page);
  await usage.waitForListRequests(requestCount + 1);
  const group = page.getByTestId(`usage-host-${getServerId()}`);
-  await expect(group.getByText("41%", { exact: true })).toBeVisible();
+  await expect(group.getByText("41% used", { exact: true })).toBeVisible();
  await expect(page.getByRole("button", { name: "Refresh all", exact: true })).toBeEnabled();
 }

@@ -178,7 +179,7 @@ test.describe("usage modal", () => {
    await expect(group.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
    await expect(hostFilter(page)).toHaveCount(0);
    await qaScreenshot(page, "usage-modal-one-host");
-    await expect(group.getByText("31%")).toBeVisible();
+    await expect(group.getByText("31% used")).toBeVisible();
    await expect(group.getByText("Beta plan", { exact: true })).toBeVisible();
    await expect(group.getByText("Unavailable", { exact: true })).toBeVisible();

@@ -240,15 +241,15 @@ test.describe("usage modal", () => {
    await gotoAppShell(page);
    await openUsageFromItem(page);
    const group = page.getByTestId(`usage-host-${serverId}`);
-    await expect(group.getByText("31%")).toBeVisible({ timeout: 10_000 });
+    await expect(group.getByText("31% used")).toBeVisible({ timeout: 10_000 });

    const alphaRefresh = group.getByTestId("usage-refresh").first();
    await alphaRefresh.click();
    await expect
      .poll(() => forcedRefreshes(usage))
      .toEqual([{ forceRefresh: true, reportIds: ["alpha:a"] }]);
-    await expect(group.getByText("58%")).toBeVisible();
-    await expect(group.getByText("12%")).toBeVisible();
+    await expect(group.getByText("58% used")).toBeVisible();
+    await expect(group.getByText("12% used")).toBeVisible();

    await group.getByTestId("usage-refresh").nth(1).hover();
    await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText("Updated 2h ago");
@@ -332,7 +333,7 @@ test.describe("usage modal", () => {
      await hostFilter(page).click();
      await page.getByTestId(`usage-host-filter-item-${secondary.serverId}`).click();
      await expect(
-        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12% used"),
      ).toBeVisible({ timeout: 30_000 });
      await expect(hostFilter(page)).toContainText("Secondary box");
      await qaScreenshot(page, "usage-modal-picked-host");
@@ -347,7 +348,7 @@ test.describe("usage modal", () => {
      await expectPinnedUsage(page, ["12% Weekly"]);
      await openUsageFromItem(page);
      await expect(
-        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12% used"),
      ).toBeVisible({ timeout: 30_000 });
    } finally {
      await secondary.close().catch(() => undefined);
@@ -513,7 +514,7 @@ for (const theme of ["light", "dark"] as const) {
      await expect(screen.getByText("69% left")).toBeVisible();
      await showUsageAs(page, "used");
      await expect(pinRow(screen, "Claude", "Session")).toHaveAccessibleName(
-        /^Pin Claude Session, 31% · resets /,
+        /^Pin Claude Session, 31% used · resets /,
      );
      await openUsageOptions(page);
      await closeUsageOptions(page);
@@ -576,7 +577,7 @@ test("an account with all logins failing shows each harness and remedy, then onl
      },
    ]);
    await refreshLoginUsage(page);
-    await expectLoginUsageOnly(page, "42%");
+    await expectLoginUsageOnly(page, "42% used");
  } finally {
    await fixture.cleanup();
  }
@@ -599,6 +600,7 @@ for (const compact of [false, true]) {
  }) => {
    const fixture = await installLoginUsage({ status: "error", error: "Initial failure" });
    try {
+      await page.clock.install();
      await page.setViewportSize(
        compact ? { width: 390, height: 844 } : { width: 1440, height: 900 },
      );
@@ -606,7 +608,10 @@ for (const compact of [false, true]) {
      if (compact) await openCompactSidebar(page);
      await openUsageFromIcon(page);
      await expectLoginErrors(page, ["Claude: Initial failure"]);
-      await expectLoginUsageFreshness(page, "No successful update", compact);
+      await test.step("developer errors do not interrupt freshness inspection", async () => {
+        await page.evaluate(() => console.error("E2E: developer toast while Usage is open"));
+        await expectLoginUsageFreshness(page, "No successful update", compact);
+      });

      await fixture.setReport({
        status: "available",
@@ -615,7 +620,8 @@ for (const compact of [false, true]) {
      // Move only the browser clock; real daemon fetches continue using the host clock.
      await page.clock.setFixedTime(new Date(Date.now() + 3_900_000));
      await refreshLoginUsage(page);
-      await expectLoginUsageOnly(page, "42%");
+      await expectLoginUsageOnly(page, "42% used");
+      await advanceUsageClock(page, 60_000);
      await expectLoginUsageFreshness(page, "Updated 1h ago", compact);

      await fixture.setReport({ status: "error", error: "Rate limited" });
@@ -640,8 +646,9 @@ for (const compact of [false, true]) {
      });
      await page.clock.setFixedTime(new Date(Date.now() + 150_000));
      await refreshLoginUsage(page);
-      await expectLoginUsageOnly(page, "43%");
-      await expect(page.getByText("42%", { exact: true })).toHaveCount(0);
+      await expectLoginUsageOnly(page, "43% used");
+      await advanceUsageClock(page, 60_000);
+      await expect(page.getByText("42% used", { exact: true })).toHaveCount(0);
      await expectLoginUsageFreshness(page, "Updated 2m ago", compact);
    } finally {
      await fixture.cleanup();
@@ -651,7 +658,88 @@ for (const compact of [false, true]) {

 async function expectRetainedLoginUsage(page: Page, message: string) {
  const card = page.getByTestId("usage-report-login-journey:account");
-  await expect(card.getByText(/^42%(?:$| ·)/)).toBeVisible();
+  await expect(card.getByText(/^42% used(?:$| ·)/)).toBeVisible();
  await expect(card.getByTestId("usage-login-error")).toHaveText(message);
  await expect(card.getByText("Reset time passed", { exact: false })).toBeVisible();
 }
+
+async function switchToJapanese(page: Page) {
+  await page.getByRole("button", { name: "Close", exact: true }).click();
+  await openSettings(page);
+  await openSettingsSection(page, "general");
+  await page.getByRole("button", { name: "System", exact: true }).click();
+  await page.getByRole("menuitem", { name: "日本語 - Japanese", exact: true }).click();
+  await page.getByRole("button", { name: "戻る", exact: true }).click();
+}
+
+async function openJapaneseUsage(page: Page) {
+  await page.getByRole("button", { name: "使用状況", exact: true }).click();
+  await expect(page.getByTestId("usage-modal").first()).toBeVisible();
+}
+
+test("usage percentages state their meaning and follow the selected language", async ({ page }) => {
+  test.setTimeout(120_000);
+  const login = await installLoginUsage({
+    status: "available",
+    windows: [{ id: "session", label: "Session", usedPct: 70, summary: true }],
+  });
+  try {
+    await gotoAppShell(page);
+    await openUsageFromIcon(page);
+    await expect(page.getByText("70% used", { exact: true })).toBeVisible();
+    await switchToJapanese(page);
+    await expect(usageItem(page)).toHaveAccessibleName(/Claude セッション 70% 使用済み/);
+    await openJapaneseUsage(page);
+    await expect(page.getByText("70% 使用済み", { exact: true })).toBeVisible();
+    await expect(page.getByRole("button", { name: "すべて更新", exact: true })).toBeVisible();
+    await page.getByRole("button", { name: "設定", exact: true }).last().click();
+    await expect(page.getByText("割合", { exact: true })).toBeVisible();
+    await expect(page.getByText("使用済み", { exact: true })).toBeVisible();
+    await expect(page.getByText("残り", { exact: true })).toBeVisible();
+  } finally {
+    await login.cleanup();
+  }
+});
+
+test("open usage clocks advance without refreshing or reopening", async ({ page }) => {
+  test.setTimeout(120_000);
+  const now = new Date();
+  const reset = new Date(now.getTime() + 30.5 * 60_000).toISOString();
+  const login = await installLoginUsage({
+    status: "available",
+    windows: [
+      { id: "session", label: "Session", usedPct: 42, resetsAt: reset },
+      { id: "weekly", label: "Weekly", usedPct: 80, runsOutAt: reset, shortfallPct: 10 },
+    ],
+    balances: [{ id: "credits", label: "Credits", unit: "usd", remaining: 12, resetsAt: reset }],
+  });
+  try {
+    await openCompactUsageWithClock(page, now);
+    const card = page.getByTestId("usage-report-login-journey:account");
+    await expect(card.getByTestId("usage-freshness")).toHaveText("Updated just now");
+    await expect(card.getByText("resets 30m", { exact: false }).first()).toBeVisible();
+    // The shared minute clock is wall-aligned, and the daemon timestamps use real time.
+    // After two browser minutes the latest displayed tick is one or two minutes old.
+    await advanceUsageClock(page, 120_000);
+    await expect(card.getByTestId("usage-freshness")).toHaveText(/^Updated [12]m ago$/);
+    await expect(card.getByText(/resets (28|29)m/).first()).toBeVisible();
+    await expect(card.getByText(/runs out (28|29)m/)).toBeVisible();
+    await expect(card.getByTestId("provider-usage-balance-credits-reset")).toHaveText(
+      /^resets (28|29)m$/,
+    );
+  } finally {
+    await login.cleanup();
+  }
+});
+
+async function openCompactUsageWithClock(page: Page, now: Date) {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.clock.install({ time: now });
+  await gotoAppShell(page);
+  await openCompactSidebar(page);
+  await openUsageFromIcon(page);
+}
+
+async function advanceUsageClock(page: Page, milliseconds: number) {
+  await page.clock.fastForward(milliseconds);
+}
@@ -93,7 +93,7 @@ test.describe("usage settings", () => {
    await expect(card.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
    await expect(card.getByText("dev@example.com", { exact: true })).toBeVisible();
    await expect(card.getByText("Beta plan", { exact: true })).toBeVisible();
-    await expect(card.getByText("70%")).toBeVisible();
+    await expect(card.getByText("70% used")).toBeVisible();
    await expect(card.getByText("1,234 left", { exact: true })).toBeVisible();
    await expect(card.getByText("$5.00 / $20.00", { exact: true })).toBeVisible();
    await expect(card.getByText("2026-12-31", { exact: true })).toBeVisible();
@@ -131,11 +131,11 @@ test.describe("usage settings", () => {
    await openSettings(page);
    await openSettingsHostSection(page, serverId, "usage");
    const card = page.getByTestId("usage-card");
-    await expect(card.getByText("23%")).toBeVisible({ timeout: 10_000 });
+    await expect(card.getByText("23% used")).toBeVisible({ timeout: 10_000 });

    await refreshAllUsage(page);
    await expect.poll(() => forcedRefreshCount(usage)).toBe(1);
-    await expect(card.getByText("64%")).toBeVisible();
+    await expect(card.getByText("64% used")).toBeVisible();
  });

  test("asks to update a host without usage support and never calls it", async ({ page }) => {
@@ -28,6 +28,7 @@ import {
  closeWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
  waitForWorkspaceSetupProgress,
+  observeSetupPanelTraffic,
 } from "../support/helpers/workspace-setup";

 interface WorkspaceScriptStarter {
@@ -116,6 +117,45 @@ test.describe("Workspace setup streaming", () => {
    }
  });

+  test("setup panel releases details while retained behind another tab and resubscribes when shown", async ({
+    page,
+  }) => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-membership-", {
+      paseoConfig: { worktree: { setup: ["echo setup complete"] } },
+    });
+    const traffic = observeSetupPanelTraffic(page);
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      const completed = waitForWorkspaceSetupProgress(
+        client,
+        (payload) => payload.status === "completed",
+      );
+      const workspace = await createWorkspaceThroughDaemon(client, {
+        cwd: repo.path,
+        worktreeSlug: "setup-membership",
+      });
+      await completed;
+      await openHomeWithProject(page, repo.path);
+      await navigateToWorkspaceViaSidebar(page, workspace.id);
+      await expectSetupTabNotSeeded(page, workspace.id);
+      await traffic.expectNoDemand();
+      await expectSetupPanel(page);
+      await traffic.expectSubscribed(workspace.id, 1);
+      await expect(page.getByTestId("workspace-setup-log").first()).toContainText("setup complete");
+      await clickNewChat(page);
+      await expectComposerVisible(page);
+      await traffic.expectReleased(0);
+      await expectSetupPanel(page);
+      await traffic.expectSubscribed(workspace.id, 2);
+      await closeSetupTab(page, workspace.id);
+      await traffic.expectReleased(1);
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
  daemonTest("streams running and completed setup snapshots for a successful setup", async () => {
    const client = await connectWorkspaceSetupClient();
    const repo = await createTempGitRepo("setup-success-", {
@@ -4,8 +4,8 @@ env APP_ID=sh.paseo.debug
 open "${APP_ID}"
 wait "id=\"workspace-header-menu-trigger\"" 20000
 press "id=\"workspace-explorer-toggle\""
-wait "id=\"explorer-tab-files\"" 10000
-press "id=\"explorer-tab-files\""
+wait "id=\"workspace-tab-files\"" 10000
+press "id=\"workspace-tab-files\""
 wait "id=\"file-explorer-row-0\"" 10000
 longpress "id=\"file-explorer-row-0\"" 600
 wait "id=\"file-explorer-row-0-context-menu-content\"" 10000
@@ -0,0 +1,19 @@
+# Prerequisite: a native terminal showing the output of echo '한글 문장'
+# on its first row, with no active selection. Use a dedicated QA workspace.
+# Coordinates target the first half of 문 on a 1080x1920 phone at default
+# code size. Override WORD_X/WORD_Y for other device geometry.
+context platform=android timeout=30000 retries=0
+env APP_ID=sh.paseo.debug
+env WORD_X=105
+env WORD_Y=251
+
+open "${APP_ID}"
+wait "label=\"Terminal input\"" 10000
+wait "label=\"한글 문장\"" 10000
+longpress "${WORD_X}" "${WORD_Y}" 650
+wait "id=\"terminal-copy\"" 5000
+press "id=\"terminal-copy\""
+# Copy clears the selection; only Android's clipboard preview has this exact
+# text, since the unselected terminal row contains the full sentence.
+wait "text=\"문장\"" 3000
+close
@@ -0,0 +1,145 @@
+// Run against an Android dev client serving this checkout, with a real software keyboard.
+// node packages/app/e2e/mobile/appearance-keyboard/android.mjs <session> <metro-url> <server-id> [app-id]
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdirSync } from "node:fs";
+import { resolve } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+
+const [, , session, metroUrl, serverId, appId = "sh.paseo.debug"] = process.argv;
+assert(
+  session && metroUrl && serverId,
+  "Pass the agent-device session, Metro URL and connected host ID",
+);
+const artifacts = resolve(".dev/agent-device-artifacts/appearance-keyboard-android");
+mkdirSync(artifacts, { recursive: true });
+
+function ad(...args) {
+  return execFileSync("agent-device", ["--session", session, ...args], {
+    encoding: "utf8",
+    timeout: 60_000,
+  });
+}
+
+function evaluate(expression) {
+  return ad("cdp", "runtime", "eval", "--expr", expression, "--json");
+}
+
+// Read the mounted app's public React Native APIs through Metro. Accessibility
+// snapshots with Gboard open can block while waiting for an idle hierarchy.
+const reactNative = `Array.from(__r.getModules().values()).find(
+  m => m.verboseName?.endsWith("/react-native/index.js")
+).publicModule.exports`;
+
+function measureFocusedInput() {
+  evaluate(`(() => {
+    const rn = ${reactNative};
+    globalThis.__appearanceKeyboardMeasurement = null;
+    rn.TextInput.State.currentlyFocusedInput()?.measureInWindow((x, y, width, height) => {
+      globalThis.__appearanceKeyboardMeasurement = JSON.stringify({
+        x, y, width, height,
+        statusBarHeight: rn.StatusBar.currentHeight,
+        scale: rn.PixelRatio.get(),
+        keyboard: rn.Keyboard.metrics(),
+      });
+    });
+  })()`);
+  const value = JSON.parse(evaluate("globalThis.__appearanceKeyboardMeasurement"));
+  return value ? JSON.parse(value) : null;
+}
+
+async function waitForFocusedInput() {
+  let measurement;
+  let previous;
+  let stable = 0;
+  const deadline = Date.now() + 30_000;
+  do {
+    measurement = measureFocusedInput();
+    const current = measurement?.keyboard
+      ? [measurement.y, measurement.height, measurement.keyboard.screenY].map(Math.round).join(",")
+      : null;
+    stable = measurement?.keyboard && current === previous ? stable + 1 : 0;
+    previous = current;
+    if (stable >= 3) break;
+    await delay(150);
+  } while (Date.now() < deadline);
+
+  assert(stable >= 3, `Focused input and keyboard must settle: ${JSON.stringify(measurement)}`);
+  return measurement;
+}
+
+ad("open", appId, "--platform", "android", "--no-test-ime");
+const targets = ad("cdp", "target", "list", "--url", metroUrl)
+  .split("\n")
+  .filter((line) => line.includes(appId));
+assert.equal(targets.length, 1, "Connect only the test app to this Metro server");
+ad("cdp", "target", "select", targets[0].split(/\s+/)[0]);
+
+try {
+  evaluate(`(${reactNative}).Keyboard.dismiss()`);
+  ad("open", appId, "paseo://settings", "--platform", "android", "--no-test-ime");
+  ad("wait", "text", "Appearance", "5000");
+  ad("open", appId, "paseo://settings/appearance", "--platform", "android", "--no-test-ime");
+  ad("wait", "text", "Code size", "5000");
+  const snapshot = JSON.parse(ad("snapshot", "-i", "--json"));
+  const numericFields = snapshot.data.nodes.filter(
+    (node) => node.type === "android.widget.EditText" && /^\d+$/.test(node.value ?? ""),
+  );
+  assert.equal(numericFields.length, 3, "All three font sizes must be visible without scrolling");
+  ad("screenshot", resolve(artifacts, "before-keyboard.png"));
+  // Appearance orders Interface size, Content size, then Code size.
+  ad("press", `@${numericFields[2].ref}`);
+
+  const measurement = await waitForFocusedInput();
+  // Android measureInWindow excludes the status bar, Keyboard.metrics uses screen coordinates.
+  const inputBottom = measurement.y + measurement.height + measurement.statusBarHeight;
+  const keyboardTop = measurement.keyboard.screenY;
+  console.log(JSON.stringify({ inputBottom, keyboardTop, measurement }));
+  ad("screenshot", resolve(artifacts, "keyboard.png"));
+  assert(
+    inputBottom <= keyboardTop + 1 / measurement.scale,
+    "Code size must be fully visible above the number keyboard (within one physical pixel)",
+  );
+  console.log("PASS: focusing Code size reveals the whole field above the keyboard");
+
+  evaluate(`(${reactNative}).Keyboard.dismiss()`);
+  ad(
+    "open",
+    appId,
+    `paseo://settings/hosts/${encodeURIComponent(serverId)}/plugins`,
+    "--platform",
+    "android",
+    "--no-test-ime",
+  );
+  ad("wait", "text", "Plugin source", "5000");
+  const plugins = JSON.parse(ad("snapshot", "-i", "--json"));
+  const source = plugins.data.nodes.find((node) => node.type === "android.widget.EditText");
+  assert(source, "The connected host must support installing plugins from source");
+  ad("press", `@${source.ref}`);
+  ad("type", "qa-source");
+  const pluginMeasurement = await waitForFocusedInput();
+  // A FormTextInput draws its border and padding on the native input's parent.
+  // Measure that visible frame, rather than accepting only the text as visible.
+  const hierarchy = JSON.parse(ad("snapshot", "--json")).data.nodes;
+  const focused = hierarchy.find((node) => node.type === "android.widget.EditText" && node.focused);
+  assert(focused, "Plugin source must remain focused after typing");
+  assert.equal(focused.value, "qa-source", "Typed source must remain in the focused field");
+  const frame = hierarchy.find((node) => node.index === focused.parentIndex);
+  assert(frame, "The source input's visible frame must be present in the native hierarchy");
+  assert(
+    frame.rect.height > focused.rect.height,
+    "Measure the surrounding frame, including padding",
+  );
+  const frameBottom = frame.rect.y + frame.rect.height;
+  const pluginKeyboardTop = pluginMeasurement.keyboard.screenY * pluginMeasurement.scale;
+  console.log(JSON.stringify({ frameBottom, keyboardTop: pluginKeyboardTop, frame: frame.rect }));
+  ad("screenshot", resolve(artifacts, "plugin-source-keyboard.png"));
+  assert(
+    frameBottom <= pluginKeyboardTop + 1,
+    "Plugin source frame must be fully visible above the keyboard (within one physical pixel)",
+  );
+  console.log("PASS: focusing Plugin source reveals the whole field frame above the keyboard");
+} finally {
+  evaluate(`(${reactNative}).Keyboard.dismiss()`);
+  evaluate("delete globalThis.__appearanceKeyboardMeasurement");
+}
@@ -0,0 +1,47 @@
+# Late composer pill clearance
+
+This regression opens a completed conversation, relaunches the Android app, and
+registers a composer pill five seconds after the client plugin loads. It checks
+that the completed turn's Copy and Fork buttons remain fully above the pill.
+The daemon, plugin API, native app, layout, and accessibility bounds are real;
+no provider calls are needed during the test.
+
+Prerequisites:
+
+- Build the server and app dependencies with `npm run build:server` and
+  `npm run build --workspace=@getpaseo/expo-two-way-audio`.
+- Run an isolated development daemon on a non-default port.
+- Run this checkout's Metro server and open the connected Android dev client
+  with `agent-device`. The app must already know the isolated daemon.
+- Open a completed conversation on a compact portrait Android emulator, at the
+  latest turn, with no other composer tracks visible. Keep the software keyboard
+  closed. Note the workspace and agent IDs from the daemon.
+
+Set `WORKSPACE_ID` and `AGENT_ID` to that conversation, then run from the
+repository root, substituting the session and ports:
+
+```sh
+PASEO_OVERLAY_ARTIFACTS_DIR=.dev/composer-overlay-evidence \
+  node packages/app/e2e/mobile/composer-overlay/android.mjs \
+  composer-overlay ws://127.0.0.1:6843/ws "$WORKSPACE_ID" "$AGENT_ID" sh.paseo.debug 8193
+```
+
+The runner installs and removes its delayed plugin and leaves the conversation
+intact. It preserves the daemon's previous plugins-enabled setting. The evidence directory
+contains the cold-reopen screenshot and raw accessibility snapshot. Without an
+explicit directory, temporary evidence is removed with the fixture.
+
+To check an existing capture independently:
+
+```sh
+node packages/app/e2e/mobile/composer-overlay/assert-footer-clear.mjs \
+  .dev/composer-overlay-evidence/cold-reopen.json 'Overlay regression pill'
+```
+
+On the failing baseline, the Copy button extends below the pill's top edge. With
+the correction, both actions are clear before the composer receives focus.
+
+Additional checks on the same conversation: opening the keyboard keeps the footer
+clear; after scrolling up, a newly registered pill must not jump back to the latest
+turn. Native iOS uses a different keyboard implementation and needs its own device
+verification.
@@ -0,0 +1,95 @@
+// Start on a completed conversation in the connected Android dev client.
+// node android.mjs <session> <daemon-ws-url> <workspace-id> <agent-id> [app-id] [metro-port]
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { WebSocket } from "ws";
+import { DaemonClient } from "../../../../client/dist/daemon-client.js";
+
+const [, , session, daemonUrl, workspaceId, agentId, appId = "sh.paseo.debug", metroPort = "8081"] =
+  process.argv;
+assert(
+  session && daemonUrl && workspaceId && agentId,
+  "Pass a session, isolated daemon URL, workspace ID, and agent ID",
+);
+const url = new URL(daemonUrl);
+assert(["127.0.0.1", "localhost"].includes(url.hostname), "Use an isolated loopback daemon");
+assert(!["", "6767", "6768"].includes(url.port), "Do not use the installed or development daemon");
+const directory = await mkdtemp(path.join(tmpdir(), "paseo-composer-overlay-"));
+const artifacts = process.env.PASEO_OVERLAY_ARTIFACTS_DIR ?? path.join(directory, "evidence");
+await mkdir(artifacts, { recursive: true });
+const pluginId = "composer-overlay-mobile-repro";
+const pillLabel = "Overlay regression pill";
+const client = new DaemonClient({
+  url: daemonUrl,
+  clientId: "composer-overlay-mobile-regression",
+  clientType: "cli",
+  appVersion: JSON.parse(await readFile(new URL("../../../package.json", import.meta.url))).version,
+  webSocketFactory: (address, options) => new WebSocket(address, options),
+});
+function ad(...args) {
+  return execFileSync("agent-device", [...args, "--session", session], {
+    encoding: "utf8",
+    timeout: 90_000,
+  });
+}
+let installed = false;
+let previousConfig;
+try {
+  ad("wait", 'label="Copy turn"', "20000");
+  await client.connect();
+  previousConfig = (await client.getDaemonConfig()).config;
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: pluginId,
+      requirements: { paseo: ">=0.11.4" },
+    }),
+  );
+  await writeFile(
+    path.join(directory, "index.client.tsx"),
+    `export default function contribute(client) {
+    let pill;
+    const timer = setTimeout(() => {
+      pill = client.addComposerPill({
+        id: "late-pill", workspaceId: ${JSON.stringify(workspaceId)}, agentId: ${JSON.stringify(agentId)},
+        button: { title: ${JSON.stringify(pillLabel)}, icon: "Clock", behavior: { kind: "action", onPress() {} } },
+      });
+    }, 5000);
+    return () => { clearTimeout(timer); pill?.remove(); };
+  }`,
+  );
+  await client.installDirectoryPlugin(directory);
+  installed = true;
+  ad("wait", `label="${pillLabel}"`, "20000");
+  // Match the report: reopen a completed conversation, then let the plugin register late.
+  ad(
+    "open",
+    appId,
+    "--platform",
+    "android",
+    "--metro-port",
+    metroPort,
+    "--no-test-ime",
+    "--relaunch",
+  );
+  ad("wait", `label="${pillLabel}"`, "20000");
+  const capture = path.join(artifacts, "cold-reopen.json");
+  await writeFile(capture, ad("snapshot", "--raw", "--json"));
+  ad("screenshot", path.join(artifacts, "cold-reopen.png"));
+  execFileSync(
+    process.execPath,
+    [fileURLToPath(new URL("./assert-footer-clear.mjs", import.meta.url)), capture, pillLabel],
+    { stdio: "inherit" },
+  );
+} finally {
+  if (installed) await client.removePlugin(pluginId);
+  if (previousConfig)
+    await client.patchDaemonConfig({ pluginsEnabled: previousConfig.pluginsEnabled });
+  await client.close();
+  await rm(directory, { recursive: true, force: true });
+}
@@ -0,0 +1,21 @@
+// Assert geometry from a fresh agent-device snapshot --raw --json capture.
+// node assert-footer-clear.mjs <snapshot.json> <composer-pill-label>
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+
+const [, , snapshotPath, pillLabel] = process.argv;
+assert(snapshotPath && pillLabel, "Pass a snapshot JSON path and composer pill label");
+const { data } = JSON.parse(readFileSync(snapshotPath, "utf8"));
+const buttons = data.nodes.filter((node) => node.type === "android.widget.Button");
+const pill = buttons.find((node) => node.label === pillLabel);
+assert(pill?.rect, `Composer pill '${pillLabel}' must be visible`);
+for (const label of ["Copy turn", "Fork chat from here"]) {
+  const button = buttons.find((node) => node.label === label);
+  assert(button?.rect, `Completed-turn action '${label}' must be visible`);
+  const bottom = button.rect.y + button.rect.height;
+  assert(
+    bottom <= pill.rect.y,
+    `${label} ends at ${bottom}, below composer pill top ${pill.rect.y}`,
+  );
+}
+console.log("PASS: completed-turn actions remain fully above the composer pill");
@@ -0,0 +1,45 @@
+# Native retained status-ring regression
+
+This runs the production native ring and clock inside real retained panels with
+Reanimated on Android. A probe consumes the same public rotation hook and counts
+UI-runtime value changes. No Reanimated mocks or provider processes are used.
+
+Use an Android development client compatible with the checkout's native dependencies.
+In a disposable checkout, temporarily replace `packages/app/index.ts` with:
+
+```tsx
+import "./src/polyfills/install-early";
+import "./src/styles/unistyles";
+import { registerRootComponent } from "expo";
+import NativeRingRegression from "./e2e/mobile/status-ring/native";
+registerRootComponent(NativeRingRegression);
+```
+
+Start Metro in `packages/app`:
+
+```sh
+APP_VARIANT=development npx expo start --localhost --port 8096
+```
+
+With one Android emulator running, open that bundle:
+
+```sh
+agent-device open sh.paseo.debug 'exp+voice-mobile://expo-development-client/?url=http%3A%2F%2F10.0.2.2%3A8096' --platform android --session status-ring --metro-port 8096
+```
+
+From the repository root:
+
+```sh
+node packages/app/e2e/mobile/status-ring/android.mjs status-ring http://127.0.0.1:8096
+```
+
+The test checks visible rotation, hidden-panel inactivity while another ring is
+visible, inactivity with both panels hidden, and synchronized resumption. Each
+sample reads counters on the UI runtime; elapsed time includes device-command
+latency. The baseline fails at the first hidden-panel assertion.
+
+Restore the original `packages/app/index.ts`, close the agent-device session,
+and stop Metro afterward. The fixture substitutes running rings for a live agent
+and toggles retained panels directly; it does not exercise workspace navigation
+or measure whole-app CPU usage. It is excluded from routine unit tests because
+it requires a native runtime.
@@ -0,0 +1,71 @@
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { setTimeout as delay } from "node:timers/promises";
+
+const [, , session, metroUrl] = process.argv;
+assert(session && metroUrl, "Pass an agent-device session and Metro URL serving native.tsx");
+function ad(...args) {
+  return execFileSync("agent-device", ["--session", session, ...args], {
+    encoding: "utf8",
+    timeout: 60_000,
+  });
+}
+function evaluate(expression) {
+  const value = ad("cdp", "runtime", "eval", "--expr", expression, "--json").trim();
+  return value === "undefined" ? undefined : JSON.parse(value);
+}
+let target;
+const deadline = Date.now() + 30_000;
+do {
+  target = ad("cdp", "target", "list", "--url", metroUrl)
+    .split("\n")
+    .find((line) => line.includes("sh.paseo.debug"));
+  if (!target) await delay(250);
+} while (!target && Date.now() < deadline);
+assert(target, "Open the Android dev client on this Metro bundle first");
+ad("cdp", "target", "select", target.split(/\s+/)[0]);
+let ready = false;
+do {
+  ready = evaluate("Object.keys(globalThis.__ringReaders ?? {}).length === 2");
+  if (!ready) await delay(250);
+} while (!ready && Date.now() < deadline);
+assert(ready, "The two native probes must mount before sampling");
+async function sample() {
+  evaluate("Object.values(globalThis.__ringReaders).forEach(read => read())");
+  await delay(100);
+  return JSON.parse(evaluate("JSON.stringify(globalThis.__ringSamples)"));
+}
+async function observe(label) {
+  const before = await sample();
+  await delay(600);
+  const after = await sample();
+  const deltas = Object.fromEntries(
+    Object.keys(before).map((key) => [key, after[key].updates - before[key].updates]),
+  );
+  console.log(JSON.stringify({ label, deltas, after }));
+  return { deltas, after };
+}
+const visible = await observe("both visible");
+assert(visible.deltas.first > 0 && visible.deltas.second > 0);
+assert.equal(visible.after.first.rotation, visible.after.second.rotation);
+ad("press", 'label="HIDE FIRST"');
+await delay(200);
+const hidden = await observe("first hidden, second visible");
+assert.equal(hidden.deltas.first, 0, "A retained hidden ring must stop UI-thread rotation updates");
+assert(hidden.deltas.second > 0, "Visible rings must continue rotating");
+ad("press", 'label="HIDE SECOND"');
+await delay(200);
+const allHidden = await observe("both hidden");
+assert.equal(allHidden.deltas.first, 0);
+assert.equal(allHidden.deltas.second, 0);
+ad("press", 'label="SHOW FIRST"');
+ad("press", 'label="SHOW SECOND"');
+await delay(200);
+const restored = await observe("both shown again");
+assert(restored.deltas.first > 0 && restored.deltas.second > 0);
+assert.equal(
+  restored.after.first.rotation,
+  restored.after.second.rotation,
+  "Restored rings must share the current phase",
+);
+console.log("PASS native retained-ring lifecycle");
@@ -0,0 +1,69 @@
+import { useCallback, useLayoutEffect, useState } from "react";
+import { Button, Text, View } from "react-native";
+import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
+import { scheduleOnRN, scheduleOnUI } from "react-native-worklets";
+import { RetainedPanel } from "@/components/retained-panel";
+import { useStatusRingRotation } from "@/components/status-ring/clock";
+import { StatusRing } from "@/components/status-ring";
+
+interface Sample {
+  updates: number;
+  rotation: number;
+}
+
+declare global {
+  var __ringSamples: Record<string, Sample>;
+  var __ringReaders: Record<string, () => void>;
+}
+
+function recordSample(name: string, value: { updates: number; rotation: number }) {
+  globalThis.__ringSamples[name] = value;
+}
+
+function Probe({ name }: { name: string }) {
+  const rotation = useStatusRingRotation();
+  const updates = useSharedValue(0);
+  useAnimatedReaction(
+    () => rotation.value,
+    () => {
+      updates.value += 1;
+    },
+  );
+  // Read the real UI runtime, without scheduling a continuous JS observer.
+  useLayoutEffect(() => {
+    globalThis.__ringSamples ??= {};
+    globalThis.__ringReaders ??= {};
+    globalThis.__ringReaders[name] = () =>
+      scheduleOnUI(() => {
+        "worklet";
+        const sample = { updates: updates.value, rotation: rotation.value };
+        scheduleOnRN(recordSample, name, sample);
+      });
+    return () => {
+      delete globalThis.__ringReaders[name];
+    };
+  }, [name, rotation, updates]);
+  return <StatusRing />;
+}
+
+const containerStyle = { flex: 1, padding: 60, backgroundColor: "white" };
+
+export default function NativeRingRegression() {
+  const [first, setFirst] = useState(true);
+  const [second, setSecond] = useState(true);
+  const toggleFirst = useCallback(() => setFirst((value) => !value), []);
+  const toggleSecond = useCallback(() => setSecond((value) => !value), []);
+  return (
+    <View style={containerStyle}>
+      <Text>Native retained status rings</Text>
+      <Button title={first ? "Hide first" : "Show first"} onPress={toggleFirst} />
+      <Button title={second ? "Hide second" : "Show second"} onPress={toggleSecond} />
+      <RetainedPanel active={first}>
+        <Probe name="first" />
+      </RetainedPanel>
+      <RetainedPanel active={second}>
+        <Probe name="second" />
+      </RetainedPanel>
+    </View>
+  );
+}
@@ -0,0 +1,27 @@
+/** @param {import('@playwright/test').Page} page */
+export async function installDeveloperToastDismissal(page) {
+  // Keep developer chrome out of app actions without pointer/focus changes.
+  // Locator handlers can deadlock when concurrent checks dismiss the same toast.
+  const install = () => {
+    let observedRoot;
+    const options = { childList: true, subtree: true };
+    const dismiss = () => {
+      const toast = document.getElementById("error-toast");
+      const root = toast?.shadowRoot ?? toast;
+      if (root && root !== observedRoot) {
+        observer.disconnect();
+        observer.observe(document, options);
+        observer.observe(root, options);
+        observedRoot = root;
+      }
+      // Expo's toast root contains dismiss buttons; its overlay has a different ID.
+      for (const button of root?.querySelectorAll("button") ?? [])
+        button.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    };
+    const observer = new MutationObserver(dismiss);
+    observer.observe(document, options);
+    dismiss();
+  };
+  await page.addInitScript(install);
+  await page.evaluate(install);
+}
@@ -1,4 +1,5 @@
 import { test as base, expect, type Page } from "@playwright/test";
+import { installDeveloperToastDismissal } from "./developer-ui.mjs";
 import { startOutdatedDaemon, type OutdatedDaemon } from "./helpers/daemon-update";
 import { startE2EWorker } from "./helpers/e2e-worker";
 import { getE2EDaemonPort } from "./helpers/daemon-port";
@@ -130,6 +131,8 @@ const test = daemonTest.extend<{
        await ws.close({ code: 1008, reason: "Blocked connection to localhost:6767 during e2e." });
      });

+      await installDeveloperToastDismissal(page);
+
      const entries: string[] = [];

      page.on("console", (message) => {
@@ -134,6 +134,8 @@ function startMetro(port: number, buffer: ReturnType<typeof createLineBuffer>):
    env: {
      ...process.env,
      BROWSER: "none",
+      // Automation never opens native DevTools or installs its desktop shell.
+      EXPO_UNSTABLE_HEADLESS: "1",
      ...(process.env.E2E_DESKTOP_RUNTIME === "1" ? { PASEO_WEB_PLATFORM: "electron" } : {}),
    },
    stdio: ["ignore", "pipe", "pipe"],
@@ -1,3 +1,4 @@
+import { inspectSessionWireRequest } from "./session-wire";
 import type { Page, WebSocketRoute } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";

@@ -16,11 +17,7 @@ interface SendAgentMessageRequest {
 function readSendRequest(message: WebSocketMessage): SendAgentMessageRequest | null {
  if (typeof message !== "string") return null;
  try {
-    const envelope = JSON.parse(message) as {
-      type?: unknown;
-      message?: Record<string, unknown>;
-    };
-    const request = envelope.type === "session" ? envelope.message : null;
+    const request = inspectSessionWireRequest(message)?.request;
    if (
      request?.type !== "send_agent_message_request" ||
      typeof request.requestId !== "string" ||
@@ -363,10 +363,11 @@ export async function resizeComposerViewport(
  await page.setViewportSize(sizes[orientation]);
  // Before the app has loaded there is no layout to wait for.
  if (page.url() === "about:blank") return;
-  // Crossing the compact breakpoint remounts the shell and the editor. Anything that
-  // follows (a shortcut, a locator) belongs to the layout the new size implies, so
-  // wait for that layout before returning.
-  await expect(page.getByTestId("compact-shell")).toHaveCount(orientation === "landscape" ? 0 : 1);
+  // The shell and editor survive the breakpoint. Wait for the shell's layout
+  // marker to update before interacting with the resized composer.
+  await expect(
+    page.getByTestId(orientation === "landscape" ? "wide-shell" : "compact-shell"),
+  ).toBeVisible();
 }
 export async function selectComposerDraftRange(
  page: Page,
@@ -501,3 +502,59 @@ export async function expectNoCollapsedVisibleComposer(page: Page): Promise<void
  expect(frames.length).toBeGreaterThan(0);
  expect(frames.filter((frame) => frame.root < 42 || frame.input < 42)).toEqual([]);
 }
+
+/** Exercise the quick-return race before a hidden pane gets a rendering frame. */
+export async function roundTripComposerTabBeforePaint(
+  page: Page,
+  activeChatTitle: string,
+): Promise<void> {
+  const activeTab = page.getByRole("button", { name: activeChatTitle, exact: true });
+  await expect(activeTab).toHaveAttribute("aria-selected", "true");
+  const result = await activeTab.evaluate((tab) => {
+    const editor = document.activeElement;
+    return new Promise<{ returnedBeforePaint: boolean; focused: boolean }>((resolve) => {
+      let switchedAway = false;
+      let painted = false;
+      let frame = 0;
+      const shortcut = (code: "BracketLeft" | "BracketRight") => {
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: code === "BracketLeft" ? "{" : "}",
+            code,
+            altKey: true,
+            shiftKey: true,
+            bubbles: true,
+            cancelable: true,
+          }),
+        );
+      };
+      // Watch selection commits without reading layout: a layout read could make
+      // Chromium blur the hidden editor and erase the condition under test.
+      const observer = new MutationObserver(() => {
+        if (!switchedAway && tab.getAttribute("aria-selected") === "false") {
+          switchedAway = true;
+          frame = requestAnimationFrame(() => {
+            painted = true;
+          });
+          // Deliver the return shortcut before rendering, without a Playwright
+          // round trip allowing the browser to paint the inactive tab first.
+          shortcut("BracketRight");
+        } else if (switchedAway && tab.getAttribute("aria-selected") === "true") {
+          observer.disconnect();
+          cancelAnimationFrame(frame);
+          return resolve({
+            returnedBeforePaint: !painted,
+            focused: document.activeElement === editor,
+          });
+        }
+      });
+      observer.observe(tab, { attributes: true, attributeFilter: ["aria-selected"] });
+      shortcut("BracketLeft");
+    });
+  });
+  expect(
+    result.returnedBeforePaint,
+    "tab round trip must finish before rendering the hidden pane",
+  ).toBe(true);
+  expect(result.focused, "returning on touch must leave the composer unfocused").toBe(false);
+}
@@ -37,7 +37,7 @@ export async function hoverContextWindowMeter(page: Page, name = METER_NAME): Pr
  await page.getByRole("img", { name, exact: true }).hover({ timeout: 30_000 });
  const card = contextWindowDetails(page);
  await expect(card).toBeVisible();
-  await expect(card).toBeInViewport();
+  await expect(card).toBeInViewport({ ratio: 1 });
  return card;
 }

@@ -24,6 +24,7 @@ interface E2EDaemonClientConfig {
  clientType: "cli";
  appVersion?: string;
  webSocketFactory?: NodeWebSocketFactory;
+  capabilities?: Record<string, unknown>;
 }

 function resolveDaemonWsUrl(port?: number): string {
@@ -34,6 +35,7 @@ export interface ConnectDaemonClientOptions {
  clientIdPrefix: string;
  appVersion?: string;
  port?: number;
+  capabilities?: Record<string, unknown>;
 }

 /**
@@ -51,6 +53,7 @@ export async function connectDaemonClient<ClientInstance extends { connect(): Pr
    clientType: "cli",
    appVersion: options.appVersion ?? loadAppVersion(),
    webSocketFactory: createNodeWebSocketFactory(),
+    capabilities: options.capabilities,
  });
  await client.connect();
  return client;
@@ -71,3 +74,12 @@ export async function loadProtocolSchemas(): Promise<typeof import("@getpaseo/pr
  ).href;
  return import(moduleUrl);
 }
+
+export async function loadPaseoApiFactory(): Promise<
+  (typeof import("@getpaseo/client"))["createPaseoApi"]
+> {
+  const moduleUrl = pathToFileURL(
+    path.resolve(__dirname, "../../../../../packages/client/dist/index.js"),
+  ).href;
+  return (await import(moduleUrl)).createPaseoApi;
+}
@@ -1,3 +1,4 @@
+import { inspectSessionWireRequest } from "./session-wire";
 import type { Page, WebSocketRoute } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";

@@ -71,12 +72,11 @@ function readSessionMessage(message: string | Buffer): ClientRequest | null {

 function readClientRequest(message: string | Buffer): ClientRequest | null {
  if (typeof message !== "string") return null;
+  const session = inspectSessionWireRequest(message);
+  if (session) return session.request;
  try {
-    const envelope = JSON.parse(message) as {
-      type?: unknown;
-      message?: ClientRequest;
-    };
-    return envelope.type === "session" ? (envelope.message ?? null) : envelope;
+    const envelope = JSON.parse(message) as ClientRequest;
+    return envelope.type === "session" ? null : envelope;
  } catch {
    return null;
  }
@@ -0,0 +1,44 @@
+/** Inspect an ordinary session request while preserving any owning transport envelopes. */
+export function inspectSessionWireRequest(message: string | Buffer): {
+  request: Record<string, unknown>;
+  reply(response: unknown): string;
+} | null {
+  const routes: string[] = [];
+  let raw = typeof message === "string" ? message : message.toString("utf8");
+  try {
+    for (;;) {
+      const envelope = JSON.parse(raw);
+      if (envelope?.type !== "session" || !envelope.message || typeof envelope.message !== "object")
+        return null;
+      const request: Record<string, unknown> = envelope.message;
+      if (request.type !== "hosts.route.frame.request") {
+        return {
+          request,
+          reply(response) {
+            let data = JSON.stringify({ type: "session", message: response });
+            for (const subscriptionId of routes.toReversed()) {
+              data = JSON.stringify({
+                type: "session",
+                message: {
+                  type: "hosts.route.frame",
+                  payload: { subscriptionId, data, binary: false },
+                },
+              });
+            }
+            return data;
+          },
+        };
+      }
+      if (
+        typeof request.routeId !== "string" ||
+        typeof request.data !== "string" ||
+        request.binary !== false
+      )
+        return null;
+      routes.push(request.routeId);
+      raw = request.data;
+    }
+  } catch {
+    return null;
+  }
+}
@@ -276,15 +276,22 @@ export async function swipeOpenMobileExplorer(page: Page): Promise<void> {
 }

 export async function closeMobileExplorer(page: Page): Promise<void> {
-  const closeButton = page.getByTestId("explorer-close");
+  const closeButton = page
+    .getByTestId("workspace-explorer-sidebar")
+    .getByRole("button", { name: "Close Explorer sidebar", exact: true });
  await expect(closeButton).toBeInViewport({ ratio: 1, timeout: 5_000 });
  await closeButton.click();
 }

 export async function expectMobileExplorerVisible(page: Page): Promise<void> {
-  await expect(page.getByTestId("explorer-header")).toBeInViewport({ ratio: 1, timeout: 5_000 });
+  await expect(page.getByTestId("workspace-explorer-sidebar")).toBeInViewport({
+    ratio: 1,
+    timeout: 5_000,
+  });
 }

 export async function expectMobileExplorerHidden(page: Page): Promise<void> {
-  await expect(page.getByTestId("explorer-header")).not.toBeInViewport({ timeout: 5_000 });
+  await expect(page.getByTestId("workspace-explorer-sidebar")).not.toBeInViewport({
+    timeout: 5_000,
+  });
 }
@@ -1,3 +1,15 @@
+import type { HostRuntimeStore } from "@/runtime/host-runtime";
+import { addConnectedHostAndReload } from "./hosts";
+import { buildSeededHost } from "./daemon-registry";
+import { openAgentRoute } from "./mock-agent";
+import { openSessions, clickSessionRow } from "./archive-tab";
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { randomUUID } from "node:crypto";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { connectDaemonClient, loadPaseoApiFactory } from "./daemon-client-loader";
+import { startIsolatedHostDaemon } from "./isolated-host-daemon";
+import { seedWorkspace } from "./seed-client";
+import { inspectSessionWireRequest } from "./session-wire";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
 import { expect, type Page } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";
@@ -251,22 +263,19 @@ export async function rejectNextManagedSubagentArchiveRequest(
  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
    const server = ws.connectToServer();
    ws.onMessage((message) => {
-      const requestId = archiveRequestId(message, subagentId);
-      if (requestId && !rejected) {
+      const intercepted = archiveRequest(message, subagentId);
+      if (intercepted && !rejected) {
        rejected = true;
        // A daemon-rejected archive RPC: the request never reaches the daemon, and its normal
        // correlated error travels back through the real browser client and mutation rollback.
        ws.send(
-          JSON.stringify({
-            type: "session",
-            message: {
-              type: "rpc_error",
-              payload: {
-                requestId,
-                requestType: "archive_agent_request",
-                error: "Archive rejected for test",
-                code: "archive_rejected",
-              },
+          intercepted.reply({
+            type: "rpc_error",
+            payload: {
+              requestId: intercepted.request.requestId,
+              requestType: "archive_agent_request",
+              error: "Archive rejected for test",
+              code: "archive_rejected",
            },
          }),
        );
@@ -282,28 +291,18 @@ export async function rejectNextManagedSubagentArchiveRequest(
 }

 function isArchiveRequestForSubagent(message: WebSocketMessage, subagentId: string): boolean {
-  return archiveRequestId(message, subagentId) !== null;
+  return archiveRequest(message, subagentId) !== null;
 }

-function archiveRequestId(message: WebSocketMessage, subagentId: string): string | null {
-  const rawMessage = typeof message === "string" ? message : message.toString("utf8");
-  try {
-    const envelope = JSON.parse(rawMessage) as {
-      type?: unknown;
-      message?: { type?: unknown; agentId?: unknown; requestId?: unknown };
-    };
-    if (
-      envelope.type === "session" &&
-      envelope.message?.type === "archive_agent_request" &&
-      envelope.message.agentId === subagentId &&
-      typeof envelope.message.requestId === "string"
-    ) {
-      return envelope.message.requestId;
-    }
-    return null;
-  } catch {
-    return null;
-  }
+function archiveRequest(message: WebSocketMessage, subagentId: string) {
+  const inspected = inspectSessionWireRequest(message);
+  if (
+    inspected?.request.type === "archive_agent_request" &&
+    inspected.request.agentId === subagentId &&
+    typeof inspected.request.requestId === "string"
+  )
+    return inspected;
+  return null;
 }

 export async function detachSubagentFromTrack(page: Page, childId: string): Promise<void> {
@@ -320,3 +319,354 @@ export async function detachSubagentFromTrack(page: Page, childId: string): Prom
  await expect(detachButton).toBeVisible({ timeout: 30_000 });
  await detachButton.click();
 }
+
+/** Real equal-ID children in equal-ID workspaces, with both route authorities independently live. */
+export async function seedFleetSubagents() {
+  const workspace = await seedWorkspace({ repoPrefix: "fleet-track-" });
+  const destination = await startIsolatedHostDaemon(`fleet_${randomUUID()}`);
+  const clients: DaemonClient[] = [];
+  const apis: ReturnType<Awaited<ReturnType<typeof loadPaseoApiFactory>>>[] = [];
+  const close = async () => {
+    await Promise.allSettled(apis.map((api) => api.dispose()));
+    await Promise.allSettled(clients.map((client) => client.close()));
+    await destination.close();
+    await workspace.cleanup();
+  };
+  try {
+    const createApi = await loadPaseoApiFactory();
+    const aClient = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "fleet-origin" });
+    clients.push(aClient);
+    const bClient = await connectDaemonClient<DaemonClient>({
+      clientIdPrefix: "fleet-destination",
+      port: destination.port,
+    });
+    clients.push(bClient);
+    const origin = createApi(aClient);
+    const direct = createApi(bClient);
+    apis.push(origin, direct);
+    const registered = await origin.hosts.add({ connection: `127.0.0.1:${destination.port}` });
+    await expect
+      .poll(
+        async () =>
+          (await origin.hosts.list()).hosts.find(
+            (host) => host.registrationId === registered.registrationId,
+          )?.status,
+      )
+      .toBe("online");
+    const destinationWorkspace = await direct.workspaces.create({
+      workspaceId: workspace.workspaceId,
+      source: { kind: "directory", path: workspace.repoPath },
+    });
+    expect(destinationWorkspace.id).toBe(workspace.workspaceId);
+    const config = { provider: "mock/ten-second-stream", modeId: "load-test" };
+    const parent = await origin.workspaces
+      .ref(workspace.workspaceId)
+      .agents.create({ title: "Fleet parent", config });
+    const agentId = randomUUID();
+    const local = await parent.subagents.create({ agentId, title: "Fleet child on A", config });
+    const remote = await parent.subagents.create({
+      agentId,
+      serverId: destination.serverId,
+      workspaceId: destinationWorkspace.id,
+      title: "Fleet child on B",
+      config,
+    });
+    return {
+      workspace,
+      destination,
+      origin,
+      direct,
+      parent,
+      local,
+      remote,
+      disable: () => origin.hosts.update(registered.registrationId, { enabled: false }),
+      enable: () => origin.hosts.update(registered.registrationId, { enabled: true }),
+      close,
+    };
+  } catch (error) {
+    await close();
+    throw error;
+  }
+}
+
+export async function connectFleetDirectHost(
+  page: Page,
+  fleet: Awaited<ReturnType<typeof seedFleetSubagents>>,
+) {
+  await openAgentRoute(page, {
+    workspaceId: fleet.workspace.workspaceId,
+    agentId: fleet.parent.id,
+  });
+  await addConnectedHostAndReload(page, {
+    serverId: fleet.destination.serverId,
+    port: fleet.destination.port,
+    label: "Fleet B",
+  });
+  await page.evaluate(
+    (host) => localStorage.setItem("@paseo:e2e-extra-hosts", JSON.stringify([host])),
+    buildSeededHost({
+      serverId: fleet.destination.serverId,
+      endpoint: `127.0.0.1:${fleet.destination.port}`,
+      nowIso: new Date().toISOString(),
+      label: "Fleet B",
+    }),
+  );
+  await page.goto(
+    buildHostAgentDetailRoute(
+      fleet.destination.serverId,
+      fleet.remote.id,
+      fleet.workspace.workspaceId,
+    ),
+  );
+  await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+}
+
+export async function openFleetParentTrack(page: Page) {
+  await openSessions(page);
+  await clickSessionRow(page, "Fleet parent");
+  await openSubagentsTrack(page);
+}
+
+export async function readFleetAuthorityState(
+  page: Page,
+  originServerId: string,
+  serverId: string,
+) {
+  return page.evaluate(
+    ({ originServerId: sourceId, serverId: destinationId }) => {
+      const runtime = Reflect.get(globalThis, "__paseoHostRuntimeStore") as HostRuntimeStore;
+      const read = (origin: string) => {
+        const binding = runtime
+          .getAuthorityBindings()
+          .find(
+            (candidate) =>
+              candidate.reference.originServerId === origin &&
+              candidate.reference.serverId === destinationId,
+          );
+        const queries =
+          binding?.queries
+            .getQueryCache()
+            .findAll({ queryKey: ["providersSnapshot", destinationId] }) ?? [];
+        return {
+          status: binding?.runtime.getSnapshot(destinationId)?.connectionStatus ?? "absent",
+          hydrated: binding?.sessionStore.getState().sessions[destinationId]?.hasHydratedWorkspaces,
+          workspaceIds: [
+            ...(binding?.sessionStore.getState().sessions[destinationId]?.workspaces.keys() ?? []),
+          ],
+          catalogVersion: Math.max(0, ...queries.map((query) => query.state.dataUpdatedAt)),
+        };
+      };
+      return { direct: read(destinationId), routed: read(sourceId) };
+    },
+    { originServerId, serverId },
+  );
+}
+
+export async function expectFleetRouteUnavailable(
+  page: Page,
+  originServerId: string,
+  serverId: string,
+) {
+  await expect
+    .poll(async () => (await readFleetAuthorityState(page, originServerId, serverId)).routed.status)
+    .toMatch(/^(offline|error)$/);
+  const unavailable = page.getByText(/^(Cannot reach .+|.+ is offline)$/).filter({ visible: true });
+  const composer = page.getByRole("textbox", { name: "Message agent..." });
+  await expect(unavailable.or(composer)).toBeVisible();
+  if (await composer.isVisible()) {
+    if (await composer.isEditable()) {
+      await composer.fill("MUST_NOT_USE_DIRECT_AUTHORITY");
+      await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeDisabled();
+    } else await expect(composer).toBeDisabled();
+  } else
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toHaveCount(0);
+}
+
+/** Primary children are created by the agent's real MCP endpoint, never the seed SDK. */
+export async function delegateFleetThroughMcp() {
+  const { Client } = await import("@modelcontextprotocol/sdk/client/index.js");
+  const { StreamableHTTPClientTransport } =
+    await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
+  const { getE2EDaemonPort } = await import("./daemon-port");
+  const { z } = await import("zod");
+  const workspace = await seedWorkspace({ repoPrefix: "mcp-fleet-journey-" });
+  const destination = await startIsolatedHostDaemon(`fleet_${randomUUID()}`);
+  const createApi = await loadPaseoApiFactory();
+  const aClient = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "mcp-fleet-origin" });
+  const bClient = await connectDaemonClient<DaemonClient>({
+    clientIdPrefix: "mcp-fleet-observer",
+    port: destination.port,
+  });
+  const origin = createApi(aClient);
+  const direct = createApi(bClient);
+  const mcp = new Client({ name: "fleet-delegating-agent", version: "1.0.0" });
+  const close = async () => {
+    await mcp.close();
+    await Promise.allSettled([origin.dispose(), direct.dispose()]);
+    await Promise.allSettled([aClient.close(), bClient.close()]);
+    await destination.close();
+    await workspace.cleanup();
+  };
+  const call = async (name: string, args: Record<string, unknown> = {}) => {
+    const result = await mcp.callTool({ name, arguments: args });
+    expect(result, `${name} result`).not.toMatchObject({ isError: true });
+    return z.record(z.string(), z.unknown()).parse(result.structuredContent);
+  };
+  try {
+    const config = { provider: "mock/ten-second-stream", modeId: "load-test" };
+    const parent = await origin.workspaces
+      .ref(workspace.workspaceId)
+      .agents.create({ title: "Fleet MCP parent", config });
+    const registered = await origin.hosts.add({
+      connection: `127.0.0.1:${destination.port}`,
+      label: "Fleet B",
+    });
+    await expect
+      .poll(
+        async () =>
+          (await origin.hosts.list()).hosts.find(
+            (host) => host.registrationId === registered.registrationId,
+          )?.status,
+      )
+      .toBe("online");
+    await mcp.connect(
+      new StreamableHTTPClientTransport(
+        new URL(`http://127.0.0.1:${getE2EDaemonPort()}/mcp/agents?callerAgentId=${parent.id}`),
+      ),
+    );
+    const hosts = await call("list_hosts");
+    expect(hosts).toMatchObject({
+      hosts: expect.arrayContaining([
+        expect.objectContaining({ serverId: destination.serverId, label: "Fleet B" }),
+      ]),
+    });
+    const target = await call("create_workspace", {
+      serverId: destination.serverId,
+      isolation: "local",
+      path: workspace.repoPath,
+      title: "Fleet B workspace",
+    });
+    const targetWorkspaceId = z.string().parse(target.workspaceId);
+    expect(await call("list_workspaces", { serverId: destination.serverId })).toMatchObject({
+      workspaces: expect.arrayContaining([
+        expect.objectContaining({ workspaceId: targetWorkspaceId }),
+      ]),
+    });
+    const createChild = async (serverId: string, workspaceId: string, title: string) => {
+      const result = await call("create_agent", {
+        serverId,
+        workspaceId,
+        title,
+        provider: config.provider,
+        settings: { modeId: config.modeId },
+        initialPrompt: `Complete ${title}`,
+        notifyOnFinish: true,
+      });
+      const agentId = z.string().parse(result.agentId);
+      const submissionId = z.string().parse(result.submissionId);
+      expect(await call("get_agent_status", { serverId, agentId })).toMatchObject({ serverId });
+      expect(await call("get_agent_activity", { serverId, agentId })).toMatchObject({ serverId });
+      expect(await call("list_agents", { serverId })).toMatchObject({
+        serverId,
+        agents: expect.arrayContaining([expect.objectContaining({ id: agentId })]),
+      });
+      return { id: agentId, serverId, workspaceId, submissionId, title };
+    };
+    const local = await createChild(parent.serverId, workspace.workspaceId, "MCP child on A");
+    const remote = await createChild(destination.serverId, targetWorkspaceId, "MCP child on B");
+    // Opposite-host collisions are unrelated fixture agents. Neither primary child is seeded.
+    await direct.agents.create({
+      agentId: local.id,
+      cwd: workspace.repoPath,
+      title: "Unrelated collision on B",
+      config,
+    });
+    await origin.agents.create({
+      agentId: remote.id,
+      cwd: workspace.repoPath,
+      title: "Unrelated collision on A",
+      config,
+    });
+    expect((await parent.subagents.list()).rows.map((row) => row.child)).toEqual(
+      expect.arrayContaining([
+        { serverId: local.serverId, agentId: local.id },
+        { serverId: remote.serverId, agentId: remote.id },
+      ]),
+    );
+    return {
+      workspace,
+      destination,
+      parent,
+      local,
+      remote,
+      origin,
+      direct,
+      close,
+      async expectCompletion(child: typeof local) {
+        await expect
+          .poll(
+            async () => {
+              const timeline = await parent.timeline.refetch();
+              return timeline.entries
+                .flatMap(({ item }) =>
+                  item.type === "tool_call" && item.agentMessage ? [item.agentMessage] : [],
+                )
+                .filter(
+                  (message) =>
+                    message.event === "finished" &&
+                    message.sender.address?.serverId === child.serverId &&
+                    message.text.includes(child.submissionId),
+                );
+            },
+            { timeout: 30000 },
+          )
+          .toHaveLength(1);
+      },
+    };
+  } catch (error) {
+    await close();
+    throw error;
+  }
+}
+
+export async function readFleetCompletion(
+  page: Page,
+  child: { title: string; submissionId: string },
+) {
+  await expect(
+    page.getByRole("button", { name: new RegExp(`Agent finished.*${child.title}`) }),
+  ).toBeVisible();
+}
+
+/** Records observed requests and runtime-owned sessions without opening extra scopes. */
+export function observeFleetRouteOwnership(page: Page) {
+  const requests: Record<string, number> = {};
+  let sockets = 0;
+  page.on("websocket", (socket) => {
+    sockets++;
+    socket.on("framesent", ({ payload }) => {
+      const request = inspectSessionWireRequest(payload)?.request;
+      if (!request || typeof request.type !== "string") return;
+      if (request.subscribe !== undefined || request.type === "hosts.route.open.request")
+        requests[request.type] = (requests[request.type] ?? 0) + 1;
+    });
+  });
+  return async () => ({
+    sockets,
+    cumulativeRequests: { ...requests },
+    bindings: await page.evaluate(() => {
+      const registry = Reflect.get(globalThis, "__paseoHostRuntimeStore") as HostRuntimeStore;
+      return registry.getAuthorityBindings().map((binding) => {
+        const id = binding.reference.serverId;
+        const session = binding.sessionStore.getState().sessions[id];
+        return {
+          reference: binding.reference,
+          status: binding.runtime.getSnapshot(id)?.connectionStatus,
+          session: session?.client !== null && session?.client !== undefined,
+          workspaceReplica: session?.hasHydratedWorkspaces === true,
+          timelineReplica: session?.viewedTimelineSync !== undefined,
+        };
+      });
+    }),
+  });
+}
@@ -35,6 +35,8 @@ export type { WorkspaceSetupDaemonClient };
 export async function connectWorkspaceSetupClient(): Promise<WorkspaceSetupDaemonClient> {
  const client = await connectDaemonClient<WorkspaceSetupDaemonClient>({
    clientIdPrefix: "workspace-setup",
+    // COMPAT(workspaceSetupObservation): legacy streaming coverage; remove after 2027-04-19.
+    capabilities: { workspace_setup_observation: false },
  });
  // Establish demand before a caller can launch setup. Client close releases it.
  try {
@@ -326,3 +328,51 @@ export async function waitForWorkspaceSetupProgress(
    });
  });
 }
+
+/** Observe the browser's actual setup membership without requesting any output. */
+export function observeSetupPanelTraffic(page: Page) {
+  const subscriptions: Array<{ workspaceId: string; subscriptionId: string }> = [];
+  const releases = new Set<string>();
+  const requests: string[] = [];
+  let legacySetupDemand = false;
+  const outputWorkspaces: string[] = [];
+  page.on("websocket", (socket) => {
+    socket.on("framesent", ({ payload }) => {
+      const frame = JSON.parse(String(payload));
+      if (frame.type !== "session") return;
+      if (frame.message?.type === "subscription.release.request")
+        releases.add(frame.message.subscriptionId);
+      if (frame.message?.type === "workspace.setup.subscribe.request")
+        requests.push(frame.message.workspaceId);
+      if (
+        frame.message?.type === "session.events.set_subscription.request" &&
+        frame.message.events.includes("workspace_setup_progress")
+      )
+        legacySetupDemand = true;
+    });
+    socket.on("framereceived", ({ payload }) => {
+      const frame = JSON.parse(String(payload));
+      if (frame.type !== "session") return;
+      if (frame.message?.type === "workspace.setup.subscribe.response")
+        subscriptions.push(frame.message.payload);
+      if (frame.message?.type === "workspace_setup_progress")
+        outputWorkspaces.push(frame.message.payload.workspaceId);
+    });
+  });
+  return {
+    async expectNoDemand() {
+      expect(requests).toEqual([]);
+      expect(legacySetupDemand).toBe(false);
+      expect(subscriptions).toEqual([]);
+      expect(outputWorkspaces).toEqual([]);
+    },
+    async expectSubscribed(workspaceId: string, count: number) {
+      await expect.poll(() => subscriptions.length).toBe(count);
+      expect(subscriptions[count - 1].workspaceId).toBe(workspaceId);
+      expect(requests).toEqual(Array(count).fill(workspaceId));
+    },
+    async expectReleased(index: number) {
+      await expect.poll(() => releases.has(subscriptions[index].subscriptionId)).toBe(true);
+    },
+  };
+}
@@ -12,6 +12,7 @@ useDefaultAndroidSdkVersions()
 def skiaPackage = new File(["node", "--print", "require.resolve('@shopify/react-native-skia/package.json')"].execute(null, projectDir).text.trim()).parentFile

 android {
+  ndkVersion rootProject.ext.ndkVersion
  namespace "sh.paseo.diffprototype"
  defaultConfig {
    externalNativeBuild {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.12.0-beta.3",
+  "version": "0.12.0",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -58,11 +58,11 @@
    "@marijn/find-cluster-break": "^1.0.2",
    "@mattermost/react-native-paste-input": "2.0.1",
    "@react-native-async-storage/async-storage": "2.2.0",
-    "@react-native-masked-view/masked-view": "^0.3.2",
-    "@react-native/normalize-colors": "^0.81.5",
+    "@react-native-masked-view/masked-view": "0.3.2",
+    "@react-native/normalize-colors": "0.86.3",
    "@react-navigation/native": "^7.1.8",
    "@replit/codemirror-vim": "6.3.0",
-    "@shopify/react-native-skia": "2.2.12",
+    "@shopify/react-native-skia": "2.6.2",
    "@tanstack/react-query": "^5.90.11",
    "@tanstack/react-virtual": "^3.13.21",
    "@xterm/addon-clipboard": "^0.3.0-beta.213",
@@ -75,30 +75,30 @@
    "@xterm/addon-webgl": "^0.20.0-beta.212",
    "@xterm/xterm": "^6.1.0-beta.213",
    "buffer": "^6.0.3",
-    "expo": "^54.0.18",
-    "expo-asset": "~12.0.12",
-    "expo-audio": "~1.0.13",
-    "expo-build-properties": "^1.0.9",
-    "expo-camera": "~17.0.10",
-    "expo-clipboard": "~8.0.7",
-    "expo-constants": "~18.0.9",
-    "expo-crypto": "^15.0.8",
-    "expo-dev-client": "^6.0.15",
-    "expo-document-picker": "~14.0.8",
-    "expo-file-system": "~19.0.17",
-    "expo-haptics": "~15.0.7",
-    "expo-image": "~3.0.10",
-    "expo-image-manipulator": "~14.0.8",
-    "expo-image-picker": "^17.0.8",
-    "expo-keep-awake": "^15.0.7",
-    "expo-linking": "~8.0.8",
-    "expo-localization": "~17.0.9",
-    "expo-notifications": "^0.32.16",
-    "expo-router": "~6.0.13",
-    "expo-sharing": "^14.0.8",
-    "expo-splash-screen": "~31.0.10",
-    "expo-sqlite": "~16.0.10",
-    "expo-system-ui": "~6.0.7",
+    "expo": "~57.0.30",
+    "expo-asset": "~57.0.20",
+    "expo-audio": "~57.0.5",
+    "expo-build-properties": "~57.0.22",
+    "expo-camera": "~57.0.6",
+    "expo-clipboard": "~57.0.2",
+    "expo-constants": "~57.0.22",
+    "expo-crypto": "~57.0.4",
+    "expo-dev-client": "~57.0.20",
+    "expo-document-picker": "~57.0.3",
+    "expo-file-system": "~57.0.7",
+    "expo-haptics": "~57.0.3",
+    "expo-image": "~57.0.5",
+    "expo-image-manipulator": "~57.0.21",
+    "expo-image-picker": "~57.0.20",
+    "expo-keep-awake": "~57.0.2",
+    "expo-linking": "~57.0.13",
+    "expo-localization": "~57.0.2",
+    "expo-notifications": "~57.0.23",
+    "expo-router": "~57.0.28",
+    "expo-sharing": "~57.0.23",
+    "expo-splash-screen": "~57.0.10",
+    "expo-sqlite": "~57.0.4",
+    "expo-system-ui": "~57.0.4",
    "fast-deep-equal": "^3.1.3",
    "htmlparser2": "^12.0.0",
    "i18next": "^26.3.0",
@@ -111,25 +111,25 @@
    "micromark-util-decode-string": "2.0.1",
    "mnemonic-id": "^3.2.7",
    "qrcode": "^1.5.4",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
    "react-freeze": "1.0.4",
    "react-i18next": "^17.0.8",
-    "react-native": "0.81.5",
+    "react-native": "0.86.3",
    "react-native-draggable-flatlist": "^4.0.3",
    "react-native-edge-to-edge": "^1.7.0",
    "react-native-enriched-markdown": "1.2.0-nightly-20261014-766fc0e67",
-    "react-native-gesture-handler": "~2.28.0",
+    "react-native-gesture-handler": "~2.32.0",
    "react-native-keyboard-controller": "1.21.12",
    "react-native-nitro-modules": "0.35.5",
-    "react-native-reanimated": "~4.3.1",
-    "react-native-safe-area-context": "~5.6.0",
-    "react-native-screens": "~4.16.0",
-    "react-native-svg": "^15.14.0",
+    "react-native-reanimated": "4.5.1",
+    "react-native-safe-area-context": "~5.7.0",
+    "react-native-screens": "~4.26.0",
+    "react-native-svg": "15.15.4",
    "react-native-unistyles": "^3.2.4",
    "react-native-web": "~0.21.0",
-    "react-native-webview": "^13.16.0",
-    "react-native-worklets": "~0.8.3",
+    "react-native-webview": "13.16.1",
+    "react-native-worklets": "0.10.1",
    "tiny-invariant": "^1.3.3",
    "turndown": "^7.2.4",
    "turndown-plugin-gfm": "^1.0.2",
@@ -151,11 +151,12 @@
    "@vitest/browser": "^4.1.7",
    "@vitest/browser-playwright": "^4.1.7",
    "@xterm/headless": "^6.1.0-beta.213",
+    "babel-preset-expo": "~57.0.16",
    "dotenv": "^17.2.3",
    "eas-cli": "^16.24.1",
    "esbuild": "0.28.1",
    "eslint": "^9.25.0",
-    "eslint-config-expo": "~10.0.0",
+    "eslint-config-expo": "~57.0.2",
    "expo-gradle-jvmargs": "^1.1.2",
    "fake-indexeddb": "^6.2.5",
    "jsdom": "^20.0.3",
@@ -4,26 +4,33 @@ const {
  IOSConfig,
  withAppDelegate,
  withDangerousMod,
+  withInfoPlist,
  withPodfile,
 } = require("expo/config-plugins");

-const MODULE_SETUP = "    PasteInputModule.setup(factory.rootViewFactory)";
-const REACT_NATIVE_START_END = "      launchOptions: launchOptions)\n#endif";
 const BRIDGING_HEADER_IMPORT = "#import <react-native-paste-input/PasteInputModule.h>";
-const PODFILE_NEW_ARCH_DISABLED =
-  "ENV['RCT_NEW_ARCH_ENABLED'] ||= '0' if podfile_properties['newArchEnabled'] == 'false'";
-const PODFILE_NEW_ARCH_ENABLED =
-  "ENV['RCT_NEW_ARCH_ENABLED'] ||= '1' if podfile_properties['newArchEnabled'] == 'true'";
+const SCENE_DELEGATE = `
+@objc(PaseoSceneDelegate)
+class PaseoSceneDelegate: ExpoAppSceneDelegate {
+  override func scene(
+    _ scene: UIScene,
+    willConnectTo session: UISceneSession,
+    options connectionOptions: UIScene.ConnectionOptions
+  ) {
+    super.scene(scene, willConnectTo: session, options: connectionOptions)
+    guard let provider = UIApplication.shared.delegate as? ExpoReactNativeFactoryProvider,
+      let factory = provider.reactNativeFactory else { return }
+    PasteInputModule.setup(factory.rootViewFactory)
+  }
+}
+`;

 function configurePasteInputAppDelegate(contents) {
-  const configured = contents.replace(`\n${MODULE_SETUP}`, "");
-  if (!configured.includes(REACT_NATIVE_START_END)) {
-    throw new Error("Could not register paste input after React Native starts");
+  if (contents.includes("class PaseoSceneDelegate:")) return contents;
+  if (!contents.includes("ExpoReactNativeFactoryProvider")) {
+    throw new Error("Paste input requires Expo scene support");
  }
-  return configured.replace(
-    REACT_NATIVE_START_END,
-    `      launchOptions: launchOptions)\n${MODULE_SETUP}\n#endif`,
-  );
+  return `${contents.trimEnd()}\n${SCENE_DELEGATE}`;
 }

 function configurePasteInputBridgingHeader(contents) {
@@ -33,19 +40,6 @@ function configurePasteInputBridgingHeader(contents) {
  return `${contents.trimEnd()}\n${BRIDGING_HEADER_IMPORT}\n`;
 }

-function configurePasteInputPodfile(contents) {
-  if (contents.includes(PODFILE_NEW_ARCH_ENABLED)) {
-    return contents;
-  }
-  if (!contents.includes(PODFILE_NEW_ARCH_DISABLED)) {
-    throw new Error("Could not configure the new architecture for paste input");
-  }
-  return contents.replace(
-    PODFILE_NEW_ARCH_DISABLED,
-    `${PODFILE_NEW_ARCH_DISABLED}\n${PODFILE_NEW_ARCH_ENABLED}`,
-  );
-}
-
 function withPasteInput(config) {
  const withDelegate = withAppDelegate(config, (modConfig) => {
    if (modConfig.modResults.language !== "swift") {
@@ -54,7 +48,18 @@ function withPasteInput(config) {
    modConfig.modResults.contents = configurePasteInputAppDelegate(modConfig.modResults.contents);
    return modConfig;
  });
-  const withPods = withPodfile(withDelegate, (modConfig) => {
+  const withScene = withInfoPlist(withDelegate, (modConfig) => {
+    const scenes =
+      modConfig.modResults.UIApplicationSceneManifest?.UISceneConfigurations
+        ?.UIWindowSceneSessionRoleApplication;
+    if (!scenes || scenes.length !== 1) {
+      throw new Error("Paste input requires Expo's single scene configuration");
+    }
+    scenes[0].UISceneDelegateClassName = "PaseoSceneDelegate";
+    return modConfig;
+  });
+  const withPods = withPodfile(withScene, (modConfig) => {
+    // Paste input checks this legacy flag even though RN 0.86 only supports Fabric.
    modConfig.modResults.contents = configurePasteInputPodfile(modConfig.modResults.contents);
    return modConfig;
  });
@@ -79,4 +84,9 @@ function withPasteInputBridgingHeader(config) {
 module.exports = withPasteInput;
 module.exports.configurePasteInputAppDelegate = configurePasteInputAppDelegate;
 module.exports.configurePasteInputBridgingHeader = configurePasteInputBridgingHeader;
+
+function configurePasteInputPodfile(contents) {
+  const flag = "ENV['RCT_NEW_ARCH_ENABLED'] = '1'";
+  return contents.includes(flag) ? contents : `${flag}\n${contents}`;
+}
 module.exports.configurePasteInputPodfile = configurePasteInputPodfile;
@@ -7,22 +7,14 @@ const {
 } = require("./with-paste-input");

 describe("withPasteInput", () => {
-  it("registers the module after React Native starts", () => {
-    const source = [
-      "import ReactAppDependencyProvider",
-      "",
-      "    bindReactNativeFactory(factory)",
-      "    factory.startReactNative(",
-      '      withModuleName: "main",',
-      "      in: window,",
-      "      launchOptions: launchOptions)",
-      "#endif",
-    ].join("\n");
+  it("registers paste input after Expo connects the React Native scene", () => {
+    const source = "class AppDelegate: ExpoAppDelegate, ExpoReactNativeFactoryProvider {}";
    const configured = configurePasteInputAppDelegate(source);
-
-    expect(configured).toContain(
-      "      launchOptions: launchOptions)\n    PasteInputModule.setup(factory.rootViewFactory)\n#endif",
+    expect(configured).toContain("class PaseoSceneDelegate: ExpoAppSceneDelegate");
+    expect(configured.indexOf("super.scene(")).toBeLessThan(
+      configured.indexOf("PasteInputModule.setup("),
    );
+    expect(configured).toContain("provider.reactNativeFactory");
    expect(configurePasteInputAppDelegate(configured)).toBe(configured);
  });

@@ -33,15 +25,11 @@ describe("withPasteInput", () => {
    expect(configured).toContain("#import <react-native-paste-input/PasteInputModule.h>");
    expect(configurePasteInputBridgingHeader(configured)).toBe(configured);
  });
-
-  it("sets the new architecture environment before CocoaPods evaluates dependencies", () => {
+  it("enables the legacy new-architecture flag required by the paste input podspec", () => {
    const source =
-      "ENV['RCT_NEW_ARCH_ENABLED'] ||= '0' if podfile_properties['newArchEnabled'] == 'false'";
+      "require File.join(File.dirname(`node --print \"require.resolve('expo/package.json')\"`), 'scripts/autolinking')";
    const configured = configurePasteInputPodfile(source);
-
-    expect(configured).toContain(
-      "ENV['RCT_NEW_ARCH_ENABLED'] ||= '1' if podfile_properties['newArchEnabled'] == 'true'",
-    );
+    expect(configured).toBe("ENV['RCT_NEW_ARCH_ENABLED'] = '1'\n" + source);
    expect(configurePasteInputPodfile(configured)).toBe(configured);
  });
 });
@@ -0,0 +1,22 @@
+// After Expo prebuild, run from packages/app/android:
+// ./gradlew --init-script ../scripts/verify-android-ndk.gradle verifyAndroidNdk
+gradle.projectsEvaluated {
+    rootProject.tasks.register('verifyAndroidNdk') {
+        doLast {
+            def expected = rootProject.ext.ndkVersion
+            def nativeProjects = rootProject.subprojects.findAll { subproject ->
+                def android = subproject.extensions.findByName('android')
+                android != null && (android.externalNativeBuild.cmake.path != null ||
+                    android.externalNativeBuild.ndkBuild.path != null)
+            }
+            assert !nativeProjects.empty : 'No native Android modules found'
+            println "Project NDK: ${expected}"
+            def mismatches = nativeProjects.findAll { subproject ->
+                def actual = subproject.android.ndkVersion
+                println "${subproject.path} NDK: ${actual}"
+                actual != expected
+            }
+            assert mismatches.empty : "Native Android modules must use project NDK ${expected}: ${mismatches*.path}"
+        }
+    }
+}
@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
-import { useFocusEffect } from "@react-navigation/native";
+import { useFocusEffect } from "expo-router/react-navigation";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { ArrowUpRight, Blocks, Check, Settings2 } from "lucide-react-native";
 import type { AgentSkillOperation, AgentSkillsStatus } from "@getpaseo/protocol/messages";
@@ -445,11 +445,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
          serverId: resolvedServerId,
          workspaceId: context.workspaceId ?? "",
        }),
-        checkout: {
-          serverId: resolvedServerId,
-          cwd: context.cwd,
-          isGit: context.projectPlacement?.checkout?.isGit ?? true,
-        },
        view: "files",
      });
    });
@@ -1252,6 +1247,12 @@ function agentStreamViewPropsEqual(
  if (left.isAuthoritativeHistoryReady !== right.isAuthoritativeHistoryReady) {
    reasons.push("isAuthoritativeHistoryReady");
  }
+  if (left.bottomOverlayTailClearance !== right.bottomOverlayTailClearance) {
+    reasons.push("bottomOverlayTailClearance");
+  }
+  if (left.bottomOverlayControlClearance !== right.bottomOverlayControlClearance) {
+    reasons.push("bottomOverlayControlClearance");
+  }
  if (left.toast !== right.toast) reasons.push("toast");
  if (left.onOpenWorkspaceFile !== right.onOpenWorkspaceFile) reasons.push("onOpenWorkspaceFile");
  if (left.readOnly !== right.readOnly) reasons.push("readOnly");
@@ -1,3 +1,7 @@
+import { HostAuthoritySessions } from "@/runtime/host-authority-sessions";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
+import { useIsExplorerSidebarOpen } from "@/workspace-tabs/explorer-sidebar";
 import { ComposerEditingSessionsProvider } from "@/composer/editing-session";
 import "@/styles/unistyles";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
@@ -41,7 +45,7 @@ import { DesktopWindowControls } from "@/components/desktop/window-controls";
 import { SidebarModelProvider } from "@/components/sidebar/sidebar-model";
 import { WorkspacePinShortcutHandler } from "@/components/workspace-pin-shortcut-handler";
 import { WorkspaceRenameHost } from "@/components/workspace-rename-host";
-import { CompactExplorerSidebarHost } from "@/components/compact-explorer-sidebar-host";
+import { WorkspaceExplorerOpenGesture } from "@/mobile-panels/explorer-open-gesture";
 import { ProviderSettingsHost } from "@/components/provider-settings-host";
 import { WorkspaceSetupDialog } from "@/components/workspace-setup-dialog";
 import { WorkspaceShortcutTargetsSubscriber } from "@/components/workspace-shortcut-targets-subscriber";
@@ -90,7 +94,6 @@ import { useGlobalNewWorkspaceAction } from "@/hooks/use-global-new-workspace-ac
 import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
 import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
-import { resolveExplorerSidebarPresentation } from "@/workspace-tabs/explorer-sidebar";
 import { KeyboardShiftProvider } from "@/keyboard/shift";
 import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
@@ -311,6 +314,7 @@ function HostSessionManager() {

  return (
    <>
+      <HostAuthoritySessions />
      {hosts.map((daemon) => (
        <ManagedDaemonSession key={daemon.serverId} daemon={daemon} />
      ))}
@@ -468,17 +472,15 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  const isFocusModeEnabled = usePanelStore((state) => state.desktop.focusModeEnabled);
  const isDesktopAgentListOpen = usePanelStore((state) => state.desktop.agentListOpen);
  const sidebarWidth = usePanelStore((state) => state.sidebarWidth);
-  const { width: viewportWidth } = useWindowDimensions();
+  const { width: windowWidth } = useWindowDimensions();
+  const insets = useSafeAreaInsets();
+  const viewportWidth = windowWidth - insets.left - insets.right;

  const cycleTheme = useCallback(() => {
    void updateSettings({ theme: getNextThemePreference(settings.theme) });
  }, [settings.theme, updateSettings]);

  const isCompactLayout = useIsCompactFormFactor();
-  const explorerSidebarPresentation = resolveExplorerSidebarPresentation({
-    isCompact: isCompactLayout,
-  });
-  const usesCompactExplorerHost = explorerSidebarPresentation !== "pane";
  useCompactWebViewportZoomLock(isCompactLayout);
  const pathname = usePathname();
  const isWorkspaceRoute = parseHostWorkspaceRouteFromPathname(pathname) !== null;
@@ -516,7 +518,15 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  useActiveWorktreeNewAction();
  useGlobalNewWorkspaceAction();

+  const activeWorkspace = useActiveWorkspaceSelection();
+  const explorerVisible = useIsExplorerSidebarOpen({
+    isCompact: isCompactLayout,
+    workspaceKey: activeWorkspace
+      ? `${activeWorkspace.serverId}:${activeWorkspace.workspaceId}`
+      : null,
+  });
  const appContentMinimumWidth = resolveDesktopAppContentMinimum({
+    explorerVisible: isWorkspaceRoute && explorerVisible,
    isSettingsRoute: pathname.includes("/settings"),
  });
  const desktopSidebarMounted = hasMountedDesktopSidebar && !isWorkspaceFocusModeEnabled;
@@ -548,28 +558,25 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  if (isWeb) {
    themedSidebarChrome = <AppearanceStyleBoundary>{sidebarChrome}</AppearanceStyleBoundary>;
  }
+  const workspaceChromeStyle = useMemo(
+    () => [rowStyle, !isCompactLayout && { paddingLeft: insets.left, paddingRight: insets.right }],
+    [insets.left, insets.right, isCompactLayout],
+  );
  const workspaceChrome = (
-    <View style={rowStyle}>
+    <View style={workspaceChromeStyle}>
      <WorkspaceLayoutModePublisher />
      {!isCompactLayout ? (
        <WindowChromeRegion corners={appChromeLayout.sidebarCorners}>
          {themedSidebarChrome}
        </WindowChromeRegion>
      ) : null}
-      {usesCompactExplorerHost ? (
-        <CompactExplorerSidebarHost
-          enabled={chromeEnabled}
-          presentation={explorerSidebarPresentation === "dock" ? "dock" : "overlay"}
+      <WorkspaceExplorerOpenGesture enabled={chromeEnabled && isCompactLayout}>
+        <WindowChromeRegion
+          corners={isCompactLayout && chromeEnabled ? "both" : appChromeLayout.contentCorners}
        >
-          <WindowChromeRegion corners={chromeEnabled ? "both" : appChromeLayout.contentCorners}>
-            <View style={flexStyle}>{children}</View>
-          </WindowChromeRegion>
-        </CompactExplorerSidebarHost>
-      ) : (
-        <WindowChromeRegion corners={appChromeLayout.contentCorners}>
          <View style={flexStyle}>{children}</View>
        </WindowChromeRegion>
-      )}
+      </WorkspaceExplorerOpenGesture>
    </View>
  );

@@ -620,15 +627,27 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
    </View>
  );

-  const content = isCompactLayout ? (
-    <MobileGestureWrapper chromeEnabled={chromeEnabled}>{surface}</MobileGestureWrapper>
-  ) : (
-    surface
+  return (
+    <AppContainerLifetime compactGesturesEnabled={chromeEnabled && isCompactLayout}>
+      {surface}
+    </AppContainerLifetime>
  );
+}

+function AppContainerLifetime({
+  children,
+  compactGesturesEnabled,
+}: {
+  children: ReactNode;
+  compactGesturesEnabled: boolean;
+}) {
  return (
    <ComposerEditingSessionsProvider>
-      <CommandCenterProvider>{content}</CommandCenterProvider>
+      <CommandCenterProvider>
+        <MobileGestureWrapper chromeEnabled={compactGesturesEnabled}>
+          {children}
+        </MobileGestureWrapper>
+      </CommandCenterProvider>
    </ComposerEditingSessionsProvider>
  );
 }
@@ -662,10 +681,15 @@ function MobileGestureWrapper({
  chromeEnabled: boolean;
 }) {
  const openGesture = useOpenAgentListGesture(chromeEnabled);
+  const isCompactLayout = useIsCompactFormFactor();

  return (
    <GestureDetector gesture={openGesture} touchAction={MOBILE_WEB_GESTURE_TOUCH_ACTION}>
-      <View collapsable={false} style={layoutStyles.surfaceFill} testID="compact-shell">
+      <View
+        collapsable={false}
+        style={layoutStyles.surfaceFill}
+        testID={isCompactLayout ? "compact-shell" : "wide-shell"}
+      >
        {children}
      </View>
    </GestureDetector>
@@ -10,6 +10,8 @@ const HOST_STACK_SCREEN_OPTIONS = {
  animation: "none" as const,
 };

+const SCREEN_OWNED_APPEARANCE = ["workspace/[workspaceId]/index"] as const;
+
 const AGENT_SCREEN_OPTIONS = { gestureEnabled: false };

 export default function HostRouteLayout() {
@@ -17,13 +19,20 @@ export default function HostRouteLayout() {
 }

 function KnownHostRoute() {
-  const params = useLocalSearchParams<{ serverId?: string | string[] }>();
+  const params = useLocalSearchParams<{
+    serverId?: string | string[];
+    origin?: string | string[];
+  }>();
  const hosts = useHosts();
  const hostRegistryStatus = useHostRegistryStatus();
  const bootstrapState = useHostRuntimeBootstrapState();
  const routeServerId = typeof params.serverId === "string" ? params.serverId : null;
  const startupRoute = resolveStartupRoute({
-    route: { kind: "host", serverId: routeServerId },
+    route: {
+      kind: "host",
+      serverId: routeServerId,
+      ...(typeof params.origin === "string" ? { originServerId: params.origin } : {}),
+    },
    startupBlocker: bootstrapState.startupBlocker,
    hostRegistryStatus,
    hosts,
@@ -34,7 +43,10 @@ function KnownHostRoute() {
  }

  const stack = (
-    <ThemedStack screenOptions={HOST_STACK_SCREEN_OPTIONS}>
+    <ThemedStack
+      screenOptions={HOST_STACK_SCREEN_OPTIONS}
+      screenOwnedAppearance={SCREEN_OWNED_APPEARANCE}
+    >
      <Stack.Screen name="index" />
      <Stack.Screen name="workspace/[workspaceId]/index" />
      <Stack.Screen name="agent/[agentId]" options={AGENT_SCREEN_OPTIONS} />
@@ -1,3 +1,4 @@
+import { HostAuthorityRoute } from "@/runtime/host-authority-route";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useLocalSearchParams, useRouter, type Href } from "expo-router";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
@@ -5,21 +6,34 @@ import { useFetchQuery } from "@/data/query";
 import { resolveAgentRoute, type AgentRouteLookup } from "@/navigation/agent-route-resolution";
 import { AgentRouteResolutionView } from "@/navigation/agent-route-resolution-view";
 import { useSessionStore } from "@/stores/session-store";
-import { getHostRuntimeStore, useHostRuntimeSnapshot, useHosts } from "@/runtime/host-runtime";
-import { buildHostRootRoute, buildSettingsHostRoute } from "@/utils/host-routes";
+import { useHostRuntimeStore, useHostRuntimeSnapshot, useHosts } from "@/runtime/host-runtime";
+import {
+  buildHostRootRoute,
+  buildSettingsHostRoute,
+  withHostRouteAuthority,
+} from "@/utils/host-routes";
 import { toErrorMessage } from "@/utils/error-messages";
 import { navigateToAgent } from "@/utils/navigate-to-agent";

 export default function HostAgentReadyRoute() {
+  const { serverId, origin } = useLocalSearchParams<{ serverId?: string; origin?: string }>();
+  const reference = useMemo(
+    () => ({ originServerId: origin ?? serverId ?? "", serverId: serverId ?? "" }),
+    [origin, serverId],
+  );
+  if (!serverId) return null;
  return (
    <HostRouteBootstrapBoundary>
-      <HostAgentReadyRouteContent />
+      <HostAuthorityRoute reference={reference}>
+        <HostAgentReadyRouteContent />
+      </HostAuthorityRoute>
    </HostRouteBootstrapBoundary>
  );
 }

 function HostAgentReadyRouteContent() {
  const router = useRouter();
+  const runtime = useHostRuntimeStore();
  const params = useLocalSearchParams<{
    serverId?: string;
    agentId?: string;
@@ -40,10 +54,8 @@ function HostAgentReadyRouteContent() {
  });
  useEffect(() => {
    if (!serverId || !agentId || agentWorkspaceId) return;
-    void getHostRuntimeStore()
-      .prepareAgentRoute(serverId, agentId)
-      .catch(() => undefined);
-  }, [agentId, agentWorkspaceId, serverId]);
+    void runtime.prepareAgentRoute(serverId, agentId).catch(() => undefined);
+  }, [agentId, agentWorkspaceId, serverId, runtime]);
  const shouldLookupAgent = Boolean(
    serverId && agentId && client && connectionStatus === "online" && !agentWorkspaceId,
  );
@@ -106,11 +118,23 @@ function HostAgentReadyRouteContent() {
    handledNavigationRef.current = navigationKey;

    if (resolution.kind === "resolved") {
-      navigateToAgent({ serverId, agentId, workspaceId: resolution.workspaceId });
+      navigateToAgent({
+        serverId,
+        agentId,
+        workspaceId: resolution.workspaceId,
+        authority: runtime.authorityFor(serverId),
+      });
      return;
    }
-    router.replace(resolution.kind === "invalid" ? ("/" as Href) : buildHostRootRoute(serverId));
-  }, [agentId, resolution, router, serverId]);
+    router.replace(
+      resolution.kind === "invalid"
+        ? ("/" as Href)
+        : (withHostRouteAuthority(
+            buildHostRootRoute(serverId),
+            runtime.authorityFor(serverId),
+          ) as Href),
+    );
+  }, [agentId, resolution, router, serverId, runtime]);

  const handleRetry = useCallback(() => {
    if (resolution.kind === "lookupError") {
@@ -118,21 +142,28 @@ function HostAgentReadyRouteContent() {
      return;
    }
    if (serverId) {
-      void getHostRuntimeStore().runProbeCycleNow(serverId);
+      void runtime.runProbeCycleNow(serverId);
    }
-  }, [lookupQuery, resolution.kind, serverId]);
+  }, [lookupQuery, resolution.kind, serverId, runtime]);
  const handleManageHost = useCallback(() => {
    if (serverId) {
-      router.push(buildSettingsHostRoute(serverId));
+      router.push(buildSettingsHostRoute(runtime.authorityFor(serverId).originServerId));
    }
-  }, [router, serverId]);
+  }, [router, serverId, runtime]);
  const handleBack = useCallback(() => {
    if (router.canGoBack()) {
      router.back();
      return;
    }
-    router.replace(serverId ? buildHostRootRoute(serverId) : ("/" as Href));
-  }, [router, serverId]);
+    router.replace(
+      serverId
+        ? (withHostRouteAuthority(
+            buildHostRootRoute(serverId),
+            runtime.authorityFor(serverId),
+          ) as Href)
+        : ("/" as Href),
+    );
+  }, [router, serverId, runtime]);

  if (
    resolution.kind === "waitingForHost" ||
@@ -1,4 +1,10 @@
-import { Redirect } from "expo-router";
+import { useMemo } from "react";
+import { HostAuthorityRoute } from "@/runtime/host-authority-route";
+import {
+  workspaceSelectionAuthority,
+  type ActiveWorkspaceSelection,
+} from "@/stores/last-workspace-selection";
+import { Redirect, useLocalSearchParams } from "expo-router";
 import { useHostRouteServerId } from "@/navigation/host-route-context";
 import {
  resolveHostIndexRoute,
@@ -13,10 +19,31 @@ import {

 export default function HostIndexRoute() {
  const serverId = useHostRouteServerId();
-  const workspaceSelection = useLastWorkspaceSelection();
+  const remembered = useLastWorkspaceSelection();
+  const { origin } = useLocalSearchParams<{ origin?: string }>();
+  const selection = useMemo(
+    () =>
+      remembered?.serverId === serverId
+        ? { ...remembered, ...(origin ? { authority: { originServerId: origin } } : {}) }
+        : null,
+    [remembered, serverId, origin],
+  );
+  if (!selection) return <HostIndexContent workspaceSelection={null} />;
+  return (
+    <HostAuthorityRoute reference={workspaceSelectionAuthority(selection)}>
+      <HostIndexContent workspaceSelection={selection} />
+    </HostAuthorityRoute>
+  );
+}
+
+function HostIndexContent({
+  workspaceSelection,
+}: {
+  workspaceSelection: ActiveWorkspaceSelection | null;
+}) {
+  const serverId = useHostRouteServerId();
  const isWorkspaceSelectionLoaded = useIsLastWorkspaceSelectionHydrated();
-  const workspaceSelectionWorkspaceId =
-    workspaceSelection?.serverId === serverId ? workspaceSelection.workspaceId : null;
+  const workspaceSelectionWorkspaceId = workspaceSelection?.workspaceId ?? null;
  const hasHydratedWorkspaces = useHasHydratedWorkspaces(serverId);
  const workspaceSelectionExists = useWorkspaceExists(serverId, workspaceSelectionWorkspaceId);

@@ -1,7 +1,9 @@
+import { HostAuthorityRoute } from "@/runtime/host-authority-route";
+import { workspaceSelectionAuthority } from "@/stores/last-workspace-selection";
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
-import { useNavigation } from "@react-navigation/native";
+import { useNavigation } from "expo-router/react-navigation";
 import { StyleSheet, View } from "react-native";
-import { useGlobalSearchParams, useLocalSearchParams, useRootNavigationState } from "expo-router";
+import { useGlobalSearchParams, useRootNavigationState } from "expo-router";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
 import { RetainedPanel } from "@/components/retained-panel";
 import {
@@ -24,16 +26,12 @@ import {
  resolveWorkspaceDeckEntries,
  shouldKeepWorkspaceDeckEntryMounted,
 } from "@/screens/workspace/workspace-deck-retention";
-import {
-  decodeWorkspaceIdFromPathSegment,
-  parseWorkspaceOpenIntent,
-  type WorkspaceOpenIntent,
-} from "@/utils/host-routes";
+import { parseWorkspaceOpenIntent, type WorkspaceOpenIntent } from "@/utils/host-routes";
 import {
  replaceBrowserRouteWithCanonicalHostWorkspaceRoute,
  stripHostWorkspaceRouteEchoSearchFromBrowserUrlAfterCommit,
 } from "@/utils/host-route-browser";
-import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
+import { useWorkspaceTabNavigation } from "@/workspace-tabs/navigation";
 import { isNative, isWeb } from "@/constants/platform";
 import { RenderProfile } from "@/utils/render-profiler";

@@ -94,24 +92,34 @@ export default function HostWorkspaceIndexRoute() {
 }

 function HostWorkspaceRouteContent() {
+  const { open } = useGlobalSearchParams<{ open?: string | string[] }>();
+  return (
+    <WorkspaceDeck
+      recoveryRequested={parseWorkspaceOpenIntent(getParamValue(open))?.kind === "agent"}
+    />
+  );
+}
+
+function WorkspaceOpenIntentBoundary({
+  selection,
+  active,
+  children,
+}: {
+  selection: ActiveWorkspaceSelection;
+  active: boolean;
+  children: React.ReactNode;
+}) {
+  const { prepareWorkspaceTab } = useWorkspaceTabNavigation();
  const navigation = useNavigation();
  const rootNavigationState = useRootNavigationState();
  const hasHydratedWorkspaceLayoutStore = useWorkspaceLayoutStoreHydrated();
  const consumedIntentRef = useRef<string | null>(null);
  const [intentConsumed, setIntentConsumed] = useState(false);
-  const params = useLocalSearchParams<{
-    serverId?: string | string[];
-    workspaceId?: string | string[];
-  }>();
  const globalParams = useGlobalSearchParams<{
    open?: string | string[];
  }>();
-  const serverId = getParamValue(params.serverId);
-  const workspaceValue = getParamValue(params.workspaceId);
-  const workspaceId = workspaceValue
-    ? (decodeWorkspaceIdFromPathSegment(workspaceValue) ?? "")
-    : "";
-  const openValue = getParamValue(globalParams.open);
+  const { serverId, workspaceId } = selection;
+  const openValue = active ? getParamValue(globalParams.open) : "";
  const hasHydratedWorkspaces = useHasHydratedWorkspaces(serverId);
  const workspaceExists = useWorkspaceExists(serverId, workspaceId);
  const openIntent = useMemo(() => parseWorkspaceOpenIntent(openValue), [openValue]);
@@ -178,6 +186,7 @@ function HostWorkspaceRouteContent() {
    openIntent,
    openValue,
    rootNavigationState?.key,
+    prepareWorkspaceTab,
    serverId,
    workspaceId,
  ]);
@@ -190,7 +199,7 @@ function HostWorkspaceRouteContent() {
    return null;
  }

-  return <WorkspaceDeck recoveryRequested={isAgentOpenIntent} />;
+  return children;
 }

 function WorkspaceDeck({ recoveryRequested }: { recoveryRequested: boolean }) {
@@ -274,7 +283,20 @@ function WorkspaceDeck({ recoveryRequested }: { recoveryRequested: boolean }) {
  );
 }

-function WorkspaceDeckEntry({
+function WorkspaceDeckEntry(props: {
+  selection: ActiveWorkspaceSelection;
+  active: boolean;
+  recoveryRequested: boolean;
+  onUnmountInactive: (selection: ActiveWorkspaceSelection) => void;
+}) {
+  return (
+    <HostAuthorityRoute reference={workspaceSelectionAuthority(props.selection)}>
+      <WorkspaceDeckEntryContent {...props} />
+    </HostAuthorityRoute>
+  );
+}
+
+function WorkspaceDeckEntryContent({
  selection,
  active,
  recoveryRequested,
@@ -308,12 +330,14 @@ function WorkspaceDeckEntry({
      active={active}
      testID={`workspace-deck-entry-${selection.serverId}:${selection.workspaceId}`}
    >
-      <WorkspaceScreen
-        serverId={selection.serverId}
-        workspaceId={selection.workspaceId}
-        isRouteFocused={active}
-        recoveryRequested={active && recoveryRequested}
-      />
+      <WorkspaceOpenIntentBoundary selection={selection} active={active}>
+        <WorkspaceScreen
+          serverId={selection.serverId}
+          workspaceId={selection.workspaceId}
+          isRouteFocused={active}
+          recoveryRequested={active && recoveryRequested}
+        />
+      </WorkspaceOpenIntentBoundary>
    </RetainedPanel>
  );
 }
@@ -39,10 +39,14 @@ export default function Index() {
    hosts,
    anyOnlineHostServerId,
    workspaceSelection,
-    workspaceSelectionStatus: resolveWorkspaceSelectionStatus({
-      hasHydratedWorkspaces: hasHydratedWorkspaceSelectionHost,
-      workspaceExists: workspaceSelectionExists,
-    }),
+    // COMPAT(unboundStartupSelection): added in v0.12, remove after 2027-04-20.
+    // Qualified restore reacquires its origin at the host boundary before proving absence.
+    workspaceSelectionStatus: workspaceSelection?.authority
+      ? "unknown"
+      : resolveWorkspaceSelectionStatus({
+          hasHydratedWorkspaces: hasHydratedWorkspaceSelectionHost,
+          workspaceExists: workspaceSelectionExists,
+        }),
    isWorkspaceSelectionLoaded,
    hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
  });
@@ -33,7 +33,7 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
  },
  overlay: {
-    ...StyleSheet.absoluteFillObject,
+    ...StyleSheet.absoluteFill,
    justifyContent: "center",
    alignItems: "center",
  },
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path d="M2.033 9.867l2.554 1.483a.589.589 0 00.592 0l2.554-1.483.01-.008a.608.608 0 00.11-.084l.013-.015a.631.631 0 00.076-.1c.003-.005.008-.01.01-.016a.558.558 0 00.052-.125l.007-.028a.611.611 0 00.019-.14V7.868c0-.572.307-1.105.8-1.392a1.595 1.595 0 011.598 0l1.277.742a.54.54 0 00.129.053l.028.01c.044.01.088.015.133.016h.006l.013-.002a.587.587 0 00.27-.074l.011-.004 2.554-1.483a.596.596 0 00.297-.516V2.253a.595.595 0 00-.297-.516L12.293.257a.587.587 0 00-.591 0L9.148 1.737l-.01.01a.609.609 0 00-.109.083l-.014.015a.632.632 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.028a.612.612 0 00-.018.14v1.483c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.603.603 0 00-.13-.053l-.028-.008a.658.658 0 00-.133-.018h-.02a.57.57 0 00-.269.074c-.003.002-.008.002-.012.005L2.033 5.872a.596.596 0 00-.297.515v2.966c0 .213.113.41.297.515z" fill="currentColor"></path><path d="M15.943 10.607a1.596 1.596 0 011.599 0l1.276.74c.041.025.085.04.13.055l.028.008c.043.01.088.016.133.018h.005c.005 0 .01-.002.014-.003a.474.474 0 00.122-.016l.021-.005a.616.616 0 00.126-.052c.004-.002.009-.002.013-.005l2.554-1.482a.597.597 0 00.297-.516V6.383a.596.596 0 00-.297-.515l-2.552-1.483a.587.587 0 00-.592 0l-2.553 1.482-.011.008a.61.61 0 00-.108.084l-.014.016a.637.637 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.029a.612.612 0 00-.018.14v1.482c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.584.584 0 00-.13-.053l-.028-.008a.62.62 0 00-.133-.018h-.02a.587.587 0 00-.269.074l-.012.004L9.15 10a.596.596 0 00-.296.516v2.966c0 .212.112.409.296.515l2.554 1.483s.008.002.012.005c.04.022.082.04.126.052l.02.004a.57.57 0 00.123.017l.014.002h.006c.054 0 .108-.01.16-.025a.587.587 0 00.13-.054l1.277-.741a1.597 1.597 0 012.398 1.392v1.482c0 .049.007.095.019.14l.007.028a.619.619 0 00.051.125c.004.006.008.01.01.016a.6.6 0 00.076.1l.014.015c.033.032.069.06.108.084.004.002.006.006.011.008l2.554 1.483a.59.59 0 00.593 0l2.554-1.483a.597.597 0 00.296-.516v-2.965a.595.595 0 00-.296-.516l-2.554-1.483s-.008-.002-.012-.005a.54.54 0 00-.126-.051c-.007-.003-.013-.003-.02-.005a.635.635 0 00-.125-.017h-.018a.557.557 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.595 1.595 0 01-1.598 0 1.615 1.615 0 010-2.785l-.005-.001z" fill="currentColor"></path><path d="M14.848 18.265l-2.554-1.482-.012-.005a.526.526 0 00-.126-.052c-.007-.002-.014-.002-.02-.005a.64.64 0 00-.124-.017h-.02a.56.56 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.594 1.594 0 01-1.598 0c-.493-.286-.8-.82-.8-1.393V14.65a.563.563 0 00-.018-.14l-.008-.028a.604.604 0 00-.051-.124l-.01-.017a.603.603 0 00-.076-.1l-.014-.015a.596.596 0 00-.109-.084c-.003-.002-.005-.006-.01-.008L5.178 12.65a.587.587 0 00-.591 0l-2.554 1.483a.596.596 0 00-.297.516v2.965c0 .213.113.41.297.516l2.554 1.483.012.004a.618.618 0 00.267.074l.016.002h.007a.55.55 0 00.16-.026.584.584 0 00.129-.053l1.277-.742a1.597 1.597 0 012.398 1.393v1.482c0 .05.007.095.019.14l.007.028c.013.044.03.085.051.125l.01.016c.022.036.047.07.076.1l.014.015c.032.032.069.06.109.084l.01.008 2.554 1.483a.587.587 0 00.593 0l2.554-1.483a.596.596 0 00.296-.515v-2.966a.596.596 0 00-.296-.516h-.002z" fill="currentColor"></path>
+</svg>
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 1024 1024" fill="none">
+  <path fill="currentColor" d="M395.479 633.828L735.91 381.105C752.599 368.715 776.454 373.548 784.406 392.792C826.26 494.285 807.561 616.253 724.288 699.996C641.016 783.739 525.151 802.104 419.247 760.277L303.556 814.143C469.49 928.202 670.987 899.995 796.901 773.282C896.776 672.843 927.708 535.937 898.785 412.476L899.047 412.739C857.105 231.37 909.358 158.874 1016.4 10.6326C1018.93 7.11771 1021.47 3.60279 1024 0L883.144 141.651V141.212L395.392 633.916"/>
+  <path fill="currentColor" d="M325.226 695.251C206.128 580.84 226.662 403.776 328.285 301.668C403.431 226.097 526.549 195.254 634.026 240.596L749.454 186.994C728.657 171.88 702.007 155.623 671.424 144.2C533.19 86.9942 367.693 115.465 255.323 228.382C147.234 337.081 113.244 504.215 171.613 646.833C215.216 753.423 143.739 828.818 71.7385 904.916C46.2237 931.893 20.6216 958.87 0 987.429L325.139 695.339"/>
+</svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M18.8 0H5.2A5.2 5.2 0 000 5.2v13.6A5.2 5.2 0 005.2 24h13.6a5.2 5.2 0 005.2-5.2V5.2A5.2 5.2 0 0018.8 0z" fill="#9046FF" /> <path d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001z" fill="#fff" /> <path d="M12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z" fill="#000" /></svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="currentColor" fill-rule="nonzero"></path>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path d="M24 20.541H3.428v-3.426H0V3.4h24V20.54zM3.428 17.115h17.144V6.827H3.428v10.288zm8.573-5.196l-2.425 2.424-2.424-2.424 2.424-2.424 2.425 2.424zm6.857-.001l-2.424 2.423-2.425-2.423 2.425-2.425 2.424 2.425z" fill="currentColor"></path>
+</svg>
@@ -50,7 +50,8 @@ function createAgent(overrides: Partial<Agent> = {}): Agent {
        options: [{ id: "high", label: "High" }],
      },
    ],
-    parentAgentId: null,
+    parent: null,
+    managedRelationship: null,
    labels: {},
    ...overrides,
    turn: overrides.turn ?? { phase: "idle", cancellationRequestId: null },
@@ -943,7 +943,7 @@ const styles = StyleSheet.create((theme) => ({
    alignItems: "center",
    paddingTop: theme.spacing[12],
  },
-  backdrop: { ...StyleSheet.absoluteFillObject, backgroundColor: "rgba(0, 0, 0, 0.5)" },
+  backdrop: { ...StyleSheet.absoluteFill, backgroundColor: "rgba(0, 0, 0, 0.5)" },
  panel: {
    width: 640,
    height: 560,
@@ -1,4 +1,4 @@
-import type { GitAction, GitActions } from "@/git/policy";
+import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import type {
  WorkspacePanelPlacement,
@@ -581,9 +581,7 @@ export function buildWorkspaceCommandCenterContributions(
    ...(source.capabilities.canSplitPanes ? buildPaneContributions(source) : []),
  ];

-  const primary = source.gitActions.primary;
-  for (const [index, action] of source.gitActions.secondary.entries()) {
-    if (action.id === primary?.id) continue;
+  for (const [index, action] of actionsWithoutPrimary(source.gitActions).entries()) {
    contributions.push(buildGitContribution(source, action, 100 + index, "query"));
  }

@@ -41,7 +41,7 @@ import {
  findPaneById,
  useWorkspaceLayoutStore,
 } from "@/stores/workspace-layout-store";
-import { shouldShowWorkspaceSetup, useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
+import { shouldShowWorkspaceSetup } from "@/stores/workspace-setup-store";
 import { clearCommandCenterFocusRestoreElement } from "@/utils/command-center-focus-restore";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import {
@@ -188,6 +188,7 @@ export function useWorkspaceCommandCenterActions(): void {
    workspaceDirectory: workspace.workspaceDirectory ?? null,
    currentBranch: workspace.gitRuntime?.currentBranch ?? null,
    pinnedAt: workspace.pinnedAt ?? null,
+    setupStatus: workspace.setupStatus ?? null,
    labels: workspace.labels ?? [],
  }));
  const cwd = useWorkspaceDirectory(serverId, workspaceId);
@@ -195,12 +196,10 @@ export function useWorkspaceCommandCenterActions(): void {
  const isPinned = fields?.pinnedAt != null;
  const isCompact = useIsCompactFormFactor();
  const canPin = useHostFeature(serverId, "workspacePinning");
-  const persistenceKey =
-    serverId && fields
-      ? buildWorkspaceTabPersistenceKey({ serverId, workspaceId: fields.id })
-      : null;
-  const canShowSetup = useWorkspaceSetupStore((state) =>
-    shouldShowWorkspaceSetup(persistenceKey ? (state.snapshots[persistenceKey] ?? null) : null),
+  const supportsSetupObservation = useHostFeature(serverId, "workspaceSetupObservation");
+  const canShowSetup = shouldShowWorkspaceSetup(
+    fields?.setupStatus ?? null,
+    supportsSetupObservation,
  );
  const { overrides } = useKeyboardShortcutOverrides();
  const { gitActions, isGit } = useGitActions({
@@ -66,7 +66,7 @@ export interface SheetHeader {
 }

 const SCROLL_CONTENT_GROW = { flexGrow: 1 };
-const ABSOLUTE_FILL_STYLE = { ...StyleSheet.absoluteFillObject };
+const ABSOLUTE_FILL_STYLE = { ...StyleSheet.absoluteFill };
 const NATIVE_DIALOG_SNAP_POINTS = ["100%"];

 const styles = StyleSheet.create((theme) => ({
@@ -77,7 +77,7 @@ const styles = StyleSheet.create((theme) => ({
    backgroundColor: "transparent",
  },
  desktopOverlay: {
-    ...StyleSheet.absoluteFillObject,
+    ...StyleSheet.absoluteFill,
    backgroundColor: "rgba(0,0,0,0.55)",
    justifyContent: "center",
    alignItems: "center",
@@ -11,10 +11,7 @@ import {
  serializeConnectionUri,
  serializeConnectionUriForStorage,
 } from "@/utils/daemon-endpoints";
-import {
-  DaemonConnectionTestError,
-  getConnectionAuthFailureReason,
-} from "@/utils/test-daemon-connection";
+import { buildConnectionFailureCopy } from "./connection-failure-copy";
 import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { PairingTargetTracker } from "./pair-link-credentials";
@@ -195,92 +192,6 @@ function draftFromConnectionUri(uri: string): DirectConnectionDraft {
  };
 }

-function normalizeTransportMessage(message: string | null | undefined): string | null {
-  if (!message) return null;
-  const trimmed = message.trim();
-  if (!trimmed) return null;
-  return trimmed;
-}
-
-function formatTechnicalTransportDetails(
-  details: (string | null)[],
-  labels: DirectConnectionLabels,
-): string | null {
-  const unique = Array.from(
-    new Set(
-      details
-        .map((value) => normalizeTransportMessage(value))
-        .filter((value): value is string => Boolean(value))
-        .map((value) => value.trim())
-        .filter((value) => value.length > 0),
-    ),
-  );
-
-  if (unique.length === 0) return null;
-
-  const allGeneric = unique.every((value) => {
-    const lower = value.toLowerCase();
-    return lower === "transport error" || lower === "transport closed";
-  });
-
-  if (allGeneric) {
-    return labels.noAdditionalDetails(unique[0] ?? "");
-  }
-
-  return unique.join(" — ");
-}
-
-function buildConnectionFailureCopy(input: {
-  endpoint: string;
-  error: unknown;
-  labels: DirectConnectionLabels;
-}): { title: string; detail: string | null; raw: string | null } {
-  const { endpoint, error, labels } = input;
-  const title = labels.failedToConnect(endpoint);
-
-  const raw = (() => {
-    if (error instanceof DaemonConnectionTestError) {
-      return (
-        formatTechnicalTransportDetails([error.reason, error.lastError], labels) ??
-        normalizeTransportMessage(error.message)
-      );
-    }
-    if (error instanceof Error) {
-      return normalizeTransportMessage(error.message);
-    }
-    return null;
-  })();
-
-  const rawLower = raw?.toLowerCase() ?? "";
-  let detail: string | null = null;
-
-  if (getConnectionAuthFailureReason(error)) {
-    detail = error instanceof Error ? error.message : raw;
-  } else if (rawLower.includes("timed out")) {
-    detail = labels.timedOut;
-  } else if (
-    rawLower.includes("econnrefused") ||
-    rawLower.includes("connection refused") ||
-    rawLower.includes("err_connection_refused")
-  ) {
-    detail = labels.refused;
-  } else if (rawLower.includes("enotfound") || rawLower.includes("not found")) {
-    detail = labels.hostNotFound;
-  } else if (rawLower.includes("ehostunreach") || rawLower.includes("host is unreachable")) {
-    detail = labels.hostUnreachable;
-  } else if (
-    rawLower.includes("certificate") ||
-    rawLower.includes("tls") ||
-    rawLower.includes("ssl")
-  ) {
-    detail = labels.tlsError;
-  } else {
-    detail = labels.unableToConnect;
-  }
-
-  return { title, detail, raw };
-}
-
 export interface AddHostModalProps {
  visible: boolean;
  onClose: () => void;
@@ -1007,7 +1007,7 @@ const styles = StyleSheet.create((theme) => ({
    paddingTop: theme.spacing[12],
  },
  backdrop: {
-    ...StyleSheet.absoluteFillObject,
+    ...StyleSheet.absoluteFill,
    backgroundColor: "rgba(0, 0, 0, 0.5)",
  },
  panel: {
@@ -20,54 +20,53 @@ describe("appearanceStyleBoundaryKey", () => {
 // This is a placement contract against the production JSX, not a simulated native mount.
 // Native Gesture Handler/Fabric lifetime behavior is verified on the release app.
 describe("retained native gesture host appearance placement", () => {
-  it.each([
-    ["../app/_layout.tsx", ["sidebarChrome", "themedSidebarChrome"]],
-    [
-      "./compact-explorer-sidebar-host.tsx",
-      ["explorer", "themedExplorer", "CompactExplorerSidebar", "NativeExplorerSidebarDock"],
-    ],
-  ] as const)("keeps native hosts outside appearance keys in %s", (path, hosts) => {
-    const source = ts.createSourceFile(
-      path,
-      readFileSync(new URL(path, import.meta.url), "utf8"),
-      ts.ScriptTarget.Latest,
-      true,
-      ts.ScriptKind.TSX,
-    );
-    let hostsFound = 0;
-    let webKeysFound = 0;
-    function visit(node: ts.Node) {
-      let name: string | undefined;
-      if (ts.isIdentifier(node)) name = node.text;
-      if (ts.isJsxSelfClosingElement(node)) name = node.tagName.getText(source);
-      if (name && hosts.some((host) => host === name)) {
-        hostsFound++;
-        let webOnly = false;
-        let keyed = false;
-        for (
-          let child = node, parent = node.parent;
-          parent;
-          child = parent, parent = parent.parent
-        ) {
-          if (
-            ts.isIfStatement(parent) &&
-            parent.expression.getText(source) === "isWeb" &&
-            parent.thenStatement === child
-          )
-            webOnly = true;
-          if (
-            ts.isJsxElement(parent) &&
-            parent.openingElement.tagName.getText(source) === "AppearanceStyleBoundary"
-          )
-            keyed = true;
+  it.each([["../app/_layout.tsx", ["sidebarChrome", "themedSidebarChrome"], true]] as const)(
+    "keeps native hosts outside appearance keys in %s",
+    (path, hosts, hasWebKeys) => {
+      const source = ts.createSourceFile(
+        path,
+        readFileSync(new URL(path, import.meta.url), "utf8"),
+        ts.ScriptTarget.Latest,
+        true,
+        ts.ScriptKind.TSX,
+      );
+      let hostsFound = 0;
+      let webKeysFound = 0;
+      function visit(node: ts.Node) {
+        let name: string | undefined;
+        if (ts.isIdentifier(node)) name = node.text;
+        if (ts.isJsxSelfClosingElement(node)) name = node.tagName.getText(source);
+        if (name && hosts.some((host) => host === name)) {
+          hostsFound++;
+          let webOnly = false;
+          let keyed = false;
+          for (
+            let child = node, parent = node.parent;
+            parent;
+            child = parent, parent = parent.parent
+          ) {
+            if (
+              ts.isIfStatement(parent) &&
+              parent.expression.getText(source) === "isWeb" &&
+              parent.thenStatement === child
+            )
+              webOnly = true;
+            if (
+              ts.isJsxElement(parent) &&
+              parent.openingElement.tagName.getText(source) === "AppearanceStyleBoundary"
+            )
+              keyed = true;
+          }
+          if (keyed && webOnly) webKeysFound++;
+          expect(keyed && !webOnly, `${name} is remounted on native appearance changes`).toBe(
+            false,
+          );
        }
-        if (keyed && webOnly) webKeysFound++;
-        expect(keyed && !webOnly, `${name} is remounted on native appearance changes`).toBe(false);
+        ts.forEachChild(node, visit);
      }
-      ts.forEachChild(node, visit);
-    }
-    visit(source);
-    expect(hostsFound).toBeGreaterThan(0);
-    expect(webKeysFound).toBeGreaterThan(0);
-  });
+      visit(source);
+      expect(hostsFound).toBeGreaterThan(0);
+      if (hasWebKeys) expect(webKeysFound).toBeGreaterThan(0);
+    },
+  );
 });
@@ -1,106 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  resolveCompactExplorerSidebarHostModel,
-  type CompactExplorerSidebarHostModel,
-} from "@/components/compact-explorer-sidebar-host-state";
-import type { WorkspaceDescriptor } from "@/stores/session-store";
-
-function createWorkspace(
-  input: Partial<WorkspaceDescriptor> & Pick<WorkspaceDescriptor, "id">,
-): WorkspaceDescriptor {
-  return {
-    id: input.id,
-    projectId: input.projectId ?? "project-1",
-    projectDisplayName: input.projectDisplayName ?? "Project 1",
-    projectRootPath: input.projectRootPath ?? "/repo",
-    workspaceDirectory: input.workspaceDirectory ?? "/repo",
-    projectKind: input.projectKind ?? "git",
-    workspaceKind: input.workspaceKind ?? "local_checkout",
-    name: input.name ?? "main",
-    status: input.status ?? "done",
-    archivingAt: input.archivingAt ?? null,
-    statusEnteredAt: null,
-    diffStat: input.diffStat ?? null,
-    scripts: input.scripts ?? [],
-  };
-}
-
-function createModel(
-  overrides: Partial<CompactExplorerSidebarHostModel> = {},
-): CompactExplorerSidebarHostModel {
-  return {
-    serverId: overrides.serverId ?? "server-1",
-    workspaceId: overrides.workspaceId ?? "workspace-a",
-    persistenceKey: overrides.persistenceKey ?? "server-1:workspace-a",
-    workspaceRoot: overrides.workspaceRoot ?? "/repo/a",
-    isGit: overrides.isGit ?? true,
-  };
-}
-
-describe("resolveCompactExplorerSidebarHostModel", () => {
-  it("retains the last workspace root for the same active selection while the workspace reloads", () => {
-    const previous = createModel();
-
-    const result = resolveCompactExplorerSidebarHostModel({
-      previous,
-      selection: { serverId: "server-1", workspaceId: "workspace-a" },
-      workspace: null,
-      isGit: false,
-    });
-
-    expect(result).toEqual({
-      serverId: "server-1",
-      workspaceId: "workspace-a",
-      persistenceKey: "server-1:workspace-a",
-      workspaceRoot: "/repo/a",
-      isGit: true,
-    });
-  });
-
-  it("switches ownership to the active workspace instead of leaking the previous one", () => {
-    const previous = createModel();
-
-    const result = resolveCompactExplorerSidebarHostModel({
-      previous,
-      selection: { serverId: "server-1", workspaceId: "workspace-b" },
-      workspace: null,
-      isGit: false,
-    });
-
-    expect(result).toEqual({
-      serverId: "server-1",
-      workspaceId: "workspace-b",
-      persistenceKey: "server-1:workspace-b",
-      workspaceRoot: "",
-      isGit: false,
-    });
-  });
-
-  it("does not retain a previous owner when there is no active workspace selection", () => {
-    const result = resolveCompactExplorerSidebarHostModel({
-      previous: createModel(),
-      selection: null,
-      workspace: null,
-      isGit: false,
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it("uses the current workspace directory when it is available", () => {
-    const result = resolveCompactExplorerSidebarHostModel({
-      previous: null,
-      selection: { serverId: "server-1", workspaceId: "workspace-a" },
-      workspace: createWorkspace({ id: "workspace-a", workspaceDirectory: "/repo/current" }),
-      isGit: true,
-    });
-
-    expect(result).toEqual({
-      serverId: "server-1",
-      workspaceId: "workspace-a",
-      persistenceKey: "server-1:workspace-a",
-      workspaceRoot: "/repo/current",
-      isGit: true,
-    });
-  });
-});
@@ -1,59 +0,0 @@
-import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
-import type { ActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
-import type { WorkspaceDescriptor } from "@/stores/session-store";
-
-export interface CompactExplorerSidebarHostModel {
-  serverId: string;
-  workspaceId: string;
-  persistenceKey: string;
-  workspaceRoot: string;
-  isGit: boolean;
-}
-
-interface ResolveCompactExplorerSidebarHostModelInput {
-  previous: CompactExplorerSidebarHostModel | null;
-  selection: ActiveWorkspaceSelection | null;
-  workspace: WorkspaceDescriptor | null;
-  isGit: boolean;
-}
-
-function trimNonEmpty(value: string | null | undefined): string | null {
-  if (typeof value !== "string") {
-    return null;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-
-export function resolveCompactExplorerSidebarHostModel(
-  input: ResolveCompactExplorerSidebarHostModelInput,
-): CompactExplorerSidebarHostModel | null {
-  const serverId = trimNonEmpty(input.selection?.serverId);
-  const workspaceId = trimNonEmpty(input.selection?.workspaceId);
-  if (!serverId || !workspaceId) {
-    return null;
-  }
-
-  const persistenceKey = buildWorkspaceTabPersistenceKey({ serverId, workspaceId });
-  if (!persistenceKey) {
-    return null;
-  }
-
-  const previousForSelection =
-    input.previous &&
-    input.previous.serverId === serverId &&
-    input.previous.workspaceId === workspaceId
-      ? input.previous
-      : null;
-
-  return {
-    serverId,
-    workspaceId,
-    persistenceKey,
-    workspaceRoot:
-      trimNonEmpty(input.workspace?.workspaceDirectory) ??
-      previousForSelection?.workspaceRoot ??
-      "",
-    isGit: input.workspace ? input.isGit : (previousForSelection?.isGit ?? input.isGit),
-  };
-}
@@ -1,216 +0,0 @@
-import { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { View, type LayoutChangeEvent } from "react-native";
-import { GestureDetector } from "react-native-gesture-handler";
-import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
-import { useWorkspace } from "@/stores/session-store-hooks";
-import {
-  CompactExplorerSidebar,
-  NativeExplorerSidebarDock,
-} from "@/components/compact-explorer-sidebar";
-import { useOpenFileExplorerGesture } from "@/mobile-panels/gestures";
-import { useIsMobilePanelActive } from "@/mobile-panels/provider";
-import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { usePanelStore } from "@/stores/panel-store";
-import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
-import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
-import { useWorkspaceCheckoutStatus } from "@/screens/workspace/use-workspace-checkout-status";
-import { openWorkspaceFileFromExplorer } from "@/screens/workspace/workspace-file-open-command";
-import { isWeb } from "@/constants/platform";
-import { DiffDocumentWorkspaceCacheProvider } from "@/git/diff-document/workspace-cache";
-import {
-  resolveCompactExplorerSidebarHostModel,
-  type CompactExplorerSidebarHostModel,
-} from "@/components/compact-explorer-sidebar-host-state";
-import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
-
-interface CompactExplorerOpenGestureSurfaceProps {
-  children: ReactNode;
-  enabled: boolean;
-  onOpenExplorer: () => void;
-}
-
-const COMPACT_WEB_GESTURE_TOUCH_ACTION = isWeb ? "auto" : "pan-y";
-
-function CompactExplorerOpenGestureSurface({
-  children,
-  enabled,
-  onOpenExplorer,
-}: CompactExplorerOpenGestureSurfaceProps) {
-  const explorerOpenGesture = useOpenFileExplorerGesture({
-    enabled,
-    onOpen: onOpenExplorer,
-  });
-
-  return (
-    <GestureDetector gesture={explorerOpenGesture} touchAction={COMPACT_WEB_GESTURE_TOUCH_ACTION}>
-      <View style={styles.fill}>{children}</View>
-    </GestureDetector>
-  );
-}
-
-function useActiveCompactExplorerSidebarModel(
-  enabled: boolean,
-): CompactExplorerSidebarHostModel | null {
-  const selection = useActiveWorkspaceSelection();
-  const workspace = useWorkspace(selection?.serverId ?? null, selection?.workspaceId ?? null);
-  const isExplorerActive = useIsMobilePanelActive("file-explorer");
-  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
-  const client = useHostRuntimeClient(selection?.serverId ?? "");
-  const isConnected = useHostRuntimeIsConnected(selection?.serverId ?? "");
-  const retainedModelRef = useRef<CompactExplorerSidebarHostModel | null>(null);
-  const { checkoutQuery } = useWorkspaceCheckoutStatus({
-    client,
-    isConnected,
-    isRouteFocused: enabled && selection !== null,
-    normalizedServerId: selection?.serverId ?? "",
-    normalizedWorkspaceId: selection?.workspaceId ?? "",
-    workspaceDirectory: workspace?.workspaceDirectory || null,
-  });
-  const resolvedModel = useMemo(
-    () =>
-      resolveCompactExplorerSidebarHostModel({
-        previous: isExplorerActive ? retainedModelRef.current : null,
-        selection,
-        workspace,
-        isGit: checkoutQuery.data?.isGit ?? false,
-      }),
-    [checkoutQuery.data?.isGit, isExplorerActive, selection, workspace],
-  );
-
-  useEffect(() => {
-    if (!selection) {
-      retainedModelRef.current = null;
-      if (enabled && isExplorerActive) {
-        showMobileAgent();
-      }
-      return;
-    }
-    if (!isExplorerActive) {
-      retainedModelRef.current = null;
-      return;
-    }
-    if (resolvedModel) {
-      retainedModelRef.current = resolvedModel;
-    }
-  }, [enabled, isExplorerActive, resolvedModel, selection, showMobileAgent]);
-
-  return selection ? (resolvedModel ?? (isExplorerActive ? retainedModelRef.current : null)) : null;
-}
-
-interface CompactExplorerSidebarHostProps {
-  children: ReactNode;
-  enabled: boolean;
-  presentation: "overlay" | "dock";
-}
-
-export function CompactExplorerSidebarHost({
-  children,
-  enabled,
-  presentation,
-}: CompactExplorerSidebarHostProps) {
-  const model = useActiveCompactExplorerSidebarModel(enabled);
-  const [containerWidth, setContainerWidth] = useState(0);
-  const openCompactFileExplorer = usePanelStore((state) => state.openCompactFileExplorer);
-  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
-  const openTab = useWorkspaceLayoutStore((state) => state.openTab);
-  const openWorkspaceTabInFocusedPane = useCallback(
-    (workspaceKey: string, target: WorkspaceTabTarget) =>
-      openTab({ workspaceKey, target, intent: "reveal" }),
-    [openTab],
-  );
-  const focusWorkspaceTab = useWorkspaceLayoutStore((state) => state.focusTab);
-
-  const handleOpenExplorer = useCallback(() => {
-    if (!model?.workspaceRoot) {
-      return;
-    }
-    openCompactFileExplorer({
-      serverId: model.serverId,
-      cwd: model.workspaceRoot,
-      isGit: model.isGit,
-    });
-  }, [model, openCompactFileExplorer]);
-
-  const handleOpenFile = useCallback(
-    (filePath: string) => {
-      if (!model) {
-        return;
-      }
-      openWorkspaceFileFromExplorer({
-        filePath,
-        persistenceKey: model.persistenceKey,
-        closeExplorerAfterOpen: presentation === "overlay",
-        showMobileAgent,
-        openWorkspaceTabInFocusedPane,
-        focusWorkspaceTab,
-      });
-    },
-    [focusWorkspaceTab, model, openWorkspaceTabInFocusedPane, presentation, showMobileAgent],
-  );
-
-  const handleContainerLayout = useCallback((event: LayoutChangeEvent) => {
-    const nextWidth = event.nativeEvent.layout.width;
-    setContainerWidth((current) => (current === nextWidth ? current : nextWidth));
-  }, []);
-
-  const explorer =
-    enabled && model ? (
-      <DiffDocumentWorkspaceCacheProvider key={model.persistenceKey}>
-        {presentation === "dock" ? (
-          <NativeExplorerSidebarDock
-            serverId={model.serverId}
-            workspaceId={model.workspaceId}
-            workspaceRoot={model.workspaceRoot}
-            isGit={model.isGit}
-            persistenceKey={model.persistenceKey}
-            containerWidth={containerWidth}
-            onOpenFile={handleOpenFile}
-          />
-        ) : (
-          <CompactExplorerSidebar
-            serverId={model.serverId}
-            workspaceId={model.workspaceId}
-            workspaceRoot={model.workspaceRoot}
-            isGit={model.isGit}
-            onOpenFile={handleOpenFile}
-          />
-        )}
-      </DiffDocumentWorkspaceCacheProvider>
-    ) : null;
-
-  let themedExplorer = explorer;
-  if (isWeb) {
-    themedExplorer = <AppearanceStyleBoundary>{explorer}</AppearanceStyleBoundary>;
-  }
-
-  if (presentation === "dock") {
-    return (
-      <View style={styles.row} onLayout={handleContainerLayout}>
-        <View style={styles.fill}>{children}</View>
-        {themedExplorer}
-      </View>
-    );
-  }
-
-  return (
-    <>
-      <CompactExplorerOpenGestureSurface
-        enabled={enabled && Boolean(model?.workspaceRoot)}
-        onOpenExplorer={handleOpenExplorer}
-      >
-        {children}
-      </CompactExplorerOpenGestureSurface>
-      {themedExplorer}
-    </>
-  );
-}
-
-const styles = {
-  fill: {
-    flex: 1,
-  },
-  row: {
-    flex: 1,
-    flexDirection: "row",
-  },
-} as const;
@@ -1,574 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { View, Text, Pressable } from "react-native";
-import { Gesture } from "react-native-gesture-handler";
-import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
-import { scheduleOnRN } from "react-native-worklets";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
-import { X } from "lucide-react-native";
-import { useTranslation } from "react-i18next";
-import { formatPrTabLabel, PullRequestTabIcon } from "@/git/pull-request-panel";
-import {
-  usePanelStore,
-  selectIsCompactFileExplorerOpen,
-  type ExplorerTab,
-} from "@/stores/panel-store";
-import { useCloseFileExplorerGesture } from "@/mobile-panels/gestures";
-import { useIsMobilePanelActive } from "@/mobile-panels/provider";
-import { MobilePanelOverlay } from "@/mobile-panels/presentation";
-import {
-  HEADER_INNER_HEIGHT,
-  HEADER_INNER_HEIGHT_MOBILE,
-  HEADER_TOP_PADDING_MOBILE,
-  useIsCompactFormFactor,
-} from "@/constants/layout";
-import { ChangesSurface } from "@/git/diff-pane";
-import { changesStateSchema, defaultChangesState, type ChangesState } from "@/panels/changes/state";
-import { FileExplorerPane } from "./file-explorer-pane";
-import { useKeyboardShiftStyle } from "@/keyboard/shift";
-import { shouldUseCompactExplorerKeyboardPadding } from "@/keyboard/shift";
-import { WindowChromeSafeArea } from "@/utils/desktop-window";
-import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
-import { RetainedPanel, RetainedPanelActivity } from "@/components/retained-panel";
-import { useMountedTabSet } from "@/screens/workspace/use-mounted-tab-set";
-import { usePullRequestPanelAvailability } from "@/panels/pull-request-availability";
-import { PullRequestContent } from "@/panels/pull-request";
-import { useAddFileToChat } from "@/panels/use-add-file-to-chat";
-import { SidebarResizeHandle } from "@/components/sidebar-resize-handle";
-import {
-  SIDEBAR_RESIZE_ACTIVATION_OFFSET,
-  SIDEBAR_RESIZE_FAIL_OFFSET,
-} from "@/components/sidebar-resize-handle-layout";
-import {
-  EXPLORER_TAB_RAIL_INSET,
-  explorerSidebarCloseButtonLayout,
-  resolveExplorerSidebarWidth,
-} from "@/components/explorer-sidebar-layout";
-import { ToolbarButton } from "@/components/ui/pane-content-toolbar";
-import { mutedIconColorMapping } from "@/components/ui/icon-button-chrome";
-import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
-
-const ThemedX = withUnistyles(X);
-
-function logExplorerSidebar(_event: string, _details: Record<string, unknown>): void {}
-
-interface ExplorerSidebarProps {
-  serverId: string;
-  workspaceId?: string | null;
-  workspaceRoot: string;
-  isGit: boolean;
-  onOpenFile?: (filePath: string) => void;
-}
-
-interface ExplorerSidebarSharedState {
-  explorerTab: ExplorerTab;
-  handleTabPress: (tab: ExplorerTab) => void;
-}
-
-function useExplorerSidebarSharedState({
-  serverId,
-  workspaceRoot,
-  isGit,
-}: Pick<ExplorerSidebarProps, "serverId" | "workspaceRoot" | "isGit">): ExplorerSidebarSharedState {
-  const explorerTab = usePanelStore((state) => state.explorerTab);
-  const setExplorerTabForCheckout = usePanelStore((state) => state.setExplorerTabForCheckout);
-  const handleTabPress = useCallback(
-    (tab: ExplorerTab) => {
-      setExplorerTabForCheckout({ serverId, cwd: workspaceRoot, isGit, tab });
-    },
-    [isGit, serverId, setExplorerTabForCheckout, workspaceRoot],
-  );
-
-  return { explorerTab, handleTabPress };
-}
-
-export function CompactExplorerSidebar({
-  serverId,
-  workspaceId,
-  workspaceRoot,
-  isGit,
-  onOpenFile,
-}: ExplorerSidebarProps) {
-  const { theme } = useUnistyles();
-  const insets = useSafeAreaInsets();
-  const isActive = useIsMobilePanelActive("file-explorer");
-  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
-  const { explorerTab, handleTabPress } = useExplorerSidebarSharedState({
-    serverId,
-    workspaceRoot,
-    isGit,
-  });
-  const usePanelKeyboardPadding = shouldUseCompactExplorerKeyboardPadding({ isGit, explorerTab });
-  const { style: mobileKeyboardInsetStyle } = useKeyboardShiftStyle({
-    mode: "padding",
-    enabled: usePanelKeyboardPadding,
-  });
-  const { gesture: closeGesture } = useCloseFileExplorerGesture();
-
-  const handleClose = useCallback(
-    (reason: string) => {
-      logExplorerSidebar("handleClose", {
-        reason,
-        isOpen: isActive,
-      });
-      showMobileAgent();
-    },
-    [isActive, showMobileAgent],
-  );
-
-  const handleHeaderClose = useCallback(() => handleClose("header-close-button"), [handleClose]);
-
-  const mobileSidebarStyle = useMemo(
-    () => [
-      {
-        paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE,
-        paddingBottom: usePanelKeyboardPadding ? 0 : insets.bottom,
-        backgroundColor: theme.colors.surfaceSidebar,
-      },
-      mobileKeyboardInsetStyle,
-    ],
-    [
-      insets.bottom,
-      insets.top,
-      mobileKeyboardInsetStyle,
-      theme.colors.surfaceSidebar,
-      usePanelKeyboardPadding,
-    ],
-  );
-
-  return (
-    <RetainedPanelActivity active={isActive}>
-      <MobilePanelOverlay
-        panel="file-explorer"
-        closeGesture={closeGesture}
-        panelStyle={mobileSidebarStyle}
-      >
-        <ExplorerSidebarContent
-          activeTab={explorerTab}
-          onTabPress={handleTabPress}
-          onClose={handleHeaderClose}
-          serverId={serverId}
-          workspaceId={workspaceId}
-          workspaceRoot={workspaceRoot}
-          isGit={isGit}
-          isOpen={isActive}
-          onOpenFile={onOpenFile}
-        />
-      </MobilePanelOverlay>
-    </RetainedPanelActivity>
-  );
-}
-
-interface NativeExplorerSidebarDockProps extends ExplorerSidebarProps {
-  persistenceKey: string;
-  containerWidth: number;
-}
-
-export function NativeExplorerSidebarDock({
-  serverId,
-  workspaceId,
-  workspaceRoot,
-  isGit,
-  onOpenFile,
-  persistenceKey,
-  containerWidth,
-}: NativeExplorerSidebarDockProps) {
-  const { theme } = useUnistyles();
-  const insets = useSafeAreaInsets();
-  const isOpen = usePanelStore(selectIsCompactFileExplorerOpen);
-  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
-  const storedWidth = useWorkspaceLayoutStore(
-    (state) => state.explorerSidebarWidthByWorkspace[persistenceKey],
-  );
-  const resizeExplorerSidebar = useWorkspaceLayoutStore((state) => state.resizeExplorerSidebar);
-  const visibleWidth = resolveExplorerSidebarWidth({
-    requestedWidth: storedWidth,
-    containerWidth,
-  });
-  const resizeWidth = useSharedValue(visibleWidth);
-  const startWidthRef = useRef(visibleWidth);
-  const [resizePressed, setResizePressed] = useState(false);
-  const { explorerTab, handleTabPress } = useExplorerSidebarSharedState({
-    serverId,
-    workspaceRoot,
-    isGit,
-  });
-
-  useEffect(() => {
-    resizeWidth.value = visibleWidth;
-  }, [resizeWidth, visibleWidth]);
-
-  const showResizeGrip = useCallback(() => setResizePressed(true), []);
-  const hideResizeGrip = useCallback(() => setResizePressed(false), []);
-  const commitWidth = useCallback(
-    (width: number) => resizeExplorerSidebar(persistenceKey, width),
-    [persistenceKey, resizeExplorerSidebar],
-  );
-  const resizeGesture = useMemo(
-    () =>
-      Gesture.Pan()
-        .enabled(true)
-        .hitSlop({ left: 8, right: 8, top: 0, bottom: 0 })
-        .onBegin(() => scheduleOnRN(showResizeGrip))
-        .activeOffsetX([-SIDEBAR_RESIZE_ACTIVATION_OFFSET, SIDEBAR_RESIZE_ACTIVATION_OFFSET])
-        .failOffsetY([-SIDEBAR_RESIZE_FAIL_OFFSET, SIDEBAR_RESIZE_FAIL_OFFSET])
-        .onStart((event) => {
-          startWidthRef.current = visibleWidth + event.translationX;
-          resizeWidth.value = visibleWidth;
-        })
-        .onUpdate((event) => {
-          resizeWidth.value = resolveExplorerSidebarWidth({
-            requestedWidth: startWidthRef.current - event.translationX,
-            containerWidth,
-          });
-        })
-        .onEnd(() => runOnJS(commitWidth)(resizeWidth.value))
-        .onFinalize(() => scheduleOnRN(hideResizeGrip)),
-    [commitWidth, containerWidth, hideResizeGrip, resizeWidth, showResizeGrip, visibleWidth],
-  );
-  const animatedWidthStyle = useAnimatedStyle(() => ({ width: resizeWidth.value }));
-  const dockStyle = useMemo(
-    () => [
-      styles.nativeDock,
-      {
-        display: isOpen ? ("flex" as const) : ("none" as const),
-        paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE,
-        backgroundColor: theme.colors.surfaceSidebar,
-      },
-      animatedWidthStyle,
-    ],
-    [animatedWidthStyle, insets.top, isOpen, theme.colors.surfaceSidebar],
-  );
-  const dockContentStyle = useMemo(
-    () => [styles.nativeDockContent, { borderLeftColor: theme.colors.border }],
-    [theme.colors.border],
-  );
-
-  return (
-    <RetainedPanelActivity active={isOpen}>
-      <Animated.View style={dockStyle} testID="native-explorer-sidebar-dock">
-        <View style={dockContentStyle}>
-          <SidebarResizeHandle
-            edge="left"
-            gesture={resizeGesture}
-            pressed={resizePressed}
-            testID="native-explorer-sidebar-resize-handle"
-          />
-          <ExplorerSidebarContent
-            activeTab={explorerTab}
-            onTabPress={handleTabPress}
-            onClose={showMobileAgent}
-            serverId={serverId}
-            workspaceId={workspaceId}
-            workspaceRoot={workspaceRoot}
-            isGit={isGit}
-            isOpen={isOpen}
-            onOpenFile={onOpenFile}
-          />
-        </View>
-      </Animated.View>
-    </RetainedPanelActivity>
-  );
-}
-
-interface ExplorerTabButtonProps {
-  tab: ExplorerTab;
-  active: boolean;
-  label?: string;
-  onTabPress: (tab: ExplorerTab) => void;
-  testID: string;
-  children?: React.ReactNode;
-}
-
-function ExplorerTabButton({
-  tab,
-  active,
-  label,
-  onTabPress,
-  testID,
-  children,
-}: ExplorerTabButtonProps) {
-  const isCompact = useIsCompactFormFactor();
-  const handlePress = useCallback(() => onTabPress(tab), [onTabPress, tab]);
-  const tabStyle = useMemo(
-    () => [styles.tab(isCompact), active && styles.tabActive],
-    [active, isCompact],
-  );
-  const tabTextStyle = useMemo(() => [styles.tabText, active && styles.tabTextActive], [active]);
-  return (
-    <Pressable testID={testID} style={tabStyle} onPress={handlePress}>
-      {children}
-      {label !== undefined ? <Text style={tabTextStyle}>{label}</Text> : null}
-    </Pressable>
-  );
-}
-
-interface SidebarContentProps {
-  activeTab: ExplorerTab;
-  onTabPress: (tab: ExplorerTab) => void;
-  onClose: () => void;
-  serverId: string;
-  workspaceId?: string | null;
-  workspaceRoot: string;
-  isGit: boolean;
-  isOpen: boolean;
-  onOpenFile?: (filePath: string) => void;
-}
-
-function ExplorerSidebarContent({
-  activeTab,
-  onTabPress,
-  onClose,
-  serverId,
-  workspaceId,
-  workspaceRoot,
-  isGit,
-  isOpen,
-  onOpenFile,
-}: SidebarContentProps) {
-  const { theme } = useUnistyles();
-  const { t } = useTranslation();
-  const isCompact = useIsCompactFormFactor();
-  const closeButtonLayout = explorerSidebarCloseButtonLayout(isCompact);
-  const closeButtonStyle = useMemo(
-    () => ({ width: closeButtonLayout.size, height: closeButtonLayout.size }),
-    [closeButtonLayout.size],
-  );
-  // The close glyph shares the trailing rail with the toolbar rows below it.
-  const headerRightSectionStyle = useMemo(
-    () => [styles.headerRightSection, { paddingRight: closeButtonLayout.trailingPadding }],
-    [closeButtonLayout.trailingPadding],
-  );
-  const { prPane, showPullRequest: showPrTab } = usePullRequestPanelAvailability({
-    serverId,
-    cwd: workspaceRoot,
-    isGit,
-    requested: activeTab === "pr",
-    enabled: isOpen,
-    timelineEnabled: activeTab === "pr",
-  });
-  const requestedTab: ExplorerTab =
-    !isGit && (activeTab === "changes" || activeTab === "pr") ? "files" : activeTab;
-  const resolvedTab: ExplorerTab = requestedTab === "pr" && !showPrTab ? "changes" : requestedTab;
-  const prTabLabel = formatPrTabLabel(prPane.prNumber);
-  const availableTabs = useMemo<ExplorerTab[]>(() => {
-    const tabs: ExplorerTab[] = isGit ? ["changes", "files"] : ["files"];
-    if (isGit && showPrTab) tabs.push("pr");
-    return tabs;
-  }, [isGit, showPrTab]);
-  const { mountedTabIds } = useMountedTabSet({
-    activeTabId: resolvedTab,
-    allTabIds: availableTabs,
-    cap: availableTabs.length,
-  });
-
-  return (
-    <View style={styles.sidebarContent} pointerEvents="auto">
-      {/* Header with tabs and close button */}
-      <WindowChromeSafeArea placement="inline" style={styles.header} testID="explorer-header">
-        <TitlebarDragRegion />
-        <View style={styles.tabsContainer(isCompact)}>
-          {isGit && (
-            <ExplorerTabButton
-              tab="changes"
-              active={resolvedTab === "changes"}
-              label={t("workspace.tabs.explorerSidebar.changes")}
-              onTabPress={onTabPress}
-              testID="explorer-tab-changes"
-            />
-          )}
-          <ExplorerTabButton
-            tab="files"
-            active={resolvedTab === "files"}
-            label={t("workspace.tabs.explorerSidebar.files")}
-            onTabPress={onTabPress}
-            testID="explorer-tab-files"
-          />
-          {isGit && showPrTab && (
-            <ExplorerTabButton
-              tab="pr"
-              active={resolvedTab === "pr"}
-              label={prTabLabel}
-              onTabPress={onTabPress}
-              testID="explorer-tab-pr"
-            >
-              <PullRequestTabIcon
-                forge={prPane.forge}
-                size={13}
-                color={
-                  resolvedTab === "pr" ? theme.colors.foreground : theme.colors.foregroundMuted
-                }
-              />
-            </ExplorerTabButton>
-          )}
-        </View>
-        <View style={headerRightSectionStyle}>
-          <ToolbarButton
-            compact={isCompact}
-            style={closeButtonStyle}
-            hitSlop={closeButtonLayout.hitSlop}
-            label={t("workspace.tabs.explorerSidebar.close")}
-            onPress={onClose}
-            testID="explorer-close"
-            nativeID="explorer-close"
-          >
-            <ThemedX size={closeButtonLayout.iconSize} uniProps={mutedIconColorMapping} />
-          </ToolbarButton>
-        </View>
-      </WindowChromeSafeArea>
-
-      {/* Content based on active tab */}
-      <View style={styles.contentArea} testID="explorer-content-area">
-        {mountedTabIds.has("changes") ? (
-          <RetainedPanel active={resolvedTab === "changes"}>
-            <ChangedFilesPane
-              serverId={serverId}
-              workspaceId={workspaceId}
-              workspaceRoot={workspaceRoot}
-              isOpen={isOpen}
-              onOpenFile={onOpenFile}
-            />
-          </RetainedPanel>
-        ) : null}
-        {mountedTabIds.has("files") ? (
-          <RetainedPanel active={resolvedTab === "files"}>
-            <FilesPane
-              serverId={serverId}
-              workspaceId={workspaceId}
-              workspaceRoot={workspaceRoot}
-              onOpenFile={onOpenFile}
-            />
-          </RetainedPanel>
-        ) : null}
-        {mountedTabIds.has("pr") ? (
-          <RetainedPanel active={resolvedTab === "pr"}>
-            <PrTabContent
-              serverId={serverId}
-              workspaceId={workspaceId}
-              cwd={workspaceRoot}
-              prPane={prPane}
-            />
-          </RetainedPanel>
-        ) : null}
-      </View>
-    </View>
-  );
-}
-
-function ChangedFilesPane({
-  serverId,
-  workspaceId,
-  workspaceRoot,
-  isOpen,
-  onOpenFile,
-}: Pick<
-  SidebarContentProps,
-  "serverId" | "workspaceId" | "workspaceRoot" | "isOpen" | "onOpenFile"
->) {
-  const { addFile, canAddToChat } = useAddFileToChat({ serverId, workspaceId });
-  const [changesState, setChangesState] = useState<ChangesState>(() =>
-    changesStateSchema.parse(defaultChangesState),
-  );
-  return (
-    <ChangesSurface
-      serverId={serverId}
-      workspaceId={workspaceId}
-      cwd={workspaceRoot}
-      enabled={isOpen}
-      onOpenFile={onOpenFile}
-      onAddToChat={canAddToChat ? addFile : undefined}
-      state={changesState}
-      onStateChange={setChangesState}
-    />
-  );
-}
-
-function FilesPane({
-  serverId,
-  workspaceId,
-  workspaceRoot,
-  onOpenFile,
-}: Pick<SidebarContentProps, "serverId" | "workspaceId" | "workspaceRoot" | "onOpenFile">) {
-  const { addFile, canAddToChat } = useAddFileToChat({ serverId, workspaceId });
-  return (
-    <FileExplorerPane
-      serverId={serverId}
-      workspaceId={workspaceId}
-      workspaceRoot={workspaceRoot}
-      onOpenFile={onOpenFile}
-      onAddToChat={canAddToChat ? addFile : undefined}
-    />
-  );
-}
-
-const PrTabContent = PullRequestContent;
-
-const styles = StyleSheet.create((theme) => ({
-  nativeDock: {
-    position: "relative",
-    height: "100%",
-    minHeight: 0,
-    overflow: "hidden",
-  },
-  nativeDockContent: {
-    position: "relative",
-    flex: 1,
-    minHeight: 0,
-    borderLeftWidth: 1,
-  },
-  sidebarContent: {
-    flex: 1,
-    minHeight: 0,
-    overflow: "hidden",
-  },
-  header: {
-    position: "relative",
-    height: {
-      xs: HEADER_INNER_HEIGHT_MOBILE,
-      md: HEADER_INNER_HEIGHT,
-    },
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.border,
-  },
-  tabsContainer: (isCompact: boolean) => ({
-    flexDirection: "row",
-    gap: theme.spacing[1],
-    // With the tab's own horizontal padding this puts the label on the pane's
-    // leading rail, the same way the desktop tab rail does.
-    paddingLeft: isCompact ? EXPLORER_TAB_RAIL_INSET : theme.spacing[2],
-  }),
-  tab: (isCompact: boolean) => ({
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingVertical: theme.spacing[2],
-    paddingHorizontal: isCompact ? theme.spacing[2] : theme.spacing[3],
-    borderRadius: theme.borderRadius.md,
-  }),
-  tabActive: {
-    backgroundColor: theme.colors.surfaceSidebarHover,
-  },
-  tabText: {
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.normal,
-    color: theme.colors.foregroundMuted,
-  },
-  tabTextActive: {
-    color: theme.colors.foreground,
-  },
-  tabTextMuted: {
-    opacity: 0.8,
-  },
-  headerRightSection: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-  },
-  contentArea: {
-    flex: 1,
-    minHeight: 0,
-  },
-}));
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M18.8 0H5.2A5.2 5.2 0 000 5.2v13.6A5.2 5.2 0 005.2 24h13.6a5.2 5.2 0 005.2-5.2V5.2A5.2 5.2 0 0018.8 0z" fill="#9046FF" /> <path d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001z" fill="#fff" /> <path d="M12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z" fill="#000" /></svg>