test(server): reproduce lost child notification across restart

fix: update lockfile signatures and Nix hash [skip ci]
Sort sidebar workspaces and keep active overflow visible (#7635 )
2026-10-22 17:22:47 +00:00 · 2026-10-22 16:18:36 +02:00 · 2026-10-22 13:09:27 +00:00 · 2026-10-22 19:59:28 +07:00 · 2026-10-22 19:50:06 +07:00 · 2026-10-22 19:48:34 +07:00
1123 changed files with 69717 additions and 23901 deletions
@@ -41,6 +41,7 @@ server:
 desktop:
  - "packages/desktop/**"
  - "packages/app/src/desktop/**"
+  - "packages/app/src/**/*.electron.{ts,tsx}"
  - "packages/server/src/server/browser-tools/**"
  - "packages/app/e2e/support/**"
  - "packages/app/*config.{cjs,js,ts}"
@@ -3,8 +3,8 @@ name: CI
 on:
  push:
    branches: [main]
+  # Every base branch, so stacked PRs and PRs into `next` get the same checks.
  pull_request:
-    branches: [main]
  merge_group:
  workflow_dispatch:

@@ -417,6 +417,14 @@ jobs:
      - name: Run app unit tests
        run: npm run test --workspace=@getpaseo/app

+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "21"
+
+      - name: Run Android module tests
+        run: npm run test:android --workspace=@getpaseo/app
+
  playwright-1:
    name: playwright (shard 1/8)
    needs: changes
@@ -6,7 +6,6 @@ on:
  # Packaging leaves ordinary PR CI, but a PR that changes what gets packaged
  # or how it is smoked still proves the real artifacts before merge.
  pull_request:
-    branches: [main]
    paths:
      - "packages/desktop/**"
      - "plugins/**"
@@ -1,5 +1,70 @@
 # Changelog

+## 0.13.0-beta.1 - 2026-10-22
+
+Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.
+
+Connect your daemon to another machine, then ask an agent to delegate work there:
+
+```sh
+paseo host add 192.168.1.20:6767 --label studio
+paseo host add 'ssh://me@build-box' --label build-box
+paseo host add 'relay://...' --label laptop
+```
+
+### Added
+
+- Added support for foldable phones such as iPhone Duo, which switch to the wide layout when unfolded ([#7424](https://github.com/getpaseo/paseo/pull/7424))
+- Added connected hosts, so agents can create, prompt and monitor agents on other machines and see them in the Subagents track ([#7370](https://github.com/getpaseo/paseo/pull/7370), [#7593](https://github.com/getpaseo/paseo/pull/7593))
+- Added paseo.sh in Simplified Chinese at [paseo.sh/zh-CN](https://paseo.sh/zh-CN) ([#7373](https://github.com/getpaseo/paseo/pull/7373))
+- Added All changes to the Changes pane as the default, showing committed and uncommitted work since the branch base in one diff ([#7576](https://github.com/getpaseo/paseo/pull/7576))
+- Added Implement with Auto mode to Claude plan approvals when Auto was on before Plan ([#7453](https://github.com/getpaseo/paseo/pull/7453))
+
+### Improved
+
+- Changed the Host field on New workspace to always show, with Add host at the end of its menu ([#7580](https://github.com/getpaseo/paseo/pull/7580))
+- Replaced the file tab's Preview/Source toggle with a switcher between the file's panels ([#7411](https://github.com/getpaseo/paseo/pull/7411))
+- Changed Explorer to use the same tabs and launcher on phones, tablets and desktop ([#7424](https://github.com/getpaseo/paseo/pull/7424))
+- Changed Explorer tabs on phones to keep full labels and scroll, with Close moved to the long-press menu ([#7589](https://github.com/getpaseo/paseo/pull/7589))
+- Changed usage rows to say whether a percentage is used or remaining, in the app's language ([#7376](https://github.com/getpaseo/paseo/pull/7376) by [@michaelmwu](https://github.com/michaelmwu))
+- Changed an agent's report and its finish notification to reach the parent agent as one message ([#7561](https://github.com/getpaseo/paseo/pull/7561))
+- Stopped sending workspace setup output to apps that are not showing that workspace's Setup panel ([#7407](https://github.com/getpaseo/paseo/pull/7407), [#7473](https://github.com/getpaseo/paseo/pull/7473))
+- Paused status ring animations inside hidden panels on iOS and Android ([#7423](https://github.com/getpaseo/paseo/pull/7423) by [@peterkeen](https://github.com/peterkeen))
+- Reduced app startup work by loading only the selected language's translations ([#7410](https://github.com/getpaseo/paseo/pull/7410) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Removed repeated workspace layout saves when nothing changed ([#7358](https://github.com/getpaseo/paseo/pull/7358) by [@colonelpanic8](https://github.com/colonelpanic8))
+
+### Plugins
+
+- Added [file panels](https://paseo.sh/docs/plugins/reference#file-panels), so a plugin can open matching files in the file tab, such as a PDF viewer or a rich Markdown editor ([#7411](https://github.com/getpaseo/paseo/pull/7411), [#7366](https://github.com/getpaseo/paseo/pull/7366))
+- Added [plugin translations](https://paseo.sh/docs/plugins/reference#runtime-translations), so plugin content and labels follow the app's language ([#7478](https://github.com/getpaseo/paseo/pull/7478))
+- Added translated plugin listings through `translations` in `paseo-plugin.json` and `OVERVIEW.zh-CN.md` ([#7373](https://github.com/getpaseo/paseo/pull/7373))
+- Added `Markdown` to `@getpaseo/plugin/client/ui` to render Markdown with Paseo's renderer ([#7579](https://github.com/getpaseo/paseo/pull/7579))
+- Added inline SVG and component icons to every plugin `icon` ([#7368](https://github.com/getpaseo/paseo/pull/7368))
+- Changed every plugin UI import to `@getpaseo/plugin/client/ui`; the previous entry point still works and is deprecated ([#7474](https://github.com/getpaseo/paseo/pull/7474))
+- Changed turn-ended hooks to send an empty `timeline`; fetch recent history with `timeline.refetch` instead ([#7477](https://github.com/getpaseo/paseo/pull/7477))
+- Fixed notification timeline transformers failing to load with "invalid item type: notification" ([#7582](https://github.com/getpaseo/paseo/pull/7582) by [@Gavinchen92](https://github.com/Gavinchen92))
+
+### Fixed
+
+- Fixed agents showing as running after a daemon restart ([#7573](https://github.com/getpaseo/paseo/pull/7573))
+- Fixed Claude system context appearing as an assistant message in imported or restored chats ([#7590](https://github.com/getpaseo/paseo/pull/7590) by [@khevamann](https://github.com/khevamann), [@rogerluan](https://github.com/rogerluan))
+- Fixed saved workspace tabs being lost when leaving or reloading the app right after it loads ([#7547](https://github.com/getpaseo/paseo/pull/7547))
+- Fixed relative links in Markdown preview resolving from the workspace root instead of the document's folder ([#7538](https://github.com/getpaseo/paseo/pull/7538))
+- Fixed Add image failing with "Failed to select image" on Android after changing the font size ([#7546](https://github.com/getpaseo/paseo/pull/7546) by [@RRD-dev](https://github.com/RRD-dev), [@idoyana](https://github.com/idoyana), [@luoph](https://github.com/luoph))
+- Fixed popovers, tooltips and context menus on Android opening one status bar below their trigger ([#7589](https://github.com/getpaseo/paseo/pull/7589))
+- Fixed the active Explorer tab being invisible in the light theme ([#7589](https://github.com/getpaseo/paseo/pull/7589))
+- Fixed Android showing "Host not found" instead of a TLS error for untrusted certificates ([#7429](https://github.com/getpaseo/paseo/pull/7429))
+- Fixed the keyboard covering focused Settings fields on Android ([#7362](https://github.com/getpaseo/paseo/pull/7362))
+- Fixed Pull or Push appearing twice in the compact Changes menu ([#7355](https://github.com/getpaseo/paseo/pull/7355) by [@az33zy](https://github.com/az33zy))
+- Fixed Jump to tab and Jump to workspace saving shortcuts that don't end in a number ([#7365](https://github.com/getpaseo/paseo/pull/7365))
+- Fixed `paseo agent archive` reporting `AGENT_NOT_FOUND` for agents beyond the first 200 ([#7535](https://github.com/getpaseo/paseo/pull/7535) by [@L4XB](https://github.com/L4XB), [@hteo1337](https://github.com/hteo1337))
+- Fixed archived agents reappearing in MCP `list_agents` after their history was read ([#7532](https://github.com/getpaseo/paseo/pull/7532) by [@thomasvan](https://github.com/thomasvan))
+- Fixed detached agents created with `notifyOnFinish` never notifying their creator ([#7528](https://github.com/getpaseo/paseo/pull/7528) by [@thomasvan](https://github.com/thomasvan))
+- Fixed OpenCode agents being told `notifyOnFinish` defaults to off ([#7383](https://github.com/getpaseo/paseo/pull/7383) by [@gszep](https://github.com/gszep))
+- Fixed Pi subagent rows staying running when a resume is refused ([#7369](https://github.com/getpaseo/paseo/pull/7369))
+- Fixed Android source builds downloading a second NDK ([#7403](https://github.com/getpaseo/paseo/pull/7403) by [@dwyanewang](https://github.com/dwyanewang))
+- Fixed Nix packages reporting the AGPL license instead of Apache-2.0 ([#7415](https://github.com/getpaseo/paseo/pull/7415))
+
 ## 0.12.0 - 2026-10-19

 Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
@@ -36,16 +36,20 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/floating-panels.md](docs/floating-panels.md)                   | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
 | [docs/menus.md](docs/menus.md)                                       | The menu engine — popover vs sheet, submenu pages, hover intent, when a decision earns a submenu                               |
 | [docs/expo-router.md](docs/expo-router.md)                           | Expo Router route ownership, startup restore, and native blank-screen gotchas                                                  |
+| [docs/notifications.md](docs/notifications.md)                       | Notification tap ownership, native replay and acknowledgement, startup handoff, and payload QA                                 |
 | [docs/file-icons.md](docs/file-icons.md)                             | Material icon theme integration for the file explorer                                                                          |
 | [docs/providers.md](docs/providers.md)                               | Adding a new agent provider end-to-end                                                                                         |
 | [docs/forge-providers.md](docs/forge-providers.md)                   | Adding a git forge: registry/manifest, drop-in checklist, self-host/GHES, the two facts tiers                                  |
 | [docs/custom-providers.md](docs/custom-providers.md)                 | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
 | [docs/plugins.md](docs/plugins.md)                                   | Local plugin manifest, directory source config, RPCs, native surfaces, and attachment sources                                  |
+| [docs/website-i18n.md](docs/website-i18n.md)                         | Website languages: locale URLs, translated Markdown pairs, `{#id}` anchors, Chinese style                                      |
 | [docs/service-proxy.md](docs/service-proxy.md)                       | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
+| [docs/relay-endpoint-security.md](docs/relay-endpoint-security.md)   | Relay E2EE modes: Noise NK mapping, record framing, negotiation, the `requireProtectedSecurity` flag, close codes              |
 | [docs/development.md](docs/development.md)                           | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
 | [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                            |
@@ -106,6 +110,8 @@ npm run format:check                 # Check formatting without writing

 Repo dev commands use checkout-local state by default. In this checkout, `PASEO_HOME` resolves to `.dev/paseo-home`, and `npm run cli -- ...` targets that same dev home automatically. The packaged desktop app and production-style daemon keep using `~/.paseo` on port `6767`.

+When Mo requests an APK, use `npm run build:apk:arm64` for an ARM64 build: writes `artifacts/paseo-dogfood-arm64.apk` with diagnostics without starting a device; `npm run build:apk` builds all four Android architectures.
+
 See [docs/development.md](docs/development.md) for full setup, build sync requirements, and debugging.

 ## Release branches
@@ -59,8 +59,8 @@
 <table>
  <tr>
    <td align="center" width="33%"><a href="https://hoplite.sh/?utm_source=paseo&utm_medium=readme&utm_campaign=sponsor"><picture><source media="(prefers-color-scheme: dark)" srcset="packages/website/public/sponsors/hoplite-on-dark.svg"><img src="packages/website/public/sponsors/hoplite-on-light.svg" alt="Hoplite" height="40"></picture></a><br><sub>Cloud coding agents</sub></td>
-    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">成为 Paseo 赞助商</a></td>
-    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">成为 Paseo 赞助商</a></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/zh-CN/sponsor">成为 Paseo 赞助商</a></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/zh-CN/sponsor">成为 Paseo 赞助商</a></td>
  </tr>
 </table>

@@ -80,7 +80,7 @@ Paseo 会运行一个名为 daemon 的本地服务，用来管理你的 coding a

 ### 桌面 app（推荐）

-从 [paseo.sh/download](https://paseo.sh/download) 或 [GitHub releases 页面](https://github.com/getpaseo/paseo/releases)下载。打开 app 后 daemon 会自动启动，不需要再安装其他东西。
+从 [paseo.sh/download](https://paseo.sh/zh-CN/download) 或 [GitHub releases 页面](https://github.com/getpaseo/paseo/releases)下载。打开 app 后 daemon 会自动启动，不需要再安装其他东西。

 如果要从手机连接，在 Settings 中扫描显示的二维码。

@@ -97,8 +97,8 @@ paseo

 完整安装和配置见：

- [文档](https://paseo.sh/docs)
- [配置参考](https://paseo.sh/docs/configuration)
+- [文档](https://paseo.sh/zh-CN/docs)
+- [配置参考](https://paseo.sh/zh-CN/docs/configuration)

 ## CLI

@@ -116,7 +116,7 @@ paseo send abc123 "also add tests" # 发送后续任务
 paseo --host workstation.local:6767 run "run the full test suite"
 ```

-更多内容见[完整 CLI 参考](https://paseo.sh/docs/cli)。
+更多内容见[完整 CLI 参考](https://paseo.sh/zh-CN/docs/cli)。

 ## Skills

@@ -164,7 +164,7 @@ npm run typecheck

 ## 支持 Paseo

-Paseo 由一个人开发，靠使用它的人来资助。你可以通过 [GitHub Sponsors](https://github.com/sponsors/boudra) 支持这项工作。公司也可以按月[赞助 Paseo](https://paseo.sh/sponsor#spot)，logo 会展示在本 README 顶部，以及 paseo.sh 的首页和文档中。
+Paseo 由一个人开发，靠使用它的人来资助。你可以通过 [GitHub Sponsors](https://github.com/sponsors/boudra) 支持这项工作。公司也可以按月[赞助 Paseo](https://paseo.sh/zh-CN/sponsor#spot)，logo 会展示在本 README 顶部，以及 paseo.sh 的首页和文档中。

 ## 相关项目

@@ -21,8 +21,8 @@ The relay is designed to be untrusted. All traffic between your phone and daemon

 1. The daemon generates a persistent Curve25519 keypair on first run and stores it at `$PASEO_HOME/daemon-keypair.json` with mode `0600`
 2. The pairing URL (rendered as a QR code or opened directly) carries the daemon's public key in its URL fragment (`https://app.paseo.sh/#offer=...`). Fragments are not sent to the web server, so `app.paseo.sh` never sees the key.
-3. When the phone connects via the relay, it generates a fresh ephemeral Curve25519 keypair and sends an `e2ee_hello` message containing its public key. The daemon will not process any application messages until this handshake completes.
-4. Both sides perform a Curve25519 ECDH key exchange to derive a shared key. All subsequent messages are encrypted with XSalsa20-Poly1305 (NaCl `box`). The encrypted bundle is `[24-byte nonce][ciphertext]`. Peers optionally negotiate `binaryCiphertext` in `e2ee_hello` / `e2ee_ready`: negotiated application text is carried as a base64 WebSocket text frame, while application binary is carried as a raw WebSocket binary frame. A peer that does not negotiate the capability uses base64 text frames for both kinds.
+3. When the phone connects via the relay, it generates fresh ephemeral keys and sends an `e2ee_hello` message. The daemon will not process any application messages until this handshake completes.
+4. Updated peers run a Noise `NK` handshake (`Noise_NK_25519_ChaChaPoly_SHA256`) keyed to the daemon's static key: the `e2ee_hello` carries the first Noise message and the daemon's `e2ee_ready` carries the second. Every later frame is a counter-nonced ChaCha20-Poly1305 record. When either side predates this, the session falls back to the legacy construction: a Curve25519 ECDH shared key with XSalsa20-Poly1305 (NaCl `box`) and a random `[24-byte nonce][ciphertext]` bundle. Both modes negotiate `binaryCiphertext`: negotiated application text is carried as a base64 WebSocket text frame, while application binary is carried as a raw WebSocket binary frame. A peer that does not negotiate the capability uses base64 text frames for both kinds. [docs/relay-endpoint-security.md](docs/relay-endpoint-security.md) has the exact mapping.

 The WebSocket opcode is preserved end to end after negotiation; the receiver never guesses whether authenticated plaintext is text or binary from its byte contents. The plaintext handshake remains WebSocket text and contains only public keys and capability declarations.

@@ -34,9 +34,9 @@ The daemon requires a valid cryptographic handshake before processing any comman

 - **Impersonate the daemon to your phone** — Without the daemon's secret key, it cannot derive the shared key, so any traffic it injects fails authenticated decryption on the phone
 - **Send commands as you** — The daemon only accepts traffic that decrypts and authenticates under a shared key derived with its own secret key. The phone's keypair is ephemeral per connection, so there is no persistent phone-side secret to steal; protection comes from the daemon's secret key never leaving the daemon.
- **Read your traffic** — All messages are encrypted with XSalsa20-Poly1305 (NaCl box) after the handshake
- **Forge messages** — NaCl box provides authenticated encryption; tampered messages are rejected
- **Replay old messages across sessions** — Each session derives fresh encryption keys, so ciphertext from one session cannot be replayed into another session. Within a live session, replay protection is not yet implemented; the protocol uses random nonces and does not track nonce reuse or message counters.
+- **Read your traffic** — After the handshake every message is encrypted: ChaCha20-Poly1305 in protected mode, XSalsa20-Poly1305 (NaCl box) in legacy mode
+- **Forge messages** — Both constructions are authenticated encryption; a tampered message is rejected in either mode
+- **Replay old messages** — In protected mode the daemon contributes a fresh ephemeral key to every session and every record carries a strictly increasing counter, so a recorded session cannot be replayed into a new one and a duplicated, reordered, or reflected record closes the session. Legacy mode has neither property: it uses random nonces, and a daemon that still admits legacy clients accepts a recorded legacy transcript (hello, credentials, commands) as a new session. Set `daemon.relay.requireProtectedSecurity: true` to refuse legacy clients once every client you use has updated.

 ### Trust model

@@ -71,9 +71,16 @@ normal root agent immediately, and closing its still-open tab archives it.

 Runtime ownership is resolved from explicit workspace ID and caller context, never from `cwd`. Workspace creation is a separate operation with `local | worktree` isolation; agent creation reuses that workspace unless a new workspace is explicitly requested.

+Setup belongs to the workspace, including combined workspace-plus-agent creation and the supported agent `worktree` request. Run setup through the workspace workflow before launching configured terminals or scripts. Setup output is read in the Setup panel from per-command snapshots; never produce setup chat timeline rows or concatenate command logs. Legacy agent `git`/`worktreeName` inputs and hidden MCP worktree placement are rejected with workspace-creation guidance. Existing wire schemas retain an empty combined-log string for parsing compatibility.
+
 Users can also detach an existing subagent from the subagents track. Detach is deliberately a manual lifecycle gesture, not an agent-facing MCP tool. It removes the parent and open-tab lifecycle labels: it does not stop, archive, move, or restart the agent. The agent keeps its current `cwd` and `workspaceId`, leaves the former parent's track, and behaves like a root agent for tab close, workspace activity, and future parent archive.

-`notifyOnFinish` defaults to `true` for agent-scoped creation and prompt follow-ups because most delegated work needs to report back to the creating agent. Set it to `false` only for truly fire-and-forget agents or prompts.
+`notifyOnFinish` defaults to `true` for agent-scoped creation and prompt follow-ups because most delegated work needs to report back to the creating agent. Set it to `false` for explicit reporting or no completion callback.
+
+Agent-originated messages and automatic notifications share a recipient-daemon delivery module. A queued receipt acknowledges admission before provider dispatch, allowing a child to report and finish in the same two-second quiet window. Human prompts dispatch directly. Conflicting explicit interruption or session-mode choices retain separate ordered dispatches.
+
+The pending window is in memory. Clean shutdown flushes it before closing agents; an abrupt crash can lose it. A durable send receipt remains pending until actual dispatch acknowledgment, so a lost window never becomes a completed receipt. Completion waits cover queued admission within their original timeout and cancellation scope.
+
 Permission requests are notification checkpoints, not the end of that subscription. The caller is notified again after a permission response when the child finishes, errors, or requests another permission.
 The permission notification includes the normalized request plus the child and request IDs, so the caller can inspect it and respond without fetching agent status.
 A watched child that closes before its finish event also notifies the caller so delegated work cannot disappear silently during archive or workspace teardown.
@@ -61,39 +61,81 @@ Gradle auto-fetches the platform/build-tools it needs once licenses are accepted

 ## Local build + install

+The locked `expo-modules-core@57.0.23` needs the patch installed by `npm install`.
+It backports
+[Expo's Activity-result launcher fix](https://github.com/expo/expo/pull/49634): changing
+font size or another unhandled configuration can otherwise disable image selection
+until the app process restarts. Rebuild the native app after changing this patch;
+a Metro reload cannot update it. Remove the patch when the installed
+`expo-modules-core` includes the fix.
+
+Run its native regression tests from `packages/app/android` after prebuild:
+
+```bash
+./gradlew :expo-modules-core:testDebugUnitTest \
+  --tests expo.modules.kotlin.activityresult.AppContextActivityResultRegistryRecreationTest \
+  --no-daemon --max-workers=1 -Dorg.gradle.parallel=false
+```
+
 From repo root:

 ```bash
-npm run android:development    # Debug build
-npm run android:production     # Release build
-npm run android:clear          # Remove generated Android project
+npm run build:apk       # Universal dogfood APK: 32/64-bit ARM and x86
+npm run build:apk:arm64 # Smaller dogfood APK for ARM64 phones
+npm run dev:android     # Build/install the debug app and start development
+npm run dev:ios         # Build/install the iOS development app
 ```

-For a production-ID release APK that local Android profiling tools can attach to:
+`build:apk` writes `artifacts/paseo-dogfood-universal.apk`; `build:apk:arm64` writes
+`artifacts/paseo-dogfood-arm64.apk`. Neither command launches or installs on a device. Both enable
+`PASEO_WATCHDOG_BUILD=1`, the production React profiling renderer, and Android's shell-profileable
+flag. These builds keep the production package ID (`sh.paseo`) and release optimizations. Use this APK for
+personal dogfooding. Android system-trace spans require the separate `PASEO_PROFILE_BUILD=1` flag;
+watchdog recording does not send duplicate spans to that sink by default. Normal store/release
+workflows leave diagnostics disabled.
+
+The older `android`, `android:development`, and `ios` commands remain aliases for development.
+`android:production` still builds and installs a release through Expo; use `build:apk` when you
+need an artifact. `android:clear` removes the generated Android project.
+
+Run `npm run test:android --workspace=@getpaseo/app` to prebuild Android and run native module unit tests. The app CI job runs this command with the Android toolchain.
+
+### Diagnostic logs without ADB
+
+In a dogfood build, open Android's Files app → Downloads → **Paseo diagnostics** and share all
+retained `.jsonl` files. No app screen, storage permission, or attached debugger is required.
+The recorder retains eight files of about 5 MiB each across reconnects and app restarts. Rotation
+replaces the oldest files, so collect them soon after reproducing a freeze. Uninstall/reinstall
+can leave older Downloads files that the new installation cannot manage.
+
+Each file identifies its build and session. Events include application-transport frame sizes and
+message/request IDs, connection transitions, parse/validation/dispatch spans, named React subtree
+render timings, and foreground JS heartbeat gaps. Payloads, passwords, and message contents
+are excluded; connection identifiers include host addresses. Each size has a unit: **bytes** when
+already available, otherwise **UTF-16 code units** for text. These are
+client transport observations, after relay decryption where applicable, not packet arrival times.
+
+The native recorder flags a heartbeat overdue by more than 500 ms (250 ms expected interval).
+A heartbeat gap bounds the unresponsive interval; it is not an exact blocked-stack duration.
+Backgrounding suspends detection. `js.stall.started` can be written while JS remains blocked;
+`js.stall.recovered` records the gap when JS resumes. Recovery can appear without a start event
+when JS resumes before the next native sampling tick. Process death leaves earlier files intact,
+but queued/unflushed records can be lost. A missing recovery event alone does not prove a crash.
+
+`react.render.slow` records subtree rendering taking at least 16 ms; one-second summaries include
+faster renders. Nested profiler timings overlap: don't add parent and child times. React's render
+measurements do not measure native layout/paint or the complete commit phase. `recorder.dropped`
+means the bounded queue overflowed; missing events in that interval must not be treated as absence
+of activity. Storage failure stops recording rather than blocking the app.
+
+For an ordinary release APK with system trace markers only:

 ```bash
 PASEO_PROFILE_BUILD=1 npm run android:production
 ```

-This keeps the `sh.paseo` package id, release Hermes bundle, and release optimizations. It adds
-`<profileable android:shell="true" />` and enables local Android trace markers for workspace mounts
-and daemon WebSocket traffic. The markers contain message types and sizes, never payload contents,
-and emit only while a system trace records the `sh.paseo` app (`perfetto -a sh.paseo ...`).
-
-Or from `packages/app`:
-
-```bash
-# Debug
-npx cross-env APP_VARIANT=development expo prebuild --platform android --clean --non-interactive
-npx cross-env APP_VARIANT=development expo run:android --variant=debug
-
-# Release
-npx cross-env APP_VARIANT=production expo prebuild --platform android --clean --non-interactive
-npx cross-env APP_VARIANT=production expo run:android --variant=release
-
-# Clear generated Android project
-rm -rf android
-```
+Those markers emit only while a system trace records `sh.paseo` (`perfetto -a sh.paseo ...`);
+they do not produce Downloads files.

 ## Running on an emulator against a worktree daemon

@@ -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

 ```
@@ -71,6 +74,13 @@ server to capability-aware sessions. It deliberately does not use the broad recu
 watcher or the per-session Git observer: those are checkout/status mechanisms and intentionally do
 not retain non-Git directories.

+Workspace git and forge runtime data belongs to one daemon-level, directory-keyed store.
+Workspace descriptors, checkout diff subscriptions, and script metadata read the last known
+snapshot from that store, so reconnecting clients receive it before refresh completes.
+Refcounted git watches feed the store through snapshot-updated events; their lifetime controls
+refresh only. Session cleanup and workspace archive retain the data. Removing the final active
+workspace for a directory clears it. The store lives in memory and resets on daemon restart.
+
 **Key modules:**

 | Module                          | Responsibility                                                                 |
@@ -172,9 +182,9 @@ Communicates with the daemon via the same WebSocket protocol as the app.

 Enables remote access when the daemon is behind a firewall.

- Curve25519 establishes the relay-session secret; NaCl `box` protects each payload with XSalsa20-Poly1305
+- Updated peers negotiate a Noise `NK` session with per-record counters; peers on either side that predate it fall back to the legacy NaCl `box` construction. [docs/relay-endpoint-security.md](relay-endpoint-security.md) owns the mapping, negotiation, and the `daemon.relay.requireProtectedSecurity` flag
 - The relay is zero-knowledge — it routes encrypted bytes and cannot read content
- Client and daemon channels with identical API (`createClientChannel`, `createDaemonChannel`)
+- Client and daemon channels with identical API (`openClientSecureChannel`, `openDaemonSecureChannel`)
 - Pairing via QR code transfers the daemon's public key to the client
 - New homes keep relay disabled until pairing consent. `DaemonConfigStore` persists the desired state, while the relay runtime starts or stops the outbound transport live; pairing reads that current state instead of a startup snapshot.
 - Optional E2EE capability negotiation preserves application frame kind: text plaintext uses base64 ciphertext text frames, while binary plaintext uses raw ciphertext binary frames; mixed-version peers remain base64-only
@@ -0,0 +1,89 @@
+# 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.
+
+## Delegating agents
+
+Agent MCP discovers destination IDs with `list_hosts`. `create_workspace`, `list_workspaces`,
+`create_agent`, `send_agent_prompt`, `get_agent_status`, `get_agent_activity`, and `list_agents`
+accept `serverId`; omission selects the calling daemon. Remote creation requires a
+destination workspace and explicit provider/model. Caller filesystem defaults apply only on the
+calling daemon. Prompting a remote child acknowledges acceptance and uses the existing idle wait for
+finish notifications. Remote agent lists have no caller-directory default; pass `cwd` to filter them.
+
+The parent’s Subagents track shows qualified children across connected hosts. Opening a child uses
+the ordinary conversation on the destination's session. The runtime selects among that host's
+connection candidates, including direct connections and routes discovered through another daemon.
+Adding a direct connection to a discovered host adds another candidate. If no candidate connects,
+the destination workspace keeps its existing disconnected or reconnecting behavior.
+
+Finish notifications use the existing idle wait, including a pending initial run or an already idle
+child. They name the server and agent. A daemon restart or route loss ends an outstanding notification
+wait; inspect or wait for the child again rather than resending its prompt. Concurrent prompts gain
+no additional turn attribution or delivery guarantee.
+
+## 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.
+
+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).
@@ -317,7 +317,7 @@ Paseo tools; otherwise the provider policy applies. Provider and global policy a
 session is created, resumed, imported, or reloaded, so configuration changes affect the next
 session rather than an already-running one.

-`agents.metadataGeneration.providers` controls the preferred structured-generation fallback order for daemon-side metadata tasks such as commit messages, PR text, branch names, and generated agent titles. Entries are tried first in the configured order, then Paseo falls through to dynamically discovered defaults and finally the current selection when available.
+`agents.metadataGeneration.providers` selects the models for daemon-side metadata tasks: commit messages, PR text, branch names, and generated titles. An empty list is Automatic; a non-empty list is Manual and only those models are tried. See [public-docs/metadata-generation.md](../public-docs/metadata-generation.md#how-a-model-is-chosen).

 ### Git process limits

@@ -353,8 +353,6 @@ Environment variables override `config.json`:
 after changing `config.json`. Environment changes require a daemon restart; the launch environment
 remains authoritative during reload.

-`agents.metadataGeneration.providers` controls the preferred structured-generation fallback order for daemon-side metadata tasks such as commit messages, PR text, branch names, and generated agent titles. Entries are tried first in the configured order, then Paseo falls through to dynamically discovered defaults and finally the current selection when available.
-
 Local speech model ids are intentionally narrow: STT uses `parakeet-tdt-0.6b-v2-int8`, TTS uses `kokoro-en-v0_19`, and turn detection uses the bundled Silero VAD model.

 Set these to select OpenAI instead of local speech:
@@ -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,42 @@ 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. Compact layouts show no inline close on any tab,
+since a narrow X beside the label is easy to hit by accident; the long-press menu closes it.
+Compact tabs also keep their natural width and the rail scrolls as soon as they overflow, while
+pointer layouts shrink tabs toward the clickable minimum first. A rail that scrolls never truncates.
+The + menu opens compatible panels in the dock, including Agent and terminal profiles. Compact
+layouts omit Diff from it because compact Changes shows each file's diff inline.
+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

@@ -104,17 +104,24 @@ Do not collapse this topology with a catch-all, `getId`, or

 ## Agent Targets

-Notifications and agent URLs enter the router with different authoritative
-targets.
+Notifications and agent URLs name a host and agent. Both use
+`navigateToAgent()`, which reads the agent's current workspace from the store
+or routes through `/h/[serverId]/agent/[agentId]`. The agent route waits for
+the named host, demands its directory, and waits for workspace and layout
+hydration before opening the tab. Keep the stable agent URL free of a workspace
+hint. [Notifications](notifications.md) owns tap delivery and native lifecycle
+constraints.

- Notifications carry `serverId`, `workspaceId`, and `agentId`. Route them
-  directly to the workspace with the agent open intent.
- Agent URLs carry only `serverId` and `agentId`. Route them through
-  `/h/[serverId]/agent/[agentId]`; that route waits for the named host, resolves
-  the agent's workspace from the host, and then opens the agent there.
+When a workspace target cannot open yet, `navigateToWorkspace()` records a
+pending open in the layout model under that host and workspace key. The owning
+workspace screen consumes it once after hydration. Archived-workspace recovery
+reads the same pending target, so startup redirects cannot discard it and a
+retained screen cannot consume another workspace's request.

-Both paths converge on `navigateToAgent()`. Do not make notification routing
-guess a workspace, and do not add a workspace to the stable agent URL format.
+Legacy `?open=` links seed this model state at the matched route boundary and
+then lose the query parameter. Internal navigation does not use the query as a
+handoff. Read matched route params locally; global search params let retained
+workspace screens observe requests for other workspaces.

 ## Params

@@ -157,7 +164,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
@@ -282,10 +282,12 @@ left = anchorRect.x - hostRect.x;
 bottom = hostRect.height - (anchorRect.y - hostRect.y) + offset;
 ```

-Do this before adding any platform offset. If anchor and host are both measured
-with `measureInWindow`, Android's status-bar coordinate behavior cancels out.
-Only add a status-bar offset when the render surface is not measured in the same
-coordinate system. See `tooltip.tsx` for that separate case.
+Do this before adding any platform offset. The app draws edge-to-edge on Android, so
+`measureInWindow`, touch `pageY`, and a full-screen `Modal` all share one coordinate
+space that starts at the screen top. Do not add `StatusBar.currentHeight` to an anchor:
+React Native 0.86 stopped subtracting the status bar from window coordinates under
+edge-to-edge, and the old compensation now lands every menu, tooltip, and context menu
+one status bar below its trigger.

 ## Gotcha 5 — The two-measurement flash

@@ -26,6 +26,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Side pane** — An ordinary right-side workspace pane used for content opened beside the user's work. It closes and participates in workspace splits like every other main-host pane. See [explorer-sidebar.md](explorer-sidebar.md#side-pane). Forbidden: "Side panel".
 - **Directory-backed surface** — A right-sidebar surface whose content is determined by the workspace's `cwd`, so two workspaces on the same directory see identical content: git diff/status, forge change-request info, file preview/explorer contents. Keyed by `(serverId, cwd)`, never `workspaceId`. See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace-owned state** — Per-workspace state that never leaks to a same-`cwd` sibling: tabs, agents, terminals, panes, title, plus review drafts, diff-mode overrides, composer attachments, and file-explorer open/expand state. Keyed by `workspaceId` (`cwd` only as a fallback for old payloads). See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
+- **Last prompt** — Sidebar workspace sort by the most recent human prompt recorded by an agent in that workspace, including archived agents. Agent output, agent-to-agent messages, scheduled prompts, and opening a workspace do not count. A workspace without a human prompt uses its creation time.
 - **Workspace status bucket** — Aggregate activity signal for a workspace row. Same-`cwd` workspaces intentionally share agent and terminal status buckets, while tab, agent, and terminal visibility remains scoped by `workspaceId`.
 - **Agent session** — One running instance of an agent inside a workspace (one provider, one model, one cwd, one timeline). The conceptual unit; in the UI this opens as a tab. Moving toward this as the canonical term over "Agent". Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`).
 - **Session** — Two senses: (a) per-client connection to a daemon, internal; (b) user-facing agent session, see **Agent session**. Code: `Session` (`packages/server/src/server/session.ts`) for (a). Don't confuse with: provider-side agent session log.
@@ -1,6 +1,6 @@
 # I18n

-Paseo client UI translations live in `packages/app/src/i18n`.
+Paseo client UI translations live in `packages/app/src/i18n`. Website translations are in [website-i18n.md](website-i18n.md).

 ## Supported Locales

@@ -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
@@ -0,0 +1,71 @@
+# Notifications
+
+Use `notification-open` for OS notification taps. It owns delivery, parsing,
+process-local deduplication, startup readiness, and native acknowledgement.
+Keep agent and workspace navigation in their existing navigation modules.
+Import the pure API from `@/notification-open` and the app-shell component from
+`@/notification-open/react`; senders must not load the React routing runtime.
+
+Agent payloads name a host and agent. Ignore their workspace hint when opening:
+the agent can move after a notification is sent. Use `navigateToAgent`, which
+uses the current store record or the agent route to resolve the workspace from
+the host. Terminal payloads name their workspace and use `navigateToWorkspace`.
+
+See [agent targets and deferred opens](expo-router.md#agent-targets) for route
+ownership and workspace recovery. Notification generation, presence, and push
+eligibility remain daemon concerns.
+
+## Native delivery
+
+Keep the router instance at module scope. Android's `singleTask` Activity can
+finish on Back while its JS context remains alive. A React ref is lost when the
+root remounts; process-local handled IDs must survive that remount.
+
+Clear `lastNotificationResponse` after dispatch. Reading a launch response does
+not acknowledge it. Without clearing it, a later Activity launch can reopen the
+old agent.
+
+With expo-notifications 57, Android also replays its pending response list to
+new native listeners. Clearing the last response does not drain that list.
+Deduplication covers listener registration within one JS context. A development
+JS reload creates another context and can replay a cold-launch response; do not
+add persisted handled IDs to compensate. Recheck this limitation when upgrading
+expo-notifications.
+
+iOS drains pending responses when its delegate first handles them. Push data
+read by Expo arrives under `userInfo.body`; simulator payloads must match:
+
+```json
+{
+  "aps": { "alert": { "title": "Agent finished", "body": "Open the agent" }, "sound": "default" },
+  "body": {
+    "serverId": "host",
+    "workspaceId": "workspace",
+    "agentId": "agent",
+    "reason": "finished"
+  }
+}
+```
+
+An Android FCM launch intent needs `google.message_id` and a JSON `body` extra.
+An arbitrary Activity launch with data extras does not exercise Expo's FCM path.
+
+Foreground pushes remain in Notification Center without a banner or sound.
+This preserves notifications sent with stale presence information.
+
+## Startup and verification
+
+Wait for the root navigator, host registry, remembered selection, and startup
+redirects before handing off a tap. A compact agent route must demand the host's
+directory itself; its sidebar can be closed for the entire cold launch.
+
+Verify warm and cold taps, stale and missing workspace hints, two distinct taps,
+and Android Back followed by launcher reopen or a different notification tap. Check the focused tab and every
+workspace's saved layout, since a foreign pinned tab survives navigation.
+Use the daemon's payload shape on both iOS and Android; a browser event alone
+does not test native replay or acknowledgement.
+
+Existing foreign pins belong to the reconciliation fix in
+[#6900](https://github.com/getpaseo/paseo/issues/6900). Desktop main-process window
+selection is tracked separately in
+[#6875](https://github.com/getpaseo/paseo/issues/6875).
@@ -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.
@@ -86,6 +86,12 @@ plugin before compiling and starting from disk. A failed reload stays failed; Pa
 the old code. Use `enable`, `disable`, and `remove` to manage one plugin. Removing a directory source
 never deletes it. The global `pluginsEnabled` switch remains available.

+## Client translations
+
+Plugin runtime translations follow the connected app, so never send a daemon locale through RPCs or add plugin resources to the app catalog. The installation owns the translation engine; native portal bridges must carry it alongside RPC and client-state contexts. Keep host label resolution at presentation time so language changes preserve the installation lifetime.
+
+The author contract is in [runtime translations](../public-docs/plugins/reference.md#runtime-translations).
+
 ## Built-in plugins

 Built-in plugins ship from `plugins/<id>/`, with `paseo-plugin.json`, `index.server.ts`,
@@ -240,8 +246,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/ui`. 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).
@@ -256,14 +263,14 @@ Classify every SDK export before adding it. All client entry points and implemen
 Zod schemas, and functions that run in both runtimes. A type-only import is still an architectural
 dependency; shared types must not refer to React components, hooks, Node APIs, or server contexts.

-| Entry                                                | Owns                                                                       | May depend on          |
-| ---------------------------------------------------- | -------------------------------------------------------------------------- | ---------------------- |
-| `@getpaseo/plugin`                                   | Shared data, schemas, RPC/settings definitions, runtime-neutral helpers    | Shared code only       |
-| `@getpaseo/plugin/server`                            | Server contexts, lifecycle contracts, and CLI process launch               | Shared and server code |
-| `@getpaseo/plugin/server/provider`, `/server/acp`    | Server provider contracts and adapters                                     | Shared and server code |
-| `@getpaseo/plugin/client`                            | Client contribution contexts, hooks, navigation, and UI contribution types | Shared and client code |
-| `@getpaseo/plugin/client/react-native`, `/client/ui` | Host-provided UI components                                                | Shared and client code |
-| `@getpaseo/plugin/client/host`                       | App-owned rendering integration; not a plugin-author entry                 | Shared and client code |
+| Entry                                             | Owns                                                                       | May depend on          |
+| ------------------------------------------------- | -------------------------------------------------------------------------- | ---------------------- |
+| `@getpaseo/plugin`                                | Shared data, schemas, RPC/settings definitions, runtime-neutral helpers    | Shared code only       |
+| `@getpaseo/plugin/server`                         | Server contexts, lifecycle contracts, and CLI process launch               | Shared and server code |
+| `@getpaseo/plugin/server/provider`, `/server/acp` | Server provider contracts and adapters                                     | Shared and server code |
+| `@getpaseo/plugin/client`                         | Client contribution contexts, hooks, navigation, and UI contribution types | Shared and client code |
+| `@getpaseo/plugin/client/ui`                      | Host-provided UI components                                                | Shared and client code |
+| `@getpaseo/plugin/client/host`                    | App-owned rendering integration; not a plugin-author entry                 | Shared and client code |

 Server code imports shared helpers from the root and server capabilities from `/server`. Client
 code imports shared helpers from the root and client capabilities from `/client`. Neither runtime
@@ -332,7 +339,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 +407,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 +517,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.

@@ -538,16 +562,39 @@ one section's order from built-ins, plugin groups, and the section's preference
  remembers under its own key. It shares header ids and the `plugin:<pluginId>:<id>` settings key
  with new-API items.

+## Contribute file panels
+
+Client `addFilePanel` registrations become the body of a file tab. The tab stats the file, picks a
+panel, and mounts it with a `PluginFile` handle; the panel reads, shows its own `Loading`, writes,
+and resolves conflicts. The host has no bar and no notion of a panel's views: the Markdown and HTML
+panels own their Preview and Source views, toolbar and editor buffer, and the tab only shows the
+dot a panel sets through `tab.setModified`. Source is the floor for text files no other built-in
+claims, never a candidate beside one. Built-in panels (Markdown, HTML, Image, and Source, Paseo's
+editor) take the same handle as plugin panels, so a fix to reading, watching, or writing lands in one place:
+`packages/app/src/file-panels/file/`. Do not add a host-side read or loading gate for one panel;
+make that panel faster instead. Source highlights a large file on native in idle-time slices,
+the lines around the opening line first.
+
+The handle checks every write against the version it last read or wrote, so two panels or a panel
+and an agent cannot silently overwrite each other. The daemon reports the file's kind (text,
+image, binary) with its stat from a bounded sniff, which is how Source claims text files without a
+read. See the [public file panel reference](../public-docs/plugins/reference.md#file-panels) for
+the author API, selection, `DocumentFrame`, and the version requirement. The examples live in
+`plugin-examples/pdf-panel` and `plugin-examples/markdown-panel`.
+
 ## Contribute buttons

 Header buttons and composer pills share the client-only descriptor and registration lifecycle in
 `packages/app/src/plugins/buttons/`. The [public button reference](../public-docs/plugins/reference.md#header-buttons)
 owns the author API and placement rules. Keep presentation policy in this module so another
-placement can reuse behavior without copying registration or action state.
+placement can reuse behavior without copying registration or action state. The header overflow
+and the compact workspace menu share one builder that turns buttons into menu rows and pages; the
+workspace menu reaches it through `usePluginWorkspaceMenu`.

 Native sheets teleport their children. Button surfaces rebuild the installation's SDK, state,
-query, and toast providers inside the surface content, including overflow pages from different
-plugins. Providers only around the trigger do not reach those bodies.
+query, and toast providers inside the surface content. A host menu can hold buttons from several
+installations, so each of its rows and pages resolves its own installation's runtime. Providers
+only around the trigger do not reach those bodies.

 Request observation with `client.paseo.agents.list({ subscribe: {} })` and consume the returned
 `subscription` handle. Plain `list()` and agent/workspace directory `.subscribe(handler)` listeners create no daemon
@@ -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.

@@ -0,0 +1,88 @@
+# Relay endpoint security
+
+The relay carries daemon sessions between a client and a daemon that cannot reach each other directly. The relay is untrusted, so the two endpoints secure the session themselves. This doc owns the protected construction, its mapping onto Paseo's handshake and record flow, the negotiation rules, and the enforcement flag. The threat model lives in [SECURITY.md](../SECURITY.md); the code is `packages/relay/src/secure-channel.ts`.
+
+Fixes [#359](https://github.com/getpaseo/paseo/issues/359): the legacy construction has no replay protection. A recorded legacy hello plus records replays onto a fresh daemon channel, and duplicated records are delivered twice.
+
+## Two modes
+
+| Mode        | Construction                                     | Replay protection                |
+| ----------- | ------------------------------------------------ | -------------------------------- |
+| `legacy`    | X25519 + NaCl `box`, random nonces               | none                             |
+| `protected` | `Noise_NK_25519_ChaChaPoly_SHA256` (revision 34) | counters, fresh daemon ephemeral |
+
+Two updated peers always negotiate `protected`. An old peer on either side falls to `legacy` while the daemon permits it. Everything in `packages/relay/src/encrypted-channel.ts` is the legacy construction and is unchanged.
+
+The shared entry points are `openClientSecureChannel` and `openDaemonSecureChannel`. Callers get a `SecureChannel` and ask it `securityMode()`; nothing outside the module branches on the construction.
+
+## Noise mapping
+
+- **Pattern:** NK. The daemon's static key is the existing `$PASEO_HOME/daemon-keypair.json` X25519 key that pairing already distributes. There is no second daemon identity.
+- **Prologue:** the ASCII bytes `paseo-relay-e2ee/1`.
+- **Primitives:** `@noble/curves` x25519, `@noble/ciphers` ChaCha20-Poly1305, `@noble/hashes` SHA-256 and HMAC. The state machine in `packages/relay/src/noise/` is our own implementation of the spec and is checked against vendored third-party vectors in `noise/fixtures/`.
+- **Message 1** (`-> e, es`) travels inside the legacy hello: `{ type: "e2ee_hello", key, capabilities, protected: { v: 1, message: <base64> } }`. `key` is a separate legacy ephemeral so an old daemon still completes a legacy handshake. The Noise payload is the offered parameters.
+- **Message 2** (`<- e, ee`) travels inside the ready: `{ type: "e2ee_ready", protected: { v: 1, message: <base64> } }`. Its payload is the selected parameters. The outer `capabilities` field is ignored in protected mode because it is not authenticated.
+- **Parameters payload:** two bytes, `[0x01 version][flags]`. Flag bit 0 is `binaryCiphertext`. Unknown versions, reserved flag bits, and a selection the client did not offer fail the handshake.
+- **Split:** the initiator sends with the first cipher state and receives with the second. The daemon is the mirror. Nonces are 64-bit little-endian in a 12-byte nonce, reserved synchronously before any await, never wrapped. A receiver advances its counter only after the tag verifies.
+
+Nothing else is bound into the handshake. The outer JSON, the relay URL, and session credentials are not authenticated by Noise. Credentials travel in the application `hello` after message 2 verified the daemon.
+
+## Records
+
+Each application frame becomes one record of one or more Noise transport messages:
+
+```
+chunk plaintext = kind(1) || flags(1) || totalLength(u32 BE) || data
+wire record     = (u16 BE ciphertextLength || ciphertext)+
+```
+
+`kind` is `0x00` text or `0x01` binary. `flags` bit 0 marks the first chunk and bit 1 the last. `data` is at most 65513 bytes per chunk, so a chunk never exceeds the Noise message limit. The chunk count is `max(1, ceil(totalLength / 65513))`.
+
+The receiver rejects a record whose metadata disagrees between chunks, whose non-final chunks are not full, whose byte total differs from `totalLength`, or that has zero chunks, trailing bytes, reserved flags, or an invalid kind. Partial plaintext never reaches the application. Transport AD is empty, as the Noise spec writes it; framing authenticity comes from the metadata being inside the ciphertext. `packages/relay/src/protected-records.ts` owns this.
+
+Frame kind is preserved on the wire the same way as legacy: text records are base64 WebSocket text, binary records are WebSocket binary when `binaryCiphertext` was negotiated.
+
+## Retries and failures
+
+- The client resends its hello every second until a ready arrives. The daemon caches the exact hello text and ready text for the channel. An identical hello gets the identical ready and counters keep running. A different hello closes the channel (`1008`, transcript mismatch). A ready after the channel is open is ignored.
+- A fresh daemon channel always generates a fresh `e`, so a recorded hello and its records fail authentication when replayed later, including after a daemon restart.
+- A present but invalid `protected` field fails the handshake. There is no fallback to legacy once protected was attempted.
+- Any record failure (bad tag, duplicate, reordered, reflected, malformed) closes the channel and nothing from that record is delivered. The daemon closes with `1011`; the client closes with `4003`, because a browser `WebSocket.close` accepts only `1000` and `3000`-`4999`.
+- A record header is checked against the bytes actually received before any buffer is allocated for it, so a header claiming gigabytes costs nothing.
+- Keys are cleared on close as a best effort.
+
+## Negotiation and admission
+
+The daemon advertises `server_info.features.relayProtectedSecurity: true` on every session, whatever mode that session negotiated. A relay client that ended up in `legacy` with such a daemon closes with `4002` before the client marks itself connected, restores subscriptions, or flushes queued commands. The check lives in the relay E2EE transport, so it also covers the Node connector; direct connections never see it.
+
+The app pins `minimumSecurityMode: "protected"` on every relay connection to a daemon public key after the first protected handshake with that key, or when the pairing offer carries `minimumSecurityMode`. A pinned client passes `minimumMode: "protected"` to the handshake and refuses a legacy ready before sending credentials. The pin belongs to the daemon identity, not to a relay address: re-importing the same key through any relay keeps it, a different key is a different connection, and connection failures never clear it.
+
+The handshake result is read in one place, `HostRuntimeController` when the host's active client reports connected. Every client reaches that point, whether the controller created it or adopted it from a pairing or startup probe, so no client constructor carries a persistence callback. A probe that negotiated protected but was never adopted pins nothing; the pin lands when the host first goes online.
+
+Within one client process the floor also rises on its own. `DaemonClient` and the Node host connector remember a protected result and require it on every later attempt, so a reconnect after a relay drop cannot be answered in legacy mode even before the pin is persisted.
+
+The daemon refuses a legacy client with close `1008` and reason `protected endpoint security required`, and logs `relay_e2ee_handshake_rejected`. That close code stops at the relay: both relays replace a daemon-side close with their own (the wrangler relay sends `1012 Server disconnected`), so an old client sees an ordinary disconnect and keeps retrying. The only client-detectable failure is the client's own `4002`, which stops reconnecting and tells the user to update.
+
+The client learns its own `4002` and `4003` from the relay E2EE transport, which reports the close the moment the channel decides it. A socket close event arrives later and the channel's error callback earlier; neither is what `DaemonClient` acts on, because acting on the error would start a reconnect before the code is known.
+
+## Enforcement flag
+
+`daemon.relay.requireProtectedSecurity` in `config.json` (also `relay.requireProtectedSecurity` through the config RPC) makes the daemon refuse legacy relay clients. Default `false`. It is a local daemon setting with no relay-server counterpart.
+
+- It is read when each hello arrives, so toggling it affects the next admission without a restart. Sessions already admitted in legacy mode stay up until they disconnect; turning the flag on does not close them. To finish enforcement, restart the daemon or disconnect its relay sessions after enabling the flag: every reconnect is then a new admission and legacy clients are refused.
+- While it is on, pairing offers carry `minimumSecurityMode: "protected"` and `relay://` URIs carry `security=protected`, so new clients pin before their first handshake.
+- Direct and local connections are outside the flag.
+
+Flipping the default is a separate decision, tentatively reviewed about 30 days after the compatibility release. Nothing in the code expires on a date.
+
+## Known limitation
+
+While a daemon accepts legacy clients, a transcript recorded from any legacy session (hello, credentials, commands) can still be replayed to it. Pinning on the client does not change that, because the attacker replays the old client's transcript, not the pinned client's. The only remedy is enabling the flag on that daemon.
+
+## Testing
+
+- `packages/relay/src/noise/noise.test.ts`: vendored vectors, replay and out-of-order rejection at the cipher-state level.
+- `packages/relay/src/protected-records.test.ts`: framing round trips and every malformed-record rule.
+- `packages/relay/src/secure-channel.test.ts`: both modes, mixed versions, policy rejection, retries, recorded-transcript replay, downgrade attempts.
+- `packages/server/src/server/websocket/secure-relay-ingress.test.ts`: daemon admission and the flag.
+- `packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts`: real daemon through the wrangler relay. Set `PASEO_RELAY_E2E_PORT` to run the same cases against an already-running relay such as the Elixir relay in Docker.
@@ -62,9 +62,10 @@ release. This applies to both beta and stable releases.
  the changelog. Retarget remaining PRs based on `next` to `main` and delete the integrated
  `next`. Create it fresh when needed again.

-**Setup still needed:** CI, Docker, and Nix PR checks currently target only `main`,
-and GitHub permits only squash merges. Enable checks and required-check protection
-for `next`, CI on its pushes, and merge commits for the integration PR. Handle PR
+**Setup still needed:** PR checks run for every base branch, but CI, Docker, and Nix
+push runs target only `main`, and GitHub permits only squash merges. Enable
+required-check protection for `next`, CI on its pushes, and merge commits for the
+integration PR. Handle PR
 base changes (`edited` events) so retargeting runs checks against the new base;
 GitHub's default PR events do not cover this. Deployment triggers stay unchanged.

@@ -533,6 +534,14 @@ No prefix (`v`), no extra text. `Release Notes Sync` matches the `## X.Y.Z` (or

 Older prerelease bodies on GitHub keep the notes they were synced with; `Release Notes Sync` only writes the release whose tag matches the top entry.

+## Changelog translations
+
+`CHANGELOG.zh-CN.md` holds the Chinese notes for `paseo.sh/zh-CN/changelog`. Only the website reads it; the app's **What's new** sheet, GitHub release bodies and F-Droid read `CHANGELOG.md`.
+
+- The release agent writes the Chinese entry in the changelog commit, after the English entry is approved. Every beta that rewrites the English entry rewrites the Chinese one too, and promotion renames both. `packages/website/e2e/i18n.spec.ts` fails CI on the release commit when any entry has no current translation.
+- A translated entry uses the English heading unchanged: `## X.Y.Z - YYYY-MM-DD`. The website uses it only while the version and date both match the English entry. Otherwise it shows that release whole in English under a notice. Delete Chinese entries whose English entry was renamed.
+- Keep the English sections, bullets and links one to one. Section titles: Added 新增, Improved 改进, Changed 变更, Fixed 修复, Security 安全, Breaking 破坏性变更, Plugins 插件, Notes 说明. Wording follows [website-i18n.md](website-i18n.md#chinese-style).
+
 ## Changelog ownership

 - **The agent running the release writes the changelog entry — beta or stable.** The release context and final wording stay with that agent.
@@ -645,7 +654,7 @@ Every entry covers `previous stable release → release source`: first beta, lat

 - [ ] The resolved release source is the intended commit (default `origin/main`) and its existing CI is green
 - [ ] Every PR in the release range has been opened, and its full description and every linked issue have been read before drafting the changelog
- [ ] Fold this beta into the series' single `CHANGELOG.md` entry (heading `## X.Y.Z-beta.N - YYYY-MM-DD`, previous stable → release source), review it against the changelog policy, get approval, and commit it before cutting the release
+- [ ] Fold this beta into the series' single `CHANGELOG.md` entry (heading `## X.Y.Z-beta.N - YYYY-MM-DD`, previous stable → release source), review it against the changelog policy, get approval, and commit it with its [`CHANGELOG.zh-CN.md` translation](#changelog-translations) before cutting the release
 - [ ] The diff from the previous stable to the resolved release source is classified as patch or minor, with the target version and rationale approved
 - [ ] Release preparation stayed local until the approved release command pushed the complete branch and tag
 - [ ] `npm run release:beta:patch`, `npm run release:beta:minor`, or `npm run release:beta:next` completes successfully
@@ -668,7 +677,7 @@ Every entry covers `previous stable release → release source`: first beta, lat
 - [ ] Every PR in the release range has been opened, and its full description and every linked issue have been read before drafting the changelog
 - [ ] Ensure the approved release inputs are committed locally and the git worktree is clean before running any release command
 - [ ] Ensure local `npm run typecheck` passes on that exact commit before running any release command
- [ ] Update `CHANGELOG.md` with user-facing release notes (features, fixes — not refactors). Promotion renames the series' `## X.Y.Z-beta.N` entry to `## X.Y.Z - YYYY-MM-DD` and re-checks it covers the full release
+- [ ] Update `CHANGELOG.md` with user-facing release notes (features, fixes — not refactors). Promotion renames the series' `## X.Y.Z-beta.N` entry to `## X.Y.Z - YYYY-MM-DD` and re-checks it covers the full release. Commit the matching [`CHANGELOG.zh-CN.md` entry](#changelog-translations) with it
 - [ ] Verify the changelog heading follows strict `## X.Y.Z - YYYY-MM-DD` format
 - [ ] Release preparation stayed local until the approved release command pushed the complete branch and tag
 - [ ] `npm run release:patch`, `npm run release:minor`, or `npm run release:promote` completes successfully
@@ -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,51 @@
+# Website translations
+
+paseo.sh is served in English and Simplified Chinese (`zh-CN`). This doc covers the website in `packages/website`. App UI translations are in [i18n.md](i18n.md).
+
+## URLs own the language
+
+- English pages keep their unprefixed paths. Every other language lives under its tag: `/docs/cli` and `/zh-CN/docs/cli` are the same page. `/en/...` is not a page.
+- The server renders the language in the URL. There is no browser-language detection or redirect, so a shared link always opens in the language it was shared in.
+- The language selector moves to the same page in the other language and keeps the query and hash. Every internal link on a page carries the page's language, so the choice sticks while the reader navigates. An explicit English URL always renders English.
+- The choice is not stored. A stored choice could only take effect by redirecting unprefixed URLs, which are the English pages. First-party links into the site carry the reader's language instead: `README.zh-CN.md` links to `/zh-CN/...`.
+- Routes live under `src/routes/{-$locale}/`. Build internal links with `localizePath` or `useLocalizePath` from `~/i18n`. Links inside Markdown are localized by `DocsMarkdown`. Files, `.md` sources, `llms.txt` and API endpoints keep one path for every language (`isPagePath`).
+- Give each page's `head` the language-neutral path through `pageMeta` (`src/meta.ts`). It writes the self canonical, the `hreflang` alternates with English as `x-default`, and `og:locale`. The sitemap in `vite.config.ts` lists the same alternates.
+
+## Where copy lives
+
+| Content          | English                                            | Chinese                                                                         |
+| ---------------- | -------------------------------------------------- | ------------------------------------------------------------------------------- |
+| Interface copy   | `src/i18n/resources/en.json`                       | `src/i18n/resources/zh-CN.json`                                                 |
+| Docs             | `public-docs/<page>.md`                            | `public-docs/<page>.zh-CN.md`                                                   |
+| Blog posts       | `posts/<slug>.md`                                  | `posts/<slug>.zh-CN.md`                                                         |
+| Comparison pages | `src/content/alternatives/<slug>.md`               | `src/content/alternatives/<slug>.zh-CN.md`                                      |
+| Legal pages      | `legal/<page>.md`                                  | `legal/<page>.zh-CN.md`                                                         |
+| Changelog        | `CHANGELOG.md`                                     | `CHANGELOG.zh-CN.md`, see [release.md](release.md#changelog-translations)       |
+| Plugin listings  | the plugin's `paseo-plugin.json` and `OVERVIEW.md` | `translations` and `OVERVIEW.zh-CN.md`, see `public-docs/plugins/publishing.md` |
+
+`en.json` types the keys, so typecheck fails when `zh-CN.json` misses one. A translation file is grouped with its English original by name (`src/markdown-content.ts`). A translation without an English original fails the build.
+
+Every first-party page has a translation. The changelog and plugin listings are the exceptions: a release or listing without one renders whole in English under a notice. Pages never mix languages paragraph by paragraph. Navigation order, categories and slugs always come from the English file's frontmatter.
+
+## Editing a translated doc
+
+Edit the English file and its `.zh-CN.md` in the same PR, and add the `.zh-CN.md` with any new page. Code blocks, commands, flags, config keys and links are copied verbatim, so code-only changes are a copy. Never delete a translation to get around an edit, and never leave one that describes behavior the English no longer has.
+
+Translated headings pin the English anchor with a trailing `{#id}`, so `/zh-CN/docs/cli#running-agents` lands on the same section as the English link:
+
+```md
+## 运行 Agent {#running-agents}
+
+:::example[回复 Slack 提及 {#answer-a-slack-mention}]
+```
+
+When you rename an English heading, change the `{#id}` in the translation to the new slug. `src/content-translations.test.ts` fails when a docs, blog, comparison or legal page has no translation, and when a translation's headings differ from the English in count, level, order or anchor. It cannot tell whether the prose under a heading is current. The `.md` source endpoints serve files verbatim, so `{#id}` shows there as written.
+
+## Chinese style
+
+- Keep code, commands, file paths, IDs, brand and product names, and command output in English.
+- Keep these terms in English: Agent, worktree, daemon, Provider, PR, diff, Composer, Hub, workflow, heartbeat, slug.
+- Translate these: workspace 工作区, host 主机, relay 中继, plugin 插件, skill 技能, review 审查, schedule 定时任务, orchestration 编排, configuration 配置, prompt 提示词, subagent 子 Agent.
+- Quote app UI labels with the app's Chinese wording from `packages/app/src/i18n/resources/zh-CN.ts`, such as **设置 → 插件**. Labels the app has not translated stay in English, as do labels in Hub, GitHub, Slack and Discord. Add the English label in parentheses only where readers search for it, such as an error message.
+- Put a space between Chinese and Latin text or numbers: `启动 Agent`, `共 3 个`.
+- Bold that ends in full-width punctuation does not render when Chinese text follows it directly: `**注意：**这里` shows the asterisks. Move the punctuation outside the bold (`**注意**：这里`).
@@ -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-iy1sFWI+odVTFG4jvNcJfv3xGAcQrbNkNQ+gtmInNCU=
@@ -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",
+  "version": "0.13.0-beta.1",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -41,12 +41,16 @@
    "dev:server:watch": "concurrently --kill-others --names protocol,client,server --prefix-colors yellow,blue,cyan \"npm run watch:protocol\" \"npm run watch:client\" \"npm run dev:server:raw\"",
    "dev:server:raw": "npm run dev --workspace=@getpaseo/server",
    "dev:app": "cross-env PASEO_LISTEN=127.0.0.1:6768 EXPO_PORT=8081 ./scripts/dev-app.sh",
+    "dev:android": "npm run dev:android --workspace=@getpaseo/app",
+    "dev:ios": "npm run dev:ios --workspace=@getpaseo/app",
    "test:e2e:mobile": "./scripts/test-mobile-agent-device.sh",
    "test:e2e:composer-keyboard:android": "./packages/app/e2e/mobile/composer-keyboard/android.sh",
    "dev:website": "npm run dev --workspace=@getpaseo/website",
    "postinstall": "node scripts/postinstall-patches.mjs",
    "prepare": "lefthook install --force",
    "build": "npm run build --workspaces --if-present",
+    "build:apk": "node scripts/build-apk.mjs",
+    "build:apk:arm64": "node scripts/build-apk.mjs arm64",
    "build:highlight": "npm run build --workspace=@getpaseo/highlight",
    "build:highlight:clean": "npm run build:clean --workspace=@getpaseo/highlight",
    "build:plugin": "npm run build --workspace=@getpaseo/plugin",
@@ -80,15 +84,14 @@
    "acp:version-drift:check": "node scripts/check-acp-catalog-version-drift.mjs --fail-on-drift",
    "acp:version-drift:update": "node scripts/check-acp-catalog-version-drift.mjs --update",
    "start": "npm run start --workspace=@getpaseo/server",
-    "android": "npm run android --workspace=@getpaseo/app",
+    "android": "npm run dev:android",
    "android:development": "npm run android:development --workspace=@getpaseo/app",
    "android:production": "npm run android:production --workspace=@getpaseo/app",
    "android:release": "npm run android:production --workspace=@getpaseo/app",
    "android:clear": "npm run android:clear --workspace=@getpaseo/app",
-    "android:clean": "npm run android:clean --workspace=@getpaseo/app",
    "fdroid:changelogs": "node scripts/sync-fdroid-changelogs.mjs",
    "fdroid:changelogs:check": "node scripts/sync-fdroid-changelogs.mjs --check",
-    "ios": "npm run ios --workspace=@getpaseo/app",
+    "ios": "npm run dev:ios",
    "web": "npm run web --workspace=@getpaseo/app",
    "dev:desktop": "cross-env PASEO_LISTEN=127.0.0.1:6768 npm run dev --workspace=@getpaseo/desktop",
    "dev:win:desktop": "npm run dev:win --workspace=@getpaseo/desktop",
@@ -137,16 +140,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"
  }
 }
@@ -10,6 +10,7 @@ const withAndroidScroll = require("./modules/paseo-scroll/app.plugin");
 const { getNativeReleaseVersion } = require("./native-release-version");
 const appVariant = process.env.APP_VARIANT ?? "production";
 const isFdroidBuild = process.env.PASEO_FDROID_BUILD === "1";
+const isWatchdogBuild = process.env.PASEO_WATCHDOG_BUILD === "1";
 const isProfileBuild = process.env.PASEO_PROFILE_BUILD === "1";

 const buildProfile = isFdroidBuild
@@ -171,6 +172,7 @@ export default {
      [
        "expo-build-properties",
        {
+          ios: { enableSceneSupport: true },
          android: {
            minSdkVersion: 29,
            kotlinVersion: "2.1.20",
@@ -180,7 +182,7 @@ export default {
        },
      ],
      ...buildProfile.fdroidPlugins,
-      ...(isProfileBuild ? [withAndroidProfileable] : []),
+      ...(isProfileBuild || isWatchdogBuild ? [withAndroidProfileable] : []),
    ],
    experiments: {
      typedRoutes: true,
@@ -190,6 +192,9 @@ export default {
    extra: {
      fdroidBuild: isFdroidBuild,
      profileBuild: isProfileBuild,
+      watchdogBuild: isWatchdogBuild,
+      diagnosticRevision: process.env.PASEO_DIAGNOSTIC_REVISION,
+      diagnosticBuildTime: process.env.PASEO_DIAGNOSTIC_BUILD_TIME,
      router: {},
      eas: {
        projectId: "0e7f65ce-0367-46c8-a238-2b65963d235a",
@@ -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();
+    }
+  });
+}
@@ -21,8 +21,10 @@ async function completeSubmittedTurn(
  const userMessage = page.getByTestId("user-message").filter({ hasText: prompt });
  await expect(userMessage).toBeVisible();

+  await expectAgentReadyToInterrupt(page);
  const finish = await agent.client.waitForFinish(agent.agentId, 30_000);
  expect(finish.status).toBe("idle");
+  await expectAgentIdle(page);
  await expect(page.getByText("(end of synthetic stream)", { exact: true }).last()).toBeVisible();
  await expect(userMessage).toHaveAttribute("aria-busy", "false");
  return userMessage;
@@ -262,24 +262,74 @@ test.afterEach(async () => {
  }
 });

-test("Changes opens the populated committed comparison for a clean checkout", async ({ page }) => {
+test("Changes opens All changes for a clean checkout", async ({ page }) => {
  const workspace = await createWorkspaceWithCommittedDiff();

  await openWorkspaceChangesSurface(page, workspace, 90_000);

  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
  const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
-  await expect(tree.getByTestId("changes-diff-status-trigger")).toContainText("Committed");
+  await expect(tree.getByTestId("changes-diff-status-trigger")).toContainText("All changes");
  await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName("committed-only.ts, +1, -0");
 });

-test("Changes expires a manual comparison when checkout dirtiness changes", async ({ page }) => {
+test("All changes combines committed and pending edits and preserves an unfinished review", async ({
+  page,
+  context,
+}) => {
+  const workspace = await createWorkspaceWithNetDiff();
+  await context.grantPermissions(["clipboard-read", "clipboard-write"]);
+  await configureDiffPresentation(page, { layout: "unified", wrapLines: false });
+  await openWorkspaceChangesSurface(page, workspace);
+  const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
+  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
+  const mode = tree.getByRole("button", { name: "Diff mode", exact: true });
+  await expect(mode).toContainText("All changes");
+  await expectNetComparisonFiles(page, ["a-tracked.ts", "b-committed.ts"]);
+  await expectRenderedAddedLine(page, "committed");
+
+  await test.step("an unfinished review survives the first dirty edit", async () => {
+    await startReviewOnFirstChangedLine(page);
+    await page
+      .getByRole("textbox", { name: "Review comment" })
+      .fill("Unfinished review stays here");
+    await writeFile(path.join(workspace.repoPath, "c-untracked.txt"), "untracked\n");
+    await expectNetComparisonFiles(page, ["a-tracked.ts", "b-committed.ts", "c-untracked.txt"]);
+    await expect(mode).toContainText("All changes");
+    await expect(page.getByRole("textbox", { name: "Review comment" })).toHaveValue(
+      "Unfinished review stays here",
+    );
+    await cancelInlineReview(page);
+  });
+  await test.step("pending edits form a live net patch over the committed edit", async () => {
+    await writeFile(path.join(workspace.repoPath, "a-tracked.ts"), "working\n");
+    await expectRenderedAddedLine(page, "working");
+    await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName("a-tracked.ts, +1, -1");
+  });
+  await test.step("committing the same contents preserves the rendered comparison", async () => {
+    execFileSync("git", ["add", "--all"], { cwd: workspace.repoPath });
+    execFileSync("git", ["commit", "-m", "Commit pending changes"], { cwd: workspace.repoPath });
+    await expect(page.getByTestId("changes-primary-cta")).toContainText("Merge", {
+      timeout: 30_000,
+    });
+    await expect(mode).toContainText("All changes");
+    await expectNetComparisonFiles(page, ["a-tracked.ts", "b-committed.ts", "c-untracked.txt"]);
+    await expectRenderedAddedLine(page, "working");
+  });
+  await test.step("undoing to the comparison base removes the net change", async () => {
+    await writeFile(path.join(workspace.repoPath, "a-tracked.ts"), "base\n");
+    await expectNetComparisonFiles(page, ["b-committed.ts", "c-untracked.txt"]);
+    await expect(mode).toContainText("All changes");
+  });
+});
+
+test("Changes keeps a manual comparison when checkout dirtiness changes", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff();
  await openWorkspaceChanges(page, workspace);

  const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
  const mode = tree.getByTestId("changes-diff-status-trigger");
-  await expect(mode).toContainText("Uncommitted");
+  await expect(mode).toContainText("All changes");

  await mode.click();
  await page.getByTestId("changes-diff-mode-committed").click();
@@ -294,7 +344,23 @@ test("Changes expires a manual comparison when checkout dirtiness changes", asyn
  });

  await writeFile(path.join(workspace.repoPath, "new-working-change.txt"), "uncommitted\n");
-  await expect(mode).toContainText("Uncommitted", { timeout: 30_000 });
+  await expect(tree.getByRole("button", { name: "See uncommitted changes" })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(mode).toContainText("Committed");
+
+  await selectChangesComparison(page, "Uncommitted");
+  execFileSync("git", ["add", "--all"], { cwd: workspace.repoPath });
+  execFileSync("git", ["commit", "-m", "Commit new working change"], { cwd: workspace.repoPath });
+  await expect(tree.getByText("No changes to display", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(mode).toContainText("Uncommitted");
+  await writeFile(path.join(workspace.repoPath, "another-working-change.txt"), "pending\n");
+  await expect(tree.getByText("another-working-change.txt", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(mode).toContainText("Uncommitted");
 });

 test("an empty Changes comparison links to the populated comparison", async ({ page }) => {
@@ -633,6 +699,7 @@ test("changes context menus expose folder revert and restore a file after confir
  const workspace = await createWorkspaceWithMountedTabDiff();
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
+  await selectChangesComparison(page, "Uncommitted");

  const tree = changesTree(page);
  await tree.getByTestId("diff-folder-src-toggle").click({ button: "right" });
@@ -680,6 +747,7 @@ test("discarding a staged rename restores its source path", async ({ page }) =>
  const workspace = await createWorkspaceWithMountedTabDiff({ includeRenamedFile: true });
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
+  await selectChangesComparison(page, "Uncommitted");

  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
  const renamedHeader = diffHeaderForPath(panel, "src/zz-renamed.ts");
@@ -710,6 +778,7 @@ test("discarding an untracked file removes it from the working tree", async ({ p
  const workspace = await createWorkspaceWithMountedTabDiff({ includeUntrackedFile: true });
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
+  await selectChangesComparison(page, "Uncommitted");

  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
  const untrackedHeader = diffHeaderForPath(panel, "zz-untracked.txt");
@@ -741,6 +810,7 @@ test("shows a revert error returned by the daemon", async ({ page }) => {
  await failNextDiscardRequest(page);
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
+  await selectChangesComparison(page, "Uncommitted");

  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
  const confirmation = new Promise<void>((resolve) => {
@@ -832,14 +902,19 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
  await page.setViewportSize({ width: 480, height: 900 });
+  // The shell survives the breakpoint, so the wide Explorer can still be on screen right after the
+  // resize. Check for the compact tab only once the shell reports the compact layout.
+  await expect(page.getByTestId("compact-shell")).toBeVisible();

-  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 +951,29 @@ 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 explorer.getByRole("button", { name: "Diff mode", exact: true }).click();
+  await page.getByRole("menuitem", { name: "Uncommitted", exact: true }).click();
+  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);
@@ -1499,6 +1597,64 @@ async function createWorkspaceWithMountedTabDiff(
  return { id: createdWorkspace.workspace.id, repoPath: repo.path };
 }

+async function createWorkspaceWithNetDiff(): Promise<DirtyWorkspace> {
+  const repo = await createTempGitRepo("changes-net-", {
+    files: [{ path: "a-tracked.ts", content: "base\n" }],
+  });
+  const client = await connectSeedClient();
+  cleanupTasks.push({
+    run: async () => {
+      await client.close();
+      await repo.cleanup();
+    },
+  });
+  execFileSync("git", ["checkout", "-b", "feature"], { cwd: repo.path });
+  await writeFile(path.join(repo.path, "a-tracked.ts"), "committed\n");
+  await writeFile(path.join(repo.path, "b-committed.ts"), "committed only\n");
+  execFileSync("git", ["add", "--all"], { cwd: repo.path });
+  execFileSync("git", ["commit", "-m", "Committed changes"], { cwd: repo.path });
+  const created = await client.createWorkspace({ source: { kind: "directory", path: repo.path } });
+  if (!created.workspace) throw new Error(created.error ?? "Failed to create net diff workspace");
+  return { id: created.workspace.id, repoPath: repo.path };
+}
+
+async function expectNetComparisonFiles(page: Page, files: string[]): Promise<void> {
+  const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
+  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
+  await expect(tree.locator('[data-testid^="diff-tree-file-"][data-testid$="-name"]')).toHaveText(
+    files,
+  );
+  await expect(panel.getByTestId(/^diff-file-\d+$/)).toHaveCount(files.length);
+  for (const file of files) {
+    await expect(diffHeaderForPath(panel, file)).toBeVisible();
+  }
+}
+
+async function expectRenderedAddedLine(page: Page, contents: string): Promise<void> {
+  await changesTree(page).getByText("a-tracked.ts", { exact: true }).click();
+  await expect(async () => {
+    await page.keyboard.press("Escape");
+    await page.evaluate(() => navigator.clipboard.writeText(""));
+    const body = page.getByTestId("diff-file-0-body");
+    const canvas = page.getByTestId("git-diff-canvas");
+    const bounds = await body.boundingBox();
+    if (!bounds) throw new Error("Expanded diff body has no bounds");
+    const fontSize = await canvas.evaluate((element) =>
+      Number.parseFloat(getComputedStyle(element).fontSize),
+    );
+    // Replacement: hunk header, removed line, added line.
+    await page.mouse.click(bounds.x + 120, bounds.y + Math.round(fontSize * 1.5) * 2.5, {
+      button: "right",
+    });
+    const copyLine = page.getByRole("menuitem", { name: "Copy line", exact: true });
+    await expect(copyLine).toBeEnabled({ timeout: 1000 });
+    await copyLine.click();
+    await expect
+      .poll(() => page.evaluate(() => navigator.clipboard.readText()), { timeout: 1000 })
+      .toBe(contents);
+  }).toPass({ timeout: 15_000 });
+}
+
 async function createWorkspaceWithCommittedDiff(): Promise<DirtyWorkspace> {
  const repo = await createTempGitRepo("changes-committed-", {
    files: [{ path: "tracked.ts", content: "export const tracked = 1;\n" }],
@@ -1674,10 +1830,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;
 }
@@ -1821,9 +1977,14 @@ async function changeCodeTypographyFromSettings(
  await page.getByTestId("sidebar-settings").click();
  await expect(page).toHaveURL(new RegExp(`${buildSettingsSectionRoute("general")}|/settings$`));
  await page.getByRole("button", { name: "Appearance" }).click();
+  // A committed font change remounts the screen (AppearanceStyleBoundary), and the new form starts
+  // from the stored size. Edit the size only in the remounted form, or the remount drops it.
+  const sizeField = page.getByLabel("Code font size");
+  await sizeField.evaluate((field) => field.setAttribute("data-e2e-before-font-family", ""));
  await page.getByLabel("Code font family").fill(typography.fontFamily);
  await page.getByLabel("Code font family").press("Enter");
-  await page.getByLabel("Code font size").fill(String(typography.fontSize));
+  await expect(page.locator("[data-e2e-before-font-family]")).toHaveCount(0);
+  await sizeField.fill(String(typography.fontSize));
  await page.getByLabel("Code font size").press("Enter");
  await expect(page.getByLabel("Code font family")).toHaveValue(typography.fontFamily);
  await expect(page.getByLabel("Code font size")).toHaveValue(String(typography.fontSize));
@@ -5,6 +5,7 @@ import {
  applyCommandCenterAgentControls,
  chooseCommandCenterAgentControl,
  openCommandCenterForAgent,
+  searchAgentControls,
  expectCommandCenterAgentControlSelected,
  expectFocusedAgentControls,
  expectWorkspaceAgentConfiguration,
@@ -111,8 +112,8 @@ test.describe("Command Center agent controls", () => {
    });
    try {
      await workspace.client.setAgentMode(workspace.agentId, "approval-test");
-      const input = await openCommandCenterForAgent(page, workspace);
-      await input.fill("load");
+      await openCommandCenterForAgent(page, workspace);
+      await searchAgentControls(page, "load");
      await page.keyboard.press("Enter");

      await expectWorkspaceAgentConfiguration(workspace, {
@@ -184,7 +185,7 @@ test.describe("Command Center agent controls", () => {
    try {
      await workspace.client.setAgentMode(workspace.agentId, "approval-test");
      const input = await openCommandCenterForAgent(page, workspace);
-      await input.fill("loa");
+      await searchAgentControls(page, "loa");
      // Moves the highlight onto a model row, which still matches after the next keystroke.
      await page.keyboard.press("ArrowDown");
      await input.fill("load");
@@ -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,7 +847,10 @@ 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) {
@@ -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 { hideDeveloperToasts } 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 openHiddenDeveloperToast(page: Page) {
+  await page.setContent("<button>Continue</button>");
+  await showTransientDeveloperToast(page, false);
+  await hideDeveloperToasts(page);
+}
+
+async function navigateWithHiddenDeveloperToasts(page: Page) {
+  await hideDeveloperToasts(page);
+  await page.goto("data:text/html,<button>Continue</button>");
+  await showTransientDeveloperToast(page, true);
+}
+
+async function inspectLayoutWithHiddenToast(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")).toBeHidden();
+  await action.click();
+}
+
+test("a hidden developer toast does not stall concurrent layout checks", async ({ page }) => {
+  test.setTimeout(10000);
+  await openHiddenDeveloperToast(page);
+  await inspectLayoutWithHiddenToast(page);
+});
+
+test("developer toast hiding survives navigation and Expo shadow-root updates", async ({
+  page,
+}) => {
+  test.setTimeout(10000);
+  await navigateWithHiddenDeveloperToasts(page);
+  await inspectLayoutWithHiddenToast(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 inspectLayoutWithHiddenToast(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();
+  }
+});
@@ -56,45 +56,12 @@ async function replaceEditorText(page: Page, content: string): Promise<void> {
  await editor.type(content);
 }

-async function replaceFileAfterDeletionWasObserved(input: {
-  page: Page;
-  gate: Awaited<ReturnType<typeof installDaemonWebSocketGate>>;
-  filePath: string;
-  relativePath: string;
-  content: string;
-}): Promise<void> {
-  const { page, gate, filePath, relativePath, content } = input;
-  // Recreate the observed race without faking file state: the daemon publishes the
-  // deletion, then a real read succeeds after the replacement while its ready event waits.
-  await gate.waitForFileSubscription(relativePath);
-  gate.holdFileReads(relativePath);
-  await unlink(filePath);
-  await gate.waitForHeldFileRead();
-  await expect(fileCallout(page)).toHaveCount(0);
-  gate.releaseHeldFileRead();
-  await expectOnlyFileCallout(page, "File deleted on disk");
-  gate.holdNextReadyFileUpdate(relativePath);
-  await writeFile(filePath, content, "utf8");
-  await gate.waitForHeldReadyFileUpdate();
-  await expect.poll(() => readFile(filePath, "utf8")).toBe(content);
-}
-
 async function expectOnlyFileCallout(page: Page, title: string): Promise<void> {
  await expect(fileCallout(page)).toHaveCount(1);
  await expect(fileCallout(page)).toContainText(title);
  await expect(filePane(page).getByText(title, { exact: true })).toHaveCount(1);
 }

-async function expectCleanReplacementCanReload(page: Page): Promise<void> {
-  await expectOnlyFileCallout(page, "Changed on disk");
-  await expect(filePane(page).getByText("File deleted on disk", { exact: true })).toHaveCount(0);
-  await expect(fileCallout(page).getByRole("button", { name: "Overwrite" })).toHaveCount(0);
-  await expect(fileCallout(page).getByRole("button", { name: "Reload" })).toBeEnabled();
-  await fileCallout(page).getByRole("button", { name: "Reload" }).click();
-  await expect(filePane(page).getByText("After", { exact: true })).toBeVisible();
-  await expect(fileCallout(page)).toHaveCount(0);
-}
-
 async function expectDeletedFileNotice(page: Page): Promise<void> {
  await expectOnlyFileCallout(page, "File deleted on disk");
  await expect(fileCallout(page)).toContainText("The open copy is preserved.");
@@ -140,7 +107,7 @@ test.describe("Workspace file change conflicts", () => {
      relativePath,
      content: "const preserved = true;\n",
    });
-    await gate.waitForFileSubscription(relativePath);
+    await expect(visibleEditor(page)).toContainText("const preserved = true;");
    await recordFileCallouts(page);

    await restoreFileAfterWatcherObservedTemporaryAbsence({ gate, filePath, relativePath });
@@ -189,162 +156,80 @@ test.describe("Workspace file change conflicts", () => {
      relativePath,
      content: "const before = true;\n",
    });
-    await gate.waitForFileSubscription(relativePath);
+    await expect(visibleEditor(page)).toContainText("const before = true;");
    await recordFileCallouts(page);
-    gate.holdFileReads(relativePath);
+    gate.holdNextReadyFileUpdate(relativePath);

    await replaceEditorText(page, "const saved = true;\n");
    await expect.poll(() => readFile(filePath, "utf8")).toContain("const saved = true;");
-    await gate.waitForHeldFileRead();
+    await gate.waitForHeldReadyFileUpdate();
+    gate.releaseHeldReadyFileUpdate();

    await expect(visibleEditor(page)).toContainText("const saved = true;");
    await expect(fileCallout(page)).toHaveCount(0);
    await expectNoFileCalloutWasRendered(page);
-    gate.releaseHeldFileRead();
  });

-  test("a clean file replaced on disk offers one working reload action", async ({
+  test("a viewed file deleted and written back shows the new file", async ({
    page,
    withWorkspace,
  }) => {
-    const gate = await installDaemonWebSocketGate(page);
    const filePath = await openTrackedFile(page, withWorkspace, {
      prefix: "file-clean-replacement-",
      relativePath: "inventory.md",
      content: "# Before\n",
    });
    await expect(filePane(page).getByText("Before", { exact: true })).toBeVisible();
-    await replaceFileAfterDeletionWasObserved({
-      page,
-      gate,
-      filePath,
-      relativePath: "inventory.md",
-      content: "# After\n",
-    });
-    gate.releaseHeldReadyFileUpdate();
-    await expectCleanReplacementCanReload(page);
+
+    await unlink(filePath);
+    await expectDeletedFileNotice(page);
+    await expect(filePane(page).getByText("Before", { exact: true })).toBeVisible();
+    await writeFile(filePath, "# After\n", "utf8");
+
+    await expect(filePane(page).getByText("After", { exact: true })).toBeVisible();
+    await expect(fileCallout(page)).toHaveCount(0);
  });

-  test("a deleted file shows one explanatory notice and no resolution actions", async ({
+  test("a deleted file keeps the open copy with one notice and no resolution actions", async ({
    page,
    withWorkspace,
  }) => {
    const filePath = await openTrackedFile(page, withWorkspace, {
      prefix: "file-deleted-",
-      relativePath: "deleted.md",
-      content: "# Present\n",
+      relativePath: "deleted.ts",
+      content: "const present = true;\n",
    });
-    await expect(filePane(page).getByText("Present", { exact: true })).toBeVisible();
+    await expect(visibleEditor(page)).toContainText("const present = true;");
    await recordFileCallouts(page);
    await unlink(filePath);
    await expectDeletedFileNotice(page);
    await expectFileCalloutWasRendered(page, "File deleted on disk");
+    await expect(visibleEditor(page)).toContainText("const present = true;");
  });

-  test("a file check error offers a working retry", async ({ page, withWorkspace }) => {
-    const gate = await installDaemonWebSocketGate(page);
-    const relativePath = "retry.md";
-    const filePath = await openTrackedFile(page, withWorkspace, {
-      prefix: "file-check-retry-",
-      relativePath,
-      content: "# Before\n",
-    });
-    await gate.waitForFileSubscription(relativePath);
-    await expect(filePane(page).getByText("Before", { exact: true })).toBeVisible();
-
-    await unlink(filePath);
-    await mkdir(filePath);
-    await expectOnlyFileCallout(page, "Couldn't check file on disk");
-    await expect(fileCallout(page).getByRole("button", { name: "Retry" })).toBeEnabled();
-    await expect(fileCallout(page).getByRole("button", { name: "Reload" })).toHaveCount(0);
-    await expect(fileCallout(page).getByRole("button", { name: "Overwrite" })).toHaveCount(0);
-
-    gate.holdNextReadyFileUpdate(relativePath);
-    await rm(filePath, { recursive: true });
-    await writeFile(filePath, "# After\n", "utf8");
-    await gate.waitForHeldReadyFileUpdate();
-    gate.holdFileReads(relativePath);
-    await fileCallout(page).getByRole("button", { name: "Retry" }).click();
-    await gate.waitForHeldFileRead();
-    await expect(fileCallout(page).getByRole("button", { name: "Retry" })).toBeDisabled();
-    gate.releaseHeldFileRead();
-    await expectCleanReplacementCanReload(page);
-    gate.releaseHeldReadyFileUpdate();
-  });
-
-  test("retry clears a transient error when the file is unchanged", async ({
+  test("a path that stops being a file keeps the open copy and follows the file back", async ({
    page,
    withWorkspace,
  }) => {
    const gate = await installDaemonWebSocketGate(page);
-    const relativePath = "unchanged.md";
+    const relativePath = "retry.ts";
    const filePath = await openTrackedFile(page, withWorkspace, {
-      prefix: "file-check-unchanged-",
+      prefix: "file-check-error-",
      relativePath,
-      content: "# Unchanged\n",
+      content: "const before = true;\n",
    });
-    const parkedPath = `${filePath}.parked`;
-    await gate.waitForFileSubscription(relativePath);
-    await expect(filePane(page).getByText("Unchanged", { exact: true })).toBeVisible();
+    await expect(visibleEditor(page)).toContainText("const before = true;");

-    await rename(filePath, parkedPath);
+    await unlink(filePath);
    await mkdir(filePath);
-    await expectOnlyFileCallout(page, "Couldn't check file on disk");
+    await gate.waitForFileUpdate(relativePath, "error");
+    await expect(visibleEditor(page)).toContainText("const before = true;");

-    gate.holdNextReadyFileUpdate(relativePath);
    await rm(filePath, { recursive: true });
-    await rename(parkedPath, filePath);
-    await gate.waitForHeldReadyFileUpdate();
-    await fileCallout(page).getByRole("button", { name: "Retry" }).click();
+    await writeFile(filePath, "const after = true;\n", "utf8");

+    await expect(visibleEditor(page)).toContainText("const after = true;");
    await expect(fileCallout(page)).toHaveCount(0);
-    await expect(filePane(page).getByText("Changed on disk", { exact: true })).toHaveCount(0);
-    gate.releaseHeldReadyFileUpdate();
-  });
-
-  test("a read-only file error preserves its message and offers retry", async ({
-    page,
-    withWorkspace,
-  }) => {
-    const gate = await installDaemonWebSocketGate(page);
-    const relativePath = "artifact.bin";
-    const binaryContent = new Uint8Array([0, 1, 2, 3, 255]);
-    const filePath = await openTrackedFile(page, withWorkspace, {
-      prefix: "file-read-only-retry-",
-      relativePath,
-      content: binaryContent,
-    });
-    await gate.waitForFileSubscription(relativePath);
-    await expect(
-      filePane(page).getByText("Binary preview unavailable", { exact: true }),
-    ).toBeVisible();
-
-    await unlink(filePath);
-    await mkdir(filePath);
-    await expect(
-      filePane(page).getByText("Requested path is not a file", { exact: true }),
-    ).toBeVisible();
-    await expect(filePane(page).getByRole("button", { name: "Retry" })).toBeEnabled();
-
-    gate.holdNextReadyFileUpdate(relativePath);
-    await rm(filePath, { recursive: true });
-    await writeFile(filePath, binaryContent);
-    await gate.waitForHeldReadyFileUpdate();
-    gate.holdFileReads(relativePath);
-    await filePane(page).getByRole("button", { name: "Retry" }).click();
-    await gate.waitForHeldFileRead();
-    await expect(
-      filePane(page).getByText("Requested path is not a file", { exact: true }),
-    ).toHaveCount(0);
-    gate.releaseHeldFileRead();
-
-    await expect(
-      filePane(page).getByText("Binary preview unavailable", { exact: true }),
-    ).toBeVisible();
-    await expect(
-      filePane(page).getByText("Requested path is not a file", { exact: true }),
-    ).toHaveCount(0);
-    gate.releaseHeldReadyFileUpdate();
  });

  test("a changed file with local edits offers overwrite and a working reload", async ({
@@ -1,5 +1,6 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
+import type { Locator } from "@playwright/test";
 import { expect, test, type Page } from "../support/fixtures";
 import {
  expandFolder,
@@ -71,6 +72,23 @@ async function selectFileView(page: Page, view: "Preview" | "Source"): Promise<v
  await expect(option).toHaveAttribute("aria-selected", "true");
 }

+async function expectAbove(upper: Locator, lower: Locator): Promise<void> {
+  const [upperBox, lowerBox] = await Promise.all([upper.boundingBox(), lower.boundingBox()]);
+  expect(upperBox).not.toBeNull();
+  expect(lowerBox).not.toBeNull();
+  expect(upperBox!.y + upperBox!.height).toBeLessThanOrEqual(lowerBox!.y);
+}
+
+/** How many times the app has read the file's contents from the daemon. */
+function fileReadCount(
+  gate: Awaited<ReturnType<typeof installDaemonWebSocketGate>>,
+  fileName: string,
+): number {
+  return gate
+    .getClientRequests("file_explorer_request")
+    .filter((request) => request.mode === "file" && String(request.path).endsWith(fileName)).length;
+}
+
 async function expectMarkdownImageLoaded(page: Page, name: string): Promise<void> {
  const image = page.getByRole("button", { name, exact: true });
  await expect(image).toBeVisible();
@@ -128,7 +146,7 @@ test.describe("CodeMirror workspace file editing", () => {
        await returnToAssistant(page, session.agentId);
        await openAssistantMarkdownLink(page, "Missing capture");
        await expectFileTabOpen(page, ".dev/tablet-review/missing.png");
-        await expect(page.getByText(/ENOENT/)).toBeVisible();
+        await expect(page.getByText("File not found", { exact: true })).toBeVisible();
        await expect(page.getByRole("button", { name: "Retry", exact: true })).toBeVisible();
      });
    } finally {
@@ -317,11 +335,7 @@ test.describe("CodeMirror workspace file editing", () => {
      title: "Unsupported large source",
      initialPrompt: "Generate a title and a git branch name. Return JSON only.",
    });
-    await writeFile(
-      path.join(session.cwd, "too-large.txt"),
-      Buffer.alloc(51 * 1024 * 1024),
-      "utf8",
-    );
+    await writeFile(path.join(session.cwd, "too-large.txt"), "x".repeat(51 * 1024 * 1024), "utf8");

    try {
      await openAgentRoute(page, session);
@@ -584,6 +598,11 @@ test.describe("CodeMirror workspace file editing", () => {
    await expect(page.getByTestId("file-source-editor")).toBeVisible();
    await expect(page.getByLabel(/File size/)).toBeVisible();
    await expect(page.getByLabel(/lines/)).toBeVisible();
+    await expect(page.getByTestId("file-preview-mode")).toHaveCount(0);
+    await expectAbove(
+      page.getByTestId("file-panel-bar").filter({ visible: true }),
+      page.getByTestId("file-source-editor").filter({ visible: true }),
+    );

    await replaceEditorText(page, "const autosaved = 2;\n");
    await expect(page.getByTestId("workspace-tab-modified-file_source.ts")).toBeVisible();
@@ -685,6 +704,7 @@ test.describe("CodeMirror workspace file editing", () => {
    withWorkspace,
  }) => {
    test.setTimeout(90_000);
+    const gate = await installDaemonWebSocketGate(page);
    const workspace = await withWorkspace({ prefix: "file-editing-preview-" });
    const markdownPath = path.join(workspace.repoPath, "notes.md");
    const imagePath = path.join(workspace.repoPath, "pixel.png");
@@ -694,17 +714,30 @@ test.describe("CodeMirror workspace file editing", () => {
    await openWorkspaceFile(page, "notes.md");

    const visibleFilePane = page.getByTestId("workspace-file-pane").filter({ visible: true });
+    const toolbar = page.getByTestId("file-panel-bar").filter({ visible: true });
    await expect(visibleFilePane.getByText("First heading", { exact: true })).toBeVisible();
    await expect(page.getByRole("button", { name: "Preview", exact: true })).toBeVisible();
+    await expect(toolbar.getByLabel(/^File size/)).toBeVisible();
+    await expect(toolbar.getByLabel("2 lines")).toBeVisible();
    await writeFile(markdownPath, "# Updated heading\n", "utf8");
    await expect(visibleFilePane.getByText("Updated heading", { exact: true })).toBeVisible();

+    // Source shows the same read in the editor; the file is not read again.
+    const reads = fileReadCount(gate, "notes.md");
    await selectFileView(page, "Source");
    await expect(page.getByTestId("file-source-editor")).toBeVisible();
+    await expect(editor(page)).toContainText("# Updated heading");
+    await expect(toolbar.getByLabel("Line 1, column 1")).toBeVisible();
+    expect(fileReadCount(gate, "notes.md")).toBe(reads);
+
+    // Preview shows the edits made in Source.
    await replaceEditorText(page, "# Saved from source\n");
-    await expect.poll(() => readFile(markdownPath, "utf8")).toBe("# Saved from source\n");
+    await expect(page.getByTestId("workspace-tab-modified-file_notes.md")).toBeVisible();
    await selectFileView(page, "Preview");
    await expect(visibleFilePane.getByText("Saved from source", { exact: true })).toBeVisible();
+    await expect(toolbar.getByLabel("Line 1, column 1")).toHaveCount(0);
+    await expect.poll(() => readFile(markdownPath, "utf8")).toBe("# Saved from source\n");
+    await expect(page.getByTestId("workspace-tab-modified-file_notes.md")).not.toBeVisible();

    await openWorkspaceFile(page, "pixel.png");
    const image = visibleFilePane.locator("img");
@@ -0,0 +1,47 @@
+import { mkdir, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import {
+  expandFolder,
+  openFileExplorer,
+  openFileFromExplorer,
+} from "../support/helpers/file-explorer";
+
+async function openNestedGuide(page: Page): Promise<void> {
+  await openFileExplorer(page);
+  await expandFolder(page, "docs");
+  await openFileFromExplorer(page, "guide.md");
+}
+
+async function followDetailsLink(page: Page): Promise<void> {
+  await page
+    .getByTestId("markdown-preview-frame")
+    .getByRole("link", { name: "Details", exact: true })
+    .click();
+}
+
+test("Markdown preview resolves a relative link from the document directory", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace({ prefix: "markdown-relative-links-" });
+  await mkdir(path.join(workspace.repoPath, "docs/guide"), { recursive: true });
+  await writeFile(
+    path.join(workspace.repoPath, "docs/guide.md"),
+    "# Guide\n\n[Details](guide/details.md)\n",
+  );
+  await writeFile(
+    path.join(workspace.repoPath, "docs/guide/details.md"),
+    "# Nested details destination\n",
+  );
+  await workspace.navigateTo();
+
+  await openNestedGuide(page);
+  await followDetailsLink(page);
+
+  await expect(
+    page
+      .getByTestId("markdown-preview-frame")
+      .getByText("Nested details destination", { exact: true }),
+  ).toBeVisible();
+});
@@ -95,7 +95,7 @@ test.describe("New workspace entry points", () => {
    }
  });

-  test("the New Workspace screen hides the host selector when there is only one host", async ({
+  test("the New Workspace screen shows the host selector with Add host when there is only one host", async ({
    page,
  }) => {
    const seeded: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-single-host-" });
@@ -120,7 +120,12 @@ test.describe("New workspace entry points", () => {
      await expect(page.getByTestId("new-workspace-project-picker-trigger")).toBeVisible({
        timeout: 30_000,
      });
-      await expect(page.getByTestId("host-picker-trigger")).toHaveCount(0);
+      const hostTrigger = page.getByTestId("host-picker-trigger");
+      await expect(hostTrigger).toContainText("localhost", { timeout: 30_000 });
+      await hostTrigger.click();
+      await expect(page.getByTestId("new-workspace-host-picker-add-host")).toBeVisible();
+      await page.getByTestId("new-workspace-host-picker-add-host").click();
+      await expect(page).toHaveURL(/\/settings\/general\?addHost=/);
    } finally {
      await seeded.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.
@@ -1,15 +1,24 @@
+import { verifyPluginToolTranslations } from "../support/helpers/plugin-translations";
 import { test } from "../support/fixtures";
 import { withButtonShowcase } from "../support/helpers/plugin-buttons";

 test("plugin header and composer buttons share actions, menus, content, and updates", async ({
  page,
-}) => {
-  test.setTimeout(180_000);
-  await withButtonShowcase(page, async (buttons) => {
+}, info) => {
+  test.setTimeout(240_000);
+  await withButtonShowcase(page, info, async (buttons) => {
    await buttons.verifyObservationLifetime();
    await buttons.openWideMenusAndPopovers();
    await buttons.runAndUpdateActions();
    await buttons.openCompactSheets();
+    await buttons.useCompactWorkspaceMenu();
    await buttons.hideAndUnloadOpenButtons();
  });
 });
+
+test("plugin tooltips and menu labels follow app language with a panel draft open", async ({
+  page,
+}, info) => {
+  test.setTimeout(180_000);
+  await verifyPluginToolTranslations(page, info);
+});
@@ -0,0 +1,265 @@
+import { execFileSync } from "node:child_process";
+import { readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import type { Frame, TestInfo } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import { copyPluginExample } from "../support/helpers/plugin-fixture";
+import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import {
+  openFileExplorer,
+  openFileFromExplorer,
+  expectFileTabOpen,
+} from "../support/helpers/file-explorer";
+
+// Full Chromium includes the PDF viewer; the default headless shell does not.
+test.use({ channel: "chromium" });
+
+function samplePdf() {
+  const stream = "BT /F1 24 Tf 72 720 Td (Paseo PDF panel example) Tj ET";
+  const objects = [
+    "<< /Type /Catalog /Pages 2 0 R >>",
+    "<< /Type /Pages /Kids [3 0 R] /Count 1 >>",
+    "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 612 792] /Resources << /Font << /F1 4 0 R >> >> /Contents 5 0 R >>",
+    "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>",
+    `<< /Length ${stream.length} >>\nstream\n${stream}\nendstream`,
+  ];
+  let pdf = "%PDF-1.4\n%\u0000\u00ff\n";
+  const offsets = objects.map((object, index) => {
+    const offset = Buffer.byteLength(pdf);
+    pdf += `${index + 1} 0 obj\n${object}\nendobj\n`;
+    return offset;
+  });
+  const xref = Buffer.byteLength(pdf);
+  pdf += `xref\n0 6\n0000000000 65535 f \n${offsets.map((offset) => `${String(offset).padStart(10, "0")} 00000 n \n`).join("")}`;
+  pdf += `trailer\n<< /Size 6 /Root 1 0 R >>\nstartxref\n${xref}\n%%EOF\n`;
+  return pdf;
+}
+
+async function openFile(page: Page, name: string) {
+  await openFileFromExplorer(page, name);
+  await expectFileTabOpen(page, name);
+}
+
+const WIDE = { width: 1280, height: 900 };
+const COMPACT = { width: 390, height: 844 };
+
+async function capture(page: Page, testInfo: TestInfo, name: string) {
+  const file = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path: file });
+  await testInfo.attach(name, { path: file, contentType: "image/png" });
+}
+
+/** Captures the current state wide, then compact once `ready` holds there, and returns to wide. */
+async function captureWideAndCompact(
+  page: Page,
+  testInfo: TestInfo,
+  name: string,
+  ready: () => Promise<void>,
+) {
+  await capture(page, testInfo, `${name}-wide`);
+  // The shell survives the breakpoint, so the previous layout's copy can still be on screen right
+  // after a resize. Check `ready` only once the shell reports the new layout.
+  await page.setViewportSize(COMPACT);
+  await expect(page.getByTestId("compact-shell")).toBeVisible();
+  await ready();
+  await capture(page, testInfo, `${name}-compact`);
+  await page.setViewportSize(WIDE);
+  await expect(page.getByTestId("wide-shell")).toBeVisible();
+  await ready();
+}
+
+/** Turns on vim keybindings without discarding settings the test writes later. */
+async function enableVimKeybindings(page: Page) {
+  await page.addInitScript(() => {
+    const key = "@paseo:app-settings";
+    const settings = JSON.parse(localStorage.getItem(key) ?? "{}");
+    localStorage.setItem(key, JSON.stringify({ ...settings, vimKeybindings: true }));
+  });
+}
+
+async function chooseRichMarkdown(page: Page) {
+  await page.getByRole("radio", { name: "Rich Markdown — markdown-panel", exact: true }).click();
+  await page.getByRole("checkbox", { name: "Don't ask me again", exact: true }).click();
+  await page.getByRole("button", { name: "Use", exact: true }).click();
+}
+
+async function replaceMarkdown(page: Page, text: string) {
+  await page.getByRole("textbox", { name: "Rich Markdown editor", exact: true }).fill(text);
+}
+
+async function openWithFromTabMenu(page: Page, name: string, option: string) {
+  await page.getByTestId(`workspace-tab-file_${name}`).first().click({ button: "right" });
+  await page.getByRole("menuitem", { name: "Open with…" }).hover();
+  await page.getByRole("menuitem", { name: option }).click();
+}
+
+async function selectFileView(page: Page, view: "Preview" | "Source") {
+  const option = page
+    .getByTestId("file-preview-mode")
+    .filter({ visible: true })
+    .getByRole("button", { name: view, exact: true });
+  await option.click();
+  await expect(option).toHaveAttribute("aria-selected", "true");
+}
+
+/** The browser's PDF viewer in the mounted frame; a remounted pane leaves old frames detached. */
+async function pdfViewer(page: Page): Promise<Frame> {
+  const viewerUrl = /^chrome-extension:\/\/[^/]+\/index\.html$/;
+  const find = () =>
+    page.frames().find((frame) => !frame.isDetached() && viewerUrl.test(frame.url())) ?? null;
+  await expect.poll(() => find() !== null).toBe(true);
+  return find()!;
+}
+
+async function expectPdfViewerReady(page: Page) {
+  // A narrow viewer collapses its toolbar to Print and More actions.
+  const viewer = await pdfViewer(page);
+  await expect(viewer.getByRole("button", { name: "Print", exact: true })).toBeEnabled();
+}
+
+async function expectMarkdownEditor(page: Page, text: string) {
+  const editor = page.getByRole("textbox", { name: "Rich Markdown editor", exact: true });
+  await expect(editor).toBeVisible();
+  await expect(editor).toContainText(text);
+  await expect(editor).toBeInViewport({ ratio: 1 });
+}
+
+test("directory examples mount the PDF frame and write Markdown through the file handle", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(180_000);
+  const pdf = await copyPluginExample("pdf-panel");
+  const markdown = await copyPluginExample("markdown-panel");
+  execFileSync(
+    process.platform === "win32" ? "npm.cmd" : "npm",
+    ["install", "--ignore-scripts", "--no-audit", "--no-fund"],
+    { cwd: markdown.directory, stdio: "pipe" },
+  );
+  const workspace = await seedWorkspace({
+    repoPrefix: "file-panel-examples-",
+    repo: {
+      files: [
+        {
+          path: "notes.md",
+          content: "# Markdown panel example\n\nEdit **Markdown** through Paseo.\n",
+        },
+        { path: "second.md", content: "# Remembered panel\n" },
+        { path: "report.pdf", content: samplePdf() },
+      ],
+    },
+  });
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await client.getDaemonConfig();
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(pdf.directory);
+    await client.installDirectoryPlugin(markdown.directory);
+    await enableVimKeybindings(page);
+    await page.setViewportSize(WIDE);
+    const gate = await installDaemonWebSocketGate(page);
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openFileExplorer(page);
+    await openFile(page, "report.pdf");
+    await expect(page.getByTitle("Document preview", { exact: true })).toHaveAttribute(
+      "src",
+      /^blob:/,
+    );
+    await expect(page.getByTitle("Document preview", { exact: true })).not.toHaveAttribute(
+      "sandbox",
+    );
+    const documentUrl = await page
+      .getByTitle("Document preview", { exact: true })
+      .getAttribute("src");
+    expect(
+      await page.evaluate(
+        async (url) => (await fetch(url!)).blob().then((blob) => blob.type),
+        documentUrl,
+      ),
+    ).toBe("application/pdf");
+    await expectPdfViewerReady(page);
+    await expect(
+      (await pdfViewer(page)).getByRole("textbox", { name: "Page number", exact: true }),
+    ).toHaveValue("1");
+    await captureWideAndCompact(page, testInfo, "pdf-example", async () => {
+      await expect(page.getByTitle("Document preview", { exact: true })).toBeInViewport();
+      await expectPdfViewerReady(page);
+    });
+
+    await openFile(page, "notes.md");
+    await expect(page.getByRole("radio", { name: "Markdown — Paseo", exact: true })).toBeChecked();
+    await expect(
+      page.getByRole("radio", { name: "Rich Markdown — markdown-panel", exact: true }),
+    ).toBeVisible();
+    await expect(page.getByRole("radio")).toHaveCount(2);
+    await captureWideAndCompact(page, testInfo, "markdown-example-picker", async () => {
+      // The previous layout's picker animates out (the sheet slides down, the dialog fades), so
+      // both pickers are mounted for a moment after a resize.
+      await expect(page.getByRole("button", { name: "Use", exact: true })).toHaveCount(1);
+      await expect(page.getByRole("button", { name: "Use", exact: true })).toBeInViewport({
+        ratio: 1,
+      });
+    });
+    await chooseRichMarkdown(page);
+    await expect(page.getByRole("textbox", { name: "Rich Markdown editor" })).toContainText(
+      "Markdown panel example",
+    );
+    gate.holdNextClientRequest("fs.file.write.request");
+    await replaceMarkdown(page, "# Edited by Rich Markdown\n\nSaved by the panel.\n");
+    await gate.waitForHeldClientRequest();
+    await expect(page.getByTestId("workspace-tab-modified-file_notes.md")).toBeVisible();
+    await capture(page, testInfo, "markdown-example-dirty-wide");
+    gate.releaseHeldClientRequest();
+    await expect
+      .poll(() => readFile(path.join(workspace.repoPath, "notes.md"), "utf8"))
+      .toBe("# Edited by Rich Markdown\n\nSaved by the panel.\n");
+    await expect(page.getByTestId("workspace-tab-modified-file_notes.md")).toBeHidden();
+    await captureWideAndCompact(page, testInfo, "markdown-example-rich-markdown", async () => {
+      await expectMarkdownEditor(page, "Edited by Rich Markdown");
+    });
+
+    // "Open with…" switches to Paseo's Markdown panel; its Source view is the editor, with the
+    // cursor and vim mode in the panel's toolbar.
+    await openWithFromTabMenu(page, "notes.md", "Markdown — Paseo");
+    await expect(page.getByRole("heading", { name: "Edited by Rich Markdown" })).toBeVisible();
+    await selectFileView(page, "Source");
+    const source = page.getByTestId("file-source-editor").filter({ visible: true });
+    await expect(source.locator(".cm-content")).toContainText("Edited by Rich Markdown");
+    await source.locator(".cm-line").nth(2).click();
+    const bar = page.getByTestId("file-panel-bar").filter({ visible: true });
+    await expect(bar.getByText("NORMAL", { exact: true })).toBeVisible();
+    await expect(bar.getByText(/^Ln 3, Col \d+$/)).toBeVisible();
+    await capture(page, testInfo, "markdown-example-source-wide");
+    await openWithFromTabMenu(page, "notes.md", "Rich Markdown — markdown-panel");
+    await writeFile(path.join(workspace.repoPath, "notes.md"), "# External update\n");
+    await expect(page.getByRole("textbox", { name: "Rich Markdown editor" })).toHaveText(
+      "# External update",
+    );
+    await replaceMarkdown(page, "# Local edit\n");
+    await writeFile(path.join(workspace.repoPath, "notes.md"), "# Conflicting external edit\n");
+    await expect(page.getByTestId("rich-markdown-conflict")).toBeVisible();
+    await capture(page, testInfo, "markdown-example-conflict-wide");
+    await page.getByRole("button", { name: "Overwrite", exact: true }).click();
+    await expect
+      .poll(() => readFile(path.join(workspace.repoPath, "notes.md"), "utf8"))
+      .toBe("# Local edit\n");
+
+    await openFile(page, "second.md");
+    await expect(page.getByRole("textbox", { name: "Rich Markdown editor" })).toContainText(
+      "Remembered panel",
+    );
+    await expect(page.getByText("Open .md files with", { exact: true })).toBeHidden();
+    await page.setViewportSize(COMPACT);
+    await expectMarkdownEditor(page, "Remembered panel");
+  } finally {
+    await client.removePlugin("pdf-panel");
+    await client.removePlugin("markdown-panel");
+    await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
+    await client.close();
+    await workspace.cleanup();
+    await pdf.cleanup();
+    await markdown.cleanup();
+  }
+});
@@ -0,0 +1,171 @@
+import type { TestInfo } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { expectFileTabOpen, openFileExplorer } from "../support/helpers/file-explorer";
+import {
+  BUILTIN_MARKDOWN_OPTION,
+  MARKDOWN_PANEL_ID,
+  PLUGIN_MARKDOWN_OPTION,
+  expectBuiltinMarkdown,
+  expectPluginMarkdown,
+  filePanelPicker,
+  installMarkdownPanelPlugin,
+  openMarkdown,
+  storedFilePanelAssociations,
+} from "../support/helpers/markdown-file-panel-plugin";
+
+async function choosePanel(page: Page, option: string, options: { remember: boolean }) {
+  await page.getByRole("radio", { name: option, exact: true }).click();
+  if (options.remember) {
+    await page.getByRole("checkbox", { name: "Don't ask me again", exact: true }).click();
+  }
+  await page.getByRole("button", { name: "Use", exact: true }).click();
+  await expect(filePanelPicker(page)).toBeHidden();
+}
+
+async function openWithFromTabMenu(page: Page, name: string, option: string) {
+  await page.getByTestId(`workspace-tab-file_${name}`).first().click({ button: "right" });
+  await page.getByRole("menuitem", { name: "Open with…" }).hover();
+  await page.getByRole("menuitem", { name: option }).click();
+}
+
+async function toggleAlwaysUseFromTabMenu(page: Page, name: string) {
+  await openWithFromTabMenu(page, name, "Always use for .md");
+}
+
+/** The built-in panel's toolbar control between its Preview and Source views. */
+function viewControl(page: Page) {
+  return page.getByTestId("file-preview-mode").filter({ visible: true });
+}
+
+async function selectFileView(page: Page, view: "Preview" | "Source") {
+  const option = viewControl(page).getByRole("button", { name: view, exact: true });
+  await option.click();
+  await expect(option).toHaveAttribute("aria-selected", "true");
+}
+
+async function expectNoOpenWith(page: Page, name: string) {
+  await page.getByTestId(`workspace-tab-file_${name}`).first().click({ button: "right" });
+  await expect(page.getByRole("menuitem", { name: "Close", exact: true })).toBeVisible();
+  await expect(page.getByRole("menuitem", { name: "Open with…" })).toHaveCount(0);
+  await page.keyboard.press("Escape");
+}
+
+async function capture(page: Page, testInfo: TestInfo, name: string) {
+  const file = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path: file });
+  await testInfo.attach(name, { path: file, contentType: "image/png" });
+}
+
+test("opens Markdown with the built-in panel and its Preview and Source without asking", async ({
+  page,
+}, testInfo) => {
+  const workspace = await seedWorkspace({
+    repoPrefix: "file-panel-builtins-",
+    repo: { files: [{ path: "notes.md", content: "# notes heading\n" }] },
+  });
+  try {
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openFileExplorer(page);
+    await openMarkdown(page, "notes.md");
+    await expectBuiltinMarkdown(page, "notes heading");
+    await expect(viewControl(page).getByRole("button")).toHaveText(["Preview", "Source"]);
+    await expect(filePanelPicker(page)).toBeHidden();
+    await expectNoOpenWith(page, "notes.md");
+    await capture(page, testInfo, "file-panel-builtins-wide");
+
+    await selectFileView(page, "Source");
+    await expect(page.getByTestId("file-source-editor").filter({ visible: true })).toBeVisible();
+    await selectFileView(page, "Preview");
+    await expectBuiltinMarkdown(page, "notes heading");
+
+    await page.setViewportSize({ width: 390, height: 844 });
+    await expectBuiltinMarkdown(page, "notes heading");
+    await expect(
+      viewControl(page).getByRole("button", { name: "Source", exact: true }),
+    ).toBeInViewport({ ratio: 1 });
+    await expect(filePanelPicker(page)).toBeHidden();
+    await capture(page, testInfo, "file-panel-builtins-compact");
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("asks once which panel opens Markdown and remembers it when told to", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(120_000);
+  const workspace = await seedWorkspace({
+    repoPrefix: "file-panel-picker-",
+    repo: {
+      files: ["first", "second", "third", "fourth"].map((name) => ({
+        path: `${name}.md`,
+        content: `# ${name} heading\n`,
+      })),
+    },
+  });
+  const plugin = await installMarkdownPanelPlugin();
+  try {
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openFileExplorer(page);
+
+    // First open: the built-in renders under the picker.
+    await openMarkdown(page, "first.md");
+    await expect(filePanelPicker(page)).toBeVisible();
+    await expect(page.getByRole("radio", { name: BUILTIN_MARKDOWN_OPTION })).toBeChecked();
+    await expect(page.getByRole("radio", { name: PLUGIN_MARKDOWN_OPTION })).not.toBeChecked();
+    await expect(page.getByRole("radio")).toHaveCount(2);
+    await expectBuiltinMarkdown(page, "first heading");
+    await capture(page, testInfo, "file-panel-picker-wide");
+
+    // Don't ask me again: the plugin renders and later opens use it silently.
+    await choosePanel(page, PLUGIN_MARKDOWN_OPTION, { remember: true });
+    await expectPluginMarkdown(page, "first.md");
+    expect(await storedFilePanelAssociations(page)).toEqual({ "ext:md": MARKDOWN_PANEL_ID });
+    await openMarkdown(page, "second.md");
+    await expectPluginMarkdown(page, "second.md");
+    await expect(filePanelPicker(page)).toBeHidden();
+
+    // Forgetting from the tab menu keeps the tab on the plugin.
+    await toggleAlwaysUseFromTabMenu(page, "second.md");
+    await expect.poll(() => storedFilePanelAssociations(page)).toEqual({});
+    await expectPluginMarkdown(page, "second.md");
+
+    // An unremembered choice applies to this tab only; the next open asks again.
+    await openMarkdown(page, "third.md");
+    await expect(filePanelPicker(page)).toBeVisible();
+    await choosePanel(page, PLUGIN_MARKDOWN_OPTION, { remember: false });
+    await expectPluginMarkdown(page, "third.md");
+    expect(await storedFilePanelAssociations(page)).toEqual({});
+
+    // "Open with…" switches the open tab back to the built-in in place, with its own views.
+    await openWithFromTabMenu(page, "third.md", BUILTIN_MARKDOWN_OPTION);
+    await expectBuiltinMarkdown(page, "third heading");
+    await expectFileTabOpen(page, "third.md");
+    await selectFileView(page, "Source");
+    await expect(page.getByTestId("file-source-editor").filter({ visible: true })).toBeVisible();
+    await selectFileView(page, "Preview");
+    await expectBuiltinMarkdown(page, "third heading");
+
+    // Dismissing keeps the built-in; reopening the tab after a reload asks again.
+    await openMarkdown(page, "fourth.md");
+    await expect(filePanelPicker(page)).toBeVisible();
+    await page.keyboard.press("Escape");
+    await expect(filePanelPicker(page)).toBeHidden();
+    await expectBuiltinMarkdown(page, "fourth heading");
+
+    await page.setViewportSize({ width: 390, height: 844 });
+    await page.reload();
+    await expect(filePanelPicker(page)).toBeVisible({ timeout: 30_000 });
+    await expect(page.getByRole("button", { name: "Use", exact: true })).toBeInViewport({
+      ratio: 1,
+    });
+    await capture(page, testInfo, "file-panel-picker-compact");
+  } finally {
+    await plugin.uninstall();
+    await workspace.cleanup();
+  }
+});
@@ -0,0 +1,150 @@
+import type { TestInfo } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import { openSettings } from "../support/helpers/app";
+import { openFileExplorer } from "../support/helpers/file-explorer";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import {
+  BUILTIN_MARKDOWN_OPTION,
+  MARKDOWN_PANEL_ID,
+  PLUGIN_MARKDOWN_OPTION,
+  expectPluginMarkdown,
+  filePanelPicker,
+  installMarkdownPanelPlugin,
+  openMarkdown,
+  storedFilePanelAssociations,
+} from "../support/helpers/markdown-file-panel-plugin";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { openSettingsSection } from "../support/helpers/settings";
+
+const ASK_EVERY_TIME = "Ask every time";
+const SOURCE_OPTION = "Source — Paseo";
+
+function markdownRow(page: Page) {
+  return page.getByTestId("file-panel-settings-row-ext:md");
+}
+
+function markdownDropdown(page: Page, value: string) {
+  return markdownRow(page).getByRole("button", { name: `.md: ${value}`, exact: true });
+}
+
+function askAgain(page: Page) {
+  return markdownRow(page).getByRole("button", { name: "Ask again for .md", exact: true });
+}
+
+async function openFilesSettings(page: Page) {
+  await openSettings(page);
+  await openSettingsSection(page, "files");
+  await expect(page.getByTestId("file-panel-settings")).toBeVisible();
+}
+
+async function capture(page: Page, testInfo: TestInfo, name: string) {
+  const file = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path: file });
+  await testInfo.attach(name, { path: file, contentType: "image/png" });
+}
+
+async function expectMenuOpen(page: Page) {
+  await expect(page.getByTestId("file-panel-settings-menu")).toHaveCSS("opacity", "1");
+}
+
+test("Settings > Files chooses which panel opens .md and asks again on request", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(120_000);
+  const workspace = await seedWorkspace({
+    repoPrefix: "file-panel-settings-",
+    repo: { files: [{ path: "notes.md", content: "# notes heading\n" }] },
+  });
+  const plugin = await installMarkdownPanelPlugin();
+  try {
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openFilesSettings(page);
+
+    // Nothing remembered: the row asks every time and has nothing to forget.
+    await expect(markdownDropdown(page, ASK_EVERY_TIME)).toBeVisible({ timeout: 30_000 });
+    await expect(askAgain(page)).toBeDisabled();
+    await capture(page, testInfo, "file-panel-settings-wide");
+
+    await markdownDropdown(page, ASK_EVERY_TIME).click();
+    await expect(page.getByRole("menuitem", { name: BUILTIN_MARKDOWN_OPTION })).toBeVisible();
+    await expect(page.getByRole("menuitem", { name: PLUGIN_MARKDOWN_OPTION })).toBeVisible();
+    await expect(page.getByRole("menuitem", { name: SOURCE_OPTION })).toHaveCount(0);
+    await expectMenuOpen(page);
+    await capture(page, testInfo, "file-panel-settings-wide-menu");
+    await page.getByRole("menuitem", { name: PLUGIN_MARKDOWN_OPTION }).click();
+    await expect(markdownDropdown(page, PLUGIN_MARKDOWN_OPTION)).toBeVisible();
+    await expect
+      .poll(() => storedFilePanelAssociations(page))
+      .toEqual({
+        "ext:md": MARKDOWN_PANEL_ID,
+      });
+    await capture(page, testInfo, "file-panel-settings-wide-chosen");
+
+    // The next open uses the plugin without asking.
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openFileExplorer(page);
+    await openMarkdown(page, "notes.md");
+    await expectPluginMarkdown(page, "notes.md");
+    await expect(filePanelPicker(page)).toBeHidden();
+
+    await page.setViewportSize({ width: 390, height: 844 });
+    await page.goto("/settings/files");
+    await expect(markdownDropdown(page, PLUGIN_MARKDOWN_OPTION)).toBeVisible({ timeout: 30_000 });
+    await expect(askAgain(page)).toBeInViewport({ ratio: 1 });
+    await capture(page, testInfo, "file-panel-settings-compact");
+    await markdownDropdown(page, PLUGIN_MARKDOWN_OPTION).click();
+    await expect(page.getByRole("menuitem", { name: BUILTIN_MARKDOWN_OPTION })).toBeVisible();
+    await expectMenuOpen(page);
+    await capture(page, testInfo, "file-panel-settings-compact-menu");
+    await page.keyboard.press("Escape");
+    await expect(page.getByRole("menuitem", { name: BUILTIN_MARKDOWN_OPTION })).toBeHidden();
+
+    // Ask again forgets the choice; the next open asks.
+    await askAgain(page).click();
+    await expect(markdownDropdown(page, ASK_EVERY_TIME)).toBeVisible();
+    await expect.poll(() => storedFilePanelAssociations(page)).toEqual({});
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await expect(filePanelPicker(page)).toBeVisible({ timeout: 30_000 });
+  } finally {
+    await plugin.uninstall();
+    await workspace.cleanup();
+  }
+});
+
+test("Settings > Files explains where file panels come from when no plugin adds one", async ({
+  page,
+}, testInfo) => {
+  await page.setViewportSize({ width: 1280, height: 900 });
+  await page.goto("/settings/files");
+  const empty = page.getByTestId("file-panel-settings-empty");
+  await expect(empty).toHaveText("File panels appear here when a plugin adds one", {
+    timeout: 30_000,
+  });
+  await capture(page, testInfo, "file-panel-settings-empty-wide");
+  await page.setViewportSize({ width: 390, height: 844 });
+  await expect(empty).toBeVisible();
+  await capture(page, testInfo, "file-panel-settings-empty-compact");
+});
+
+test("Settings > Files offers Source in place of a panel no host has, and forgets it", async ({
+  page,
+}) => {
+  await page.addInitScript(() => {
+    localStorage.setItem(
+      "@paseo:app-settings",
+      JSON.stringify({ filePanelAssociations: { "ext:pdf": "plugin:none/none" } }),
+    );
+  });
+  await page.goto("/settings/files");
+  const row = page.getByTestId("file-panel-settings-row-ext:pdf");
+  const dropdown = row.getByRole("button", { name: ".pdf: Not on a connected host" });
+  await expect(dropdown).toBeEnabled({ timeout: 30_000 });
+  await dropdown.click();
+  await expect(page.getByRole("menuitem", { name: SOURCE_OPTION })).toBeVisible();
+  await page.keyboard.press("Escape");
+  await expect(page.getByRole("menuitem", { name: SOURCE_OPTION })).toBeHidden();
+  await row.getByRole("button", { name: "Ask again for .pdf", exact: true }).click();
+  await expect(page.getByTestId("file-panel-settings-empty")).toBeVisible();
+});
@@ -0,0 +1,236 @@
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { pluginRequirements } from "../support/helpers/plugin-fixture";
+import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import {
+  openFileExplorer,
+  openFileFromExplorer,
+  expectFileTabOpen,
+} from "../support/helpers/file-explorer";
+
+const PLUGIN_ID = "file-panel-e2e";
+const PDF = Buffer.from("%PDF-1.4\n%\x00\xff\n1 0 obj<</Type/Catalog>>endobj\n%%EOF", "binary");
+const SOURCE = `import React, { useEffect, useState } from "react";
+import { Text, View, Pressable } from "react-native";
+import {
+  PluginFileConflictError,
+  useFileBytes,
+  useFileUrl,
+  usePaseo,
+  useWorkspace,
+} from "@getpaseo/plugin/client";
+import { useQueryClient } from "@tanstack/react-query";
+import { DocumentFrame, Loading } from "@getpaseo/plugin/client/ui";
+function Pdf({ file, workspaceId }) {
+  usePaseo();
+  useQueryClient();
+  const workspace = useWorkspace(workspaceId, value => ({ id: value.id }));
+  const bytes = useFileBytes(file);
+  const url = useFileUrl(file);
+  const [urlBytes, setUrlBytes] = useState(-1);
+  const href = url.status === "ready" ? url.url : null;
+  useEffect(() => {
+    if (href) fetch(href).then(response => response.arrayBuffer()).then(body => setUrlBytes(body.byteLength));
+  }, [href]);
+  if (bytes.status !== "ready" || !href) return <Loading />;
+  return <View style={{ flex: 1 }}>
+    <Text>PDF plugin: {file.name}</Text>
+    <Text>Path {file.path}</Text>
+    <Text>Bytes {bytes.bytes.length}; URL bytes {urlBytes}</Text>
+    <Text>Workspace {workspace?.id}</Text>
+    <DocumentFrame url={href} testID="plugin-pdf-frame" />
+  </View>;
+}
+// Reads once and writes on demand, so a change on disk since that read rejects the write.
+function Markdown({ file, tab }) {
+  const [text, setText] = useState(null);
+  const [status, setStatus] = useState("");
+  useEffect(() => { file.readText().then(setText); }, [file]);
+  const save = (next) => {
+    tab.setModified(true);
+    file.writeText(next).then(
+      () => { tab.setModified(false); setText(next); },
+      (error) => setStatus(error instanceof PluginFileConflictError ? "Write rejected: changed on disk" : String(error)),
+    );
+  };
+  if (text === null) return <Loading />;
+  return <View>
+    <Text>Plugin Markdown: {text}</Text>
+    <Pressable accessibilityRole="button" onPress={() => save("# Saved by plugin\\n")}>
+      <Text>Edit Markdown through plugin</Text>
+    </Pressable>
+    <Text>{status}</Text>
+  </View>;
+}
+export default function contribute(client) {
+  client.addFilePanel({ id: "pdf", title: "PDF", icon: "FileText",
+    files: { extensions: ["pdf", "txt"] }, Component: Pdf });
+  client.addFilePanel({ id: "markdown", title: "Plugin Markdown", icon: "FileText",
+    files: { extensions: ["md"] }, Component: Markdown });
+  return () => {};
+}`;
+
+async function openWorkspaceFile(page: Page, name: string) {
+  await openFileFromExplorer(page, name);
+  await expectFileTabOpen(page, name);
+}
+async function associateMarkdownWithPlugin(page: Page) {
+  await page.evaluate(() => {
+    const key = "@paseo:app-settings";
+    const settings = JSON.parse(localStorage.getItem(key) ?? "{}");
+    settings.filePanelAssociations = { "ext:md": "plugin:file-panel-e2e/markdown" };
+    localStorage.setItem(key, JSON.stringify(settings));
+  });
+  await page.reload();
+}
+async function editMarkdownThroughPlugin(page: Page) {
+  await page.getByRole("button", { name: "Edit Markdown through plugin", exact: true }).click();
+}
+/** Opens the tab with Paseo's Markdown panel from "Open with…" and shows its Source view. */
+async function openBuiltinMarkdownSource(page: Page, name: string) {
+  await page.getByTestId(`workspace-tab-file_${name}`).first().click({ button: "right" });
+  await page.getByRole("menuitem", { name: "Open with…" }).hover();
+  await page.getByRole("menuitem", { name: "Markdown — Paseo" }).click();
+  await page
+    .getByTestId("file-preview-mode")
+    .filter({ visible: true })
+    .getByRole("button", { name: "Source", exact: true })
+    .click();
+}
+
+test("directory plugins render PDF bytes and write Markdown through the file handle", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(120_000);
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-file-panels-plugin-"));
+  const workspace = await seedWorkspace({
+    repoPrefix: "file-panels-",
+    repo: {
+      files: [
+        { path: "notes.md", content: "# Built-in Markdown\n" },
+        { path: "bytes.txt", content: "Bytes panel text document" },
+      ],
+    },
+  });
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previousConfig = await client.getDaemonConfig();
+  await writeFile(path.join(workspace.repoPath, "report.pdf"), PDF);
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
+  );
+  await writeFile(path.join(directory, "index.client.tsx"), SOURCE);
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    await page.setViewportSize({ width: 1280, height: 900 });
+    const gate = await installDaemonWebSocketGate(page);
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openFileExplorer(page);
+    await openWorkspaceFile(page, "report.pdf");
+    await expect(page.getByText("PDF plugin: report.pdf", { exact: true })).toBeVisible();
+    await expect(
+      page.getByText(`Bytes ${PDF.length}; URL bytes ${PDF.length}`, { exact: true }),
+    ).toBeVisible();
+    await expect(
+      page.getByText(`Workspace ${workspace.workspaceId}`, { exact: true }),
+    ).toBeVisible();
+    await expect(page.getByTitle("Document preview", { exact: true })).toHaveAttribute(
+      "src",
+      /^blob:/,
+    );
+    await expect(
+      page.getByText(`Path ${path.join(workspace.repoPath, "report.pdf")}`, { exact: true }),
+    ).toBeVisible();
+    const pdfScreenshot = testInfo.outputPath("plugin-pdf-web.png");
+    await page.screenshot({ path: pdfScreenshot });
+    await testInfo.attach("plugin-pdf-web", { path: pdfScreenshot, contentType: "image/png" });
+
+    // A plugin panel claiming a text file competes with Source, so Paseo asks over the plugin.
+    await openWorkspaceFile(page, "bytes.txt");
+    await expect(page.getByText("Open .txt files with", { exact: true })).toBeVisible();
+    await page.keyboard.press("Escape");
+    await expect(page.getByText("Open .txt files with", { exact: true })).toBeHidden();
+    await expect(page.getByText("PDF plugin: bytes.txt", { exact: true })).toBeVisible();
+    await expect(page.getByTitle("Document preview", { exact: true })).toBeVisible();
+    await expect(page.getByTitle("Document preview", { exact: true })).toHaveAttribute(
+      "sandbox",
+      "",
+    );
+    await expect(
+      page
+        .frameLocator('[title="Document preview"]')
+        .getByText("Bytes panel text document", { exact: true }),
+    ).toBeVisible();
+
+    await openWorkspaceFile(page, "notes.md");
+    await expect(page.getByText("Open .md files with", { exact: true })).toBeVisible();
+    await page.keyboard.press("Escape");
+    await expect(page.getByText("Open .md files with", { exact: true })).toBeHidden();
+    await expect(
+      page.getByRole("heading", { name: "Built-in Markdown", exact: true }),
+    ).toBeVisible();
+    await expect(page.getByRole("button", { name: "Edit Markdown through plugin" })).toHaveCount(0);
+    await associateMarkdownWithPlugin(page);
+    await expect(
+      page.getByText("Plugin Markdown: # Built-in Markdown", { exact: true }),
+    ).toBeVisible();
+    gate.holdNextClientRequest("fs.file.write.request");
+    await editMarkdownThroughPlugin(page);
+    await gate.waitForHeldClientRequest();
+    await expect(page.getByTestId("workspace-tab-modified-file_notes.md")).toBeVisible();
+    gate.releaseHeldClientRequest();
+    await expect(
+      page.getByText("Plugin Markdown: # Saved by plugin", { exact: true }),
+    ).toBeVisible();
+    await expect
+      .poll(() => readFile(path.join(workspace.repoPath, "notes.md"), "utf8"))
+      .toBe("# Saved by plugin\n");
+    await expect(page.getByTestId("workspace-tab-modified-file_notes.md")).toBeHidden();
+
+    // The disk changed since the plugin's last read or write: the write is rejected, not applied.
+    await writeFile(path.join(workspace.repoPath, "notes.md"), "# Changed outside\n");
+    await editMarkdownThroughPlugin(page);
+    await expect(page.getByText("Write rejected: changed on disk", { exact: true })).toBeVisible();
+    expect(await readFile(path.join(workspace.repoPath, "notes.md"), "utf8")).toBe(
+      "# Changed outside\n",
+    );
+    await expect(page.getByTestId("workspace-tab-modified-file_notes.md")).toBeVisible();
+    let closePrompt = "";
+    page.once("dialog", async (dialog) => {
+      closePrompt = dialog.message();
+      await dialog.dismiss();
+    });
+    await page
+      .getByTestId("workspace-tab-file_notes.md")
+      .filter({ visible: true })
+      .first()
+      .click({ button: "right" });
+    await page.getByRole("menuitem", { name: "Close", exact: true }).click();
+    await expect.poll(() => closePrompt).toContain("discard");
+
+    await openBuiltinMarkdownSource(page, "notes.md");
+    await expect(
+      page.getByTestId("file-source-editor").filter({ visible: true }).locator(".cm-content"),
+    ).toHaveText("# Changed outside");
+    const markdownScreenshot = testInfo.outputPath("plugin-markdown-source-web.png");
+    await page.screenshot({ path: markdownScreenshot });
+    await testInfo.attach("plugin-markdown-source-web", {
+      path: markdownScreenshot,
+      contentType: "image/png",
+    });
+  } finally {
+    await client.removePlugin(PLUGIN_ID);
+    await client.patchDaemonConfig({
+      pluginsEnabled: previousConfig.config.pluginsEnabled ?? false,
+    });
+    await client.close();
+    await workspace.cleanup();
+    await rm(directory, { recursive: true, force: true });
+  }
+});
@@ -1,3 +1,4 @@
+import { verifyPluginTranslations } from "../support/helpers/plugin-translations";
 import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -5,15 +6,11 @@ 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";

 const PLUGIN_SOURCE = `import { usePaseo } from "@getpaseo/plugin/client";
-import { Icon, Modal, useToast } from "@getpaseo/plugin/client/react-native";
+import { Icon, Modal, useToast, Markdown } from "@getpaseo/plugin/client/ui";
 import { useQueryClient } from "@tanstack/react-query";
 import React, { useState } from "react";
 import { Pressable, Text, View } from "react-native";
@@ -30,6 +27,9 @@ function ModalBody({ onSaved }) {

  return <View>
    <Text>Plugin modal contexts ready</Text>
+    <Markdown>{"## Plugin report"}</Markdown>
+    <Markdown>{"Checks **passed**. [Documentation](https://paseo.sh/docs/plugins)"}</Markdown>
+    <Markdown>{""}</Markdown>
    <Pressable accessibilityRole="button" onPress={save}>
      <Text>Save issue</Text>
    </Pressable>
@@ -91,20 +91,24 @@ 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();
 }

+async function expectPluginMarkdown(page: Page): Promise<void> {
+  await expect(page.getByRole("heading", { name: "Plugin report" })).toBeVisible();
+  await expect(page.getByText("Checks passed.", { exact: false })).toBeVisible();
+  await expect(page.getByRole("link", { name: "Documentation", exact: true })).toHaveAttribute(
+    "href",
+    "https://paseo.sh/docs/plugins",
+  );
+}
+
 async function expectCenteredPluginDialog(page: Page): Promise<void> {
  const dialog = page.getByRole("dialog");
  await expect(dialog.getByText("Edit plugin issue", { exact: true })).toBeVisible();
  await expect(dialog.getByText("Plugin modal contexts ready", { exact: true })).toBeVisible();
+  await expectPluginMarkdown(page);
 }

 async function closeCenteredPluginDialog(page: Page): Promise<void> {
@@ -116,6 +120,7 @@ async function closeCenteredPluginDialog(page: Page): Promise<void> {
 async function expectCompactPluginSheet(page: Page): Promise<void> {
  await expect(page.getByText("Edit plugin issue", { exact: true })).toBeVisible();
  await expect(page.getByText("Plugin modal contexts ready", { exact: true })).toBeVisible();
+  await expectPluginMarkdown(page);
 }

 async function savePluginIssue(page: Page): Promise<void> {
@@ -158,7 +163,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);
@@ -177,3 +181,10 @@ async function playPluginAudio(page: Page, button: string, result: string) {
  await page.getByRole("button", { name: button, exact: true }).click();
  await expect(page.getByText(result, { exact: true })).toBeVisible();
 }
+
+test("plugin content and host labels follow app language without losing an open draft", async ({
+  page,
+}, info) => {
+  test.setTimeout(180_000);
+  await verifyPluginTranslations(page, info);
+});
@@ -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) {
@@ -1,6 +1,7 @@
 import { test } from "../support/fixtures";
 import {
  withTimelinePlugin,
+  viewInlineThinkingExample,
  requestPluginTimeline,
  interactWithStreamingCard,
  expectWholeCompletedCard,
@@ -33,3 +34,9 @@ test("Overview preserves both consecutive tool plugin cards", async ({ page }, i
    await expectBothConsecutiveTools(page);
  });
 });
+
+test("inline-thinking example renders a streamed thought through host UI", async ({
+  page,
+}, info) => {
+  await viewInlineThinkingExample(page, info);
+});
@@ -36,7 +36,7 @@ function pluginClientSource(input: {
 }): string {
  return `import React, { useRef } from "react";
 import { Pressable, Text, View } from "react-native";
-import { Icon } from "@getpaseo/plugin/client/react-native";
+import { Icon } from "@getpaseo/plugin/client/ui";
 import { useAgent, useWorkspace, openExternalUrl } from "@getpaseo/plugin/client";
 import { ExternalLink } from "@getpaseo/plugin/client/ui";
 import { recordComposerOpen } from "./shared/rpc";
@@ -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);
@@ -24,8 +25,10 @@ test("project and workspace kebabs open action sheets on compact layouts", async
    await page.getByTestId("sidebar-display-preferences-menu").click();
    await expect(page.getByRole("menuitem")).toHaveText([
      /^Grouping/,
+      /^Sort/,
      /^Title/,
      "Show",
+      "Project",
      "Show background",
    ]);
    await closeMenuSheet(page);
@@ -53,6 +56,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();
  }
 });
@@ -1,4 +1,5 @@
 import { expect, test } from "../support/fixtures";
+import type { Page } from "@playwright/test";
 import { openAddProjectFlow, addProjectFlow } from "../support/helpers/add-project-flow";
 import { installUsageReportsFixture } from "../support/helpers/usage-reports";
 import {
@@ -31,6 +32,28 @@ import {
  setSidebarNavItemVisible,
 } from "../support/helpers/sidebar-nav-settings";

+async function showDeveloperToast(page: Page): Promise<void> {
+  await page.evaluate(() => {
+    document.getElementById("error-toast")?.remove();
+    const toast = document.createElement("div");
+    toast.id = "error-toast";
+    toast.style.cssText = "position:fixed;inset:0;z-index:2147483647;background:white";
+    // Expo renders its unnamed dismiss button in an open shadow root.
+    const button = document.createElement("button");
+    button.style.cssText = "width:24px;height:24px";
+    button.addEventListener("click", () => toast.remove());
+    toast.attachShadow({ mode: "open" }).appendChild(button);
+    document.body.appendChild(toast);
+  });
+}
+
+test("developer toasts leave concurrent sidebar layout checks uninterrupted", async ({ page }) => {
+  await gotoAppShell(page);
+  await showDeveloperToast(page);
+  await expectSidebarOrder(page, ["new-workspace", "history", "search", "schedules"]);
+  await expect(page.locator("#error-toast")).toBeHidden();
+});
+
 test("fixed footer line keeps its five icons, Help and Settings at the end", async ({ page }) => {
  test.setTimeout(120_000);
  await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
@@ -32,6 +32,7 @@ test.describe("Sidebar project filter", () => {
      await page.getByTestId("sidebar-display-preferences-menu").click();
      await expect(page.getByRole("menuitem")).toHaveText([
        /^Grouping/,
+        /^Sort/,
        /^Title/,
        "Show",
        "Project",
@@ -1,9 +1,10 @@
-import type { Locator } from "@playwright/test";
+import type { Locator, Page } from "@playwright/test";
 import { expect, test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
 import { getServerId } from "../support/helpers/server-id";
 import { seedWorkspace } from "../support/helpers/seed-client";
+import { selectSidebarStatusGrouping } from "../support/helpers/sidebar";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 async function rowTestIds(rows: Locator) {
@@ -57,7 +58,19 @@ async function quickDragFirstRowAfterSecond(
  await expect.poll(() => rowTestIds(rows)).toEqual([before[1], before[0]]);
 }

-test("projects, workspaces, and pinned chats reorder with an immediate mouse drag", async ({
+async function dragWithoutReordering(rows: Locator): Promise<void> {
+  const before = await rowTestIds(rows);
+  const source = await visibleBoundingBox(rows.nth(0));
+  const target = await visibleBoundingBox(rows.nth(1));
+  const page = rows.page();
+  await page.mouse.move(source.x + source.width / 2, source.y + source.height / 2);
+  await page.mouse.down();
+  await page.mouse.move(target.x + target.width / 2, target.y + target.height / 2, { steps: 5 });
+  await page.mouse.up();
+  await expect.poll(() => rowTestIds(rows)).toEqual(before);
+}
+
+test("projects and pinned chats reorder while ordinary workspaces stay newest first", async ({
  page,
 }) => {
  const firstProject = await seedWorkspace({ repoPrefix: "sidebar-reorder-first-" });
@@ -87,12 +100,13 @@ test("projects, workspaces, and pinned chats reorder with an immediate mouse dra
    );
    const firstWorkspaceTestId = `sidebar-workspace-row-${getServerId()}:${firstProject.workspaceId}`;
    const secondWorkspaceTestId = `sidebar-workspace-row-${getServerId()}:${secondWorkspace.workspace.id}`;
-    await quickDragFirstRowAfterSecond(
-      page.locator(
-        `[data-testid="${firstWorkspaceTestId}"], [data-testid="${secondWorkspaceTestId}"]`,
-      ),
-      pressWorkspaceRow,
+    const ordinaryRows = page.locator(
+      `[data-testid="${firstWorkspaceTestId}"], [data-testid="${secondWorkspaceTestId}"]`,
    );
+    await expect
+      .poll(() => rowTestIds(ordinaryRows))
+      .toEqual([secondWorkspaceTestId, firstWorkspaceTestId]);
+    await dragWithoutReordering(ordinaryRows);

    await firstProject.client.setWorkspacePinned(firstProject.workspaceId, true);
    await secondProject.client.setWorkspacePinned(secondProject.workspaceId, true);
@@ -108,3 +122,243 @@ test("projects, workspaces, and pinned chats reorder with an immediate mouse dra
    await secondProject.cleanup();
  }
 });
+
+async function selectWorkspaceSort(page: Page, name: "Created" | "Last prompt") {
+  await page.getByLabel("Display preferences", { exact: true }).click();
+  await page.getByRole("menuitem", { name: /^Sort/ }).click();
+  await page.getByRole("menuitem", { name, exact: true }).click();
+}
+
+async function reconnectSidebar(page: Page): Promise<void> {
+  await page.reload();
+  await waitForSidebarHydration(page);
+}
+
+async function expectNoWorkspaceSortChoice(page: Page): Promise<void> {
+  await page.getByLabel("Display preferences", { exact: true }).click();
+  await expect(page.getByRole("menuitem", { name: /^Sort/ })).toHaveCount(0);
+}
+
+async function promptWorkspace(seed: Awaited<ReturnType<typeof seedWorkspace>>, agentId: string) {
+  await seed.client.sendAgentMessage(agentId, "sidebar ordering check");
+  expect((await seed.client.waitForFinish(agentId, 30_000)).status).toBe("idle");
+}
+
+test("Created stays stable, Last prompt follows human submissions and survives tab archive", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const seed = await seedWorkspace({ repoPrefix: "sidebar-sort-" });
+  try {
+    const newer = await seed.client.createWorkspace({
+      source: { kind: "directory", path: seed.repoPath, projectId: seed.projectId },
+      title: "Newer workspace",
+    });
+    if (!newer.workspace) throw new Error(newer.error ?? "Workspace creation failed");
+    const agent = await seed.client.createAgent({
+      provider: "mock",
+      cwd: seed.repoPath,
+      workspaceId: seed.workspaceId,
+      modeId: "load-test",
+      model: "e2e-fast-stream",
+      title: "Ordering agent",
+    });
+    const newerAgent = await seed.client.createAgent({
+      provider: "mock",
+      cwd: seed.repoPath,
+      workspaceId: newer.workspace.id,
+      modeId: "load-test",
+      model: "e2e-fast-stream",
+      title: "Newer agent",
+    });
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    const oldId = `sidebar-workspace-row-${getServerId()}:${seed.workspaceId}`;
+    const newId = `sidebar-workspace-row-${getServerId()}:${newer.workspace.id}`;
+    const rows = page.locator(`[data-testid="${oldId}"], [data-testid="${newId}"]`);
+    await expect.poll(() => rowTestIds(rows)).toEqual([newId, oldId]);
+    await promptWorkspace(seed, agent.id);
+    await expect.poll(() => rowTestIds(rows)).toEqual([newId, oldId]);
+    await selectWorkspaceSort(page, "Last prompt");
+    await expect.poll(() => rowTestIds(rows)).toEqual([oldId, newId]);
+    await promptWorkspace(seed, newerAgent.id);
+    await expect.poll(() => rowTestIds(rows)).toEqual([newId, oldId]);
+    await promptWorkspace(seed, agent.id);
+    await expect.poll(() => rowTestIds(rows)).toEqual([oldId, newId]);
+    await seed.client.archiveAgent(agent.id);
+    await expect.poll(() => rowTestIds(rows)).toEqual([oldId, newId]);
+    await reconnectSidebar(page);
+    await expect.poll(() => rowTestIds(rows)).toEqual([oldId, newId]);
+    await selectWorkspaceSort(page, "Created");
+    await expect.poll(() => rowTestIds(rows)).toEqual([newId, oldId]);
+    await selectSidebarStatusGrouping(page);
+    await expectNoWorkspaceSortChoice(page);
+  } finally {
+    await seed.cleanup();
+  }
+});
+
+async function seedCompactProject() {
+  const seed = await seedWorkspace({
+    repoPrefix: "sidebar-visibility-",
+    title: "Oldest workspace",
+  });
+  const ids = [seed.workspaceId];
+  for (let index = 2; index <= 12; index += 1) {
+    const created = await seed.client.createWorkspace({
+      source: { kind: "directory", path: seed.repoPath, projectId: seed.projectId },
+      title: `Workspace ${index}`,
+    });
+    if (!created.workspace) throw new Error(created.error ?? "Workspace creation failed");
+    ids.unshift(created.workspace.id);
+  }
+  const agent = await seed.client.createAgent({
+    provider: "mock",
+    model: "e2e-fast-stream",
+    modeId: "load-test",
+    cwd: seed.repoPath,
+    workspaceId: seed.workspaceId,
+    title: "Overflow agent",
+  });
+  return { seed, ids, agent };
+}
+
+async function expectWorkspaceOrder(rows: Locator, ids: string[]) {
+  await expect
+    .poll(() => rowTestIds(rows))
+    .toEqual(ids.map((id) => `sidebar-workspace-row-${getServerId()}:${id}`));
+}
+
+async function revealWorkspaces(list: Locator, action: "Show more" | "Show less") {
+  await list.getByLabel(action, { exact: true }).click();
+}
+
+async function selectProjectGrouping(page: Page) {
+  await page.getByLabel("Display preferences", { exact: true }).click();
+  await page.getByRole("menuitem", { name: /^Group/ }).click();
+  await page.getByTestId("sidebar-grouping-project").click();
+}
+
+type CompactProject = Awaited<ReturnType<typeof seedCompactProject>>;
+
+function compactProjectRows(page: Page, seed: CompactProject["seed"]) {
+  const list = page.getByTestId(`sidebar-workspace-list-${seed.projectKey}`);
+  return {
+    rows: list.locator('[data-testid^="sidebar-workspace-row-"]'),
+    group: list.locator(".."),
+    project: page.getByTestId(`sidebar-project-row-${projectEquivalenceViewKey(seed.projectKey)}`),
+  };
+}
+
+async function expectActiveOverflowTransitions(page: Page, { seed, ids, agent }: CompactProject) {
+  const { rows } = compactProjectRows(page, seed);
+  await expectWorkspaceOrder(rows, ids.slice(0, 7));
+
+  await seed.client.sendAgentMessage(agent.id, "show active overflow");
+  await expectWorkspaceOrder(rows, [...ids.slice(0, 7), ids[11]]);
+  await seed.client.waitForFinish(agent.id, 15_000);
+  await expectWorkspaceOrder(rows, [...ids.slice(0, 7), ids[11]]);
+  await seed.client.clearWorkspaceAttention(seed.workspaceId);
+  await expectWorkspaceOrder(rows, ids.slice(0, 7));
+}
+
+async function expectRevealSurvivesSortingAndCollapse(
+  page: Page,
+  { seed, ids, agent }: CompactProject,
+) {
+  const { rows, group, project } = compactProjectRows(page, seed);
+  const retainedRows = await rows.elementHandles();
+  await revealWorkspaces(group, "Show more");
+  await expectWorkspaceOrder(rows, ids);
+  for (const [index, retained] of retainedRows.entries()) {
+    expect(
+      await rows.nth(index).evaluate((current, previous) => current === previous, retained),
+    ).toBe(true);
+  }
+  await project.click();
+  await expect(rows).toHaveCount(0);
+  await project.click();
+  await expectWorkspaceOrder(rows, ids);
+  await seed.client.sendAgentMessage(agent.id, "expanded overflow");
+  await seed.client.waitForFinish(agent.id, 15_000);
+  await seed.client.clearWorkspaceAttention(seed.workspaceId);
+  await expectWorkspaceOrder(rows, ids);
+  await selectWorkspaceSort(page, "Last prompt");
+  await expectWorkspaceOrder(rows, [ids[11], ...ids.slice(0, 11)]);
+  const revealedRow = await rows.nth(8).elementHandle();
+  await revealWorkspaces(group, "Show less");
+  await expectWorkspaceOrder(rows, [ids[11], ...ids.slice(0, 6)]);
+  await selectWorkspaceSort(page, "Created");
+  await expectWorkspaceOrder(rows, ids.slice(0, 7));
+  expect(await revealedRow!.evaluate((row) => row.isConnected)).toBe(false);
+  await reconnectSidebar(page);
+  await expectWorkspaceOrder(rows, ids.slice(0, 7));
+}
+
+async function expectStatusBucketsRetainActiveOverflow(
+  page: Page,
+  { seed, ids, agent }: CompactProject,
+) {
+  const { rows } = compactProjectRows(page, seed);
+  await selectSidebarStatusGrouping(page);
+  const done = page.getByTestId("sidebar-status-group-rows-done");
+  const doneRows = done.locator('[data-testid^="sidebar-workspace-row-"]');
+  await expect(doneRows).toHaveCount(7);
+  await revealWorkspaces(done, "Show more");
+  await expect(doneRows).toHaveCount(12);
+  await seed.client.sendAgentMessage(agent.id, "status overflow");
+  await seed.client.waitForFinish(agent.id, 15_000);
+  await expect(
+    page
+      .getByTestId("sidebar-status-group-rows-attention")
+      .getByText("Oldest workspace", { exact: true }),
+  ).toBeVisible();
+  await expect(doneRows).toHaveCount(11);
+  await seed.client.clearWorkspaceAttention(seed.workspaceId);
+  await expect(doneRows).toHaveCount(12);
+  await revealWorkspaces(done, "Show less");
+  await expect(doneRows).toHaveCount(7);
+  const activeAgents: Array<{ id: string }> = [];
+  for (const workspaceId of ids.slice(0, 8)) {
+    activeAgents.push(
+      await seed.client.createAgent({
+        provider: "mock",
+        model: "e2e-fast-stream",
+        modeId: "load-test",
+        cwd: seed.repoPath,
+        workspaceId,
+        title: "Active overflow agent",
+      }),
+    );
+  }
+  await Promise.all(
+    activeAgents.map((item) => seed.client.sendAgentMessage(item.id, "active bucket")),
+  );
+  await Promise.all(activeAgents.map((item) => seed.client.waitForFinish(item.id, 15_000)));
+  const attention = page.getByTestId("sidebar-status-group-rows-attention");
+  await expect(attention.locator('[data-testid^="sidebar-workspace-row-"]')).toHaveCount(8);
+  await expect(attention.getByLabel("Show more", { exact: true })).toHaveCount(0);
+  for (const workspaceId of ids.slice(0, 8)) await seed.client.clearWorkspaceAttention(workspaceId);
+  await expect(doneRows).toHaveCount(7);
+  await selectProjectGrouping(page);
+  await expectWorkspaceOrder(rows, ids.slice(0, 7));
+}
+
+test("compact groups retain active overflow and reveal the current ordered rows", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const fixture = await seedCompactProject();
+  try {
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await test.step("Active overflow appears without intervening Done rows", () =>
+      expectActiveOverflowTransitions(page, fixture));
+    await test.step("Reveal follows current sort and survives collapse", () =>
+      expectRevealSurvivesSortingAndCollapse(page, fixture));
+    await test.step("Status reveals Done rows and keeps every active row", () =>
+      expectStatusBucketsRetainActiveOverflow(page, fixture));
+  } finally {
+    await fixture.seed.cleanup();
+  }
+});
@@ -0,0 +1,84 @@
+import type { Page } from "@playwright/test";
+import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
+import { randomUUID } from "node:crypto";
+import { metroTest as test, expect } from "../support/fixtures";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { buildSeededHost } from "../support/helpers/daemon-registry";
+import { selectSidebarStatusGrouping } from "../support/helpers/sidebar";
+
+test("published old daemon keeps workspace navigation and gates sorting", async ({ page }) => {
+  test.setTimeout(180_000);
+  const daemon = await startIsolatedHostDaemon(`srv_sort_old_${randomUUID()}`, {
+    publishedVersion: "0.8.0",
+  });
+  try {
+    const project = await seedWorkspace({ repoPrefix: "sidebar-old-host-", port: daemon.port });
+    try {
+      const second = await project.client.createWorkspace({
+        source: { kind: "directory", path: project.repoPath, projectId: project.projectId },
+        title: "Second old workspace",
+      });
+      expect(second.workspace).toBeTruthy();
+      await openPublishedHost(page, daemon, project.workspaceId);
+      await openWorkspace(page, daemon.serverId, second.workspace!.id);
+      await expectSortingRequiresHostUpdate(page);
+      await selectSidebarStatusGrouping(page);
+      await expectStatusHasNoSorting(page);
+    } finally {
+      await project.cleanup();
+    }
+  } finally {
+    await daemon.close();
+  }
+});
+
+async function openPublishedHost(
+  page: Page,
+  daemon: { serverId: string; port: number },
+  workspaceId: string,
+) {
+  const host = buildSeededHost({
+    serverId: daemon.serverId,
+    endpoint: `127.0.0.1:${daemon.port}`,
+    nowIso: new Date().toISOString(),
+  });
+  await page.addInitScript((seededHost) => {
+    localStorage.setItem("@paseo:e2e", "1");
+    localStorage.setItem("@paseo:daemon-registry", JSON.stringify([seededHost]));
+    localStorage.setItem(
+      "sidebar-view",
+      JSON.stringify({ version: 8, state: { groupMode: "project", workspaceSort: "lastPrompt" } }),
+    );
+  }, host);
+  await page.goto(buildHostWorkspaceRoute(daemon.serverId, workspaceId));
+}
+
+async function openWorkspace(page: Page, serverId: string, workspaceId: string) {
+  const row = page.getByTestId(`sidebar-workspace-row-${serverId}:${workspaceId}`);
+  await expect(row).toBeVisible();
+  await row.click();
+  await expect(page).toHaveURL(new RegExp(workspaceId));
+}
+
+async function expectSortingRequiresHostUpdate(page: Page) {
+  await page.getByLabel("Display preferences", { exact: true }).click();
+  await page.getByRole("menuitem", { name: /^Sort/ }).click();
+  await expect(
+    page.getByRole("menuitem", { name: "Update hosts to sort workspaces" }),
+  ).toBeVisible();
+  await expect(
+    page.getByRole("menuitem", { name: "Update hosts to sort workspaces" }),
+  ).toBeDisabled();
+  await expect(page.getByRole("menuitem", { name: "Created", exact: true })).toHaveCount(0);
+  await expect(page.getByRole("menuitem", { name: "Last prompt", exact: true })).toHaveCount(0);
+  await page.keyboard.press("Escape");
+}
+
+async function expectStatusHasNoSorting(page: Page) {
+  await page.getByLabel("Display preferences", { exact: true }).click();
+  await expect(page.getByRole("menuitem", { name: "Update hosts to sort workspaces" })).toHaveCount(
+    0,
+  );
+  await expect(page.getByRole("menuitem", { name: /^Sort/ })).toHaveCount(0);
+}
@@ -6,6 +6,7 @@ import {
  seedMockAgentWorkspace,
  type MockAgentWorkspace,
 } from "../support/helpers/mock-agent";
+import { expectOpenTabCount } from "../support/helpers/sheet";
 import { getServerId } from "../support/helpers/server-id";
 import { closeMobileAgentSidebar, openMobileAgentSidebar } from "../support/helpers/sidebar";

@@ -227,3 +228,45 @@ test("manual unread survives leaving the current workspace on compact layout", a
  await markUnreadThenResumeChat(page, workspaces.subject.workspaceId);
  await completeTurnAndLeaveOnCompact(page, workspaces);
 });
+
+async function reopenMarkedWorkspaceAfterBackgroundTurn(page: Page, workspace: MockAgentWorkspace) {
+  const route = page.url();
+  // End this app session before the turn, so its cached transcript cannot contain the new prompt.
+  await page.goto("about:blank");
+  await workspace.client.sendAgentMessage(
+    workspace.agentId,
+    "A turn completed while the app was closed.",
+  );
+  await workspace.client.waitForFinish(workspace.agentId, 20_000);
+  // Reopen the ordinary workspace route, without an agent open intent that would repair focus.
+  await page.goto(route);
+  await expect(page.getByRole("button", { name: /Switch tabs/ })).toBeVisible();
+}
+
+async function expectRestoredCompactChat(page: Page) {
+  await expectOpenTabCount(page, 1);
+  await expect(
+    page.getByText("A turn completed while the app was closed.", { exact: true }),
+  ).toBeVisible();
+}
+
+test("reopening a marked unread workspace restores only its agent tab and current history on compact layout", async ({
+  page,
+  workspaces,
+}) => {
+  test.setTimeout(120_000);
+  await test.step("open a finished chat with one main tab", async () => {
+    await openCompactWorkspace(page, workspaces.subject);
+    await closeMobileAgentSidebar(page);
+    await expectOpenTabCount(page, 1);
+    await expect(page.getByText("Finish this turn.", { exact: true })).toBeVisible();
+  });
+  await test.step("mark the current workspace unread, then close and reopen the app", async () => {
+    await openMobileAgentSidebar(page);
+    await markAsUnread(page, workspaces.subject.workspaceId);
+    await reopenMarkedWorkspaceAfterBackgroundTurn(page, workspaces.subject);
+  });
+  await test.step("restore the main tab without Explorer entries and load its latest history", async () => {
+    await expectRestoredCompactChat(page);
+  });
+});
@@ -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,10 +1,19 @@
+import { buildSeededHost } from "../support/helpers/daemon-registry";
+import { submitMessage } from "../support/helpers/composer";
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import { seedWorkspace } from "../support/helpers/seed-client";
-import { openSubagentsTrack, seedParentWithSubagent } from "../support/helpers/subagents";
+import {
+  delegateFleetThroughMcp,
+  expectManagedSubagentArchived,
+  openSubagentsTrack,
+  seedParentWithSubagent,
+} from "../support/helpers/subagents";
+
+test.use({ e2eInjectPaseoTools: true });

 const SETTINGS_KEY = "@paseo:app-settings";

@@ -147,3 +156,189 @@ test("a preferred chat file link still opens beside its right-pane agent", async
    await workspace.cleanup();
  }
 });
+
+test("MCP delegates to self and B and opens both qualified children in ordinary conversations", async ({
+  page,
+}) => {
+  const fleet = await delegateFleetThroughMcp();
+  let appSockets = 0;
+  let routeOpens = 0;
+  const activeDaemonSockets = new Set<unknown>();
+  const observationRequests: Record<string, number> = {};
+  page.on("websocket", (socket) => {
+    appSockets++;
+    if (new URL(socket.url()).pathname === "/ws") {
+      activeDaemonSockets.add(socket);
+      socket.on("close", () => activeDaemonSockets.delete(socket));
+    }
+    socket.on("framesent", ({ payload }) => {
+      if (typeof payload !== "string" || !payload.startsWith("{")) return;
+      if (String(payload).includes('"hosts.route.open.request"')) routeOpens++;
+      const outer = JSON.parse(String(payload));
+      const request = outer.type === "session" ? outer.message : null;
+      if (
+        request?.type &&
+        (request.subscribe !== undefined ||
+          request.observe === true ||
+          request.type.endsWith("set_subscription.request"))
+      )
+        observationRequests[request.type] = (observationRequests[request.type] ?? 0) + 1;
+    });
+  });
+  try {
+    await openAgentRoute(page, {
+      workspaceId: fleet.workspace.workspaceId,
+      agentId: fleet.parent.id,
+    });
+    await openSubagentsTrack(page);
+    await expect(page.getByTestId(`subagents-track-row-${fleet.local.agentId}`)).toContainText(
+      "MCP child on A",
+    );
+    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`)).toContainText(
+      "MCP child on B",
+    );
+    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`)).toContainText(
+      "Fleet B",
+    );
+    await page.getByTestId(`subagents-track-row-${fleet.local.agentId}`).click();
+    await expect(page.getByTestId(`workspace-tab-agent_${fleet.local.agentId}`)).toBeVisible();
+    await submitMessage(page, "LOCAL_UI_TARGET");
+    await expect(page.getByText("LOCAL_UI_TARGET", { exact: true })).toBeVisible();
+    expect((await fleet.b.fetchAgent(fleet.local.agentId))?.agent.lastUserMessageAt).toBeNull();
+    await page.getByTestId(`workspace-tab-agent_${fleet.parent.id}`).click();
+    await openSubagentsTrack(page);
+    await page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`).click();
+    await expect(page).toHaveURL((url) =>
+      url.pathname.includes(`/h/${fleet.remote.serverId}/workspace/`),
+    );
+    await submitMessage(page, "REMOTE_UI_TARGET");
+    await expect(page.getByText("REMOTE_UI_TARGET", { exact: true })).toBeVisible();
+    expect((await fleet.a.fetchAgent(fleet.remote.agentId))?.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 expect(
+      page.getByRole("button", { name: /Agent finished.*MCP child on A/ }),
+    ).toBeVisible();
+    await expect(
+      page.getByRole("button", { name: /Agent finished.*MCP child on B/ }),
+    ).toBeVisible();
+    const owners = await page.evaluate(() => {
+      const runtime = Reflect.get(globalThis, "__paseoHostRuntimeStore") as {
+        getHosts(): Array<{ serverId: string }>;
+        getSnapshot(
+          serverId: string,
+        ): { connectionStatus: string; clientGeneration: number } | null;
+      };
+      return runtime.getHosts().map((host) => {
+        const snapshot = runtime.getSnapshot(host.serverId);
+        return {
+          serverId: host.serverId,
+          connectionStatus: snapshot?.connectionStatus,
+          clientGeneration: snapshot?.clientGeneration,
+        };
+      });
+    });
+    console.log("Fleet ordinary route counts", {
+      appSockets,
+      activeDaemonSockets: activeDaemonSockets.size,
+      routeOpens,
+      owners,
+      observationRequests,
+    });
+  } finally {
+    await fleet.close();
+  }
+});
+
+async function openFleetParentWithDirectB(
+  page: Page,
+  fleet: Awaited<ReturnType<typeof delegateFleetThroughMcp>>,
+) {
+  await page.goto("/", { waitUntil: "commit" });
+  const host = buildSeededHost({
+    serverId: fleet.remote.serverId,
+    endpoint: `127.0.0.1:${fleet.destination.port}`,
+    label: "Fleet B",
+    nowIso: new Date().toISOString(),
+  });
+  await page.evaluate((extraHost) => {
+    localStorage.setItem("@paseo:e2e-extra-hosts", JSON.stringify([extraHost]));
+  }, host);
+  await openAgentRoute(page, {
+    workspaceId: fleet.workspace.workspaceId,
+    agentId: fleet.parent.id,
+  });
+  await openSubagentsTrack(page);
+  await expect(page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`)).toContainText(
+    "MCP child on B",
+  );
+}
+
+async function openFleetChild(
+  page: Page,
+  fleet: Awaited<ReturnType<typeof delegateFleetThroughMcp>>,
+) {
+  await page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`).click();
+  await expect(page).toHaveURL(
+    (url) => url.pathname === `/h/${fleet.remote.serverId}/workspace/${fleet.remote.workspaceId}`,
+  );
+}
+
+test("a directly connected B opens and archives its MCP child from A's track", async ({ page }) => {
+  const fleet = await delegateFleetThroughMcp();
+  try {
+    await openFleetParentWithDirectB(page, fleet);
+    await openFleetChild(page, fleet);
+    await expect(page.getByRole("button", { name: "MCP child on B", exact: true })).toBeVisible();
+    await submitMessage(page, "DIRECT_B_TARGET");
+    await expect(page.getByText("DIRECT_B_TARGET", { exact: true })).toBeVisible();
+    expect((await fleet.a.fetchAgent(fleet.remote.agentId))?.agent.lastUserMessageAt).toBeNull();
+    await openFleetParentWithDirectB(page, fleet);
+    await page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`).hover();
+    page.once("dialog", (dialog) => {
+      void dialog.accept();
+    });
+    await page.getByRole("button", { name: "Archive MCP child on B", exact: true }).click();
+    await expectManagedSubagentArchived({ client: fleet.b }, fleet.remote.agentId);
+    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`)).toHaveCount(0);
+    expect((await fleet.a.fetchAgent(fleet.remote.agentId))?.agent.archivedAt).toBeNull();
+    await expect(page.getByText(/already connected through another route/)).toHaveCount(0);
+  } finally {
+    await fleet.close();
+  }
+});
+
+test("an unavailable B child opens its cached workspace with existing reconnecting behavior", async ({
+  page,
+}) => {
+  const fleet = await delegateFleetThroughMcp();
+  try {
+    await openFleetParentWithDirectB(page, fleet);
+    await fleet.destination.close();
+    await expect
+      .poll(() =>
+        page.evaluate((serverId) => {
+          const runtime = Reflect.get(globalThis, "__paseoHostRuntimeStore") as {
+            getSnapshot(id: string): { serverId: string; connectionStatus: string } | null;
+          };
+          return runtime.getSnapshot(serverId);
+        }, fleet.remote.serverId),
+      )
+      .toMatchObject({
+        serverId: fleet.remote.serverId,
+        connectionStatus: expect.stringMatching(/^(offline|connecting|error)$/),
+      });
+    await openFleetChild(page, fleet);
+    await expect(page.getByTestId("workspace-header-title").filter({ visible: true })).toHaveText(
+      "B workspace",
+    );
+    await expect(page.getByRole("button", { name: "MCP child on B", exact: true })).toBeVisible();
+    await expect(page.getByText(/already connected through another route/)).toHaveCount(0);
+  } finally {
+    await fleet.close();
+  }
+});
@@ -1,6 +1,10 @@
+import { createHash } from "node:crypto";
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
+import type { Page } from "@playwright/test";
 import { test, expect } from "../support/fixtures";
+import { holdFileUploadResponse } from "../support/helpers/file-upload-gate";
+import { installLocalDesktopHost } from "../support/helpers/local-desktop-host";
 import { TerminalE2EHarness } from "../support/helpers/terminal-dsl";
 import { getTerminalBufferText, waitForTerminalContent } from "../support/helpers/terminal-perf";

@@ -26,12 +30,130 @@ process.stdin.on("data", (chunk) => {
 setTimeout(finish, 700);
 `;

+// A TUI stand-in: turns on bracketed paste, reads every quoted path in each
+// bracketed paste, and echoes typed lines, so the PTY output proves what reached
+// the terminal and where the file was read from.
+const FILE_RECEIVER_SCRIPT = String.raw`
+const fs = require("node:fs");
+const crypto = require("node:crypto");
+let buffer = "";
+process.stdin.setRawMode(true);
+process.stdin.resume();
+process.stdout.write("\x1b[?2004hFILE_RECEIVER_READY\r\n");
+process.stdin.on("data", (chunk) => {
+  buffer += chunk.toString();
+  for (;;) {
+    const paste = /\x1b\[200~([^]*?)\x1b\[201~/.exec(buffer);
+    if (!paste) break;
+    for (const [, path] of paste[1].matchAll(/'([^']*)'/g)) {
+      const digest = crypto.createHash("sha256").update(fs.readFileSync(path)).digest("hex");
+      const location = /[\\/]uploads[\\/]upload_/.test(path) ? "upload" : "local";
+      process.stdout.write("FILE_READ:" + digest + ":" + location + "\r\n");
+    }
+    buffer = buffer.slice(0, paste.index) + buffer.slice(paste.index + paste[0].length);
+  }
+  if (buffer.includes("\x03")) {
+    process.stdout.write("INTERRUPTED\r\n");
+    buffer = buffer.replaceAll("\x03", "");
+  }
+  const enter = buffer.indexOf("\r");
+  if (enter >= 0 && !buffer.includes("'")) {
+    process.stdout.write("TYPED:" + buffer.slice(0, enter) + "\r\n");
+    buffer = buffer.slice(enter + 1);
+  }
+});
+`;
+
+function pngBytes(seed: number): Buffer {
+  return Buffer.concat([Buffer.from("iVBORw0KGgo=", "base64"), Buffer.from([seed])]);
+}
+
+function fileRead(bytes: Buffer, location: "upload" | "local"): string {
+  const digest = createHash("sha256").update(bytes).digest("hex");
+  return `FILE_READ:${digest}:${location}`;
+}
+
+// Inactive terminal tabs retain their surfaces, and another page opening a terminal in
+// the same workspace adds a tab here too. Only the selected tab's surface is visible.
+function terminalSurface(page: Page) {
+  return page.getByTestId("terminal-surface").filter({ visible: true });
+}
+
+function terminalInput(page: Page) {
+  return terminalSurface(page).locator(".xterm-helper-textarea");
+}
+
+async function pasteImage(page: Page, bytes: Buffer): Promise<void> {
+  await terminalInput(page).evaluate(
+    (element, data) => {
+      (element as HTMLTextAreaElement).focus();
+      const clipboardData = new DataTransfer();
+      clipboardData.items.add(new File([new Uint8Array(data)], "image.png", { type: "image/png" }));
+      element.dispatchEvent(
+        new ClipboardEvent("paste", { clipboardData, bubbles: true, cancelable: true }),
+      );
+    },
+    [...bytes],
+  );
+}
+
+interface DroppedFile {
+  name: string;
+  type: string;
+  bytes: Buffer;
+}
+
+async function dragTransfer(page: Page, files: DroppedFile[]) {
+  return await page.evaluateHandle(
+    (entries) => {
+      const dataTransfer = new DataTransfer();
+      for (const entry of entries) {
+        dataTransfer.items.add(
+          new File([new Uint8Array(entry.bytes)], entry.name, { type: entry.type }),
+        );
+      }
+      return dataTransfer;
+    },
+    files.map((file) => ({ ...file, bytes: [...file.bytes] })),
+  );
+}
+
+async function dragFilesOver(page: Page, files: DroppedFile[]): Promise<void> {
+  const dataTransfer = await dragTransfer(page, files);
+  await terminalInput(page).dispatchEvent("dragenter", { dataTransfer });
+  await terminalInput(page).dispatchEvent("dragover", { dataTransfer });
+  await dataTransfer.dispose();
+}
+
+async function dropFiles(page: Page, files: DroppedFile[]): Promise<void> {
+  const dataTransfer = await dragTransfer(page, files);
+  await terminalInput(page).dispatchEvent("drop", { dataTransfer });
+  await dataTransfer.dispose();
+}
+
+/** The shared "Drop files here" overlay of the zone around the terminal. */
+function terminalDropOverlay(page: Page) {
+  return terminalSurface(page)
+    .locator("xpath=ancestor::*[.//*[@data-testid='file-drop-backdrop']][1]")
+    .getByTestId("file-drop-backdrop");
+}
+
+/**
+ * Makes the app treat the e2e daemon as the desktop app's own daemon, so dropped
+ * files resolve to paths inside `directory` instead of uploading.
+ */
+async function typeLine(page: Page, text: string): Promise<void> {
+  await terminalInput(page).pressSequentially(text);
+  await terminalInput(page).press("Enter");
+}
+
 test.describe("Terminal protocol queries", () => {
  let harness: TerminalE2EHarness;

  test.beforeAll(async () => {
    harness = await TerminalE2EHarness.create({ tempPrefix: "terminal-protocol-query-" });
    await writeFile(path.join(harness.tempRepo.path, "osc11-capture.cjs"), OSC11_CAPTURE_SCRIPT);
+    await writeFile(path.join(harness.tempRepo.path, "file-receiver.cjs"), FILE_RECEIVER_SCRIPT);
  });

  test.afterAll(async () => {
@@ -58,4 +180,156 @@ test.describe("Terminal protocol queries", () => {
      await harness.killTerminal(terminalInstance.id);
    }
  });
+
+  async function openFileReceiver(page: Page, name: string) {
+    const terminal = await harness.createTerminal({
+      name,
+      command: process.execPath,
+      args: ["file-receiver.cjs"],
+    });
+    await harness.openTerminal(page, { terminalId: terminal.id });
+    await expectTerminalOutput(terminal.id, "FILE_RECEIVER_READY");
+    return terminal;
+  }
+
+  // Reads the PTY itself, so output from one pane cannot satisfy another's check.
+  async function terminalOutput(terminalId: string): Promise<string> {
+    const capture = await harness.client.captureTerminal(terminalId);
+    return capture.lines.join("").replace(/\s/g, "");
+  }
+
+  async function expectTerminalOutput(terminalId: string, text: string): Promise<void> {
+    await expect.poll(() => terminalOutput(terminalId), { timeout: 10_000 }).toContain(text);
+  }
+
+  test("pastes images from two panes into their own terminals as uploaded host files", async ({
+    page,
+  }) => {
+    const secondPage = await page.context().newPage();
+    const first = await openFileReceiver(page, "image-paste-a");
+    const second = await openFileReceiver(secondPage, "image-paste-b");
+    try {
+      await Promise.all([pasteImage(page, pngBytes(1)), pasteImage(secondPage, pngBytes(2))]);
+
+      await expectTerminalOutput(first.id, fileRead(pngBytes(1), "upload"));
+      await expectTerminalOutput(second.id, fileRead(pngBytes(2), "upload"));
+      expect(await terminalOutput(first.id)).not.toContain(fileRead(pngBytes(2), "upload"));
+      expect(await terminalOutput(second.id)).not.toContain(fileRead(pngBytes(1), "upload"));
+    } finally {
+      await secondPage.close();
+      await harness.killTerminal(first.id);
+      await harness.killTerminal(second.id);
+    }
+  });
+
+  test("uploads dropped files of any type when the host is another machine", async ({ page }) => {
+    const terminal = await openFileReceiver(page, "file-drop-remote");
+    const files = [
+      { name: "shot.png", type: "image/png", bytes: pngBytes(3) },
+      { name: "notes.txt", type: "text/plain", bytes: Buffer.from("remote notes") },
+    ];
+    try {
+      await dragFilesOver(page, files);
+      await expect(terminalDropOverlay(page)).toHaveCSS("opacity", "1");
+      await expect(terminalDropOverlay(page)).toHaveText("Drop files here");
+
+      await dropFiles(page, files);
+      await expect(terminalDropOverlay(page)).toHaveCSS("opacity", "0");
+
+      await expectTerminalOutput(terminal.id, fileRead(pngBytes(3), "upload"));
+      await expectTerminalOutput(terminal.id, fileRead(Buffer.from("remote notes"), "upload"));
+    } finally {
+      await harness.killTerminal(terminal.id);
+    }
+  });
+
+  test("pastes dropped files' own paths when the host is this machine", async ({ page }) => {
+    const files = [
+      { name: "local-shot.png", type: "image/png", bytes: pngBytes(9) },
+      { name: "local-notes.txt", type: "text/plain", bytes: Buffer.from("local notes") },
+    ];
+    for (const file of files) {
+      await writeFile(path.join(harness.tempRepo.path, file.name), file.bytes);
+    }
+    await installLocalDesktopHost(page, harness.tempRepo.path);
+    const terminal = await openFileReceiver(page, "file-drop-local");
+    try {
+      await dropFiles(page, files);
+
+      await expectTerminalOutput(terminal.id, fileRead(pngBytes(9), "local"));
+      await expectTerminalOutput(terminal.id, fileRead(Buffer.from("local notes"), "local"));
+      expect(await terminalOutput(terminal.id)).not.toContain(":upload");
+      await expect(page.getByTestId("terminal-file-uploading")).toHaveCount(0);
+    } finally {
+      await harness.killTerminal(terminal.id);
+    }
+  });
+
+  test("lands image pastes in gesture order while typing stays live", async ({ page }) => {
+    const upload = await holdFileUploadResponse(page);
+    const terminal = await openFileReceiver(page, "image-order");
+    try {
+      await pasteImage(page, pngBytes(4));
+      await upload.waitUntilHeld();
+      await pasteImage(page, pngBytes(5));
+      await expect(page.getByTestId("terminal-file-uploading")).toHaveText("Uploading file…");
+
+      await typeLine(page, "describe");
+      await expectTerminalOutput(terminal.id, "TYPED:describe");
+
+      upload.release();
+      await expectTerminalOutput(terminal.id, fileRead(pngBytes(5), "upload"));
+      const output = await terminalOutput(terminal.id);
+      expect(output.indexOf(fileRead(pngBytes(4), "upload"))).toBeGreaterThanOrEqual(0);
+      expect(output.indexOf(fileRead(pngBytes(4), "upload"))).toBeLessThan(
+        output.indexOf(fileRead(pngBytes(5), "upload")),
+      );
+      await expect(page.getByTestId("terminal-file-uploading")).toHaveCount(0);
+      await expect(page.getByTestId("app-toast-message")).toHaveText("File uploaded");
+    } finally {
+      await harness.killTerminal(terminal.id);
+    }
+  });
+
+  test("Ctrl+C abandons an image paste that is still uploading", async ({ page }) => {
+    const upload = await holdFileUploadResponse(page);
+    const terminal = await openFileReceiver(page, "image-cancel");
+    try {
+      await pasteImage(page, pngBytes(6));
+      await upload.waitUntilHeld();
+
+      await terminalInput(page).press("Control+c");
+      await expectTerminalOutput(terminal.id, "INTERRUPTED");
+      await expect(page.getByTestId("terminal-file-uploading")).toHaveCount(0);
+      upload.release();
+
+      await pasteImage(page, pngBytes(7));
+      await expectTerminalOutput(terminal.id, fileRead(pngBytes(7), "upload"));
+      expect(await terminalOutput(terminal.id)).not.toContain(fileRead(pngBytes(6), "upload"));
+    } finally {
+      await harness.killTerminal(terminal.id);
+    }
+  });
+
+  test("a disconnect during upload reports one failure and input keeps working", async ({
+    page,
+  }) => {
+    const upload = await holdFileUploadResponse(page);
+    const terminal = await openFileReceiver(page, "image-disconnect");
+    try {
+      await pasteImage(page, pngBytes(8));
+      await upload.waitUntilHeld();
+
+      await upload.disconnect();
+      await expect(page.getByTestId("app-toast-message")).toHaveText(
+        "Failed to paste file: Host is not connected",
+      );
+
+      await typeLine(page, "after");
+      await expectTerminalOutput(terminal.id, "TYPED:after");
+      expect(await terminalOutput(terminal.id)).not.toContain(fileRead(pngBytes(8), "upload"));
+    } finally {
+      await harness.killTerminal(terminal.id);
+    }
+  });
 });
@@ -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 }) => {
@@ -404,7 +404,7 @@ async function fetchWorkspaceStatuses(
 }

 test.describe("Workspace model restart regressions", () => {
-  test("browser-created same-cwd workspace preserves restarted agent status and migrated tab ownership", async ({
+  test("browser-created same-cwd workspace preserves repaired restart status and migrated tab ownership", async ({
    page,
    baseURL,
  }) => {
@@ -423,9 +423,13 @@ test.describe("Workspace model restart regressions", () => {
        .toMatchObject({
          id: LEGACY_AGENT_ID,
          workspaceId: seeded.workspaceA,
-          status: "running",
+          status: "closed",
        });

+      await expect
+        .poll(() => fetchWorkspaceStatuses(client, [seeded.workspaceA, seeded.workspaceB]))
+        .toEqual({ [seeded.workspaceA]: "done", [seeded.workspaceB]: "done" });
+
      await page.goto(buildHostWorkspaceRoute(serverId, seeded.workspaceA));
      await waitForSidebarHydration(page);
      await expectWorkspaceRowDoesNotShowIndicator(page, {
@@ -472,15 +476,11 @@ test.describe("Workspace model restart regressions", () => {
          ]),
        )
        .toMatchObject({
+          [seeded.workspaceA]: "done",
          [seeded.workspaceB]: "done",
          [createdWorkspaceId]: "done",
        });

-      // The restarted provider session may settle while the browser creates the sibling. Its
-      // initial running status is asserted above; this phase verifies that ownership never moves.
-      const workspaceStatuses = await fetchWorkspaceStatuses(client, [seeded.workspaceA]);
-      expect(["running", "done"]).toContain(workspaceStatuses[seeded.workspaceA]);
-
      await expectWorkspaceRowDoesNotShowIndicator(page, {
        serverId,
        workspaceId: seeded.workspaceB,
@@ -11,6 +11,7 @@ import {
  expectWorkspaceTabVisible,
  openWorkspaceWithAgents,
 } from "../support/helpers/archive-tab";
+import { expectAgentAbsentFromWorkspaceLayout } from "../support/helpers/workspace-layout";
 import { clickNewChat } from "../support/helpers/launcher";
 import { expectComposerVisible } from "../support/helpers/composer";
 import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
@@ -93,10 +94,20 @@ async function closeFirstVisibleDraftTab(page: Page): Promise<void> {
  await closeButton.first().click();
 }

+async function openWorkspaceTabUrl(page: Page, route: string): Promise<void> {
+  await page.evaluate((url) => {
+    window.history.pushState(null, "", url);
+    window.dispatchEvent(new PopStateEvent("popstate"));
+  }, route);
+  await expectAppRoute(page, route.split("?")[0]);
+}
+
 test.describe("Workspace navigation regression", () => {
  test.describe.configure({ timeout: 240_000 });

-  test("opens a notification's workspace on a different offline host", async ({ page }) => {
+  test("keeps an offline notification on the agent route until the host connects", async ({
+    page,
+  }) => {
    const target = {
      serverId: "notification-offline-host",
      workspaceId: "notification-workspace",
@@ -123,14 +134,33 @@ test.describe("Workspace navigation regression", () => {
      );
    }, target);

-    await expectAppRoute(
-      page,
-      buildHostWorkspaceOpenRoute(target.serverId, target.workspaceId, `agent:${target.agentId}`),
-      { timeout: 30_000 },
-    );
-    await expect(page.getByText("Connecting", { exact: true })).toBeVisible();
-    await expect(page.getByText("Notification Host", { exact: true })).toBeVisible();
-    await expect(page.getByText("Add a project", { exact: true })).toHaveCount(0);
+    await expectAppRoute(page, buildHostAgentDetailRoute(target.serverId, target.agentId), {
+      timeout: 30_000,
+    });
+    await expect(page.getByTestId("agent-route-waiting-for-host")).toBeVisible();
+    await expect(page.getByText(/Notification Host/).first()).toBeVisible();
+  });
+
+  test("cold agent targets hydrate their workspace without opening the compact sidebar", async ({
+    page,
+  }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "notification-cold-compact-" });
+    try {
+      const agent = await createMockIdleAgent(workspace.client, {
+        cwd: workspace.repoPath,
+        workspaceId: workspace.workspaceId,
+        title: "Cold notification agent",
+      });
+      await page.setViewportSize({ width: 390, height: 844 });
+      await gotoAppShell(page);
+      await page.goto(buildHostAgentDetailRoute(getServerId(), agent.id));
+      await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), workspace.workspaceId), {
+        timeout: 30_000,
+      });
+      await expectComposerVisible(page);
+    } finally {
+      await workspace.cleanup();
+    }
  });

  test("shows the New launcher after returning from settings and closing the last agent draft tab", async ({
@@ -321,7 +351,7 @@ test.describe("Workspace navigation regression", () => {
    }
  });

-  test("sidebar navigation and reload keep workspace selection and tabs aligned", async ({
+  test("a stale notification workspace preserves retained workspace selection and tabs", async ({
    page,
  }) => {
    const serverId = getServerId();
@@ -435,7 +465,7 @@ test.describe("Workspace navigation regression", () => {
            }),
          );
        },
-        { agentId: secondAgent.id, serverId, workspaceId: secondWorkspace.workspaceId },
+        { agentId: secondAgent.id, serverId, workspaceId: firstWorkspace.workspaceId },
      );
      await waitForWorkspaceTabsVisible(page);
      await expect(page).toHaveURL(buildHostWorkspaceRoute(serverId, secondWorkspace.workspaceId), {
@@ -463,6 +493,22 @@ test.describe("Workspace navigation regression", () => {
      await expect(secondDeckEntry).toBeHidden();
      await expectWorkspaceDeckEntryCount(page, 2);

+      await expectAgentAbsentFromWorkspaceLayout(page, {
+        serverId,
+        workspaceId: firstWorkspace.workspaceId,
+        agentId: secondAgent.id,
+      });
+      await openWorkspaceTabUrl(
+        page,
+        buildHostWorkspaceOpenRoute(serverId, firstWorkspace.workspaceId, `agent:${firstAgent.id}`),
+      );
+      await expectWorkspaceTabVisible(page, firstAgent.id);
+      await expectAgentAbsentFromWorkspaceLayout(page, {
+        serverId,
+        workspaceId: secondWorkspace.workspaceId,
+        agentId: firstAgent.id,
+      });
+
      await page.reload();
      await waitForSidebarHydration(page);
      await waitForWorkspaceTabsVisible(page);
@@ -3,6 +3,7 @@ import { test, expect } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { getServerId } from "../support/helpers/server-id";
+import { revealSidebarProjectWorkspaces } from "../support/helpers/sidebar";
 import {
  expectSidebarWorkspaceSelected,
  switchWorkspaceViaSidebar,
@@ -46,6 +47,7 @@ test("previous and next traverse every visible workspace while digit shortcuts s
    }
    await page.setViewportSize({ width: 1440, height: 1100 });
    await gotoAppShell(page);
+    await revealSidebarProjectWorkspaces(page, project.projectKey);
    const order = await readVisibleWorkspaceOrder(page);

    await test.step("next crosses the ninth workspace and previous returns to it", async () => {
@@ -68,7 +70,25 @@ test("previous and next traverse every visible workspace while digit shortcuts s
        workspaceId: order[8],
      });
    });
+    await test.step("hidden Done rows remain shortcut targets without expanding the project", async () => {
+      await expectHiddenWorkspaceShortcuts(page, order);
+    });
  } finally {
    await project.cleanup();
  }
 });
+
+async function expectHiddenWorkspaceShortcuts(page: Page, order: string[]) {
+  await page.getByLabel("Show less", { exact: true }).click();
+  const rows = page.getByRole("button", { name: /^Workspace \d{2}$/ });
+  await expect(rows).toHaveCount(7);
+  await switchWorkspaceViaSidebar({ page, serverId: getServerId(), workspaceId: order[0] });
+  await page.keyboard.press("Alt+9");
+  await expect(page).toHaveURL(new RegExp(`/workspace/${order[8]}$`));
+  await expect(page.getByTestId(`sidebar-workspace-row-${getServerId()}:${order[8]}`)).toHaveCount(
+    0,
+  );
+  await page.keyboard.press("Alt+]");
+  await expect(page).toHaveURL(new RegExp(`/workspace/${order[9]}$`));
+  await expect(rows).toHaveCount(7);
+}
@@ -2,6 +2,7 @@ import { test, expect } from "../support/fixtures";
 import { createTempGitRepo } from "../support/helpers/workspace";
 import {
  connectWorkspaceSetupClient,
+  setupCommandOutput,
  createWorkspaceThroughDaemon,
  openWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
@@ -33,7 +34,9 @@ test("scripts menu resizes when a service row grows after launch", async ({ page
    await seedProjectForWorkspaceSetup(client, repo.path);
    const completed = waitForWorkspaceSetupProgress(
      client,
-      (payload) => payload.status === "completed" && payload.detail.log.includes("setup complete"),
+      (payload) =>
+        payload.status === "completed" &&
+        setupCommandOutput(payload.detail).includes("setup complete"),
    );
    const workspace = await createWorkspaceThroughDaemon(client, {
      cwd: repo.path,
@@ -18,6 +18,7 @@ import {
 } from "../support/helpers/terminal-perf";
 import {
  connectWorkspaceSetupClient,
+  setupCommandOutput,
  createWorkspaceThroughDaemon,
  expectSetupPanel,
  openHomeWithProject,
@@ -28,6 +29,7 @@ import {
  closeWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
  waitForWorkspaceSetupProgress,
+  observeSetupPanelTraffic,
 } from "../support/helpers/workspace-setup";

 interface WorkspaceScriptStarter {
@@ -91,7 +93,8 @@ test.describe("Workspace setup streaming", () => {
      const completed = waitForWorkspaceSetupProgress(
        client,
        (payload) =>
-          payload.status === "completed" && payload.detail.log.includes("setup complete"),
+          payload.status === "completed" &&
+          setupCommandOutput(payload.detail).includes("setup complete"),
      );
      const workspace = await createWorkspaceThroughDaemon(client, {
        cwd: repo.path,
@@ -116,6 +119,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-", {
@@ -130,16 +172,19 @@ test.describe("Workspace setup streaming", () => {
      await seedProjectForWorkspaceSetup(client, repo.path);
      const initialRunning = waitForWorkspaceSetupProgress(
        client,
-        (payload) => payload.status === "running" && payload.detail.log === "",
+        (payload) => payload.status === "running" && payload.detail.commands.length === 0,
      );
      const runningWithOutput = waitForWorkspaceSetupProgress(
        client,
-        (payload) => payload.status === "running" && payload.detail.log.includes("starting setup"),
+        (payload) =>
+          payload.status === "running" &&
+          setupCommandOutput(payload.detail).includes("starting setup"),
      );
      const completed = waitForWorkspaceSetupProgress(
        client,
        (payload) =>
-          payload.status === "completed" && payload.detail.log.includes("setup complete"),
+          payload.status === "completed" &&
+          setupCommandOutput(payload.detail).includes("setup complete"),
      );

      await createWorkspaceThroughDaemon(client, {
@@ -152,8 +197,8 @@ test.describe("Workspace setup streaming", () => {
      const completedPayload = await completed;

      expect(initialPayload.detail.log).toBe("");
-      expect(runningPayload.detail.log).toContain("starting setup");
-      expect(completedPayload.detail.log).toContain("setup complete");
+      expect(setupCommandOutput(runningPayload.detail)).toContain("starting setup");
+      expect(setupCommandOutput(completedPayload.detail)).toContain("setup complete");
      expect(completedPayload.error).toBeNull();
    } finally {
      await client.close();
@@ -175,7 +220,9 @@ test.describe("Workspace setup streaming", () => {
      await seedProjectForWorkspaceSetup(client, repo.path);
      const failed = waitForWorkspaceSetupProgress(
        client,
-        (payload) => payload.status === "failed" && payload.detail.log.includes("setup failed"),
+        (payload) =>
+          payload.status === "failed" &&
+          setupCommandOutput(payload.detail).includes("setup failed"),
      );

      const workspace = await createWorkspaceThroughDaemon(client, {
@@ -184,8 +231,8 @@ test.describe("Workspace setup streaming", () => {
      });

      const failedPayload = await failed;
-      expect(failedPayload.detail.log).toContain("starting setup");
-      expect(failedPayload.detail.log).toContain("setup failed");
+      expect(setupCommandOutput(failedPayload.detail)).toContain("starting setup");
+      expect(setupCommandOutput(failedPayload.detail)).toContain("setup failed");
      expect(failedPayload.error).toMatch(/failed/i);

      await openHomeWithProject(page, repo.path);
@@ -291,7 +338,8 @@ test.describe("Workspace setup streaming", () => {
      const completed = waitForWorkspaceSetupProgress(
        client,
        (payload) =>
-          payload.status === "completed" && payload.detail.log.includes("setup complete"),
+          payload.status === "completed" &&
+          setupCommandOutput(payload.detail).includes("setup complete"),
      );
      const workspace = await createWorkspaceThroughDaemon(client, {
        cwd: repo.path,
@@ -337,7 +385,8 @@ test.describe("Workspace setup streaming", () => {
      const completed = waitForWorkspaceSetupProgress(
        client,
        (payload) =>
-          payload.status === "completed" && payload.detail.log.includes("setup complete"),
+          payload.status === "completed" &&
+          setupCommandOutput(payload.detail).includes("setup complete"),
      );

      const result = await client.createPaseoWorktree({
@@ -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
@@ -2,7 +2,8 @@ context platform=ios timeout=60000 retries=0
 env APP_ID=sh.paseo.debug

 # Start with the sidebar closed. WORKSPACE_ROW is the testID of a visible,
-# unselected workspace row. Hold past drag arming (180ms), below menu opening (450ms).
+# unselected PINNED workspace row. Ordinary workspace rows are not draggable.
+# Hold past drag arming (180ms), then release.
 open "${APP_ID}"
 press "label=\"Open menu\""
 wait "id=\"${WORKSPACE_ROW}\"" 10000
@@ -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,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>
+  );
+}
@@ -35,7 +35,8 @@ export const test = base.extend<{
 import { readFile, rm } from "node:fs/promises";
 export default function contribute(server) {
  return server.before("agent.session_open", async ({ request }) => {
-    if (request.reason !== "create") return request;
+    // Metadata helpers have no workspace and must not consume the one-shot failure.
+    if (request.reason !== "create" || !request.workspaceId) return request;
    const gate = ${JSON.stringify(gate)};
    let command = await readFile(gate, "utf8").catch(() => "release");
    while (command === "hold") {
@@ -0,0 +1,15 @@
+const HIDE_DEVELOPER_TOASTS = "#error-toast { display: none !important; }";
+
+/** @param {import('@playwright/test').Page} page */
+export async function hideDeveloperToasts(page) {
+  // Developer chrome must not cover app actions or move the test's pointer/focus.
+  // Console errors remain in the runner's logs. Hiding the toast, instead of clicking it away,
+  // leaves no race with a toast that closes or is replaced between matching and clicking.
+  await page.addInitScript((css) => {
+    const style = document.createElement("style");
+    style.textContent = css;
+    document.addEventListener("DOMContentLoaded", () => document.head.append(style));
+  }, HIDE_DEVELOPER_TOASTS);
+  // A page attached after it loaded (Electron over CDP) runs no init script until it navigates.
+  await page.addStyleTag({ content: HIDE_DEVELOPER_TOASTS });
+}
@@ -1,4 +1,5 @@
 import { test as base, expect, type Page } from "@playwright/test";
+import { hideDeveloperToasts } 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 hideDeveloperToasts(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"],
@@ -18,10 +18,29 @@ export async function openCommandCenterForAgent(
  workspace: Pick<MockAgentWorkspace, "workspaceId" | "agentId">,
 ): Promise<Locator> {
  await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: workspace.agentId });
+  await expect(
+    page.getByRole("button", { name: /^Select agent mode \(/ }).filter({ visible: true }),
+  ).toBeVisible({ timeout: 30_000 });
  const panel = await openCommandCenter(page);
  return panel.getByTestId("command-center-input");
 }

+/**
+ * Types a query that matches both the agent's modes and its models, and waits until rows from both
+ * groups are listed. The agent's controls register after the panel opens; a key pressed before
+ * then lands on whatever else matched, such as file search.
+ */
+export async function searchAgentControls(page: Page, query: string): Promise<void> {
+  const panel = page.getByTestId("command-center-panel");
+  await panel.getByTestId("command-center-input").fill(query);
+  await expect(panel.getByRole("button", { name: /^Mode › / }).first()).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(panel.getByRole("button", { name: /^Model › / }).first()).toBeVisible({
+    timeout: 30_000,
+  });
+}
+
 export async function chooseCommandCenterAgentControl(input: {
  page: Page;
  query: 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,
@@ -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;
 }

@@ -17,6 +17,7 @@ import {
  workspaceDeckEntryLocator,
 } from "./workspace-ui";
 import { getServerId } from "./server-id";
+import { revealSidebarProjectWorkspaces } from "./sidebar";
 import { WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES } from "@/screens/workspace/workspace-deck-retention";
 import type { installDaemonWebSocketGate } from "./daemon-websocket-gate";

@@ -282,6 +283,7 @@ export async function createCreationScenario(page: Page) {
        });
      }
      await expect(workspaceDeckEntryLocator(page, getServerId(), workspaceId)).toHaveCount(0);
+      await revealSidebarProjectWorkspaces(page, project.projectKey);
      await switchWorkspaceViaSidebar({ page, serverId: getServerId(), workspaceId });
      await page
        .getByTestId(draftTestId!)
@@ -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;
@@ -0,0 +1,44 @@
+import type { Page, WebSocketRoute } from "@playwright/test";
+import { daemonWsRoutePattern } from "./daemon-port";
+
+type WebSocketMessage = string | Buffer;
+
+function isFileUploadResponse(message: WebSocketMessage): boolean {
+  if (typeof message !== "string") return false;
+  try {
+    const envelope = JSON.parse(message) as { type?: unknown; message?: { type?: unknown } };
+    return (envelope.message ?? envelope).type === "file.upload.response";
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Holds the daemon's first `file.upload.response`, so the upload is stored on
+ * the host but the app still sees it in flight.
+ */
+export async function holdFileUploadResponse(page: Page) {
+  let held: { browser: WebSocketRoute; message: WebSocketMessage } | null = null;
+  let resolveHeld: (() => void) | null = null;
+  const heldResponse = new Promise<void>((resolve) => {
+    resolveHeld = resolve;
+  });
+  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
+    const server = browser.connectToServer();
+    browser.onMessage((message) => server.send(message));
+    server.onMessage((message) => {
+      if (held || !isFileUploadResponse(message)) {
+        browser.send(message);
+        return;
+      }
+      held = { browser, message };
+      resolveHeld?.();
+    });
+  });
+  return {
+    waitUntilHeld: () => heldResponse,
+    release: () => held?.browser.send(held.message),
+    /** Drops the app's connection while the upload is in flight. */
+    disconnect: () => held?.browser.close({ code: 1001, reason: "Upload gate disconnect" }),
+  };
+}
@@ -0,0 +1,38 @@
+import type { Page } from "@playwright/test";
+
+// Poses as the desktop app running the e2e daemon as its own managed daemon, so
+// `useIsLocalDaemon` reports the host as this machine. `directory` is where the
+// desktop bridge claims dropped files live on disk.
+export async function installLocalDesktopHost(page: Page, directory: string): Promise<void> {
+  const serverId = process.env.E2E_SERVER_ID;
+  if (!serverId) {
+    throw new Error("E2E_SERVER_ID is not set");
+  }
+  await page.addInitScript(
+    (localHost: { serverId: string; directory: string }) => {
+      (window as unknown as { paseoDesktop: unknown }).paseoDesktop = {
+        platform: "linux",
+        invoke: async (command: string) => {
+          if (command === "desktop_daemon_status") {
+            return {
+              serverId: localHost.serverId,
+              status: "running",
+              listen: null,
+              hostname: null,
+              pid: null,
+              home: "",
+              version: null,
+              desktopManaged: true,
+              error: null,
+            };
+          }
+          return null;
+        },
+        getPendingOpenProject: async () => null,
+        events: { on: async () => () => undefined },
+        webUtils: { getPathForFile: (file: File) => `${localHost.directory}/${file.name}` },
+      };
+    },
+    { serverId, directory },
+  );
+}
@@ -0,0 +1,76 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, type Page } from "@playwright/test";
+import { pluginRequirements } from "./plugin-fixture";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { expectFileTabOpen, openFileFromExplorer } from "./file-explorer";
+
+/** A directory plugin whose "Rich Markdown" file panel claims `.md`, next to the built-in. */
+export const MARKDOWN_PANEL_PLUGIN_ID = "file-panel-picker-e2e";
+export const MARKDOWN_PANEL_ID = `plugin:${MARKDOWN_PANEL_PLUGIN_ID}/rich-markdown`;
+export const BUILTIN_MARKDOWN_OPTION = "Markdown — Paseo";
+export const PLUGIN_MARKDOWN_OPTION = `Rich Markdown — ${MARKDOWN_PANEL_PLUGIN_ID}`;
+
+const SOURCE = `import React from "react";
+import { Text, View } from "react-native";
+function RichMarkdown({ file }) {
+  return <View><Text>Rich Markdown plugin: {file.name}</Text></View>;
+}
+export default function contribute(client) {
+  client.addFilePanel({ id: "rich-markdown", title: "Rich Markdown", icon: "FileType",
+    files: { extensions: ["md"] }, Component: RichMarkdown });
+  return () => {};
+}`;
+
+/** Enables plugins on the test daemon and installs the plugin; `uninstall` restores both. */
+export async function installMarkdownPanelPlugin(): Promise<{ uninstall(): Promise<void> }> {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-markdown-file-panel-"));
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previousConfig = await client.getDaemonConfig();
+  const uninstall = async () => {
+    await client.removePlugin(MARKDOWN_PANEL_PLUGIN_ID);
+    await client.patchDaemonConfig({
+      pluginsEnabled: previousConfig.config.pluginsEnabled ?? false,
+    });
+    await client.close();
+    await rm(directory, { recursive: true, force: true });
+  };
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: MARKDOWN_PANEL_PLUGIN_ID, requirements: pluginRequirements }),
+    );
+    await writeFile(path.join(directory, "index.client.tsx"), SOURCE);
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+  } catch (error) {
+    await uninstall();
+    throw error;
+  }
+  return { uninstall };
+}
+
+export function filePanelPicker(page: Page) {
+  return page.getByText("Open .md files with", { exact: true });
+}
+
+export async function openMarkdown(page: Page, name: string): Promise<void> {
+  await openFileFromExplorer(page, name);
+  await expectFileTabOpen(page, name);
+}
+
+export async function expectBuiltinMarkdown(page: Page, heading: string): Promise<void> {
+  await expect(page.getByRole("heading", { name: heading, exact: true })).toBeVisible();
+}
+
+export async function expectPluginMarkdown(page: Page, name: string): Promise<void> {
+  await expect(page.getByText(`Rich Markdown plugin: ${name}`, { exact: true })).toBeVisible();
+}
+
+export async function storedFilePanelAssociations(page: Page): Promise<unknown> {
+  return page.evaluate(() => {
+    const settings = JSON.parse(localStorage.getItem("@paseo:app-settings") ?? "{}");
+    return settings.filePanelAssociations ?? {};
+  });
+}
@@ -1,11 +1,17 @@
 import { mkdtemp, mkdir, writeFile, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import type { Locator } from "@playwright/test";
+import type { Locator, TestInfo } from "@playwright/test";
 import { test, expect, type Page } from "@playwright/test";
 import { gotoAppShell } from "./app";
 import { buildAgentRoute } from "./mock-agent";
 import { openCommandCenter } from "./command-center";
+import {
+  closeCompactWorkspaceMenu,
+  compactWorkspaceMenu,
+  goBackInMenu,
+  openCompactWorkspaceMenu,
+} from "./compact-workspace-scripts";
 import { connectNewWorkspaceDaemonClient } from "./new-workspace";
 import { seedWorkspace } from "./seed-client";
 import { pluginRequirements } from "./plugin-fixture";
@@ -60,7 +66,7 @@ export default function contribute(client) {
  let finishReview = () => {};
  let attempts = 0;
  const action = { kind: "action", async onPress() {
-    if (++attempts === 1) throw new Error("Deployment failed. Try again.");
+    if (++attempts % 2 === 1) throw new Error("Deployment failed. Try again.");
    await new Promise((resolve) => { finish = resolve; });
    deploy.update({ label: "Deployed" });
  } };
@@ -165,6 +171,13 @@ async function command(page: Page, title: string) {
  await expect(panel).not.toBeVisible();
 }

+/** The command center opens from the sidebar, which compact layouts keep closed. */
+async function commandFromCompact(page: Page, title: string) {
+  await page.setViewportSize(WIDE);
+  await command(page, title);
+  await page.setViewportSize(COMPACT);
+}
+
 async function expectSurfaceVisible(
  page: Page,
  subject: Locator = page.getByRole("toolbar", { name: "Workspace actions", exact: true }),
@@ -176,6 +189,61 @@ async function expectDetails(page: Page) {
  await expect(page.getByText("All systems operational", { exact: true })).toBeInViewport();
 }

+function workspaceMenuRow(page: Page, title: string): Locator {
+  return compactWorkspaceMenu(page).getByRole("menuitem", { name: title, exact: true });
+}
+
+async function expectWorkspaceMenuRows(page: Page, titles: readonly string[]) {
+  const rows = compactWorkspaceMenu(page).getByRole("menuitem");
+  for (const [index, title] of titles.entries()) {
+    await expect(rows.nth(index)).toHaveAccessibleName(title);
+  }
+}
+
+async function chooseInWorkspaceMenu(page: Page, title: string) {
+  await workspaceMenuRow(page, title).click();
+}
+
+async function expectWorkspaceMenuClosed(page: Page) {
+  await expect(compactWorkspaceMenu(page)).toBeHidden({ timeout: 10_000 });
+}
+
+async function expectCompactDetails(page: Page) {
+  const menu = compactWorkspaceMenu(page);
+  await expect(menu.getByText("All systems operational", { exact: true })).toBeInViewport();
+  await expect(menu.getByText("Presentation: compact", { exact: true })).toBeVisible();
+}
+
+/** Resolves once `subject` renders the same pixels twice in a row: entering animations are done. */
+async function expectStill(subject: Locator) {
+  let previous: Buffer | null = null;
+  await expect
+    .poll(
+      async () => {
+        const current = await subject.screenshot();
+        const still = previous !== null && current.equals(previous);
+        previous = current;
+        return still;
+      },
+      { intervals: [150] },
+    )
+    .toBe(true);
+}
+
+/** Attaches the screen once per colour scheme, for review alongside the run. */
+async function captureSchemes(page: Page, info: TestInfo, name: string, subject: Locator) {
+  for (const colorScheme of ["light", "dark"] as const) {
+    await page.emulateMedia({ colorScheme });
+    await expectStill(subject);
+    const file = info.outputPath(`${name}-${colorScheme}.png`);
+    await info.attach(`${name}-${colorScheme}`, {
+      body: await page.screenshot({ path: file }),
+      contentType: "image/png",
+    });
+  }
+  await page.emulateMedia({ colorScheme: "light" });
+}
+
 async function expectHeaderTextTruncated(page: Page) {
  const title = page.getByTestId("workspace-header-title");
  const subtitle = page.getByTestId("workspace-header-subtitle");
@@ -204,10 +272,12 @@ async function expectHeaderTextTruncated(page: Page) {

 export async function withButtonShowcase(
  page: Page,
+  info: TestInfo,
  run: (buttons: {
    openWideMenusAndPopovers(): Promise<void>;
    runAndUpdateActions(): Promise<void>;
    openCompactSheets(): Promise<void>;
+    useCompactWorkspaceMenu(): Promise<void>;
    hideAndUnloadOpenButtons(): Promise<void>;
    verifyObservationLifetime(): Promise<void>;
  }) => Promise<void>,
@@ -284,6 +354,12 @@ export async function withButtonShowcase(
              .getByTestId("plugin-button-chevron"),
          ).toHaveCount(0);
          await expectSurfaceVisible(page);
+          await captureSchemes(
+            page,
+            info,
+            "desktop-wide-header",
+            page.getByRole("toolbar", { name: "Workspace actions", exact: true }),
+          );
          await press(page, "Header checks");
          await expect(
            page.getByRole("menuitem", { name: "Run checks", exact: true }),
@@ -303,6 +379,12 @@ export async function withButtonShowcase(
          await expect(
            page.getByRole("menuitem", { name: "Production locked", exact: true }),
          ).toBeDisabled();
+          await captureSchemes(
+            page,
+            info,
+            "desktop-overflow",
+            page.getByRole("menuitem", { name: "Production locked", exact: true }),
+          );
          await expectSurfaceVisible(
            page,
            page.getByRole("menuitem", { name: "Production locked", exact: true }),
@@ -372,7 +454,19 @@ export async function withButtonShowcase(
          await expectSurfaceVisible(page);
          await command(page, "Enable example buttons");
          await command(page, "Use icon-only header");
+          await expect(
+            page.getByRole("button", { name: "Deploy application", exact: true }),
+          ).toHaveText("");
          await expectSurfaceVisible(page);
+          await expect(
+            page.getByText("Deployment failed. Try again.", { exact: true }),
+          ).toHaveCount(0);
+          await captureSchemes(
+            page,
+            info,
+            "desktop-icon-only-header",
+            page.getByRole("toolbar", { name: "Workspace actions", exact: true }),
+          );
          await command(page, "Hide review button");
          await expect(page.getByRole("button", { name: "Run review", exact: true })).toHaveCount(
            0,
@@ -383,7 +477,7 @@ export async function withButtonShowcase(
          );
        }),
      openCompactSheets: () =>
-        test.step("compact header omits plugin actions while composer triggers open sheets", async () => {
+        test.step("compact header leaves plugin actions to the workspace menu while composer triggers open sheets", async () => {
          await page.setViewportSize(COMPACT);
          await expect(page.getByTestId("plugin-button-chevron")).toHaveCount(0);
          await expect(
@@ -422,6 +516,98 @@ export async function withButtonShowcase(
          );
          await choose(page, "Run checks");
        }),
+      useCompactWorkspaceMenu: () =>
+        test.step("compact workspace menu carries header buttons with their actions, menus, and content", async () => {
+          await openCompactWorkspaceMenu(page);
+          await expectWorkspaceMenuRows(page, [
+            "Deploy application",
+            "Header checks",
+            "Header status",
+            "Open deployment logs",
+            "Production locked",
+            "Copy workspace path",
+          ]);
+          await expect(workspaceMenuRow(page, "Production locked")).toBeDisabled();
+          // Deploy lost its label to "Use icon-only header" and logs never had one; rows read titles.
+          await expect(workspaceMenuRow(page, "Deploy application")).toHaveText(
+            "Deploy application",
+          );
+          await expect(workspaceMenuRow(page, "Open deployment logs")).toHaveText(
+            "Open deployment logs",
+          );
+          await captureSchemes(page, info, "compact-root-icon-only", compactWorkspaceMenu(page));
+
+          await showcase.setTitle("Compact checks");
+          await expect(workspaceMenuRow(page, "Deploy application")).toHaveCount(0);
+          await showcase.setTitle("Button showcase");
+          await expect(workspaceMenuRow(page, "Deploy application")).toBeVisible();
+
+          await chooseInWorkspaceMenu(page, "Deploy application");
+          await expectWorkspaceMenuClosed(page);
+          await expect(
+            page.getByText("Deployment failed. Try again.", { exact: true }),
+          ).toBeVisible();
+          await openCompactWorkspaceMenu(page);
+          await chooseInWorkspaceMenu(page, "Deploy application");
+          await expectWorkspaceMenuClosed(page);
+          await openCompactWorkspaceMenu(page);
+          await expect(workspaceMenuRow(page, "Deploy application")).toBeDisabled();
+          await captureSchemes(page, info, "compact-row-states", compactWorkspaceMenu(page));
+          await closeCompactWorkspaceMenu(page);
+          await commandFromCompact(page, "Finish deployment");
+          await openCompactWorkspaceMenu(page);
+          await expect(workspaceMenuRow(page, "Deploy application")).toBeEnabled();
+          await captureSchemes(page, info, "compact-root", compactWorkspaceMenu(page));
+
+          await chooseInWorkspaceMenu(page, "Header checks");
+          await expectWorkspaceMenuRows(page, ["Run checks", "Environment", "Deployment details"]);
+          await captureSchemes(page, info, "compact-header-checks", compactWorkspaceMenu(page));
+          await goBackInMenu(page);
+          await expect(workspaceMenuRow(page, "Header status")).toBeVisible();
+          await chooseInWorkspaceMenu(page, "Header checks");
+          await chooseInWorkspaceMenu(page, "Environment");
+          await expectWorkspaceMenuRows(page, ["Staging", "Production"]);
+          await expect(workspaceMenuRow(page, "Production")).toBeDisabled();
+          await captureSchemes(page, info, "compact-environment", compactWorkspaceMenu(page));
+          await goBackInMenu(page);
+          await expect(workspaceMenuRow(page, "Run checks")).toBeVisible();
+          await goBackInMenu(page);
+          await expect(workspaceMenuRow(page, "Header checks")).toBeVisible();
+
+          await chooseInWorkspaceMenu(page, "Header checks");
+          await chooseInWorkspaceMenu(page, "Deployment details");
+          await expectCompactDetails(page);
+          await captureSchemes(
+            page,
+            info,
+            "compact-deployment-details",
+            compactWorkspaceMenu(page),
+          );
+          await goBackInMenu(page);
+          await expect(workspaceMenuRow(page, "Run checks")).toBeVisible();
+          await chooseInWorkspaceMenu(page, "Deployment details");
+          await expectCompactDetails(page);
+          await press(page, "Close deployment details");
+          await expectWorkspaceMenuClosed(page);
+
+          await openCompactWorkspaceMenu(page);
+          await chooseInWorkspaceMenu(page, "Header status");
+          await expectCompactDetails(page);
+          await captureSchemes(page, info, "compact-header-status", compactWorkspaceMenu(page));
+          await press(page, "Fail button content");
+          await expect(
+            compactWorkspaceMenu(page).getByText("Plugin failed: Button content failed", {
+              exact: true,
+            }),
+          ).toBeVisible();
+          await goBackInMenu(page);
+          await expect(workspaceMenuRow(page, "Header status")).toBeVisible();
+          await chooseInWorkspaceMenu(page, "Open deployment logs");
+          await expectCompactDetails(page);
+          await captureSchemes(page, info, "compact-logs-popover", compactWorkspaceMenu(page));
+          await press(page, "Close deployment details");
+          await expectWorkspaceMenuClosed(page);
+        }),
      hideAndUnloadOpenButtons: () =>
        test.step("hiding an open button and unloading a plugin remove its surfaces", async () => {
          await page.setViewportSize(WIDE);
@@ -454,6 +640,12 @@ export async function withButtonShowcase(
            0,
          );
          await expect(page.getByText("All systems operational", { exact: true })).toHaveCount(0);
+          await page.setViewportSize(COMPACT);
+          await openCompactWorkspaceMenu(page);
+          await expect(workspaceMenuRow(page, "Header checks")).toHaveCount(0);
+          await expect(workspaceMenuRow(page, "Header status")).toHaveCount(0);
+          await closeCompactWorkspaceMenu(page);
+          await page.setViewportSize(WIDE);
          await showcase.setTitle("Healthy app after plugin unload");
          await expect(page.getByTestId("workspace-header-title")).toHaveText(
            "Healthy app after plugin unload",
@@ -2,7 +2,7 @@ import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { expect, type Page, type TestInfo } from "@playwright/test";
-import { pluginRequirements } from "./plugin-fixture";
+import { copyPluginExample, pluginRequirements } from "./plugin-fixture";
 import { connectNewWorkspaceDaemonClient } from "./new-workspace";
 import { openAgentRoute, seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";

@@ -274,3 +274,40 @@ export async function withPopoverTimelinePlugin(run: () => Promise<void>): Promi
    run,
  });
 }
+
+const THOUGHT =
+  "Need to find the scroll container, the layout effect that watches for new messages, and any gesture handler that might fight with programmatic scrolling. Probably a ref on the FlatList plus a near-bottom threshold.";
+
+/** Exercises the maintained inline-thinking renderer against real streamed reasoning. */
+export async function viewInlineThinkingExample(page: Page, info: TestInfo): Promise<void> {
+  info.setTimeout(120_000);
+  const example = await copyPluginExample("inline-thinking");
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await client.getDaemonConfig();
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "inline-thinking-",
+    title: "Inline thinking example",
+    model: "one-minute-stream",
+  });
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(example.directory);
+    await openAgentRoute(page, agent);
+    await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeVisible();
+    await requestPluginTimeline(agent);
+    const thought = page.getByText(/^Need to find the scroll container/);
+    await expect(thought).toBeVisible({ timeout: 60_000 });
+    await expect(thought).not.toHaveText(THOUGHT);
+    await info.attach("inline-thinking-streaming", {
+      body: await page.screenshot({ path: info.outputPath("inline-thinking-streaming.png") }),
+      contentType: "image/png",
+    });
+    await expect(thought).toHaveText(THOUGHT, { timeout: 30_000 });
+  } finally {
+    await client.removePlugin("inline-thinking");
+    await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
+    await client.close();
+    await agent.cleanup();
+    await example.cleanup();
+  }
+}
@@ -0,0 +1,164 @@
+import { hideDeveloperToasts } from "../developer-ui.mjs";
+import { seedWorkspace } from "./seed-client";
+import { buildAgentRoute } from "./mock-agent";
+import { openCommandCenter } from "./command-center";
+import type { TestInfo, BrowserContext } from "@playwright/test";
+import { expect, type Page } from "../fixtures";
+import { gotoAppShell, openSettings } from "./app";
+import { connectNewWorkspaceDaemonClient } from "./new-workspace";
+import { copyPluginExample } from "./plugin-fixture";
+
+async function chooseChinese(page: Page) {
+  await openSettings(page);
+  await page.getByRole("button", { name: "System", exact: true }).click();
+  await page.getByRole("menuitem", { name: "简体中文 - Simplified Chinese", exact: true }).click();
+  await page.goBack();
+}
+
+async function chooseEnglish(page: Page) {
+  await page.getByTestId("sidebar-settings").click();
+  await page.getByRole("button", { name: "简体中文", exact: true }).click();
+  await page.getByRole("menuitem", { name: "English - 英语", exact: true }).click();
+  await page.goBack();
+}
+
+async function capture(page: Page, info: TestInfo, name: string) {
+  const file = info.outputPath(`${name}.png`);
+  await page.screenshot({ path: file, animations: "disabled" });
+  await info.attach(name, { path: file, contentType: "image/png" });
+}
+
+export async function verifyPluginTranslations(page: Page, info: TestInfo) {
+  const example = await copyPluginExample("translations");
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const config = await client.getDaemonConfig();
+  const browser = page.context().browser();
+  if (!browser) throw new Error("Translation isolation requires a browser");
+  let secondContext: BrowserContext | undefined;
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(example.directory);
+    await page.setViewportSize({ width: 1440, height: 1000 });
+    await gotoAppShell(page);
+    await page.getByRole("button", { name: "Workspace notes", exact: true }).click();
+    await expect(page.getByText("App language: en", { exact: true })).toBeVisible();
+    await page
+      .getByRole("textbox", { name: "Your draft", exact: true })
+      .fill("Remember the language switch");
+    await capture(page, info, "01-english-draft");
+    await page.getByRole("button", { name: "Preview draft", exact: true }).click();
+    await expect(page.getByRole("button", { name: "Close preview", exact: true })).toBeVisible();
+    await capture(page, info, "02-english-preview");
+    await page.getByRole("button", { name: "Close preview", exact: true }).click();
+    secondContext = await browser.newContext({
+      storageState: await page.context().storageState(),
+      viewport: { width: 1440, height: 1000 },
+    });
+    const second = await secondContext.newPage();
+    await hideDeveloperToasts(second);
+    await second.goto(page.url());
+    await expect(second.getByText("App language: en", { exact: true })).toBeVisible();
+    await chooseChinese(second);
+    await expect(second.getByText("应用语言：zh-CN", { exact: true })).toBeVisible();
+    await second
+      .getByRole("textbox", { name: "你的草稿", exact: true })
+      .fill("A separate client draft");
+    await expect(page.getByText("App language: en", { exact: true })).toBeVisible();
+    await expect(page.getByTestId("plugin-surface-title")).toHaveText("Workspace notes");
+    await capture(second, info, "03-independent-chinese-client");
+    await chooseChinese(page);
+    await expect(page.getByRole("textbox", { name: "你的草稿", exact: true })).toHaveValue(
+      "Remember the language switch",
+    );
+    await expect(page.getByTestId("plugin-surface-title")).toHaveText("工作区笔记");
+    await expect(page.getByText("应用语言：zh-CN", { exact: true })).toBeVisible();
+    await expect(
+      page.getByText("This English-only message demonstrates fallback.", { exact: true }),
+    ).toBeVisible();
+    await capture(page, info, "04-chinese-draft-preserved");
+    await page.getByRole("button", { name: "预览草稿", exact: true }).click();
+    await expect(page.getByText("草稿预览", { exact: true })).toBeVisible();
+    await expect(page.getByRole("button", { name: "关闭预览", exact: true })).toBeVisible();
+    await capture(page, info, "05-chinese-preview");
+    await page.getByRole("button", { name: "关闭预览", exact: true }).click();
+    await chooseEnglish(page);
+    await expect(page.getByRole("textbox", { name: "Your draft", exact: true })).toHaveValue(
+      "Remember the language switch",
+    );
+    await expect(page.getByTestId("plugin-surface-title")).toHaveText("Workspace notes");
+    await expect(second.getByRole("textbox", { name: "你的草稿", exact: true })).toHaveValue(
+      "A separate client draft",
+    );
+    await capture(page, info, "06-return-to-english-draft-preserved");
+    await page.getByRole("button", { name: "Add note", exact: true }).click();
+    await expect(page.getByText("1 note", { exact: true })).toBeVisible();
+    await page.getByRole("textbox", { name: "Your draft", exact: true }).fill("Second note");
+    await page.getByRole("button", { name: "Add note", exact: true }).click();
+    await expect(page.getByText("2 notes", { exact: true })).toBeVisible();
+  } finally {
+    await secondContext?.close().catch(() => undefined);
+    await client.removePlugin("translation-notes").catch(() => undefined);
+    await client.patchDaemonConfig({ pluginsEnabled: config.config.pluginsEnabled });
+    await client.close();
+    await example.cleanup();
+  }
+}
+
+export async function verifyPluginToolTranslations(page: Page, info: TestInfo) {
+  const workspace = await seedWorkspace({
+    repoPrefix: "translation-tools-",
+    title: "Notes translation QA",
+  });
+  const agent = await workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.repoPath,
+    workspaceId: workspace.workspaceId,
+    title: "Notes",
+    model: "ten-second-stream",
+    modeId: "load-test",
+  });
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const config = await client.getDaemonConfig();
+  const example = await copyPluginExample("translations");
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(example.directory);
+    await page.setViewportSize({ width: 1440, height: 1000 });
+    await gotoAppShell(page);
+    await page.goto(buildAgentRoute(workspace.workspaceId, agent.id));
+    const commandCenter = await openCommandCenter(page);
+    await commandCenter.getByTestId("command-center-input").fill("Show notes tools");
+    await commandCenter.getByRole("button", { name: "Show notes tools", exact: true }).click();
+    const tools = page
+      .getByRole("toolbar", { name: "Workspace actions", exact: true })
+      .getByRole("button", { name: "Notes tools", exact: true });
+    await tools.hover();
+    await expect(page.getByRole("tooltip")).toContainText("Notes tools");
+    await capture(page, info, "07-english-tooltip");
+    await tools.click();
+    await page.getByRole("menuitem", { name: "Open notes panel", exact: true }).click();
+    await page
+      .getByRole("textbox", { name: "Your draft", exact: true })
+      .fill("A workspace panel draft");
+    await chooseChinese(page);
+    await expect(page.getByRole("textbox", { name: "你的草稿", exact: true })).toHaveValue(
+      "A workspace panel draft",
+    );
+    const translatedTools = page
+      .getByRole("toolbar")
+      .getByRole("button", { name: "笔记工具", exact: true });
+    await translatedTools.hover();
+    await expect(page.getByRole("tooltip")).toContainText("笔记工具");
+    await capture(page, info, "08-chinese-tooltip-and-panel-draft");
+    await translatedTools.click();
+    await expect(page.getByRole("menuitem", { name: "打开笔记面板", exact: true })).toBeVisible();
+    await capture(page, info, "09-chinese-menu");
+    await page.keyboard.press("Escape");
+  } finally {
+    await client.removePlugin("translation-notes").catch(() => undefined);
+    await client.patchDaemonConfig({ pluginsEnabled: config.config.pluginsEnabled });
+    await client.close();
+    await example.cleanup();
+    await workspace.cleanup();
+  }
+}
@@ -24,6 +24,7 @@ const SECTION_LABELS = {
  appearance: "Appearance",
  sidebar: "Sidebar",
  editor: "Editor",
+  files: "Files",
  terminal: "Terminal",
  browser: "Browser",
  shortcuts: "Shortcuts",
@@ -1,5 +1,6 @@
 import { expect, type Page } from "@playwright/test";
 import { getServerId } from "./server-id";
+import { projectEquivalenceViewKey } from "./project-view-key";

 interface ContextMenuAnchor {
  x: number;
@@ -276,15 +277,31 @@ 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,
+  });
+}
+
+export async function revealSidebarProjectWorkspaces(
+  page: Page,
+  projectKey: string,
+): Promise<void> {
+  await page
+    .getByTestId(`sidebar-project-show-more-${projectEquivalenceViewKey(projectKey)}`)
+    .click();
 }
@@ -1,3 +1,7 @@
+import { connectDaemonClient } from "./daemon-client-loader";
+import { startIsolatedHostDaemon } from "./isolated-host-daemon";
+import { seedWorkspace } from "./seed-client";
+import { getE2EDaemonPort } from "./daemon-port";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
 import { expect, type Page } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";
@@ -166,7 +170,7 @@ export async function expectSubagentRowGone(page: Page, childId: string): Promis
 }

 export async function expectManagedSubagentUnarchived(
-  workspace: Pick<SeededWorkspace, "client">,
+  workspace: { client: Pick<SeededWorkspace["client"], "fetchAgent"> },
  childId: string,
 ): Promise<void> {
  await expect(workspace.client.fetchAgent({ agentId: childId })).resolves.toMatchObject({
@@ -175,7 +179,7 @@ export async function expectManagedSubagentUnarchived(
 }

 export async function expectManagedSubagentArchived(
-  workspace: Pick<SeededWorkspace, "client">,
+  workspace: { client: Pick<SeededWorkspace["client"], "fetchAgent"> },
  childId: string,
 ): Promise<void> {
  await expect
@@ -320,3 +324,150 @@ export async function detachSubagentFromTrack(page: Page, childId: string): Prom
  await expect(detachButton).toBeVisible({ timeout: 30_000 });
  await detachButton.click();
 }
+
+/** The primary children come from the real agent MCP endpoint on A. */
+export async function delegateFleetThroughMcp() {
+  const { Client } = await import("@modelcontextprotocol/sdk/client/index.js");
+  const { StreamableHTTPClientTransport } =
+    await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
+  const { z } = await import("zod");
+  type DaemonClient = import("@getpaseo/client/internal/daemon-client").DaemonClient;
+  const workspace = await seedWorkspace({ repoPrefix: "fleet-mcp-" });
+  const destination = await startIsolatedHostDaemon(`fleet_${crypto.randomUUID()}`);
+  const a = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "fleet-seed-A" });
+  const b = await connectDaemonClient<DaemonClient>({
+    clientIdPrefix: "fleet-observe-B",
+    port: destination.port,
+  });
+  const serverId = a.getLastServerInfoMessage()!.serverId;
+  const mcp = new Client({ name: "fleet-parent", version: "1" });
+  const close = async () => {
+    await mcp.close();
+    await Promise.allSettled([a.close(), b.close()]);
+    await destination.close();
+    await workspace.cleanup();
+  };
+  const call = async (name: string, args: Record<string, unknown> = {}) => {
+    const response = await mcp.callTool({ name, arguments: args });
+    expect(response, name).not.toMatchObject({ isError: true });
+    return z.record(z.string(), z.unknown()).parse(response.structuredContent);
+  };
+  try {
+    const parent = await a.createAgent({
+      provider: "mock",
+      model: "e2e-fast-stream",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Fleet parent",
+      modeId: "load-test",
+    });
+    const registration = await a.addHost({
+      connection: `127.0.0.1:${destination.port}`,
+      label: "Fleet B",
+    });
+    await expect
+      .poll(
+        async () =>
+          (await a.listHosts()).hosts.find(
+            (row) => row.registrationId === registration.registrationId,
+          )?.status,
+      )
+      .toBe("online");
+    await mcp.connect(
+      new StreamableHTTPClientTransport(
+        new URL(`http://127.0.0.1:${getE2EDaemonPort()}/mcp/agents?callerAgentId=${parent.id}`),
+      ),
+    );
+    expect(await call("list_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: "B workspace",
+    });
+    expect(await call("list_workspaces", { serverId: destination.serverId })).toMatchObject({
+      workspaces: expect.arrayContaining([
+        expect.objectContaining({ workspaceId: target.workspaceId }),
+      ]),
+    });
+    const createChild = async (targetServerId: string, workspaceId: string, title: string) => {
+      const result = await call("create_agent", {
+        serverId: targetServerId,
+        workspaceId,
+        title,
+        provider: "mock/e2e-fast-stream",
+        settings: { modeId: "load-test" },
+        initialPrompt: `Finish ${title}`,
+      });
+      return {
+        serverId: targetServerId,
+        agentId: z.string().parse(result.agentId),
+        workspaceId,
+        title,
+      };
+    };
+    const local = await createChild(serverId, workspace.workspaceId, "MCP child on A");
+    const remote = await createChild(
+      destination.serverId,
+      z.string().parse(target.workspaceId),
+      "MCP child on B",
+    );
+    // Existing SDK reservation creates unrelated equal-ID fixtures; primary children remain MCP-created.
+    await b.createAgent({
+      agentId: local.agentId,
+      provider: "mock",
+      model: "e2e-fast-stream",
+      cwd: workspace.repoPath,
+      workspaceId: String(target.workspaceId),
+      title: "Unrelated on B",
+      modeId: "load-test",
+    });
+    await a.createAgent({
+      agentId: remote.agentId,
+      provider: "mock",
+      model: "e2e-fast-stream",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Unrelated on A",
+      modeId: "load-test",
+    });
+    return {
+      workspace,
+      destination,
+      parent,
+      serverId,
+      local,
+      remote,
+      a,
+      b,
+      close,
+      async expectCompletion(child: typeof local) {
+        await expect
+          .poll(async () => {
+            const timeline = await a.fetchAgentTimeline(parent.id, {
+              direction: "tail",
+              limit: 100,
+            });
+            return timeline.entries
+              .flatMap(({ item }) =>
+                item.type === "tool_call" && item.agentMessage ? [item.agentMessage] : [],
+              )
+              .filter(
+                (message) =>
+                  message.event === "finished" &&
+                  message.sender.id === child.agentId &&
+                  message.text.includes(`Server: ${child.serverId}`),
+              ).length;
+          })
+          .toBe(1);
+      },
+    };
+  } catch (error) {
+    await close();
+    throw error;
+  }
+}
@@ -68,8 +68,8 @@ export async function navigateToTerminal(
  const workspaceRoute = buildTerminalWorkspaceUrl(input.workspaceId, input.terminalId);
  await page.goto(workspaceRoute);

-  // The workspace layout consumes `?open=...`, returns null during the effect,
-  // then replaces the URL with the clean workspace route after preparing the tab.
+  // The route seeds the legacy URL target into the pending-open model, then
+  // removes the query. Tab readiness below waits for that intent to be consumed.
  // On CI, Expo Router's rootNavigationState may take time to initialize,
  // so we allow a generous timeout here.
  const cleanWorkspaceRoute = buildWorkspaceUrl(input.workspaceId);
@@ -86,7 +86,8 @@ export async function navigateToTerminal(
  await terminalTab.waitFor({ state: "visible", timeout: 30_000 });
  await terminalTab.click();

-  const terminalSurface = page.locator('[data-testid="terminal-surface"]');
+  // Inactive terminal tabs retain their surfaces; interact with the selected tab.
+  const terminalSurface = page.getByTestId("terminal-surface").filter({ visible: true });
  await terminalSurface.waitFor({ state: "visible", timeout: 15_000 });

  // Wait for loading overlay to disappear (terminal attached)
--- a/Show More
+++ b/Show More