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

Parented creation enters the relationship owner before resource admission. Initial run evidence drives one qualified completion consumer, while ordinary bound conversations own their directory demand and workspace selectors. Preserve manager-owned archive lifecycles and verify managed callbacks through the parent capability.
feat(subagents): retain fleet membership and origin through app navigation
2026-10-21 08:42:39 +00:00 · 2026-10-20 17:41:52 +02:00 · 2026-10-20 15:09:50 +02:00 · 2026-10-20 13:23:04 +02:00 · 2026-10-20 12:15:51 +02:00 · 2026-10-20 10:57:13 +02:00
810 changed files with 27193 additions and 41367 deletions
@@ -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,14 +417,6 @@ 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,6 +6,7 @@ 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/**"
@@ -41,7 +41,6 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [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/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                                           |
@@ -108,8 +107,6 @@ 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/zh-CN/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/sponsor">成为 Paseo 赞助商</a></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">成为 Paseo 赞助商</a></td>
  </tr>
 </table>

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

 ### 桌面 app（推荐）

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

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

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

 完整安装和配置见：

- [文档](https://paseo.sh/zh-CN/docs)
- [配置参考](https://paseo.sh/zh-CN/docs/configuration)
+- [文档](https://paseo.sh/docs)
+- [配置参考](https://paseo.sh/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/zh-CN/docs/cli)。
+更多内容见[完整 CLI 参考](https://paseo.sh/docs/cli)。

 ## Skills

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

 ## 支持 Paseo

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

 ## 相关项目

@@ -71,8 +71,6 @@ 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.
@@ -61,81 +61,39 @@ 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 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
+npm run android:development    # Debug build
+npm run android:production     # Release build
+npm run android:clear          # Remove generated Android project
 ```

-`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:
+For a production-ID release APK that local Android profiling tools can attach to:

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

-Those markers emit only while a system trace records `sh.paseo` (`perfetto -a sh.paseo ...`);
-they do not produce Downloads files.
+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
+```

 ## Running on an emulator against a worktree daemon

@@ -29,25 +29,15 @@ principal. An ordinary direct B consumer does not become that producer by supply
 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
+A managed child has a qualified `{serverId, agentId}` address on every host. The parent's daemon owns membership and lifecycle intent; a destination's parent pointer is metadata. Workspace comparisons include the server ID, so matching workspace strings on different hosts do not share lifecycle ownership. Preserve the archive policy in [agent lifecycle](agent-lifecycle.md). The first child snapshot carries the owner's ledger projection even while creation is pending, because tab placement runs before creation finishes. Explicit clearing survives list and disk-cache round trips; a parent pointer or label cannot recreate membership on a capable daemon.

-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.
+Retained app conversations bind their stores, queries, initialization and layout to origin authority as well as destination. Two routes to B therefore keep separate cached evidence and command capabilities. Provider catalog pushes belong to that same destination binding, including facts shown in the parent's track. Route restore remembers an origin ID, then reacquires current authority; persisted namespaces grant no access.

-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.
+Durable relationships retain a stable authority reference and creation ceiling, never live credentials or execution capabilities. Recovery must resolve current authority through its owner. Derived runtime sessions cannot authorize their own recovery. Execution-scoped admissions and non-owner durable references without a supported authority resolver fail explicitly; do not recover them through the daemon owner's MCP runtime.

-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.
+Before accepting new writes, the daemon adopts eligible pre-feature local parent labels into authoritative membership. The upgrade records its bounded candidates before qualifying agent metadata, then resumes those candidates after interruption. It never rescans later label edits. Existing membership, including forgotten entries, takes precedence; explicit null or qualified parent pointers do not establish legacy provenance. Adopted entries preserve the old daemon-owned local lifecycle, not an authenticated creator grant, and contain no creation recipe to replay. Recovery still resolves current owner authority within the retained self-only ceiling.
+
+Provider-owned subagents are descriptors and timelines in `ProviderSubagentStore`, not `AgentStorage` records. They retain their provider observation/cancellation path. Internal managed agents and execution-owned records are separate stored/runtime concepts and are excluded from adoption on both sides of the relationship.

 ## Connections and recovery

@@ -72,6 +62,10 @@ Ordinary non-recoverable mutations are not automatically replayed. Existing ackn
 creation recovery retains its request identity and resumes through the ordinary creation lifecycle. Multiplexing changes only the transport: ordinary permission
 RPC codes pass through unchanged, and connection/recovery behavior matches direct clients.

+Creation cancellation fences a reserved creation identity before admission. An admitted receipt can precede resource readiness and cannot be reported as canceled. Observe its current receipt and later changes through the ordinary SDK instead of replaying an uncertain prompt. Parent archive retains a pending obligation until cancellation or destination lifecycle confirmation; explicit forget removes local membership without claiming the destination changed.
+
+Run journals retain submission and provider-turn identity. Restarted nonterminal evidence is interrupted, and subsequent evidence must match that turn. Idle and reconnect do not prove completion. A storage failure retains observed evidence with pending durability; a later read retries persistence. Notification recovery must preserve checkpoint identity and this durability distinction.
+
 Text session envelopes carry a channel identifier. Binary routing adds an opcode, a bounded UTF-8
 channel identifier, and the original terminal or file-transfer bytes. It never converts those bytes to
 base64 JSON. The existing direct binary opcodes and 100 MiB message limit remain unchanged; routed
@@ -1,6 +1,6 @@
 # I18n

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

 ## Supported Locales

@@ -86,12 +86,6 @@ 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`,
@@ -246,7 +240,7 @@ 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/ui`. Its `Icon` draws a Lucide name from the client's installed
+`@getpaseo/plugin/client/react-native`. Its `Icon` draws a Lucide name from the client's installed
 icon set, or any `PluginIcon` through its `icon` prop; an unknown name or unsafe SVG renders nothing
 so it cannot break the plugin surface.
 Its controlled modal keeps presentation metadata on `<Modal title="…" icon={…}>` and body UI in
@@ -263,14 +257,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/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/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 |

 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
@@ -562,24 +556,6 @@ 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 bar only switches panels and shows the dot the panel sets through
-`tab.setModified`. 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
@@ -62,10 +62,9 @@ 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:** 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
+**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
 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.

@@ -534,14 +533,6 @@ 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`.
-
- Translations never gate a release. Translate a new entry in a follow-up PR, or in the changelog commit when you can.
- 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, so a beta rewritten in place drops its old translation until the new notes are translated. 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.
@@ -1,51 +0,0 @@
-# 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 (`**注意**：这里`).
@@ -1 +1 @@
-sha256-Et1ofRqkqFoGETnbeqXuy2RerFT0kkk5F+VwDXak+fk=
+sha256-7B/Zyo/DaHdd3PVq8Hn1HG+x+wLdZBVxgx/cbtaM/S8=
@@ -42117,7 +42117,6 @@
      "version": "0.12.0",
      "dependencies": {
        "@agentclientprotocol/sdk": "^1.4.0",
-        "i18next": "^26.3.0",
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
@@ -43340,11 +43339,9 @@
        "@tanstack/react-start": "^1.168.26",
        "framer-motion": "^12.35.2",
        "github-slugger": "^2.0.0",
-        "i18next": "^26.3.0",
        "lucide-react": "^1.7.0",
        "react": "^19.1.4",
        "react-dom": "^19.1.4",
-        "react-i18next": "^17.0.8",
        "react-markdown": "^10.1.0",
        "rehype-autolink-headings": "^7.1.0",
        "rehype-pretty-code": "^0.14.3",
@@ -41,16 +41,12 @@
    "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",
@@ -84,14 +80,15 @@
    "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 dev:android",
+    "android": "npm run android --workspace=@getpaseo/app",
    "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 dev:ios",
+    "ios": "npm run ios --workspace=@getpaseo/app",
    "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",
@@ -10,7 +10,6 @@ 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
@@ -182,7 +181,7 @@ export default {
        },
      ],
      ...buildProfile.fdroidPlugins,
-      ...(isProfileBuild || isWatchdogBuild ? [withAndroidProfileable] : []),
+      ...(isProfileBuild ? [withAndroidProfileable] : []),
    ],
    experiments: {
      typedRoutes: true,
@@ -192,9 +191,6 @@ 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",
@@ -832,9 +832,6 @@ 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("workspace-tab-changes_tree")
@@ -1847,14 +1844,9 @@ 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 expect(page.locator("[data-e2e-before-font-family]")).toHaveCount(0);
-  await sizeField.fill(String(typography.fontSize));
+  await page.getByLabel("Code font size").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));
@@ -854,7 +854,8 @@ async function revealCompactChanges(page: Page) {
  await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
 }
 async function expectReviewEditorBody(page: Page, body: string) {
-  await expect(page.getByRole("textbox", { name: "Review comment", exact: true })).toHaveValue(
-    body,
-  );
+  const editor = page.getByRole("textbox", { name: "Review comment", exact: true });
+  // A viewport resize starts the presentation handoff; exactly one editor must remain accessible.
+  await expect(editor).toHaveCount(1);
+  await expect(editor).toHaveValue(body);
 }
@@ -1,5 +1,5 @@
 import { metroTest as test, expect } from "../support/fixtures";
-import { hideDeveloperToasts } from "../support/developer-ui.mjs";
+import { installDeveloperToastDismissal } from "../support/developer-ui.mjs";
 import type { Page } from "@playwright/test";

 async function showTransientDeveloperToast(page: Page, shadow: boolean) {
@@ -15,38 +15,38 @@ async function showTransientDeveloperToast(page: Page, shadow: boolean) {
  }, shadow);
 }

-async function openHiddenDeveloperToast(page: Page) {
+async function openTransientDeveloperToast(page: Page) {
  await page.setContent("<button>Continue</button>");
  await showTransientDeveloperToast(page, false);
-  await hideDeveloperToasts(page);
+  await installDeveloperToastDismissal(page);
 }

-async function navigateWithHiddenDeveloperToasts(page: Page) {
-  await hideDeveloperToasts(page);
+async function navigateWithDeveloperToastDismissal(page: Page) {
+  await installDeveloperToastDismissal(page);
  await page.goto("data:text/html,<button>Continue</button>");
  await showTransientDeveloperToast(page, true);
 }

-async function inspectLayoutWithHiddenToast(page: Page) {
+async function inspectLayoutWhileToastDisappears(page: Page) {
  const action = page.getByRole("button", { name: "Continue", exact: true });
  const boxes = await Promise.all(Array.from({ length: 4 }, () => action.boundingBox()));
  for (const box of boxes) expect(box).not.toBeNull();
-  await expect(page.locator("#error-toast")).toBeHidden();
+  await expect(page.locator("#error-toast").getByRole("button")).toHaveCount(0);
  await action.click();
 }

-test("a hidden developer toast does not stall concurrent layout checks", async ({ page }) => {
+test("a disappearing developer toast does not stall concurrent layout checks", async ({ page }) => {
  test.setTimeout(10000);
-  await openHiddenDeveloperToast(page);
-  await inspectLayoutWithHiddenToast(page);
+  await openTransientDeveloperToast(page);
+  await inspectLayoutWhileToastDisappears(page);
 });

-test("developer toast hiding survives navigation and Expo shadow-root updates", async ({
+test("developer toast dismissal survives navigation and observes Expo shadow-root updates", async ({
  page,
 }) => {
  test.setTimeout(10000);
-  await navigateWithHiddenDeveloperToasts(page);
-  await inspectLayoutWithHiddenToast(page);
+  await navigateWithDeveloperToastDismissal(page);
+  await inspectLayoutWhileToastDisappears(page);
  await page.evaluate(() => {
    const root = document.getElementById("error-toast")!.shadowRoot!;
    const replacement = document.createElement("button");
@@ -54,5 +54,5 @@ test("developer toast hiding survives navigation and Expo shadow-root updates",
    replacement.addEventListener("click", () => replacement.remove());
    root.append(replacement);
  });
-  await inspectLayoutWithHiddenToast(page);
+  await inspectLayoutWhileToastDisappears(page);
 });
@@ -56,12 +56,45 @@ 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.");
@@ -107,7 +140,7 @@ test.describe("Workspace file change conflicts", () => {
      relativePath,
      content: "const preserved = true;\n",
    });
-    await expect(visibleEditor(page)).toContainText("const preserved = true;");
+    await gate.waitForFileSubscription(relativePath);
    await recordFileCallouts(page);

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

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

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

-  test("a viewed file deleted and written back shows the new file", async ({
+  test("a clean file replaced on disk offers one working reload action", 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 unlink(filePath);
-    await expect(filePane(page).getByText("The file was deleted.", { exact: true })).toBeVisible();
-    await writeFile(filePath, "# After\n", "utf8");
-
-    await expect(filePane(page).getByText("After", { exact: true })).toBeVisible();
-    await expect(fileCallout(page)).toHaveCount(0);
+    await replaceFileAfterDeletionWasObserved({
+      page,
+      gate,
+      filePath,
+      relativePath: "inventory.md",
+      content: "# After\n",
+    });
+    gate.releaseHeldReadyFileUpdate();
+    await expectCleanReplacementCanReload(page);
  });

-  test("a deleted file keeps the open copy with one notice and no resolution actions", async ({
+  test("a deleted file shows one explanatory notice and no resolution actions", async ({
    page,
    withWorkspace,
  }) => {
    const filePath = await openTrackedFile(page, withWorkspace, {
      prefix: "file-deleted-",
-      relativePath: "deleted.ts",
-      content: "const present = true;\n",
+      relativePath: "deleted.md",
+      content: "# Present\n",
    });
-    await expect(visibleEditor(page)).toContainText("const present = true;");
+    await expect(filePane(page).getByText("Present", { exact: true })).toBeVisible();
    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 path that stops being a file keeps the open copy and follows the file back", async ({
+  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 ({
    page,
    withWorkspace,
  }) => {
    const gate = await installDaemonWebSocketGate(page);
-    const relativePath = "retry.ts";
+    const relativePath = "unchanged.md";
    const filePath = await openTrackedFile(page, withWorkspace, {
-      prefix: "file-check-error-",
+      prefix: "file-check-unchanged-",
      relativePath,
-      content: "const before = true;\n",
+      content: "# Unchanged\n",
    });
-    await expect(visibleEditor(page)).toContainText("const before = true;");
+    const parkedPath = `${filePath}.parked`;
+    await gate.waitForFileSubscription(relativePath);
+    await expect(filePane(page).getByText("Unchanged", { exact: true })).toBeVisible();
+
+    await rename(filePath, parkedPath);
+    await mkdir(filePath);
+    await expectOnlyFileCallout(page, "Couldn't check file on disk");
+
+    gate.holdNextReadyFileUpdate(relativePath);
+    await rm(filePath, { recursive: true });
+    await rename(parkedPath, filePath);
+    await gate.waitForHeldReadyFileUpdate();
+    await fileCallout(page).getByRole("button", { name: "Retry" }).click();
+
+    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 gate.waitForFileUpdate(relativePath, "error");
-    await expect(visibleEditor(page)).toContainText("const before = true;");
+    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, "const after = true;\n", "utf8");
+    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(visibleEditor(page)).toContainText("const after = true;");
-    await expect(fileCallout(page)).toHaveCount(0);
+    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 ({
@@ -55,10 +55,6 @@ async function openWorkspaceFile(page: Page, filename: string): Promise<void> {
  await expectFileTabOpen(page, filename);
 }

-function filePanelSwitcher(page: Page) {
-  return page.getByTestId("file-panel-switcher").filter({ visible: true });
-}
-
 function htmlPreview(page: Page) {
  return {
    host: page.getByTestId("file-html-preview"),
@@ -66,9 +62,11 @@ function htmlPreview(page: Page) {
  };
 }

-/** Switches the file tab to one of its panels from the bar's switcher. */
-async function selectFilePanel(page: Page, title: string): Promise<void> {
-  const option = filePanelSwitcher(page).getByRole("button", { name: title, exact: true });
+async function selectFileView(page: Page, view: "Preview" | "Source"): Promise<void> {
+  const option = page.getByTestId("file-panel-bar").getByRole("button", {
+    name: view,
+    exact: true,
+  });
  await option.click();
  await expect(option).toHaveAttribute("aria-selected", "true");
 }
@@ -130,7 +128,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("File not found", { exact: true })).toBeVisible();
+        await expect(page.getByText(/ENOENT/)).toBeVisible();
        await expect(page.getByRole("button", { name: "Retry", exact: true })).toBeVisible();
      });
    } finally {
@@ -319,7 +317,11 @@ 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"), "x".repeat(51 * 1024 * 1024), "utf8");
+    await writeFile(
+      path.join(session.cwd, "too-large.txt"),
+      Buffer.alloc(51 * 1024 * 1024),
+      "utf8",
+    );

    try {
      await openAgentRoute(page, session);
@@ -482,9 +484,9 @@ test.describe("CodeMirror workspace file editing", () => {
      relativePath,
    );
    await expect(page.getByTestId("file-panel-bar")).not.toContainText("visuals.md");
-    const modeControl = filePanelSwitcher(page);
+    const modeControl = page.getByTestId("file-preview-mode");
    await expect(modeControl).toBeVisible();
-    await selectFilePanel(page, "Source");
+    await selectFileView(page, "Source");

    const editorHost = page.getByTestId("file-source-editor");
    const content = editor(page);
@@ -546,7 +548,7 @@ test.describe("CodeMirror workspace file editing", () => {
    );
    await workspace.navigateTo();
    await openWorkspaceFile(page, "notes.md");
-    await selectFilePanel(page, "Source");
+    await selectFileView(page, "Source");

    const markdownScroller = page
      .getByTestId("file-source-editor")
@@ -678,7 +680,7 @@ test.describe("CodeMirror workspace file editing", () => {
    await expect(page.getByTestId("workspace-tab-modified-file_draft.ts")).toBeVisible();
  });

-  test("refreshes Markdown and images while switching between Markdown and Source", async ({
+  test("refreshes Markdown and images while preserving Preview and Source behavior", async ({
    page,
    withWorkspace,
  }) => {
@@ -693,15 +695,15 @@ test.describe("CodeMirror workspace file editing", () => {

    const visibleFilePane = page.getByTestId("workspace-file-pane").filter({ visible: true });
    await expect(visibleFilePane.getByText("First heading", { exact: true })).toBeVisible();
-    await expect(filePanelSwitcher(page).getByRole("button", { name: "Markdown" })).toBeVisible();
+    await expect(page.getByRole("button", { name: "Preview", exact: true })).toBeVisible();
    await writeFile(markdownPath, "# Updated heading\n", "utf8");
    await expect(visibleFilePane.getByText("Updated heading", { exact: true })).toBeVisible();

-    await selectFilePanel(page, "Source");
+    await selectFileView(page, "Source");
    await expect(page.getByTestId("file-source-editor")).toBeVisible();
    await replaceEditorText(page, "# Saved from source\n");
    await expect.poll(() => readFile(markdownPath, "utf8")).toBe("# Saved from source\n");
-    await selectFilePanel(page, "Markdown");
+    await selectFileView(page, "Preview");
    await expect(visibleFilePane.getByText("Saved from source", { exact: true })).toBeVisible();

    await openWorkspaceFile(page, "pixel.png");
@@ -784,10 +786,10 @@ test.describe("CodeMirror workspace file editing", () => {
    );
    await expect(preview.document.getByRole("heading", { name: "Updated plan" })).toBeVisible();

-    await selectFilePanel(page, "Source");
+    await selectFileView(page, "Source");
    await expect(page.getByTestId("file-source-editor")).toBeVisible();
    await expect(preview.host).toHaveCount(0);
-    await selectFilePanel(page, "HTML");
+    await selectFileView(page, "Preview");
    await expect(preview.host).toBeVisible();
  });

@@ -14,9 +14,8 @@ async function openMarkdownPreview(page: Page) {
  await openFileFromExplorer(page, "README.md");
  await expectFileTabOpen(page, "README.md");
  await page
-    .getByTestId("file-panel-switcher")
-    .filter({ visible: true })
-    .getByRole("button", { name: "Markdown", exact: true })
+    .getByTestId("file-panel-bar")
+    .getByRole("button", { name: "Preview", exact: true })
    .click();
  await ensureWorkspaceAgentPaneVisible(page);
 }
@@ -1,47 +0,0 @@
-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();
-});
@@ -1,4 +1,3 @@
-import { verifyPluginToolTranslations } from "../support/helpers/plugin-translations";
 import { test } from "../support/fixtures";
 import { withButtonShowcase } from "../support/helpers/plugin-buttons";

@@ -14,10 +13,3 @@ test("plugin header and composer buttons share actions, menus, content, and upda
    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);
-});
@@ -1,279 +0,0 @@
-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();
-}
-
-function filePanelSwitcher(page: Page) {
-  return page.getByTestId("file-panel-switcher").filter({ visible: true });
-}
-
-/** 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 selectPanel(page: Page, title: string) {
-  await filePanelSwitcher(page).getByRole("button", { name: title, exact: true }).click();
-}
-
-async function expectPanels(page: Page, titles: string[]) {
-  for (const title of titles) {
-    await expect(
-      filePanelSwitcher(page).getByRole("button", { name: title, exact: true }),
-    ).toBeInViewport({ ratio: 1 });
-  }
-}
-
-/** 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 });
-  // Side by side on a wide screen; on a phone three panels do not fit, so the switcher is a menu.
-  await expect(filePanelSwitcher(page)).toContainText("Rich Markdown");
-  await expect(filePanelSwitcher(page)).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", { name: "Source — Paseo", exact: true })).toBeVisible();
-    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 expectPanels(page, ["Rich Markdown", "Markdown", "Source"]);
-    await captureWideAndCompact(page, testInfo, "markdown-example-rich-markdown", async () => {
-      await expectMarkdownEditor(page, "Edited by Rich Markdown");
-    });
-
-    // Source is Paseo's editor; its cursor and vim mode are in its own status row.
-    await selectPanel(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-source-status").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");
-    // The phone layout mounts the tab anew, so it opens the remembered panel; its menu offers Source.
-    await page.setViewportSize(COMPACT);
-    await expect(filePanelSwitcher(page)).toHaveText("Rich Markdown");
-    await filePanelSwitcher(page).click();
-    await page.getByRole("menuitem", { name: "Source", exact: true }).click();
-    await expect(filePanelSwitcher(page)).toHaveText("Source");
-    await source.locator(".cm-line").nth(2).click();
-    await expect(bar.getByText("NORMAL", { exact: true })).toBeInViewport();
-    await expect(bar.getByText(/^Ln 3, Col \d+$/)).toBeInViewport();
-    await capture(page, testInfo, "markdown-example-source-compact");
-    await page.setViewportSize(WIDE);
-    await selectPanel(page, "Rich Markdown");
-    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");
-    await expect(filePanelSwitcher(page)).toHaveText("Rich Markdown");
-  } 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();
-  }
-});
@@ -1,156 +0,0 @@
-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 toggleAlwaysUseFromFileBar(page: Page) {
-  await page.getByTestId("file-panel-bar-menu").filter({ visible: true }).click();
-  await page.getByRole("menuitem", { name: "Always use for .md" }).click();
-}
-
-function filePanelSwitcher(page: Page) {
-  return page.getByTestId("file-panel-switcher").filter({ visible: true });
-}
-
-async function expectSwitcherPanels(page: Page, titles: string[]) {
-  await expect(filePanelSwitcher(page).getByRole("button")).toHaveText(titles);
-}
-
-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 Source beside it 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 expectSwitcherPanels(page, ["Markdown", "Source"]);
-    await expect(filePanelPicker(page)).toBeHidden();
-    await capture(page, testInfo, "file-panel-builtins-wide");
-
-    await filePanelSwitcher(page).getByRole("button", { name: "Source", exact: true }).click();
-    await expect(page.getByTestId("file-source-editor").filter({ visible: true })).toBeVisible();
-    await filePanelSwitcher(page).getByRole("button", { name: "Markdown", exact: true }).click();
-    await expectBuiltinMarkdown(page, "notes heading");
-
-    await page.setViewportSize({ width: 390, height: 844 });
-    await expectBuiltinMarkdown(page, "notes heading");
-    await expect(
-      filePanelSwitcher(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 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 file bar keeps the tab on the plugin.
-    await toggleAlwaysUseFromFileBar(page);
-    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.
-    await openWithFromTabMenu(page, "third.md", BUILTIN_MARKDOWN_OPTION);
-    await expectBuiltinMarkdown(page, "third heading");
-    await expectFileTabOpen(page, "third.md");
-
-    // 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();
-  }
-});
@@ -1,150 +0,0 @@
-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,
-  SOURCE_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";
-
-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 })).toBeVisible();
-    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: SOURCE_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: SOURCE_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();
-});
@@ -1,232 +0,0 @@
-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();
-}
-async function selectSource(page: Page) {
-  await page
-    .getByTestId("file-panel-switcher")
-    .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 selectSource(page);
-    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,4 +1,3 @@
-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";
@@ -10,7 +9,7 @@ import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspac
 const PLUGIN_ID = "plugin-host-ui-e2e";

 const PLUGIN_SOURCE = `import { usePaseo } from "@getpaseo/plugin/client";
-import { Icon, Modal, useToast } from "@getpaseo/plugin/client/ui";
+import { Icon, Modal, useToast } from "@getpaseo/plugin/client/react-native";
 import { useQueryClient } from "@tanstack/react-query";
 import React, { useState } from "react";
 import { Pressable, Text, View } from "react-native";
@@ -167,10 +166,3 @@ 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);
-});
@@ -1,7 +1,6 @@
 import { test } from "../support/fixtures";
 import {
  withTimelinePlugin,
-  viewInlineThinkingExample,
  requestPluginTimeline,
  interactWithStreamingCard,
  expectWholeCompletedCard,
@@ -34,9 +33,3 @@ 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/ui";
+import { Icon } from "@getpaseo/plugin/client/react-native";
 import { useAgent, useWorkspace, openExternalUrl } from "@getpaseo/plugin/client";
 import { ExternalLink } from "@getpaseo/plugin/client/ui";
 import { recordComposerOpen } from "./shared/rpc";
@@ -1,5 +1,4 @@
 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 {
@@ -32,28 +31,6 @@ 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()] });
@@ -1,17 +1,23 @@
-import { buildSeededHost } from "../support/helpers/daemon-registry";
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
 import { submitMessage } from "../support/helpers/composer";
+import { openSessions, clickSessionRow } from "../support/helpers/archive-tab";
+import {
+  seedFleetSubagents,
+  delegateFleetThroughMcp,
+  observeFleetRouteOwnership,
+  readFleetCompletion,
+  connectFleetDirectHost,
+  openFleetParentTrack,
+  readFleetAuthorityState,
+  expectFleetRouteUnavailable,
+} from "../support/helpers/subagents";
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 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 {
-  delegateFleetThroughMcp,
-  expectManagedSubagentArchived,
-  openSubagentsTrack,
-  seedParentWithSubagent,
-} from "../support/helpers/subagents";
+import { openSubagentsTrack, seedParentWithSubagent } from "../support/helpers/subagents";

 test.use({ e2eInjectPaseoTools: true });

@@ -157,187 +163,165 @@ test("a preferred chat file link still opens beside its right-pane agent", async
  }
 });

-test("MCP delegates to self and B and opens both qualified children in ordinary conversations", async ({
+test("a fleet child retains its origin beside direct access through collision, catalog push, reload and revocation", 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"))
+  test.setTimeout(180_000);
+  const fleet = await seedFleetSubagents();
+  try {
+    const a = fleet.parent.serverId;
+    const b = fleet.destination.serverId;
+    await connectFleetDirectHost(page, fleet);
+    await openFleetParentTrack(page);
+    const rows = page.getByTestId(`subagents-track-row-${fleet.remote.id}`);
+    await expect(rows).toHaveCount(2);
+    const remote = rows.filter({ hasText: "Fleet child on B" });
+    await expect(remote).toBeVisible();
+    await expect(remote.getByTestId(`subagents-track-row-facts-${fleet.remote.id}`)).toHaveText(
+      "Ten second stream · Low · Load test",
+    );
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).direct.status)
+      .toBe("online");
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.catalogVersion)
+      .toBeGreaterThan(0);
+    const beforePush = await readFleetAuthorityState(page, a, b);
+    await fleet.direct.providers.refresh({ cwd: fleet.workspace.repoPath });
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.catalogVersion)
+      .toBeGreaterThan(beforePush.routed.catalogVersion);
+    await remote.click();
+    await expect(page).toHaveURL(
+      (url) => url.pathname.includes(`/h/${b}/workspace/`) && url.searchParams.get("origin") === a,
+    );
+    await submitMessage(page, "ROUTED_FLEET_PROMPT");
+    await expect
+      .poll(async () => (await fleet.remote.refresh())?.agent.lastUserMessageAt)
+      .not.toBeNull();
+    expect((await fleet.local.refresh())?.agent.lastUserMessageAt).toBeNull();
+    const routedUrl = page.url();
+    await page.reload();
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+    await fleet.remote.waitForFinish();
+    // Reopen direct B through ordinary history, then retain it beside the routed conversation.
+    await openSessions(page);
+    await clickSessionRow(page, "Fleet child on B");
+    await expect(page).toHaveURL(
+      (url) => url.pathname.includes(`/h/${b}/workspace/`) && !url.searchParams.has("origin"),
+    );
+    await openFleetParentTrack(page);
+    await page
+      .getByTestId(`subagents-track-row-${fleet.remote.id}`)
+      .filter({ hasText: "Fleet child on B" })
+      .click();
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).direct.status)
+      .toBe("online");
+    await fleet.disable();
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.status)
+      .not.toBe("online");
+    const withdrawn = await readFleetAuthorityState(page, a, b);
+    expect(withdrawn.direct.status).toBe("online");
+    await fleet.direct.providers.refresh({ cwd: fleet.workspace.repoPath });
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).direct.catalogVersion)
+      .toBeGreaterThan(withdrawn.direct.catalogVersion);
+    expect((await readFleetAuthorityState(page, a, b)).routed.catalogVersion).toBe(
+      withdrawn.routed.catalogVersion,
+    );
+    await page.reload();
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    expect((await fleet.local.refresh())?.agent.lastUserMessageAt).toBeNull();
+    // Direct B remains a separate usable authority; its newer evidence cannot refill A's withdrawn scope.
+    await page.goto(buildHostAgentDetailRoute(b, fleet.remote.id, fleet.workspace.workspaceId));
+    await submitMessage(page, "DIRECT_ONLY_AFTER_REVOCATION");
+    await expect(page.getByText("DIRECT_ONLY_AFTER_REVOCATION", { exact: true })).toBeVisible();
+    await page.goto(routedUrl);
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    await expectFleetRouteUnavailable(page, a, b);
+    await expect(page.getByText("DIRECT_ONLY_AFTER_REVOCATION", { exact: true })).toHaveCount(0);
+    const beforeRecovery = (await fleet.direct.agents.ref(fleet.remote.id).refresh())?.agent
+      .lastUserMessageAt;
+    await fleet.enable();
+    await expect
+      .poll(async () => (await readFleetAuthorityState(page, a, b)).routed.status)
+      .toBe("online");
+    await expect(page).toHaveURL((url) => url.searchParams.get("origin") === a);
+    await expect(page.getByText("DIRECT_ONLY_AFTER_REVOCATION", { exact: true })).toBeVisible();
+    await submitMessage(page, "AFTER_REENABLE_THROUGH_A");
+    await expect
+      .poll(
+        async () =>
+          (await fleet.direct.agents.ref(fleet.remote.id).refresh())?.agent.lastUserMessageAt,
      )
-        observationRequests[request.type] = (observationRequests[request.type] ?? 0) + 1;
-    });
-  });
+      .not.toBe(beforeRecovery);
+    expect((await fleet.local.refresh())?.agent.lastUserMessageAt).toBeNull();
+  } finally {
+    await fleet.close();
+  }
+});
+
+test("an agent delegates through MCP to self and B, opens both ordinary conversations and receives correlated completion", async ({
+  page,
+}) => {
+  test.setTimeout(180_000);
+  await page.setViewportSize({ width: 1400, height: 900 });
+  const counts = observeFleetRouteOwnership(page);
+  const fleet = await delegateFleetThroughMcp();
  try {
    await openAgentRoute(page, {
      workspaceId: fleet.workspace.workspaceId,
      agentId: fleet.parent.id,
    });
+    console.log("Fleet ordinary parent ownership", await counts());
    await openSubagentsTrack(page);
-    await expect(page.getByTestId(`subagents-track-row-${fleet.local.agentId}`)).toContainText(
+    await expect(page.getByTestId(`subagents-track-row-${fleet.local.id}`)).toContainText(
      "MCP child on A",
    );
-    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`)).toContainText(
+    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.id}`)).toContainText(
      "MCP child on B",
    );
-    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`)).toContainText(
+    await expect(page.getByTestId(`subagents-track-row-${fleet.remote.id}`)).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(`subagents-track-row-${fleet.local.id}`).click();
+    await expect(page).toHaveURL((url) =>
+      url.pathname.includes(`/h/${fleet.local.serverId}/workspace/`),
+    );
+    await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+    await fleet.expectCompletion(fleet.local);
+    await submitMessage(page, "UI_MCP_FLEET_LOCAL");
+    await expect(page.getByText("UI_MCP_FLEET_LOCAL", { exact: true })).toBeVisible();
+    expect(
+      (await fleet.direct.agents.ref(fleet.local.id).refresh())?.agent.lastUserMessageAt,
+    ).toBeNull();
    await page.getByTestId(`workspace-tab-agent_${fleet.parent.id}`).click();
    await openSubagentsTrack(page);
-    await page.getByTestId(`subagents-track-row-${fleet.remote.agentId}`).click();
-    await expect(page).toHaveURL((url) =>
-      url.pathname.includes(`/h/${fleet.remote.serverId}/workspace/`),
+    await page.getByTestId(`subagents-track-row-${fleet.remote.id}`).click();
+    await expect(page).toHaveURL(
+      (url) =>
+        url.pathname.includes(`/h/${fleet.remote.serverId}/workspace/`) &&
+        url.searchParams.get("origin") === fleet.parent.serverId,
    );
-    await 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 expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+    console.log("Fleet destination conversation ownership", await counts());
+    await fleet.expectCompletion(fleet.remote);
+    await submitMessage(page, "UI_MCP_FLEET_REMOTE");
+    await expect(page.getByText("UI_MCP_FLEET_REMOTE", { exact: true })).toBeVisible();
+    expect(
+      (await fleet.origin.agents.ref(fleet.remote.id).refresh())?.agent.lastUserMessageAt,
+    ).toBeNull();
    await fleet.expectCompletion(fleet.local);
    await fleet.expectCompletion(fleet.remote);
    await openAgentRoute(page, {
      workspaceId: fleet.workspace.workspaceId,
      agentId: fleet.parent.id,
    });
-    await 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);
+    await readFleetCompletion(page, fleet.local);
+    await readFleetCompletion(page, fleet.remote);
  } finally {
    await fleet.close();
  }
@@ -2,7 +2,6 @@ import { test, expect } from "../support/fixtures";
 import { createTempGitRepo } from "../support/helpers/workspace";
 import {
  connectWorkspaceSetupClient,
-  setupCommandOutput,
  createWorkspaceThroughDaemon,
  openWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
@@ -34,9 +33,7 @@ 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" &&
-        setupCommandOutput(payload.detail).includes("setup complete"),
+      (payload) => payload.status === "completed" && payload.detail.log.includes("setup complete"),
    );
    const workspace = await createWorkspaceThroughDaemon(client, {
      cwd: repo.path,
@@ -18,7 +18,6 @@ import {
 } from "../support/helpers/terminal-perf";
 import {
  connectWorkspaceSetupClient,
-  setupCommandOutput,
  createWorkspaceThroughDaemon,
  expectSetupPanel,
  openHomeWithProject,
@@ -93,8 +92,7 @@ test.describe("Workspace setup streaming", () => {
      const completed = waitForWorkspaceSetupProgress(
        client,
        (payload) =>
-          payload.status === "completed" &&
-          setupCommandOutput(payload.detail).includes("setup complete"),
+          payload.status === "completed" && payload.detail.log.includes("setup complete"),
      );
      const workspace = await createWorkspaceThroughDaemon(client, {
        cwd: repo.path,
@@ -172,19 +170,16 @@ test.describe("Workspace setup streaming", () => {
      await seedProjectForWorkspaceSetup(client, repo.path);
      const initialRunning = waitForWorkspaceSetupProgress(
        client,
-        (payload) => payload.status === "running" && payload.detail.commands.length === 0,
+        (payload) => payload.status === "running" && payload.detail.log === "",
      );
      const runningWithOutput = waitForWorkspaceSetupProgress(
        client,
-        (payload) =>
-          payload.status === "running" &&
-          setupCommandOutput(payload.detail).includes("starting setup"),
+        (payload) => payload.status === "running" && payload.detail.log.includes("starting setup"),
      );
      const completed = waitForWorkspaceSetupProgress(
        client,
        (payload) =>
-          payload.status === "completed" &&
-          setupCommandOutput(payload.detail).includes("setup complete"),
+          payload.status === "completed" && payload.detail.log.includes("setup complete"),
      );

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

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

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

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

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

      const result = await client.createPaseoWorktree({
@@ -1,15 +1,27 @@
-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 });
+export async function installDeveloperToastDismissal(page) {
+  // Keep developer chrome out of app actions without pointer/focus changes.
+  // Locator handlers can deadlock when concurrent checks dismiss the same toast.
+  const install = () => {
+    let observedRoot;
+    const options = { childList: true, subtree: true };
+    const dismiss = () => {
+      const toast = document.getElementById("error-toast");
+      const root = toast?.shadowRoot ?? toast;
+      if (root && root !== observedRoot) {
+        observer.disconnect();
+        observer.observe(document, options);
+        observer.observe(root, options);
+        observedRoot = root;
+      }
+      // Expo's toast root contains dismiss buttons; its overlay has a different ID.
+      for (const button of root?.querySelectorAll("button") ?? [])
+        button.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    };
+    const observer = new MutationObserver(dismiss);
+    observer.observe(document, options);
+    dismiss();
+  };
+  await page.addInitScript(install);
+  await page.evaluate(install);
 }
@@ -1,5 +1,5 @@
 import { test as base, expect, type Page } from "@playwright/test";
-import { hideDeveloperToasts } from "./developer-ui.mjs";
+import { installDeveloperToastDismissal } from "./developer-ui.mjs";
 import { startOutdatedDaemon, type OutdatedDaemon } from "./helpers/daemon-update";
 import { startE2EWorker } from "./helpers/e2e-worker";
 import { getE2EDaemonPort } from "./helpers/daemon-port";
@@ -131,7 +131,7 @@ const test = daemonTest.extend<{
        await ws.close({ code: 1008, reason: "Blocked connection to localhost:6767 during e2e." });
      });

-      await hideDeveloperToasts(page);
+      await installDeveloperToastDismissal(page);

      const entries: string[] = [];

@@ -1,3 +1,4 @@
+import { inspectSessionWireRequest } from "./session-wire";
 import type { Page, WebSocketRoute } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";

@@ -16,11 +17,7 @@ interface SendAgentMessageRequest {
 function readSendRequest(message: WebSocketMessage): SendAgentMessageRequest | null {
  if (typeof message !== "string") return null;
  try {
-    const envelope = JSON.parse(message) as {
-      type?: unknown;
-      message?: Record<string, unknown>;
-    };
-    const request = envelope.type === "session" ? envelope.message : null;
+    const request = inspectSessionWireRequest(message)?.request;
    if (
      request?.type !== "send_agent_message_request" ||
      typeof request.requestId !== "string" ||
@@ -74,3 +74,12 @@ export async function loadProtocolSchemas(): Promise<typeof import("@getpaseo/pr
  ).href;
  return import(moduleUrl);
 }
+
+export async function loadPaseoApiFactory(): Promise<
+  (typeof import("@getpaseo/client"))["createPaseoApi"]
+> {
+  const moduleUrl = pathToFileURL(
+    path.resolve(__dirname, "../../../../../packages/client/dist/index.js"),
+  ).href;
+  return (await import(moduleUrl)).createPaseoApi;
+}
@@ -1,3 +1,4 @@
+import { inspectSessionWireRequest } from "./session-wire";
 import type { Page, WebSocketRoute } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";

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

 function readClientRequest(message: string | Buffer): ClientRequest | null {
  if (typeof message !== "string") return null;
+  const session = inspectSessionWireRequest(message);
+  if (session) return session.request;
  try {
-    const envelope = JSON.parse(message) as {
-      type?: unknown;
-      message?: ClientRequest;
-    };
-    return envelope.type === "session" ? (envelope.message ?? null) : envelope;
+    const envelope = JSON.parse(message) as ClientRequest;
+    return envelope.type === "session" ? null : envelope;
  } catch {
    return null;
  }
@@ -1,77 +0,0 @@
-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}`;
-export const SOURCE_OPTION = "Source — Paseo";
-
-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 ?? {};
-  });
-}
@@ -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 { copyPluginExample, pluginRequirements } from "./plugin-fixture";
+import { pluginRequirements } from "./plugin-fixture";
 import { connectNewWorkspaceDaemonClient } from "./new-workspace";
 import { openAgentRoute, seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";

@@ -274,40 +274,3 @@ 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();
-  }
-}
@@ -1,164 +0,0 @@
-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();
-  }
-}
@@ -0,0 +1,44 @@
+/** Inspect an ordinary session request while preserving any owning transport envelopes. */
+export function inspectSessionWireRequest(message: string | Buffer): {
+  request: Record<string, unknown>;
+  reply(response: unknown): string;
+} | null {
+  const routes: string[] = [];
+  let raw = typeof message === "string" ? message : message.toString("utf8");
+  try {
+    for (;;) {
+      const envelope = JSON.parse(raw);
+      if (envelope?.type !== "session" || !envelope.message || typeof envelope.message !== "object")
+        return null;
+      const request: Record<string, unknown> = envelope.message;
+      if (request.type !== "hosts.route.frame.request") {
+        return {
+          request,
+          reply(response) {
+            let data = JSON.stringify({ type: "session", message: response });
+            for (const subscriptionId of routes.toReversed()) {
+              data = JSON.stringify({
+                type: "session",
+                message: {
+                  type: "hosts.route.frame",
+                  payload: { subscriptionId, data, binary: false },
+                },
+              });
+            }
+            return data;
+          },
+        };
+      }
+      if (
+        typeof request.routeId !== "string" ||
+        typeof request.data !== "string" ||
+        request.binary !== false
+      )
+        return null;
+      routes.push(request.routeId);
+      raw = request.data;
+    }
+  } catch {
+    return null;
+  }
+}
@@ -24,7 +24,6 @@ const SECTION_LABELS = {
  appearance: "Appearance",
  sidebar: "Sidebar",
  editor: "Editor",
-  files: "Files",
  terminal: "Terminal",
  browser: "Browser",
  shortcuts: "Shortcuts",
@@ -1,7 +1,15 @@
-import { connectDaemonClient } from "./daemon-client-loader";
+import type { HostRuntimeStore } from "@/runtime/host-runtime";
+import { addConnectedHostAndReload } from "./hosts";
+import { buildSeededHost } from "./daemon-registry";
+import { openAgentRoute } from "./mock-agent";
+import { openSessions, clickSessionRow } from "./archive-tab";
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { randomUUID } from "node:crypto";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { connectDaemonClient, loadPaseoApiFactory } from "./daemon-client-loader";
 import { startIsolatedHostDaemon } from "./isolated-host-daemon";
 import { seedWorkspace } from "./seed-client";
-import { getE2EDaemonPort } from "./daemon-port";
+import { inspectSessionWireRequest } from "./session-wire";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
 import { expect, type Page } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";
@@ -170,7 +178,7 @@ export async function expectSubagentRowGone(page: Page, childId: string): Promis
 }

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

 export async function expectManagedSubagentArchived(
-  workspace: { client: Pick<SeededWorkspace["client"], "fetchAgent"> },
+  workspace: Pick<SeededWorkspace, "client">,
  childId: string,
 ): Promise<void> {
  await expect
@@ -255,22 +263,19 @@ export async function rejectNextManagedSubagentArchiveRequest(
  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
    const server = ws.connectToServer();
    ws.onMessage((message) => {
-      const requestId = archiveRequestId(message, subagentId);
-      if (requestId && !rejected) {
+      const intercepted = archiveRequest(message, subagentId);
+      if (intercepted && !rejected) {
        rejected = true;
        // A daemon-rejected archive RPC: the request never reaches the daemon, and its normal
        // correlated error travels back through the real browser client and mutation rollback.
        ws.send(
-          JSON.stringify({
-            type: "session",
-            message: {
-              type: "rpc_error",
-              payload: {
-                requestId,
-                requestType: "archive_agent_request",
-                error: "Archive rejected for test",
-                code: "archive_rejected",
-              },
+          intercepted.reply({
+            type: "rpc_error",
+            payload: {
+              requestId: intercepted.request.requestId,
+              requestType: "archive_agent_request",
+              error: "Archive rejected for test",
+              code: "archive_rejected",
            },
          }),
        );
@@ -286,28 +291,18 @@ export async function rejectNextManagedSubagentArchiveRequest(
 }

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

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

 export async function detachSubagentFromTrack(page: Page, childId: string): Promise<void> {
@@ -325,51 +320,212 @@ export async function detachSubagentFromTrack(page: Page, childId: string): Prom
  await detachButton.click();
 }

-/** The primary children come from the real agent MCP endpoint on A. */
+/** Real equal-ID children in equal-ID workspaces, with both route authorities independently live. */
+export async function seedFleetSubagents() {
+  const workspace = await seedWorkspace({ repoPrefix: "fleet-track-" });
+  const destination = await startIsolatedHostDaemon(`fleet_${randomUUID()}`);
+  const clients: DaemonClient[] = [];
+  const apis: ReturnType<Awaited<ReturnType<typeof loadPaseoApiFactory>>>[] = [];
+  const close = async () => {
+    await Promise.allSettled(apis.map((api) => api.dispose()));
+    await Promise.allSettled(clients.map((client) => client.close()));
+    await destination.close();
+    await workspace.cleanup();
+  };
+  try {
+    const createApi = await loadPaseoApiFactory();
+    const aClient = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "fleet-origin" });
+    clients.push(aClient);
+    const bClient = await connectDaemonClient<DaemonClient>({
+      clientIdPrefix: "fleet-destination",
+      port: destination.port,
+    });
+    clients.push(bClient);
+    const origin = createApi(aClient);
+    const direct = createApi(bClient);
+    apis.push(origin, direct);
+    const registered = await origin.hosts.add({ connection: `127.0.0.1:${destination.port}` });
+    await expect
+      .poll(
+        async () =>
+          (await origin.hosts.list()).hosts.find(
+            (host) => host.registrationId === registered.registrationId,
+          )?.status,
+      )
+      .toBe("online");
+    const destinationWorkspace = await direct.workspaces.create({
+      workspaceId: workspace.workspaceId,
+      source: { kind: "directory", path: workspace.repoPath },
+    });
+    expect(destinationWorkspace.id).toBe(workspace.workspaceId);
+    const config = { provider: "mock/ten-second-stream", modeId: "load-test" };
+    const parent = await origin.workspaces
+      .ref(workspace.workspaceId)
+      .agents.create({ title: "Fleet parent", config });
+    const agentId = randomUUID();
+    const local = await parent.subagents.create({ agentId, title: "Fleet child on A", config });
+    const remote = await parent.subagents.create({
+      agentId,
+      serverId: destination.serverId,
+      workspaceId: destinationWorkspace.id,
+      title: "Fleet child on B",
+      config,
+    });
+    return {
+      workspace,
+      destination,
+      origin,
+      direct,
+      parent,
+      local,
+      remote,
+      disable: () => origin.hosts.update(registered.registrationId, { enabled: false }),
+      enable: () => origin.hosts.update(registered.registrationId, { enabled: true }),
+      close,
+    };
+  } catch (error) {
+    await close();
+    throw error;
+  }
+}
+
+export async function connectFleetDirectHost(
+  page: Page,
+  fleet: Awaited<ReturnType<typeof seedFleetSubagents>>,
+) {
+  await openAgentRoute(page, {
+    workspaceId: fleet.workspace.workspaceId,
+    agentId: fleet.parent.id,
+  });
+  await addConnectedHostAndReload(page, {
+    serverId: fleet.destination.serverId,
+    port: fleet.destination.port,
+    label: "Fleet B",
+  });
+  await page.evaluate(
+    (host) => localStorage.setItem("@paseo:e2e-extra-hosts", JSON.stringify([host])),
+    buildSeededHost({
+      serverId: fleet.destination.serverId,
+      endpoint: `127.0.0.1:${fleet.destination.port}`,
+      nowIso: new Date().toISOString(),
+      label: "Fleet B",
+    }),
+  );
+  await page.goto(
+    buildHostAgentDetailRoute(
+      fleet.destination.serverId,
+      fleet.remote.id,
+      fleet.workspace.workspaceId,
+    ),
+  );
+  await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+}
+
+export async function openFleetParentTrack(page: Page) {
+  await openSessions(page);
+  await clickSessionRow(page, "Fleet parent");
+  await openSubagentsTrack(page);
+}
+
+export async function readFleetAuthorityState(
+  page: Page,
+  originServerId: string,
+  serverId: string,
+) {
+  return page.evaluate(
+    ({ originServerId: sourceId, serverId: destinationId }) => {
+      const runtime = Reflect.get(globalThis, "__paseoHostRuntimeStore") as HostRuntimeStore;
+      const read = (origin: string) => {
+        const binding = runtime
+          .getAuthorityBindings()
+          .find(
+            (candidate) =>
+              candidate.reference.originServerId === origin &&
+              candidate.reference.serverId === destinationId,
+          );
+        const queries =
+          binding?.queries
+            .getQueryCache()
+            .findAll({ queryKey: ["providersSnapshot", destinationId] }) ?? [];
+        return {
+          status: binding?.runtime.getSnapshot(destinationId)?.connectionStatus ?? "absent",
+          hydrated: binding?.sessionStore.getState().sessions[destinationId]?.hasHydratedWorkspaces,
+          workspaceIds: [
+            ...(binding?.sessionStore.getState().sessions[destinationId]?.workspaces.keys() ?? []),
+          ],
+          catalogVersion: Math.max(0, ...queries.map((query) => query.state.dataUpdatedAt)),
+        };
+      };
+      return { direct: read(destinationId), routed: read(sourceId) };
+    },
+    { originServerId, serverId },
+  );
+}
+
+export async function expectFleetRouteUnavailable(
+  page: Page,
+  originServerId: string,
+  serverId: string,
+) {
+  await expect
+    .poll(async () => (await readFleetAuthorityState(page, originServerId, serverId)).routed.status)
+    .toMatch(/^(offline|error)$/);
+  const unavailable = page.getByText(/^(Cannot reach .+|.+ is offline)$/).filter({ visible: true });
+  const composer = page.getByRole("textbox", { name: "Message agent..." });
+  await expect(unavailable.or(composer)).toBeVisible();
+  if (await composer.isVisible()) {
+    if (await composer.isEditable()) {
+      await composer.fill("MUST_NOT_USE_DIRECT_AUTHORITY");
+      await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeDisabled();
+    } else await expect(composer).toBeDisabled();
+  } else
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toHaveCount(0);
+}
+
+/** Primary children are created by the agent's real MCP endpoint, never the seed SDK. */
 export async function delegateFleetThroughMcp() {
  const { Client } = await import("@modelcontextprotocol/sdk/client/index.js");
  const { StreamableHTTPClientTransport } =
    await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
+  const { getE2EDaemonPort } = await import("./daemon-port");
  const { z } = await import("zod");
-  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",
+  const workspace = await seedWorkspace({ repoPrefix: "mcp-fleet-journey-" });
+  const destination = await startIsolatedHostDaemon(`fleet_${randomUUID()}`);
+  const createApi = await loadPaseoApiFactory();
+  const aClient = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "mcp-fleet-origin" });
+  const bClient = await connectDaemonClient<DaemonClient>({
+    clientIdPrefix: "mcp-fleet-observer",
    port: destination.port,
  });
-  const serverId = a.getLastServerInfoMessage()!.serverId;
-  const mcp = new Client({ name: "fleet-parent", version: "1" });
+  const origin = createApi(aClient);
+  const direct = createApi(bClient);
+  const mcp = new Client({ name: "fleet-delegating-agent", version: "1.0.0" });
  const close = async () => {
    await mcp.close();
-    await Promise.allSettled([a.close(), b.close()]);
+    await Promise.allSettled([origin.dispose(), direct.dispose()]);
+    await Promise.allSettled([aClient.close(), bClient.close()]);
    await destination.close();
    await workspace.cleanup();
  };
  const call = async (name: string, args: Record<string, unknown> = {}) => {
-    const response = await mcp.callTool({ name, arguments: args });
-    expect(response, name).not.toMatchObject({ isError: true });
-    return z.record(z.string(), z.unknown()).parse(response.structuredContent);
+    const result = await mcp.callTool({ name, arguments: args });
+    expect(result, `${name} result`).not.toMatchObject({ isError: true });
+    return z.record(z.string(), z.unknown()).parse(result.structuredContent);
  };
  try {
-    const 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({
+    const config = { provider: "mock/ten-second-stream", modeId: "load-test" };
+    const parent = await origin.workspaces
+      .ref(workspace.workspaceId)
+      .agents.create({ title: "Fleet MCP parent", config });
+    const registered = await origin.hosts.add({
      connection: `127.0.0.1:${destination.port}`,
      label: "Fleet B",
    });
    await expect
      .poll(
        async () =>
-          (await a.listHosts()).hosts.find(
-            (row) => row.registrationId === registration.registrationId,
+          (await origin.hosts.list()).hosts.find(
+            (host) => host.registrationId === registered.registrationId,
          )?.status,
      )
      .toBe("online");
@@ -378,7 +534,8 @@ export async function delegateFleetThroughMcp() {
        new URL(`http://127.0.0.1:${getE2EDaemonPort()}/mcp/agents?callerAgentId=${parent.id}`),
      ),
    );
-    expect(await call("list_hosts")).toMatchObject({
+    const hosts = await call("list_hosts");
+    expect(hosts).toMatchObject({
      hosts: expect.arrayContaining([
        expect.objectContaining({ serverId: destination.serverId, label: "Fleet B" }),
      ]),
@@ -387,83 +544,83 @@ export async function delegateFleetThroughMcp() {
      serverId: destination.serverId,
      isolation: "local",
      path: workspace.repoPath,
-      title: "B workspace",
+      title: "Fleet B workspace",
    });
+    const targetWorkspaceId = z.string().parse(target.workspaceId);
    expect(await call("list_workspaces", { serverId: destination.serverId })).toMatchObject({
      workspaces: expect.arrayContaining([
-        expect.objectContaining({ workspaceId: target.workspaceId }),
+        expect.objectContaining({ workspaceId: targetWorkspaceId }),
      ]),
    });
-    const createChild = async (targetServerId: string, workspaceId: string, title: string) => {
+    const createChild = async (serverId: string, workspaceId: string, title: string) => {
      const result = await call("create_agent", {
-        serverId: targetServerId,
+        serverId,
        workspaceId,
        title,
-        provider: "mock/e2e-fast-stream",
-        settings: { modeId: "load-test" },
-        initialPrompt: `Finish ${title}`,
+        provider: config.provider,
+        settings: { modeId: config.modeId },
+        initialPrompt: `Complete ${title}`,
+        notifyOnFinish: true,
      });
-      return {
-        serverId: targetServerId,
-        agentId: z.string().parse(result.agentId),
-        workspaceId,
-        title,
-      };
+      const agentId = z.string().parse(result.agentId);
+      const submissionId = z.string().parse(result.submissionId);
+      expect(await call("get_agent_status", { serverId, agentId })).toMatchObject({ serverId });
+      expect(await call("get_agent_activity", { serverId, agentId })).toMatchObject({ serverId });
+      expect(await call("list_agents", { serverId })).toMatchObject({
+        serverId,
+        agents: expect.arrayContaining([expect.objectContaining({ id: agentId })]),
+      });
+      return { id: agentId, serverId, workspaceId, submissionId, title };
    };
-    const local = await createChild(serverId, workspace.workspaceId, "MCP child on A");
-    const remote = await createChild(
-      destination.serverId,
-      z.string().parse(target.workspaceId),
-      "MCP child on B",
+    const local = await createChild(parent.serverId, workspace.workspaceId, "MCP child on A");
+    const remote = await createChild(destination.serverId, targetWorkspaceId, "MCP child on B");
+    // Opposite-host collisions are unrelated fixture agents. Neither primary child is seeded.
+    await direct.agents.create({
+      agentId: local.id,
+      cwd: workspace.repoPath,
+      title: "Unrelated collision on B",
+      config,
+    });
+    await origin.agents.create({
+      agentId: remote.id,
+      cwd: workspace.repoPath,
+      title: "Unrelated collision on A",
+      config,
+    });
+    expect((await parent.subagents.list()).rows.map((row) => row.child)).toEqual(
+      expect.arrayContaining([
+        { serverId: local.serverId, agentId: local.id },
+        { serverId: remote.serverId, agentId: remote.id },
+      ]),
    );
-    // 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,
+      origin,
+      direct,
      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);
+          .poll(
+            async () => {
+              const timeline = await parent.timeline.refetch();
+              return timeline.entries
+                .flatMap(({ item }) =>
+                  item.type === "tool_call" && item.agentMessage ? [item.agentMessage] : [],
+                )
+                .filter(
+                  (message) =>
+                    message.event === "finished" &&
+                    message.sender.address?.serverId === child.serverId &&
+                    message.text.includes(child.submissionId),
+                );
+            },
+            { timeout: 30000 },
+          )
+          .toHaveLength(1);
      },
    };
  } catch (error) {
@@ -471,3 +628,45 @@ export async function delegateFleetThroughMcp() {
    throw error;
  }
 }
+
+export async function readFleetCompletion(
+  page: Page,
+  child: { title: string; submissionId: string },
+) {
+  await expect(
+    page.getByRole("button", { name: new RegExp(`Agent finished.*${child.title}`) }),
+  ).toBeVisible();
+}
+
+/** Records observed requests and runtime-owned sessions without opening extra scopes. */
+export function observeFleetRouteOwnership(page: Page) {
+  const requests: Record<string, number> = {};
+  let sockets = 0;
+  page.on("websocket", (socket) => {
+    sockets++;
+    socket.on("framesent", ({ payload }) => {
+      const request = inspectSessionWireRequest(payload)?.request;
+      if (!request || typeof request.type !== "string") return;
+      if (request.subscribe !== undefined || request.type === "hosts.route.open.request")
+        requests[request.type] = (requests[request.type] ?? 0) + 1;
+    });
+  });
+  return async () => ({
+    sockets,
+    cumulativeRequests: { ...requests },
+    bindings: await page.evaluate(() => {
+      const registry = Reflect.get(globalThis, "__paseoHostRuntimeStore") as HostRuntimeStore;
+      return registry.getAuthorityBindings().map((binding) => {
+        const id = binding.reference.serverId;
+        const session = binding.sessionStore.getState().sessions[id];
+        return {
+          reference: binding.reference,
+          status: binding.runtime.getSnapshot(id)?.connectionStatus,
+          session: session?.client !== null && session?.client !== undefined,
+          workspaceReplica: session?.hasHydratedWorkspaces === true,
+          timelineReplica: session?.viewedTimelineSync !== undefined,
+        };
+      });
+    }),
+  });
+}
@@ -376,7 +376,3 @@ export function observeSetupPanelTraffic(page: Page) {
    },
  };
 }
-
-export function setupCommandOutput(detail: { commands: Array<{ log: string }> }): string {
-  return detail.commands.map((command) => command.log).join("\n");
-}
@@ -9,8 +9,6 @@ import "@expo/metro-runtime";
 // oxlint-disable-next-line import/no-unassigned-import -- Preserve Expo's entry side effects.
 import "expo-router/build/fast-refresh";
 import { renderRootComponent } from "expo-router/build/renderRootComponent";
-import { startWatchdog } from "./src/watchdog";
 import { RootApp } from "./src/root-app";

-startWatchdog();
 renderRootComponent(RootApp);
@@ -5,7 +5,6 @@ const path = require("path");
 const projectRoot = __dirname;
 const appNodeModulesRoot = path.resolve(projectRoot, "node_modules");
 const appSrcRoot = path.resolve(projectRoot, "src");
-const isWatchdogBuild = process.env.PASEO_WATCHDOG_BUILD === "1";
 const isFdroidBuild = process.env.PASEO_FDROID_BUILD === "1";
 const fdroidModuleOverrides = {
  "expo-camera": path.resolve(appSrcRoot, "fdroid/expo-camera.tsx"),
@@ -17,7 +16,6 @@ const customWebPlatform = (process.env.PASEO_WEB_PLATFORM ?? "")
  .toLowerCase();

 const config = getDefaultConfig(projectRoot);
-config.cacheVersion = isWatchdogBuild ? "watchdog" : "standard";
 const defaultResolveRequest = config.resolver.resolveRequest ?? resolve;

 // Keep app exports deterministic across dev machines and CI. Metro's Watchman
@@ -77,14 +75,6 @@ function resolveWithCustomWebOverlay(context, moduleName, platform) {
 }

 config.resolver.resolveRequest = (context, moduleName, platform) => {
-  if (
-    isWatchdogBuild &&
-    platform === "android" &&
-    /[/\\]Renderer[/\\]shims[/\\]/.test(context.originModulePath) &&
-    /implementations\/(ReactFabric|ReactNativeRenderer)-prod$/.test(moduleName)
-  ) {
-    return defaultResolveRequest(context, moduleName.replace(/-prod$/, "-profiling"), platform);
-  }
  if (isFdroidBuild && platform === "android" && fdroidModuleOverrides[moduleName]) {
    return resolveWithCustomWebOverlay(context, fdroidModuleOverrides[moduleName], platform);
  }
@@ -7,7 +7,6 @@
 #include <stdexcept>
 #include <unordered_map>
 #include "include/ports/SkFontMgr_android.h"
-#include "include/ports/SkFontScanner_FreeType.h"
 #include "modules/skunicode/include/SkUnicode.h"

 namespace {
@@ -87,7 +86,7 @@ extern "C" JNIEXPORT jdoubleArray JNICALL METHOD(prepareDocument)(
    const auto fontFamily = SkUnicode::convertUtf16ToUtf8(copyString(env, family));
    const double copyMs = elapsed(copyStart);
    const auto layoutStart = Clock::now();
-    paseo::diff::prepare(*document, SkFontMgr_New_Android(nullptr, SkFontScanner_Make_FreeType()), fontFamily.c_str(), size, job->cancelled);
+    paseo::diff::prepare(*document, SkFontMgr_New_Android(nullptr), fontFamily.c_str(), size, job->cancelled);
    const double layoutMs = elapsed(layoutStart);
    {
      std::lock_guard lock(mutex);
@@ -13,7 +13,6 @@
 #include "modules/skparagraph/include/Paragraph.h"
 #include "modules/skparagraph/include/ParagraphBuilder.h"
 #include "modules/skunicode/include/SkUnicode.h"
-#include "modules/skunicode/include/SkUnicode_icu.h"

 namespace paseo::diff {
 namespace {
@@ -179,7 +178,7 @@ class Measurer {
    return it->second;
  }
  std::unique_ptr<para::Paragraph> shape(const std::u16string& text) {
-    auto builder = para::ParagraphBuilder::make(style_, fonts_, SkUnicodes::ICU::Make());
+    auto builder = para::ParagraphBuilder::make(style_, fonts_);
    builder->pushStyle(textStyle_);
    const auto utf8 = SkUnicode::convertUtf16ToUtf8(text);
    builder->addText(utf8.c_str(), utf8.size());
@@ -13,7 +13,3 @@ useDefaultAndroidSdkVersions()
 android {
  namespace "sh.paseo.trace"
 }
-
-dependencies {
-  testImplementation "junit:junit:4.13.2"
-}
@@ -1,77 +0,0 @@
-package sh.paseo.trace
-
-import android.content.Context
-import android.os.SystemClock
-import android.util.Log
-import org.json.JSONObject
-import java.util.UUID
-import java.util.concurrent.ArrayBlockingQueue
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicLong
-
-/** All serialization and storage belongs to the worker, never the JS/UI threads. */
-internal class DiagnosticRecorder(private val context: Context, private val metadata: Map<String, String>) {
-  private data class Event(val name: String, val data: Map<String, String>, val monoMs: Long = SystemClock.elapsedRealtime(), val wallMs: Long = System.currentTimeMillis())
-  private val queue = ArrayBlockingQueue<Event>(2048)
-  private val dropped = AtomicLong()
-  private val worker = Executors.newSingleThreadScheduledExecutor()
-  private val session = UUID.randomUUID().toString()
-  @Volatile private var failed = false
-  private val watchdog = HeartbeatWatchdog(SystemClock.elapsedRealtime(), ::record)
-
-  private val log = RotatingLog(DownloadsLogStorage(context, session), { part ->
-    serialize(Event("file.start", metadata + mapOf("schema" to "1", "part" to "$part")))
-  }, { error ->
-    failed = true
-    queue.clear()
-    Log.e("PaseoDiagnostics", "Diagnostic recording stopped: storage unavailable", error)
-  })
-
-  init {
-    record("session.start", metadata + mapOf("session" to session, "schema" to "1", "heartbeatMs" to "${HeartbeatTiming.intervalMs}", "stallThresholdMs" to "${HeartbeatTiming.overdueMs}"))
-    worker.scheduleWithFixedDelay({ drain() }, 0, HeartbeatTiming.intervalMs, TimeUnit.MILLISECONDS)
-  }
-
-  fun record(name: String, data: Map<String, String>) {
-    if (failed) return
-    // Limit native memory even if an instrumentation caller accidentally supplies large fields.
-    val bounded = data.entries.take(24).associate { it.key.take(80) to it.value.take(256) }
-    if (!queue.offer(Event(name.take(120), bounded))) dropped.incrementAndGet()
-  }
-
-  fun heartbeat() = watchdog.heartbeat(SystemClock.elapsedRealtime())
-  fun active(value: Boolean) = watchdog.active(value, SystemClock.elapsedRealtime())
-
-  private fun drain() {
-    if (failed) return
-    watchdog.check(SystemClock.elapsedRealtime())
-    val lost = dropped.getAndSet(0)
-    if (lost > 0) write(Event("recorder.dropped", mapOf("count" to "$lost")))
-    var remaining = 2048
-    while (remaining-- > 0 && !failed) {
-      val event = queue.poll() ?: break
-      write(event)
-    }
-    log.finishBatch()
-  }
-
-  private fun write(event: Event) = log.write(serialize(event))
-
-  private fun serialize(event: Event): ByteArray = (JSONObject().apply {
-    put("event", event.name)
-    put("session", session)
-    put("wallMs", event.wallMs)
-    put("monoMs", event.monoMs)
-    put("data", JSONObject(event.data))
-  }.toString() + "\n").toByteArray(Charsets.UTF_8)
-
-  fun close() {
-    worker.execute {
-      record("session.end", emptyMap())
-      drain()
-      log.finishBatch()
-    }
-    worker.shutdown()
-  }
-}
@@ -1,36 +0,0 @@
-package sh.paseo.trace
-
-import android.content.ContentUris
-import android.content.ContentValues
-import android.content.Context
-import android.net.Uri
-import android.provider.MediaStore
-import java.io.OutputStream
-
-internal class DownloadsLogStorage(private val context: Context, private val session: String) : LogStorage {
-  private val resolver = context.contentResolver
-  private val collection = MediaStore.Downloads.EXTERNAL_CONTENT_URI
-  private val directory = "Download/Paseo diagnostics/"
-
-  override fun create(part: Int): String {
-    val values = ContentValues().apply {
-      put(MediaStore.MediaColumns.DISPLAY_NAME, "paseo-diagnostics-${System.currentTimeMillis()}-${session.take(8)}-$part.jsonl")
-      put(MediaStore.MediaColumns.MIME_TYPE, "application/x-ndjson")
-      put(MediaStore.MediaColumns.RELATIVE_PATH, directory)
-    }
-    return checkNotNull(resolver.insert(collection, values)).toString()
-  }
-
-  override fun append(id: String): OutputStream =
-    checkNotNull(resolver.openOutputStream(Uri.parse(id), "wa")).buffered(64 * 1024)
-
-  override fun newest(): List<String> = buildList {
-    resolver.query(collection, arrayOf(MediaStore.MediaColumns._ID),
-      "${MediaStore.MediaColumns.RELATIVE_PATH} = ? AND ${MediaStore.MediaColumns.OWNER_PACKAGE_NAME} = ?",
-      arrayOf(directory, context.packageName), "${MediaStore.MediaColumns._ID} DESC")?.use { cursor ->
-      while (cursor.moveToNext()) add(ContentUris.withAppendedId(collection, cursor.getLong(0)).toString())
-    }
-  }
-
-  override fun delete(id: String) { resolver.delete(Uri.parse(id), null, null) }
-}
@@ -1,38 +0,0 @@
-package sh.paseo.trace
-
-internal object HeartbeatTiming {
-  const val intervalMs = 250L
-  const val overdueMs = 500L
-  const val gapMs = intervalMs + overdueMs
-}
-
-/** Monotonic time is supplied by the owner, so suspension and recovery are deterministic. */
-internal class HeartbeatWatchdog(startMs: Long, private val emit: (String, Map<String, String>) -> Unit) {
-  private var foreground = true
-  private var lastHeartbeat = startMs
-  private var overdue = false
-
-  @Synchronized fun heartbeat(now: Long) {
-    if (foreground && now - lastHeartbeat > HeartbeatTiming.gapMs) {
-      emit("js.stall.recovered", mapOf("heartbeatGapMs" to "${now - lastHeartbeat}", "overdueMs" to "${now - lastHeartbeat - HeartbeatTiming.intervalMs}"))
-    }
-    lastHeartbeat = now
-    overdue = false
-  }
-
-  @Synchronized fun active(value: Boolean, now: Long) {
-    if (foreground == value) return
-    emit("app.lifecycle", mapOf("state" to if (value) "foreground" else "background", "stallOpen" to "$overdue"))
-    foreground = value
-    lastHeartbeat = now
-    overdue = false
-  }
-
-  @Synchronized fun check(now: Long) {
-    val gap = now - lastHeartbeat
-    if (foreground && gap > HeartbeatTiming.gapMs && !overdue) {
-      emit("js.stall.started", mapOf("heartbeatGapMs" to "$gap", "lastHeartbeatMonoMs" to "$lastHeartbeat"))
-      overdue = true
-    }
-  }
-}
@@ -5,23 +5,9 @@ import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition

 class PaseoNativeTraceModule : Module() {
-  private var recorder: DiagnosticRecorder? = null
-
  override fun definition() = ModuleDefinition {
    Name("PaseoNativeTrace")

-    Function("startRecorder") { metadata: Map<String, String> ->
-      if (recorder == null) {
-        appContext.reactContext?.applicationContext?.let { recorder = DiagnosticRecorder(it, metadata) }
-      }
-      HeartbeatTiming.intervalMs
-    }
-    Function("record") { name: String, data: Map<String, String> -> recorder?.record(name, data) }
-    Function("heartbeat") { recorder?.heartbeat() }
-    OnActivityEntersForeground { recorder?.active(true) }
-    OnActivityEntersBackground { recorder?.active(false) }
-    OnDestroy { recorder?.close(); recorder = null }
-
    Function("beginSection") { name: String ->
      Trace.beginSection(name.take(127))
    }
@@ -1,61 +0,0 @@
-package sh.paseo.trace
-
-import java.io.OutputStream
-
-/** Storage supplies installation-owned files, newest first. */
-internal interface LogStorage {
-  fun create(part: Int): String
-  fun append(id: String): OutputStream
-  fun newest(): List<String>
-  fun delete(id: String)
-}
-
-/** Owns file identity, bounded retention and the terminal storage-failure state. */
-internal class RotatingLog(
-  private val storage: LogStorage,
-  private val header: (Int) -> ByteArray,
-  private val onFailure: (Exception) -> Unit,
-  private val maxBytes: Int = 5 * 1024 * 1024,
-) {
-  private var current: String? = null
-  private var output: OutputStream? = null
-  private var size = 0
-  private var part = 0
-  var failed = false
-    private set
-
-  fun write(bytes: ByteArray) = attempt {
-    if (current == null || size + bytes.size > maxBytes) {
-      finishBatch()
-      if (failed) return@attempt
-      val nextPart = part++
-      current = storage.create(nextPart)
-      output = storage.append(checkNotNull(current))
-      val first = header(nextPart)
-      output!!.write(first)
-      size = first.size
-      storage.newest().drop(8).forEach(storage::delete)
-    }
-    if (output == null) output = storage.append(checkNotNull(current))
-    output!!.write(bytes)
-    size += bytes.size
-  }
-
-  // Closing publishes size and modification time in Android Files.
-  fun finishBatch() = attempt {
-    output?.close()
-    output = null
-  }
-
-  private fun attempt(action: () -> Unit) {
-    if (failed) return
-    try {
-      action()
-    } catch (error: Exception) {
-      failed = true
-      runCatching { output?.close() }
-      output = null
-      onFailure(error)
-    }
-  }
-}
@@ -1,40 +0,0 @@
-package sh.paseo.trace
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class HeartbeatWatchdogTest {
-  @Test fun recordsOneStartAndRecoveryWithMeasuredGap() {
-    val events = mutableListOf<Pair<String, Map<String, String>>>()
-    val watchdog = HeartbeatWatchdog(0) { name, fields -> events.add(name to fields) }
-    watchdog.heartbeat(250)
-    watchdog.check(1000)
-    assertEquals(emptyList<Pair<String, Map<String, String>>>(), events)
-    watchdog.check(1001)
-    watchdog.check(2000)
-    watchdog.heartbeat(2250)
-    assertEquals(listOf(
-      "js.stall.started" to mapOf("heartbeatGapMs" to "751", "lastHeartbeatMonoMs" to "250"),
-      "js.stall.recovered" to mapOf("heartbeatGapMs" to "2000", "overdueMs" to "1750")
-    ), events)
-  }
-
-  @Test fun backgroundAndResumeDoNotLookLikeStalls() {
-    val events = mutableListOf<String>()
-    val watchdog = HeartbeatWatchdog(0) { name, _ -> events.add(name) }
-    watchdog.active(false, 100)
-    watchdog.check(300000)
-    watchdog.heartbeat(300100)
-    watchdog.active(true, 400000)
-    watchdog.heartbeat(400250)
-    watchdog.check(400500)
-    assertEquals(listOf("app.lifecycle", "app.lifecycle"), events)
-  }
-
-  @Test fun recoveryIsReportedEvenIfNativeSamplingMissedTheGap() {
-    val events = mutableListOf<String>()
-    val watchdog = HeartbeatWatchdog(0) { name, _ -> events.add(name) }
-    watchdog.heartbeat(900)
-    assertEquals(listOf("js.stall.recovered"), events)
-  }
-}
@@ -1,59 +0,0 @@
-package sh.paseo.trace
-
-import java.io.ByteArrayOutputStream
-import java.io.IOException
-import java.io.OutputStream
-import org.junit.Assert.*
-import org.junit.Test
-
-class RotatingLogTest {
-  private class MemoryStorage : LogStorage {
-    val files = linkedMapOf<String, ByteArrayOutputStream>()
-    var fail = false
-    var opens = 0
-    override fun create(part: Int): String {
-      val id = "part-$part"
-      files[id] = ByteArrayOutputStream()
-      return id
-    }
-    override fun append(id: String): OutputStream {
-      opens++
-      if (fail) throw IOException("disk full")
-      return files.getValue(id)
-    }
-    override fun newest() = files.keys.reversed()
-    override fun delete(id: String) { files.remove(id) }
-  }
-
-  @Test fun rotatesAtByteLimitAndKeepsEightIncludingCurrent() {
-    val storage = MemoryStorage()
-    val log = RotatingLog(storage, { "header:$it\n".toByteArray() }, { throw it }, 20)
-    repeat(10) { log.write("123456789012".toByteArray()); log.finishBatch() }
-    assertEquals((2..9).map { "part-$it" }, storage.files.keys.toList())
-    for (part in 2..9) assertEquals("header:$part\n123456789012", storage.files.getValue("part-$part").toString("UTF-8"))
-    assertFalse(log.failed)
-  }
-
-  @Test fun reopeningBatchAppendsWithoutRepeatingHeaderAndExactLimitFits() {
-    val storage = MemoryStorage()
-    val log = RotatingLog(storage, { "H".toByteArray() }, { throw it }, 5)
-    log.write("12".toByteArray())
-    log.finishBatch()
-    log.write("34".toByteArray())
-    assertEquals(listOf("part-0"), storage.files.keys.toList())
-    assertEquals("H1234", storage.files.getValue("part-0").toString("UTF-8"))
-    log.write("5".toByteArray())
-    assertEquals("H5", storage.files.getValue("part-1").toString("UTF-8"))
-  }
-
-  @Test fun storageFailureStopsRecordingWithoutRetryStorm() {
-    val storage = MemoryStorage()
-    var failures = 0
-    val log = RotatingLog(storage, { byteArrayOf() }, { failures++ })
-    storage.fail = true
-    repeat(100) { log.write(byteArrayOf(1)); log.finishBatch() }
-    assertTrue(log.failed)
-    assertEquals(1, failures)
-    assertEquals(1, storage.opens)
-  }
-}
@@ -8,12 +8,12 @@
    "start:expo": "cross-env APP_VARIANT=development expo start",
    "reset-project": "node ./scripts/reset-project.js",
    "eas-build-post-install": "npm --prefix ../.. run build:app-deps && npm run build:terminal-webview",
-    "android": "npm run dev:android",
-    "android:development": "npm run dev:android",
+    "android": "npm run android:development",
+    "android:development": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=development expo prebuild --platform android --clean --non-interactive && cross-env APP_VARIANT=development expo run:android --variant=debug",
    "android:production": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=production expo prebuild --platform android --clean --non-interactive && cross-env APP_VARIANT=production expo run:android --variant=release",
    "android:release": "npm run android:production",
    "android:clear": "node -e \"require('node:fs').rmSync('android', { recursive: true, force: true })\"",
-    "ios": "npm run dev:ios",
+    "ios": "npm --prefix ../.. run build:client && expo run:ios",
    "ios:release": "npm --prefix ../.. run build:client && expo run:ios --configuration Release",
    "web": "npm --prefix ../.. run build:client && concurrently --kill-others --names protocol,client,expo --prefix-colors yellow,blue,magenta \"npm --prefix ../.. run watch:protocol\" \"npm --prefix ../.. run watch:client\" \"npm run web:expo\"",
    "web:expo": "expo start --web",
@@ -36,12 +36,7 @@
    "profile:workspace-tabs": "node ./scripts/profile-workspace-tabs.mjs",
    "deploy:web": "npm run build:web && wrangler pages deploy dist --project-name paseo-app --branch main",
    "build:terminal-webview": "node ./scripts/build-terminal-webview-html.mjs",
-    "build:mermaid-runtime": "node ./src/components/markdown/fence/mermaid/build-runtime.mjs",
-    "dev:android": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=development expo prebuild --platform android --clean --non-interactive && cross-env APP_VARIANT=development expo run:android --variant=debug",
-    "dev:ios": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=development expo run:ios",
-    "build:apk": "npm --prefix ../.. run build:apk",
-    "build:apk:arm64": "npm --prefix ../.. run build:apk:arm64",
-    "test:android": "expo prebuild --platform android --no-install && cd android && ./gradlew :paseo-native-trace:testReleaseUnitTest --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
+    "build:mermaid-runtime": "node ./src/components/markdown/fence/mermaid/build-runtime.mjs"
  },
  "dependencies": {
    "@codemirror/commands": "6.10.4",
@@ -1,4 +1,3 @@
-import { PluginTranslationRuntime } from "@getpaseo/plugin/client/host";
 import { runPluginClientBundle, type PluginClientRuntime } from "@/plugins/evaluate";
 import { transformTimelineItem, type TimelineItemTransform } from "@/plugins/timeline/model";
 import type { InstalledPlugin } from "@/plugins/types";
@@ -62,8 +61,6 @@ function installProbe(
    serverId: "host-1",
    clientBundle,
    lifetime: new AbortController(),
-    locale: "en",
-    i18n: new PluginTranslationRuntime({ getLocale: () => "en", subscribe: () => () => {} }),
    queryClient: new QueryClient(),
    paseo: {} as InstalledPlugin["paseo"],
    invoke: async () => undefined,
@@ -1,3 +1,4 @@
+import { HostAuthoritySessions } from "@/runtime/host-authority-sessions";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
 import { useIsExplorerSidebarOpen } from "@/workspace-tabs/explorer-sidebar";
@@ -313,6 +314,7 @@ function HostSessionManager() {

  return (
    <>
+      <HostAuthoritySessions />
      {hosts.map((daemon) => (
        <ManagedDaemonSession key={daemon.serverId} daemon={daemon} />
      ))}
@@ -19,13 +19,20 @@ export default function HostRouteLayout() {
 }

 function KnownHostRoute() {
-  const params = useLocalSearchParams<{ serverId?: string | string[] }>();
+  const params = useLocalSearchParams<{
+    serverId?: string | string[];
+    origin?: string | string[];
+  }>();
  const hosts = useHosts();
  const hostRegistryStatus = useHostRegistryStatus();
  const bootstrapState = useHostRuntimeBootstrapState();
  const routeServerId = typeof params.serverId === "string" ? params.serverId : null;
  const startupRoute = resolveStartupRoute({
-    route: { kind: "host", serverId: routeServerId },
+    route: {
+      kind: "host",
+      serverId: routeServerId,
+      ...(typeof params.origin === "string" ? { originServerId: params.origin } : {}),
+    },
    startupBlocker: bootstrapState.startupBlocker,
    hostRegistryStatus,
    hosts,
@@ -1,3 +1,4 @@
+import { HostAuthorityRoute } from "@/runtime/host-authority-route";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useLocalSearchParams, useRouter, type Href } from "expo-router";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
@@ -5,21 +6,34 @@ import { useFetchQuery } from "@/data/query";
 import { resolveAgentRoute, type AgentRouteLookup } from "@/navigation/agent-route-resolution";
 import { AgentRouteResolutionView } from "@/navigation/agent-route-resolution-view";
 import { useSessionStore } from "@/stores/session-store";
-import { getHostRuntimeStore, useHostRuntimeSnapshot, useHosts } from "@/runtime/host-runtime";
-import { buildHostRootRoute, buildSettingsHostRoute } from "@/utils/host-routes";
+import { useHostRuntimeStore, useHostRuntimeSnapshot, useHosts } from "@/runtime/host-runtime";
+import {
+  buildHostRootRoute,
+  buildSettingsHostRoute,
+  withHostRouteAuthority,
+} from "@/utils/host-routes";
 import { toErrorMessage } from "@/utils/error-messages";
 import { navigateToAgent } from "@/utils/navigate-to-agent";

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

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

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

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

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

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

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

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

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

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

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

-function WorkspaceDeckEntry({
+function WorkspaceDeckEntry(props: {
+  selection: ActiveWorkspaceSelection;
+  active: boolean;
+  recoveryRequested: boolean;
+  onUnmountInactive: (selection: ActiveWorkspaceSelection) => void;
+}) {
+  return (
+    <HostAuthorityRoute reference={workspaceSelectionAuthority(props.selection)}>
+      <WorkspaceDeckEntryContent {...props} />
+    </HostAuthorityRoute>
+  );
+}
+
+function WorkspaceDeckEntryContent({
  selection,
  active,
  recoveryRequested,
@@ -308,12 +330,14 @@ function WorkspaceDeckEntry({
      active={active}
      testID={`workspace-deck-entry-${selection.serverId}:${selection.workspaceId}`}
    >
-      <WorkspaceScreen
-        serverId={selection.serverId}
-        workspaceId={selection.workspaceId}
-        isRouteFocused={active}
-        recoveryRequested={active && recoveryRequested}
-      />
+      <WorkspaceOpenIntentBoundary selection={selection} active={active}>
+        <WorkspaceScreen
+          serverId={selection.serverId}
+          workspaceId={selection.workspaceId}
+          isRouteFocused={active}
+          recoveryRequested={active && recoveryRequested}
+        />
+      </WorkspaceOpenIntentBoundary>
    </RetainedPanel>
  );
 }
@@ -39,10 +39,14 @@ export default function Index() {
    hosts,
    anyOnlineHostServerId,
    workspaceSelection,
-    workspaceSelectionStatus: resolveWorkspaceSelectionStatus({
-      hasHydratedWorkspaces: hasHydratedWorkspaceSelectionHost,
-      workspaceExists: workspaceSelectionExists,
-    }),
+    // COMPAT(unboundStartupSelection): added in v0.12, remove after 2027-04-20.
+    // Qualified restore reacquires its origin at the host boundary before proving absence.
+    workspaceSelectionStatus: workspaceSelection?.authority
+      ? "unknown"
+      : resolveWorkspaceSelectionStatus({
+          hasHydratedWorkspaces: hasHydratedWorkspaceSelectionHost,
+          workspaceExists: workspaceSelectionExists,
+        }),
    isWorkspaceSelectionLoaded,
    hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
  });
@@ -23,8 +23,6 @@ const INLINE_PAREN_LINE_SUFFIX = /^(.+?)\(([0-9]+)(?:,[0-9]+)?(?:-([0-9]+)(?:,[0
 const INLINE_WORD_LINE_SUFFIX = /^(.+?)\s+lines?\s+([0-9]+)(?:-([0-9]+))?$/i;
 export interface AssistantHrefParseOptions {
  workspaceRoot?: string;
-  /** Authored document links resolve from this directory, independently of the workspace. */
-  relativePathBase?: string;
  /** Authored links identify a file; only inferred text needs filename heuristics. */
  explicitLink?: boolean;
  /**
@@ -283,7 +281,6 @@ export function parseAssistantFileLink(
    workspaceRoot: options.workspaceRoot,
    decodeHref: options.decodeHref,
    explicitLink: options.explicitLink,
-    relativePathBase: options.relativePathBase,
  });
  if (relativeTarget) {
    return relativeTarget;
@@ -398,15 +395,6 @@ function parseWorkspaceRelativeFileLink(
    };
  }

-  const documentBase = options.explicitLink && normalizePathInput(options.relativePathBase);
-  if (documentBase) {
-    return {
-      raw: value,
-      path: resolveDocumentRelativePath(parsed.path, documentBase),
-      ...parsed.lines,
-    };
-  }
-
  const workspaceRoot = normalizePathInput(options.workspaceRoot);
  if (!workspaceRoot) {
    return null;
@@ -650,24 +638,6 @@ function isDomainLikePathSegment(segment: string): boolean {
  return /^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/.test(segment);
 }

-function resolveDocumentRelativePath(relativePath: string, baseDirectory: string): string {
-  const prefix = baseDirectory.startsWith("/") ? "/" : "";
-  const segments = baseDirectory.split("/").filter(Boolean);
-  for (const segment of relativePath.split("/")) {
-    const last = segments.at(-1) ?? "";
-    if (!segment || segment === ".") continue;
-    if (segment !== "..") {
-      segments.push(segment);
-    } else if (last && last !== "~" && last !== ".." && !/^[A-Za-z]:$/.test(last)) {
-      segments.pop();
-    } else if (!prefix && !/^[A-Za-z]:$/.test(last)) {
-      segments.push("..");
-    }
-  }
-  const resolved = prefix + segments.join("/");
-  return /^[A-Za-z]:$/.test(resolved) ? `${resolved}/` : resolved;
-}
-
 function resolveRelativePathUnderRoot(pathValue: string, workspaceRoot: string): string | null {
  const normalizedPath = normalizePathToken(pathValue);
  if (!normalizedPath || isAbsolutePath(normalizedPath)) {
@@ -22,7 +22,6 @@ export interface AssistantFileLinkResolverConfig {
  client?: AssistantFileLinkDaemonClient | null;
  serverId?: string;
  workspaceRoot?: string;
-  relativePathBase?: string;
  onOpenWorkspaceFile?: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
  toast?: ToastApi | null;
 }
@@ -43,7 +42,6 @@ export function AssistantFileLinkResolverProvider({
  client,
  serverId,
  workspaceRoot,
-  relativePathBase,
  onOpenWorkspaceFile,
  toast,
  children,
@@ -52,18 +50,10 @@ export function AssistantFileLinkResolverProvider({
    client,
    serverId,
    workspaceRoot,
-    relativePathBase,
    onOpenWorkspaceFile,
    toast,
  });
-  configRef.current = {
-    client,
-    serverId,
-    workspaceRoot,
-    relativePathBase,
-    onOpenWorkspaceFile,
-    toast,
-  };
+  configRef.current = { client, serverId, workspaceRoot, onOpenWorkspaceFile, toast };

  const getDirectorySuggestions = useCallback<GetDirectorySuggestions>(async (input) => {
    const activeClient = configRef.current.client;
@@ -18,50 +18,6 @@ const CONTEXT: AssistantFileLinkContext = {
  workspaceRoot: "/Users/test/project",
 };

-it.each([
-  ["guide/details.md", "/repo/docs/guide/details.md"],
-  ["../README.md", "/repo/README.md"],
-  ["guide/details%20page.md", "/repo/docs/guide/details page.md"],
-])("resolves authored href %s from its document directory", (href, expected) => {
-  expect(
-    classifyForResolution({ href }, { workspaceRoot: "/repo", relativePathBase: "/repo/docs" }),
-  ).toMatchObject({ kind: "resolved", value: { kind: "file", target: { path: expected } } });
-});
-
-it.each([
-  ["C:/repo/docs", "../README.md", "C:/repo/README.md"],
-  ["C:/repo/docs", "../../", "C:/"],
-  ["~/.paseo/docs", "../guide.md", "~/.paseo/guide.md"],
-  ["/repo/docs", "/other/file.md", "/other/file.md"],
-  ["/repo/docs", "file:///other/file.md", "/other/file.md"],
-  ["/repo/docs", "guide/details.md#L3", "/repo/docs/guide/details.md"],
-])(
-  "resolves %s with href %s without changing absolute destinations",
-  (relativePathBase, href, expected) => {
-    expect(
-      classifyForResolution({ href }, { workspaceRoot: "/repo", relativePathBase }),
-    ).toMatchObject({
-      kind: "resolved",
-      value: { kind: "file", target: { path: expected } },
-    });
-  },
-);
-
-it("keeps inferred paths and chat links rooted at the workspace", () => {
-  const context = { workspaceRoot: "/repo", relativePathBase: "/repo/docs" };
-  expect(classifyForResolution({ href: "src/file.ts", markup: "linkify" }, context)).toMatchObject({
-    value: { kind: "file", target: { path: "/repo/src/file.ts" } },
-  });
-  expect(
-    classifyForResolution({ href: "guide/details.md" }, { workspaceRoot: "/repo" }),
-  ).toMatchObject({
-    value: { kind: "file", target: { path: "/repo/guide/details.md" } },
-  });
-  expect(classifyForResolution({ href: "https://example.com/docs" }, context)).toMatchObject({
-    value: { kind: "external", url: "https://example.com/docs" },
-  });
-});
-
 it.each(["docs/guides", "docs/guides/", "docs/%E6%8C%87%E5%8D%97"])(
  "resolves an explicit extensionless folder href: %s",
  (href) => {
@@ -17,7 +17,6 @@ export interface AssistantFileLinkSource {

 export interface AssistantFileLinkContext {
  workspaceRoot?: string;
-  relativePathBase?: string;
 }

 export interface DirectorySuggestionEntry {
@@ -119,7 +118,6 @@ export function classifyForResolution(
    workspaceRoot: context.workspaceRoot,
    decodeHref: tokenInfo.fromHref,
    explicitLink: source.sourceType !== "inline-code" && !isLinkifiedSource(source),
-    relativePathBase: context.relativePathBase,
  });
  if (!classification) {
    return { kind: "resolved", value: { kind: "ignored" } };
@@ -15,7 +15,6 @@ import {
  fetchDaemonResolution,
  type AssistantFileLinkResolution,
  type AssistantFileLinkSource,
-  type AssistantFileLinkContext,
 } from "./resolver";

 export interface UseFileLinkResult {
@@ -55,15 +54,13 @@ export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult
  const stableSource = useStableSource(source);
  const activeConfig = context.configRef.current;
  const workspaceRoot = activeConfig.workspaceRoot;
-  const relativePathBase = activeConfig.relativePathBase;
  const serverId = activeConfig.serverId;
  const resolution = useMemo(
    () =>
      classifyForResolution(stableSource, {
        workspaceRoot,
-        relativePathBase,
      }),
-    [stableSource, workspaceRoot, relativePathBase],
+    [stableSource, workspaceRoot],
  );
  const queryKey = useMemo(
    () =>
@@ -157,12 +154,12 @@ export function useAssistantFileLinkActions(): AssistantFileLinkActions {
  );
  const canOpen = useCallback(
    (source: AssistantFileLinkSource) =>
-      canOpenAssistantFileLink(source, context.configRef.current),
+      canOpenAssistantFileLink(source, context.configRef.current.workspaceRoot),
    [context.configRef],
  );
  const canResolveFile = useCallback(
    (source: AssistantFileLinkSource) =>
-      canResolveAssistantFileLinkToFile(source, context.configRef.current),
+      canResolveAssistantFileLinkToFile(source, context.configRef.current.workspaceRoot),
    [context.configRef],
  );

@@ -179,7 +176,6 @@ function openAssistantFileLink(input: {
  const capturedConfig = input.context.configRef.current;
  const capturedResolution = classifyForResolution(input.source, {
    workspaceRoot: capturedConfig.workspaceRoot,
-    relativePathBase: capturedConfig.relativePathBase,
  });

  if (capturedResolution.kind === "resolved") {
@@ -237,17 +233,17 @@ function openAssistantFileLink(input: {

 function canOpenAssistantFileLink(
  source: AssistantFileLinkSource,
-  context: AssistantFileLinkContext,
+  workspaceRoot: string | undefined,
 ): boolean {
-  const resolution = classifyForResolution(source, context);
+  const resolution = classifyForResolution(source, { workspaceRoot });
  return resolution.kind === "needsLookup" || resolution.value.kind !== "ignored";
 }

 function canResolveAssistantFileLinkToFile(
  source: AssistantFileLinkSource,
-  context: AssistantFileLinkContext,
+  workspaceRoot: string | undefined,
 ): boolean {
-  const resolution = classifyForResolution(source, context);
+  const resolution = classifyForResolution(source, { workspaceRoot });
  return resolution.kind === "needsLookup" || resolution.value.kind === "file";
 }

@@ -50,7 +50,8 @@ function createAgent(overrides: Partial<Agent> = {}): Agent {
        options: [{ id: "high", label: "High" }],
      },
    ],
-    parentAgentId: null,
+    parent: null,
+    managedRelationship: null,
    labels: {},
    ...overrides,
    turn: overrides.turn ?? { phase: "idle", cancellationRequestId: null },
@@ -5,9 +5,9 @@ import { useToast } from "@/contexts/toast-context";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { RewindMode } from "./use-rewind-capabilities";
 import { useRewindComposerRestore } from "./composer-restore";
-import { useSessionStore } from "@/stores/session-store";
+import { useSessionStoreApi } from "@/stores/session-store";
 import { shouldRestoreComposerForRewindMode } from "./rewind-mode";
-import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { useHostRuntimeStore } from "@/runtime/host-runtime";

 interface UseRewindAgentMutationInput {
  serverId?: string;
@@ -26,6 +26,8 @@ export function useRewindAgentMutation(input: UseRewindAgentMutationInput): {
  isPending: boolean;
 } {
  const toast = useToast();
+  const sessionStore = useSessionStoreApi();
+  const runtime = useHostRuntimeStore();
  const { t } = useTranslation();
  const composerRestore = useRewindComposerRestore();
  const { isPending, mutateAsync } = useMutation({
@@ -36,12 +38,10 @@ export function useRewindAgentMutation(input: UseRewindAgentMutationInput): {
      await input.client.rewindAgent(input.agentId, input.messageId, mode);
      if (mode !== "files") {
        const cursor = input.serverId
-          ? useSessionStore
-              .getState()
-              .sessions[input.serverId]?.agentTimelineCursor.get(input.agentId)
+          ? sessionStore.getState().sessions[input.serverId]?.agentTimelineCursor.get(input.agentId)
          : undefined;
        if (!input.serverId) throw new Error(t("common.errors.daemonClientUnavailable"));
-        await getHostRuntimeStore().fetchAgentTimeline(input.serverId, input.agentId, {
+        await runtime.fetchAgentTimeline(input.serverId, input.agentId, {
          direction: "tail",
          projection: "projected",
          ...(cursor ? { cursor: { epoch: cursor.epoch, seq: cursor.endSeq } } : {}),
@@ -1,4 +1,4 @@
-import { useMemo, type ReactNode } from "react";
+import React, { useMemo, type ReactNode } from "react";
 import {
  View,
  Text,
@@ -186,6 +186,48 @@ function ShellDetailSection({ command, output, ds }: ShellDetailProps) {
  );
 }

+interface WorktreeSetupDetailProps {
+  log: string;
+  branchName: string;
+  worktreePath: string;
+  ds: DetailStyles;
+}
+
+function WorktreeSetupDetailSection({
+  log,
+  branchName,
+  worktreePath,
+  ds,
+}: WorktreeSetupDetailProps) {
+  const setupLog = log.replace(/^\n+/, "");
+  const hasLog = setupLog.length > 0;
+  return (
+    <View style={ds.sectionFillStyle}>
+      <View style={ds.codeBlockFillStyle}>
+        <ScrollView
+          style={ds.codeVerticalScrollStyle}
+          contentContainerStyle={styles.codeVerticalContent}
+          nestedScrollEnabled
+          showsVerticalScrollIndicator
+        >
+          <ScrollView
+            horizontal
+            nestedScrollEnabled
+            showsHorizontalScrollIndicator
+            contentContainerStyle={styles.codeHorizontalContent}
+          >
+            <View style={styles.codeLine} dataSet={CODE_SURFACE_DATASET}>
+              <Text selectable style={styles.scrollText}>
+                {hasLog ? setupLog : `Preparing worktree ${branchName} at ${worktreePath}`}
+              </Text>
+            </View>
+          </ScrollView>
+        </ScrollView>
+      </View>
+    </View>
+  );
+}
+
 function resolveSubAgentFallbackHeader(
  subAgentType: string | null | undefined,
  description: string | null | undefined,
@@ -636,7 +678,17 @@ function buildDetailSections(
      <ShellDetailSection key="shell" command={detail.command} output={detail.output} ds={ds} />,
    ];
  }
-  if (detail.type === "worktree_setup") return [];
+  if (detail.type === "worktree_setup") {
+    return [
+      <WorktreeSetupDetailSection
+        key="worktree-setup"
+        log={detail.log}
+        branchName={detail.branchName}
+        worktreePath={detail.worktreePath}
+        ds={ds}
+      />,
+    ];
+  }
  if (detail.type === "sub_agent") {
    return [
      <SubAgentDetailSection
@@ -5,9 +5,13 @@ import {
  resolveComposerAttachmentSubmitFormat,
  splitComposerAttachmentsForSubmit,
 } from "@/composer/attachments/submit";
-import { isActiveCreateFlowForDraft, useCreateFlowStore } from "@/stores/create-flow-store";
+import {
+  isActiveCreateFlowForDraft,
+  useCreateFlowStore,
+  useCreateFlowStoreApi,
+} from "@/stores/create-flow-store";
 import { handoffCreatedAgentMessageSubmission } from "@/composer/submission/writer";
-import { useSessionStore } from "@/stores/session-store";
+import { useSessionStoreApi } from "@/stores/session-store";
 import {
  createUserMessage,
  type StreamItem,
@@ -122,6 +126,8 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
  onCreateError,
 }: UseDraftAgentCreateFlowOptions<TDraftAgent, TCreateResult>) {
  const { t } = useTranslation();
+  const sessionStore = useSessionStoreApi();
+  const flowStore = useCreateFlowStoreApi();
  const [localMachine, dispatch] = useReducer(
    reducer<TDraftAgent>,
    initialAttempt,
@@ -235,6 +241,7 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
              images: attempt.images,
              attachments: attempt.attachments,
            }),
+            sessionStore,
          );
          markPendingCreateLifecycle({ draftId, lifecycle: "sent" });
        }
@@ -255,6 +262,7 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
    },
    [
      createRequest,
+      sessionStore,
      draftId,
      getPendingServerId,
      markPendingCreateLifecycle,
@@ -268,7 +276,7 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({

  const handleCreateFromInput = useCallback(
    async ({ text, attachments, cwd }: SubmitContext) => {
-      const existing = useCreateFlowStore.getState().pendingByDraftId[draftId];
+      const existing = flowStore.getState().pendingByDraftId[draftId];
      if (
        isSubmitting ||
        isActiveCreateFlowForDraft({ pending: existing, serverId: getPendingServerId(), draftId })
@@ -285,7 +293,7 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
        throw error;
      }
      const supportsForgeSearch =
-        useSessionStore.getState().sessions[pendingServerId]?.serverInfo?.features?.forgeSearch ===
+        sessionStore.getState().sessions[pendingServerId]?.serverInfo?.features?.forgeSearch ===
        true;
      const wirePayload = splitComposerAttachmentsForSubmit(attachments, {
        format: resolveComposerAttachmentSubmitFormat({
@@ -342,6 +350,8 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
      draftId,
      getPendingServerId,
      isSubmitting,
+      flowStore,
+      sessionStore,
      onCreateStart,
      runCreateAttempt,
      setPendingCreateAttempt,
@@ -243,7 +243,8 @@ function buildDraftAgentSnapshot(input: {
    model,
    features: composerState.agentControls.features,
    thinkingOptionId,
-    parentAgentId: null,
+    parent: null,
+    managedRelationship: null,
    labels: {},
  };
 }
@@ -6,7 +6,7 @@ import {
 import type { ComposerTextSource } from "./text-source";
 import { createStore, type StoreApi } from "zustand/vanilla";
 import { useStore } from "zustand";
-import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { useHostRuntimeStore } from "@/runtime/host-runtime";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
  View,
@@ -55,7 +55,11 @@ import {
 } from "@/composer/agent-controls";
 import { ContextWindowMeter } from "@/components/context-window-meter";
 import { useImageAttachmentPicker } from "@/hooks/use-image-attachment-picker";
-import { selectAgentTurnPresentation, useSessionStore } from "@/stores/session-store";
+import {
+  selectAgentTurnPresentation,
+  useSessionStore,
+  useSessionStoreApi,
+} from "@/stores/session-store";
 import { useFilePicker } from "@/hooks/use-file-picker";
 import { useFileDrop } from "@/components/file-drop/use-file-drop";
 import type { DroppedItem } from "@/components/file-drop/types";
@@ -315,7 +319,6 @@ interface PendingFileAttachment {
 }

 interface RenderAttachmentTrayArgs {
-  serverId: string;
  selectedAttachments: ComposerAttachment[];
  pendingFiles: PendingFileAttachment[];
  isComposerLocked: boolean;
@@ -332,7 +335,6 @@ interface RenderAttachmentTrayArgs {

 function renderAttachmentTray(args: RenderAttachmentTrayArgs): ReactElement | null {
  const {
-    serverId,
    selectedAttachments,
    pendingFiles,
    isComposerLocked,
@@ -345,7 +347,6 @@ function renderAttachmentTray(args: RenderAttachmentTrayArgs): ReactElement | nu
    <View style={styles.attachmentTray} testID="composer-attachment-tray">
      {selectedAttachments.map((attachment, index) =>
        renderComposerAttachmentPill({
-          serverId,
          attachment,
          index,
          disabled: isComposerLocked,
@@ -396,7 +397,6 @@ function renderQueueTrack(args: RenderQueueTrackArgs): ReactElement | null {
 }

 interface RenderComposerAttachmentPillArgs {
-  serverId: string;
  attachment: ComposerAttachment;
  index: number;
  disabled: boolean;
@@ -457,7 +457,6 @@ function renderComposerAttachmentPill(args: RenderComposerAttachmentPillArgs): R
  if (attachment.kind === "plugin_resource") {
    return (
      <PluginResourceAttachmentPill
-        serverId={args.serverId}
        key={`${attachment.pluginId}:${attachment.sourceId}:${attachment.item.id}`}
        attachment={attachment}
        index={index}
@@ -1269,6 +1268,8 @@ function ComposerContentImpl({
  const mode = resolveComposerInputMode(inputMode);
  const { t } = useTranslation();
  const buttonIconSize = resolveComposerButtonIconSize();
+  const sessionStore = useSessionStoreApi();
+  const runtime = useHostRuntimeStore();
  const client = useHostRuntimeClient(serverId);
  const isConnected = useHostRuntimeIsConnected(serverId);
  const agentDirectoryStatus = useHostRuntimeAgentDirectoryStatus(serverId);
@@ -1565,19 +1566,27 @@ function ComposerContentImpl({
          supportsForgeAttachments: supportsForgeSearch,
        }),
        encodeImages,
-        submission: createMessageSubmissionWriter(serverId),
+        submission: createMessageSubmissionWriter(serverId, sessionStore),
        activeTurnBehavior,
        activeTurnId:
          activeTurnBehavior === "steer"
            ? (selectAgentTurnPresentation(
-                useSessionStore.getState().sessions[serverId],
+                sessionStore.getState().sessions[serverId],
                targetAgentId,
              ).turnId ?? undefined)
            : undefined,
      });
      onAttentionPromptSend?.();
    };
-  }, [appSettings.sendBehavior, client, onAttentionPromptSend, serverId, supportsForgeSearch, t]);
+  }, [
+    appSettings.sendBehavior,
+    client,
+    onAttentionPromptSend,
+    serverId,
+    sessionStore,
+    supportsForgeSearch,
+    t,
+  ]);

  useEffect(() => {
    onSubmitMessageRef.current = onSubmitMessage;
@@ -1608,10 +1617,10 @@ function ComposerContentImpl({

  const queueWriter = useMemo<QueueWriter>(
    () => ({
-      read: (id) => useSessionStore.getState().sessions[serverId]?.queuedMessages?.get(id) ?? [],
+      read: (id) => sessionStore.getState().sessions[serverId]?.queuedMessages?.get(id) ?? [],
      write: (updater) => setQueuedMessages(serverId, updater),
    }),
-    [serverId, setQueuedMessages],
+    [serverId, sessionStore, setQueuedMessages],
  );

  const queueMessage = useCallback(
@@ -1880,26 +1889,23 @@ function ComposerContentImpl({
  const handleCancelAgent = useCallback(() => {
    const targetAgentId = agentIdRef.current;
    const cancellation = cancelComposerAgent({
-      client,
+      client: client
+        ? { cancelAgent: (id) => runtime.cancelAgent({ serverId, agentId: id }) }
+        : null,
      agentId: targetAgentId,
      isAgentRunning,
      isCancellingAgent,
      isConnected,
    });
    if (!cancellation) return;
-    const requestId = getHostRuntimeStore().beginAgentCancellation(serverId, targetAgentId);
-    void cancellation
-      .catch((error) => {
-        const message = resolveErrorMessage(error);
-        if (message && message.trim().length > 0) {
-          toastErrorRef.current(message);
-        }
-      })
-      .finally(() => {
-        getHostRuntimeStore().settleAgentCancellation(serverId, targetAgentId, requestId);
-      });
+    void cancellation.catch((error) => {
+      const message = resolveErrorMessage(error);
+      if (message && message.trim().length > 0) {
+        toastErrorRef.current(message);
+      }
+    });
    messageInputRef.current?.focus();
-  }, [client, isAgentRunning, isCancellingAgent, isConnected, serverId]);
+  }, [client, runtime, isAgentRunning, isCancellingAgent, isConnected, serverId]);

  const focusMessageInputForKeyboardAction = useCallback(() => {
    focusMessageInputWithPlatformStrategy(messageInputRef);
@@ -2300,7 +2306,6 @@ function ComposerContentImpl({
  const attachmentTray = useMemo(
    () =>
      renderAttachmentTray({
-        serverId,
        selectedAttachments,
        pendingFiles,
        isComposerLocked,
@@ -2320,7 +2325,6 @@ function ComposerContentImpl({
      handleOpenAttachment,
      handleRemoveAttachment,
      isComposerLocked,
-      serverId,
      selectedAttachments,
      pendingFiles,
      t,
@@ -1,6 +1,6 @@
 import { afterEach, expect, test } from "vitest";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { useSessionStore } from "@/stores/session-store";
+import { createSessionStore, useSessionStore } from "@/stores/session-store";
 import type { UserMessageItem } from "@/types/stream";
 import { createMessageSubmissionWriter } from "./writer";

@@ -40,10 +40,45 @@ afterEach(() => {
 test("tracks submissions when canonical prompts are supported", () => {
  initializeSession(CANONICAL_ONLY_SERVER_ID, { canonicalSubmittedPrompts: true });

-  createMessageSubmissionWriter(CANONICAL_ONLY_SERVER_ID).begin(
+  createMessageSubmissionWriter(CANONICAL_ONLY_SERVER_ID, useSessionStore).begin(
    "agent-1",
    submittedMessage("canonical-only-message"),
  );

  expect(submissionIds(CANONICAL_ONLY_SERVER_ID)).toEqual(["canonical-only-message"]);
 });
+
+test.each([true, false])(
+  "writes and rejects only in its captured authority store (tracked=%s)",
+  (tracked) => {
+    initializeSession(CANONICAL_ONLY_SERVER_ID, { canonicalSubmittedPrompts: tracked });
+    const scoped = createSessionStore();
+    scoped.getState().initializeSession(CANONICAL_ONLY_SERVER_ID, null);
+    scoped.getState().updateSessionServerInfo(CANONICAL_ONLY_SERVER_ID, {
+      serverId: CANONICAL_ONLY_SERVER_ID,
+      hostname: null,
+      version: "0.12.0",
+      features: { canonicalSubmittedPrompts: tracked },
+    });
+    const writer = createMessageSubmissionWriter(CANONICAL_ONLY_SERVER_ID, scoped);
+    writer.begin("agent-1", submittedMessage("scoped-message"));
+    const session = scoped.getState().sessions[CANONICAL_ONLY_SERVER_ID];
+    if (tracked)
+      expect(
+        session.messageSubmissions.get("agent-1")?.map((submission) => submission.clientMessageId),
+      ).toEqual(["scoped-message"]);
+    else
+      expect(
+        session.agentStreamTail
+          .get("agent-1")
+          ?.map((item) => (item.kind === "user_message" ? item.clientMessageId : null)),
+      ).toEqual(["scoped-message"]);
+    expect(submissionIds(CANONICAL_ONLY_SERVER_ID)).toEqual([]);
+    expect(
+      useSessionStore
+        .getState()
+        .sessions[CANONICAL_ONLY_SERVER_ID]?.agentStreamTail.get("agent-1") ?? [],
+    ).toEqual([]);
+    expect(writer.reject("agent-1", "scoped-message")).toBe("rejected");
+  },
+);
@@ -1,31 +1,37 @@
 import type { MessageSubmissionWriter } from "@/composer/actions";
-import { useSessionStore } from "@/stores/session-store";
+import type { SessionStoreApi } from "@/stores/session-store";
 import {
  appendSubmittedUserMessage,
  removeSubmittedUserMessage,
  type UserMessageItem,
 } from "@/types/stream";

-function appendUntrackedSubmission(serverId: string, agentId: string, message: UserMessageItem) {
-  const session = useSessionStore.getState().sessions[serverId];
+function appendUntrackedSubmission(
+  store: SessionStoreApi,
+  serverId: string,
+  agentId: string,
+  message: UserMessageItem,
+) {
+  const session = store.getState().sessions[serverId];
  if (!session) return;
  const tail = session.agentStreamTail.get(agentId) ?? [];
  const head = session.agentStreamHead.get(agentId) ?? [];
-  useSessionStore
+  store
    .getState()
    .setAgentStreamState(serverId, agentId, appendSubmittedUserMessage({ tail, head, message }));
 }

 function removeUntrackedSubmission(
+  store: SessionStoreApi,
  serverId: string,
  agentId: string,
  clientMessageId: string,
 ): void {
-  const session = useSessionStore.getState().sessions[serverId];
+  const session = store.getState().sessions[serverId];
  if (!session) return;
  const tail = session.agentStreamTail.get(agentId) ?? [];
  const head = session.agentStreamHead.get(agentId) ?? [];
-  useSessionStore
+  store
    .getState()
    .setAgentStreamState(
      serverId,
@@ -34,32 +40,37 @@ function removeUntrackedSubmission(
    );
 }

-function createUntrackedMessageSubmissionWriter(serverId: string): MessageSubmissionWriter {
+function createUntrackedMessageSubmissionWriter(
+  serverId: string,
+  store: SessionStoreApi,
+): MessageSubmissionWriter {
  return {
-    begin: (agentId, message) => appendUntrackedSubmission(serverId, agentId, message),
+    begin: (agentId, message) => appendUntrackedSubmission(store, serverId, agentId, message),
    accept: () => undefined,
    reject: (agentId, clientMessageId) => {
-      removeUntrackedSubmission(serverId, agentId, clientMessageId);
+      removeUntrackedSubmission(store, serverId, agentId, clientMessageId);
      return "rejected";
    },
  };
 }

-export function createMessageSubmissionWriter(serverId: string): MessageSubmissionWriter {
+export function createMessageSubmissionWriter(
+  serverId: string,
+  store: SessionStoreApi,
+): MessageSubmissionWriter {
  const supportsTrackedMessageSubmissions =
-    useSessionStore.getState().sessions[serverId]?.serverInfo?.features
-      ?.canonicalSubmittedPrompts === true;
+    store.getState().sessions[serverId]?.serverInfo?.features?.canonicalSubmittedPrompts === true;
  if (!supportsTrackedMessageSubmissions) {
    // COMPAT(canonicalSubmittedPrompts): added in v0.2.6; remove the gate after 2027-01-31 once daemon floor >= v0.2.6.
-    return createUntrackedMessageSubmissionWriter(serverId);
+    return createUntrackedMessageSubmissionWriter(serverId, store);
  }
  return {
    begin: (agentId, message) =>
-      useSessionStore.getState().beginAgentMessageSubmission(serverId, agentId, message),
+      store.getState().beginAgentMessageSubmission(serverId, agentId, message),
    accept: (agentId, clientMessageId) =>
-      useSessionStore.getState().acceptAgentMessageSubmission(serverId, agentId, clientMessageId),
+      store.getState().acceptAgentMessageSubmission(serverId, agentId, clientMessageId),
    reject: (agentId, clientMessageId) =>
-      useSessionStore.getState().rejectAgentMessageSubmission(serverId, agentId, clientMessageId),
+      store.getState().rejectAgentMessageSubmission(serverId, agentId, clientMessageId),
  };
 }

@@ -67,6 +78,7 @@ export function handoffCreatedAgentMessageSubmission(
  serverId: string,
  agentId: string,
  message: UserMessageItem,
+  store: SessionStoreApi,
 ): boolean {
-  return useSessionStore.getState().handoffCreatedAgentUserMessage(serverId, agentId, message);
+  return store.getState().handoffCreatedAgentUserMessage(serverId, agentId, message);
 }
@@ -1,7 +1,10 @@
 import { useRef, ReactNode, useCallback, useEffect } from "react";
 import { Buffer } from "buffer";
 import { AppState } from "react-native";
-import { observeOpenWorkspaceAgentIds } from "@/stores/workspace-layout-store";
+import {
+  observeOpenWorkspaceAgentIds,
+  useWorkspaceLayoutStoreApi,
+} from "@/stores/workspace-layout-store";
 import { useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import { useClientActivity } from "@/hooks/use-client-activity";
@@ -27,36 +30,35 @@ import {

 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { AgentPermissionResponse } from "@getpaseo/protocol/agent-types";
-import { getHostRuntimeStore, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { useHostRuntimeStore, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useVoiceAudioEngineOptional, useVoiceRuntimeOptional } from "@/contexts/voice-context";
 import type { AudioPlaybackSource } from "@/audio";
 import {
  selectAgentTimelineState,
  toDaemonServerInfo,
  useSessionStore,
+  useSessionStoreApi,
  type SessionState,
 } from "@/stores/session-store";
 import { sendOsNotification } from "@/utils/os-notifications";
 import { getIsAppActivelyVisible, getIsAppVisible } from "@/utils/app-visibility";
-import {
-  getInitKey,
-  getInitDeferred,
-  createInitDeferred,
-  rejectInitDeferred,
-} from "@/utils/agent-initialization";
+import { getInitKey } from "@/utils/agent-initialization";
 import { derivePendingPermissionKey } from "@/utils/agent-snapshots";
 import { useToast } from "@/contexts/toast-context";
 import { toErrorMessage } from "@/utils/error-messages";
 import { showProviderNoticeToast } from "@/utils/provider-notice-toast";
 import { applyCheckoutStatusUpdateFromEvent } from "@/git/checkout-status-cache";
-import { resyncProviderSubagents, useProviderSubagentStore } from "@/subagents/provider-store";
+import { resyncProviderSubagents, useProviderSubagentStoreApi } from "@/subagents/provider-store";

 // Re-export types from session-store and draft-store for backward compatibility
 export type { DraftInput } from "@/stores/draft-store";
 export type {
  Agent,
  ExplorerEntry,
+  ExplorerFile,
  ExplorerEntryKind,
+  ExplorerFileKind,
+  ExplorerEncoding,
  AgentFileExplorerState,
 } from "@/stores/session-store";

@@ -198,6 +200,10 @@ export function SessionProvider(props: SessionProviderProps) {
 }

 function SessionProviderInternal({ children, serverId, client }: SessionProviderClientProps) {
+  const sessionStore = useSessionStoreApi();
+  const providerStore = useProviderSubagentStoreApi();
+  const layoutStore = useWorkspaceLayoutStoreApi();
+  const runtime = useHostRuntimeStore();
  const { t } = useTranslation();
  const voiceRuntime = useVoiceRuntimeOptional();
  const voiceAudioEngine = useVoiceAudioEngineOptional();
@@ -262,7 +268,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      notification?: AgentAttentionNotificationPayload;
    }) => {
      const appState = appStateRef.current;
-      const session = useSessionStore.getState().sessions[serverId];
+      const session = sessionStore.getState().sessions[serverId];
      const attentionFocusedAgentId = session?.focusedAgentId ?? null;
      if (params.reason === "error") {
        return;
@@ -306,7 +312,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
        data: notification.data,
      });
    },
-    [serverId],
+    [serverId, sessionStore],
  );

  useEffect(() => {
@@ -374,7 +380,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
        { event: streamEvent, seq, epoch, timestamp: parsedTimestamp },
      ]);
      if (turnLiveness.length > 0) {
-        getHostRuntimeStore().applyAgentTurnLiveness(serverId, agentId, turnLiveness);
+        runtime.applyAgentTurnLiveness(serverId, agentId, turnLiveness);
      }
      sync.enqueueStreamEvent(agentId, {
        event: streamEvent,
@@ -392,14 +398,14 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      void requestTimelineReplacement(
        {
          fetchAgentTimeline: (agentId, request) =>
-            getHostRuntimeStore().fetchAgentTimeline(serverId, agentId, request),
+            runtime.fetchAgentTimeline(serverId, agentId, request),
        },
        message.payload.agentId,
      ).catch((error: unknown) => {
        console.warn("[Session] timeline replacement refresh failed", { serverId, error });
      });
    };
-    const sync = getHostRuntimeStore().createViewedTimelineOwner(serverId, {
+    const sync = runtime.createViewedTimelineOwner(serverId, {
      observe: (agentIds) => {
        const observation = client.observeTimeline(agentIds);
        observation.subscribe({
@@ -413,7 +419,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      },
      readCursor: (agentId) => {
        const timeline = selectAgentTimelineState(
-          useSessionStore.getState().sessions[serverId],
+          sessionStore.getState().sessions[serverId],
          agentId,
        );
        return timeline.status === "synced" && timeline.range
@@ -421,15 +427,19 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
          : undefined;
      },
      fetchPage: async (agentId, request) => {
-        const session = useSessionStore.getState().sessions[serverId];
+        const session = sessionStore.getState().sessions[serverId];
        const initKey = getInitKey(serverId, agentId);
        const shouldInitialize = selectAgentTimelineState(session, agentId).status !== "synced";
        if (shouldInitialize) {
-          if (!getInitDeferred(initKey)) {
-            const deferred = createInitDeferred(initKey, request.direction ?? "tail");
+          if (!sessionStore.initializations.getInitDeferred(initKey)) {
+            const deferred = sessionStore.initializations.createInitDeferred(
+              initKey,
+              request.direction ?? "tail",
+            );
            void deferred.promise.catch(() => undefined);
          }
          refreshAgentInitializationTimeout({
+            store: sessionStore,
            key: initKey,
            agentId,
            setAgentInitializing,
@@ -437,21 +447,29 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
          setAgentInitializing(agentId, true);
        }
        try {
-          const page = await getHostRuntimeStore().fetchAgentTimeline(serverId, agentId, request);
-          if (shouldInitialize && getInitDeferred(initKey)) {
-            refreshAgentInitializationTimeout({ key: initKey, agentId, setAgentInitializing });
+          const page = await runtime.fetchAgentTimeline(serverId, agentId, request);
+          if (shouldInitialize && sessionStore.initializations.getInitDeferred(initKey)) {
+            refreshAgentInitializationTimeout({
+              store: sessionStore,
+              key: initKey,
+              agentId,
+              setAgentInitializing,
+            });
          }
          return page;
        } catch (error) {
          if (shouldInitialize) {
            setAgentInitializing(agentId, false);
-            rejectInitDeferred(initKey, error instanceof Error ? error : new Error(String(error)));
+            sessionStore.initializations.rejectInitDeferred(
+              initKey,
+              error instanceof Error ? error : new Error(String(error)),
+            );
          }
          throw error;
        }
      },
      fetchLatestTail: (agentId) =>
-        getHostRuntimeStore().fetchAgentTimeline(serverId, agentId, planTimelineTailFetch()),
+        runtime.fetchAgentTimeline(serverId, agentId, planTimelineTailFetch()),
      reportError: (error) => {
        console.warn("[Session] viewed timeline synchronization failed", { serverId, error });
      },
@@ -463,8 +481,10 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    viewedTimelineSyncRef.current = sync;
    setViewedTimelineSync(serverId, sync);
    sync.setActive(getIsAppVisible(appStateRef.current));
-    const stopObservingOpenChats = observeOpenWorkspaceAgentIds(serverId, (agentIds) =>
-      sync.replaceOpenTabAgentIds(agentIds),
+    const stopObservingOpenChats = observeOpenWorkspaceAgentIds(
+      serverId,
+      (agentIds) => sync.replaceOpenTabAgentIds(agentIds),
+      layoutStore,
    );

    return () => {
@@ -475,7 +495,17 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      setViewedTimelineSync(serverId, null);
      sync.dispose();
    };
-  }, [client, serverId, setInitializingAgents, setViewedTimelineSync, voiceRuntime]);
+  }, [
+    client,
+    serverId,
+    sessionStore,
+    runtime,
+    sessionStore.initializations,
+    layoutStore,
+    setInitializingAgents,
+    setViewedTimelineSync,
+    voiceRuntime,
+  ]);

  useEffect(() => {
    viewedTimelineSyncRef.current?.setConnected(isConnected);
@@ -516,11 +546,11 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider

    const unsubProviderSubagentUpdate = feeds.subscribe({
      snapshot: () => {
-        void resyncProviderSubagents(client, serverId);
+        void resyncProviderSubagents(client, serverId, providerStore);
      },
      update: (message) => {
        if (message.type !== "agent.provider_subagents.update") return;
-        useProviderSubagentStore.getState().applyUpdate(serverId, message.payload);
+        providerStore.getState().applyUpdate(serverId, message.payload);
      },
    });

@@ -706,6 +736,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    clearAgentStreamHead,
    setInitializingAgents,
    setAgents,
+    providerStore,
    setPendingPermissions,
    notifyAgentAttention,
    updateSessionServerInfo,
@@ -28,7 +28,8 @@ function createAgent(status: Agent["status"]): Agent {
    title: "Agent",
    cwd: "/tmp",
    model: null,
-    parentAgentId: null,
+    parent: null,
+    managedRelationship: null,
    labels: {},
    projectPlacement: null,
  };
@@ -1,12 +1,15 @@
 import { QueryClient } from "@tanstack/react-query";

-export const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      staleTime: Infinity,
-      refetchOnMount: false,
-      refetchOnReconnect: false,
-      refetchOnWindowFocus: false,
+export const createQueryClient = () =>
+  new QueryClient({
+    defaultOptions: {
+      queries: {
+        staleTime: Infinity,
+        refetchOnMount: false,
+        refetchOnReconnect: false,
+        refetchOnWindowFocus: false,
+      },
    },
-  },
-});
+  });
+
+export const queryClient = createQueryClient();
@@ -10,7 +10,6 @@ function connectionListen(connection: HostConnection): string | null {
    case "directPipe":
      return `pipe://${connection.path}`;
    case "remoteSsh":
-    case "routed":
    case "relay":
      return null;
  }
@@ -0,0 +1,34 @@
+import type { FileReadResult } from "@getpaseo/client/internal/daemon-client";
+import { describe, expect, it } from "vitest";
+import { explorerFileFromReadResult } from "./read-result";
+
+function textRead(bytes: Uint8Array): FileReadResult {
+  return {
+    bytes,
+    mime: "text/plain",
+    size: bytes.byteLength,
+    path: "notes.txt",
+    kind: "text",
+    modifiedAt: "2026-07-21T00:00:00.000Z",
+  };
+}
+
+describe("explorerFileFromReadResult", () => {
+  it("records and hides a leading UTF-8 BOM", () => {
+    const file = explorerFileFromReadResult(
+      textRead(new Uint8Array([0xef, 0xbb, 0xbf, 0x68, 0x69])),
+    );
+
+    expect(file).toMatchObject({ content: "hi", hasBom: true });
+  });
+
+  it("does not mark BOM-free text or non-leading U+FEFF as BOM files", () => {
+    const plain = explorerFileFromReadResult(textRead(new TextEncoder().encode("hi")));
+    const embedded = explorerFileFromReadResult(
+      textRead(new Uint8Array([0x68, 0x69, 0xef, 0xbb, 0xbf])),
+    );
+
+    expect(plain.hasBom).toBe(false);
+    expect(embedded.hasBom).toBe(false);
+  });
+});
@@ -0,0 +1,21 @@
+import type { FileReadResult } from "@getpaseo/client/internal/daemon-client";
+import type { ExplorerFile } from "@/stores/session-store";
+
+export function explorerFileFromReadResult(file: FileReadResult): ExplorerFile {
+  const isText = file.kind === "text";
+  return {
+    path: file.path,
+    kind: file.kind,
+    encoding: isText ? "utf-8" : "none",
+    content: isText ? new TextDecoder().decode(file.bytes) : undefined,
+    hasBom: isText && hasUtf8Bom(file.bytes),
+    mimeType: file.mime,
+    size: file.size,
+    modifiedAt: file.modifiedAt,
+    revision: file.revision,
+  };
+}
+
+function hasUtf8Bom(bytes: Uint8Array): boolean {
+  return bytes.length >= 3 && bytes[0] === 0xef && bytes[1] === 0xbb && bytes[2] === 0xbf;
+}
@@ -1,42 +1,126 @@
-import { View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
+import { Text, View } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { PaneContentToolbar } from "@/components/ui/pane-content-toolbar";
-import {
-  FilePanelBarMenu,
-  FilePanelSwitcher,
-  useFilePanelChoiceSnapshot,
-  type FilePanelChoice,
-} from "@/file-panels";
+import { SegmentedControl } from "@/components/ui/segmented-control";
+import type { Theme } from "@/styles/theme";
+import { FileConflictAlert, type FileConflictAlertState } from "./conflict-alert";
+import type { FileEditorStatus } from "./editor/model";

-/**
- * The file tab's bar: the switcher between the file's panels, "Open with…", and whether the panel
- * has unsaved changes. Shown only when the file has more than one panel; the panel shows the rest.
- */
-export function FilePanelBar({ choice, modified }: { choice: FilePanelChoice; modified: boolean }) {
+const ThemedSpinner = withUnistyles(LoadingSpinner);
+const spinnerMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+
+export function FilePanelBar({
+  size,
+  lineCount,
+  mode,
+  onModeChange,
+  editorStatus,
+  cursor,
+  vimMode,
+  conflict,
+}: {
+  size: number;
+  lineCount?: number;
+  mode?: "preview" | "source";
+  onModeChange?(mode: "preview" | "source"): void;
+  editorStatus?: FileEditorStatus;
+  cursor?: { line: number; column: number };
+  vimMode?: string | null;
+  conflict?: FileConflictAlertState;
+}) {
  const { t } = useTranslation();
-  const { openWith } = useFilePanelChoiceSnapshot(choice);
-  if (!openWith) return null;
+  const previewModes = [
+    {
+      value: "preview" as const,
+      label: t("panels.file.editor.preview"),
+      testID: "file-mode-preview",
+    },
+    { value: "source" as const, label: t("panels.file.editor.source"), testID: "file-mode-source" },
+  ];
  return (
    <View style={styles.chrome}>
      <PaneContentToolbar testID="file-panel-bar">
        <View style={styles.row}>
-          <View style={styles.spacer} />
-          {modified ? (
-            <View
-              style={styles.modifiedDot}
-              accessibilityLabel={t("panels.file.editor.unsavedChanges")}
-              testID="file-panel-modified"
+          <View style={styles.metadata}>
+            <Text
+              style={styles.whisper}
+              accessibilityLabel={t("panels.file.editor.fileSize", { size: formatFileSize(size) })}
+            >
+              {formatFileSize(size)}
+            </Text>
+            {lineCount !== undefined ? (
+              <Text
+                style={styles.whisper}
+                accessibilityLabel={t("panels.file.editor.lines", { count: lineCount })}
+              >
+                {t("panels.file.editor.lines", { count: lineCount })}
+              </Text>
+            ) : null}
+          </View>
+          <View
+            style={styles.status}
+            accessibilityLabel={
+              editorStatus
+                ? t("panels.file.editor.editorStatus", { status: editorStatus })
+                : undefined
+            }
+          >
+            {editorStatus === "dirty" ? (
+              <View
+                style={styles.dirtyDot}
+                accessibilityLabel={t("panels.file.editor.unsavedChanges")}
+              />
+            ) : null}
+            {editorStatus === "saving" ? (
+              <>
+                <ThemedSpinner size={14} uniProps={spinnerMapping} />
+                <Text style={styles.secondary}>{t("panels.file.editor.saving")}</Text>
+              </>
+            ) : null}
+            {editorStatus === "error" ? (
+              <Text style={styles.error}>{t("panels.file.editor.saveFailed")}</Text>
+            ) : null}
+            {vimMode ? (
+              <Text
+                style={styles.vim}
+                accessibilityLabel={t("panels.file.editor.vimMode", { mode: vimMode })}
+              >
+                {vimMode}
+              </Text>
+            ) : null}
+            {cursor ? (
+              <Text
+                style={styles.whisper}
+                accessibilityLabel={t("panels.file.editor.cursor", cursor)}
+              >
+                Ln {cursor.line}, Col {cursor.column}
+              </Text>
+            ) : null}
+          </View>
+          {mode && onModeChange ? (
+            <SegmentedControl
+              size="xs"
+              value={mode}
+              onValueChange={onModeChange}
+              testID="file-preview-mode"
+              options={previewModes}
            />
          ) : null}
-          <FilePanelSwitcher choice={choice} />
-          <FilePanelBarMenu choice={choice} />
        </View>
      </PaneContentToolbar>
+      {conflict ? <FileConflictAlert state={conflict} /> : null}
    </View>
  );
 }

+function formatFileSize(size: number): string {
+  if (size < 1024) return `${size} B`;
+  if (size < 1024 * 1024) return `${(size / 1024).toFixed(1)} KB`;
+  return `${(size / (1024 * 1024)).toFixed(1)} MB`;
+}
+
 const styles = StyleSheet.create((theme) => ({
  chrome: {
    flexShrink: 0,
@@ -48,11 +132,31 @@ const styles = StyleSheet.create((theme) => ({
    gap: theme.spacing[3],
    paddingHorizontal: theme.spacing[3],
  },
-  spacer: { flex: 1 },
-  modifiedDot: {
+  metadata: {
+    flex: 1,
+    minWidth: 0,
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  secondary: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.sm },
+  whisper: { color: theme.colors.foregroundExtraMuted, fontSize: theme.fontSize.sm },
+  error: { color: theme.colors.palette.red[300], fontSize: theme.fontSize.sm },
+  dirtyDot: {
    width: 6,
    height: 6,
    borderRadius: theme.borderRadius.full,
    backgroundColor: theme.colors.foregroundExtraMuted,
  },
+  status: {
+    flexShrink: 0,
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  vim: {
+    color: theme.colors.foregroundMuted,
+    fontFamily: theme.fontFamily.mono,
+    fontSize: theme.fontSize.sm,
+  },
 }));
@@ -10,12 +10,14 @@ const warningIconMapping = (theme: Theme) => ({ color: theme.colors.palette.ambe

 export type FileConflictAlertState =
  | { kind: "changed"; canOverwrite: boolean; onReload(): void; onOverwrite(): void }
-  | { kind: "deleted" };
+  | { kind: "deleted" }
+  | { kind: "checkFailed"; retrying: boolean; onRetry(): void };

 export function FileConflictAlert({ state }: { state: FileConflictAlertState }) {
  const { t } = useTranslation();
  let title = t("panels.file.editor.changedOnDisk");
  if (state.kind === "deleted") title = t("panels.file.editor.deletedTitle");
+  else if (state.kind === "checkFailed") title = t("panels.file.editor.checkFailedTitle");
  let description: string | undefined;
  if (state.kind !== "changed") description = t("panels.file.editor.preservedDescription");
  else if (state.canOverwrite) description = t("panels.file.editor.conflictDescription");
@@ -27,16 +29,23 @@ export function FileConflictAlert({ state }: { state: FileConflictAlertState })
        <Text style={styles.title}>{title}</Text>
        {description ? <Text style={styles.description}>{description}</Text> : null}
      </View>
-      {state.kind === "changed" ? (
+      {state.kind !== "deleted" ? (
        <View style={styles.actions}>
-          {state.canOverwrite ? (
+          {state.kind === "changed" && state.canOverwrite ? (
            <Button variant="outline" size="sm" onPress={state.onOverwrite}>
              {t("panels.file.editor.overwrite")}
            </Button>
          ) : null}
-          <Button variant="outline" size="sm" onPress={state.onReload}>
-            {t("panels.file.editor.reload")}
-          </Button>
+          {state.kind === "changed" ? (
+            <Button variant="outline" size="sm" onPress={state.onReload}>
+              {t("panels.file.editor.reload")}
+            </Button>
+          ) : null}
+          {state.kind === "checkFailed" ? (
+            <Button variant="outline" size="sm" onPress={state.onRetry} loading={state.retrying}>
+              {t("common.actions.retry")}
+            </Button>
+          ) : null}
        </View>
      ) : null}
    </View>
@@ -0,0 +1,652 @@
+import { describe, expect, test } from "vitest";
+import type { FileVersion, FileWriteResult } from "@getpaseo/protocol/messages";
+import {
+  FileEditorModel,
+  getFileConflictCallout,
+  type FileEditorClock,
+  type FileEditorFile,
+  type FileEditorObservation,
+  type FileEditorSession,
+  type FileObservationSource,
+} from "./model";
+
+class TestClock implements FileEditorClock {
+  private callback: (() => void) | null = null;
+
+  setTimeout(callback: () => void): ReturnType<typeof setTimeout> {
+    this.callback = callback;
+    return 1 as unknown as ReturnType<typeof setTimeout>;
+  }
+
+  clearTimeout(): void {
+    this.callback = null;
+  }
+
+  fire(): void {
+    const callback = this.callback;
+    this.callback = null;
+    callback?.();
+  }
+}
+
+class FileSession implements FileEditorSession {
+  file: FileEditorFile;
+  writes: Array<{ content: string; expectedModifiedAt: string; expectedRevision?: string }> = [];
+  nextWrite: FileWriteResult | Error | null = null;
+  private pendingWrite: Promise<FileWriteResult> | null = null;
+  private resolvePendingWrite: ((result: FileWriteResult) => void) | null = null;
+
+  constructor(file: FileEditorFile) {
+    this.file = file;
+  }
+
+  async write(input: {
+    content: string;
+    expectedModifiedAt: string;
+    expectedRevision?: string;
+  }): Promise<FileWriteResult> {
+    this.writes.push(input);
+    if (this.pendingWrite) return this.pendingWrite;
+    if (this.nextWrite instanceof Error) throw this.nextWrite;
+    if (this.nextWrite) return this.nextWrite;
+    return {
+      status: "written",
+      modifiedAt: "2026-07-18T00:00:01.000Z",
+      size: input.content.length,
+    };
+  }
+
+  holdNextWrite(): void {
+    this.pendingWrite = new Promise((resolve) => {
+      this.resolvePendingWrite = resolve;
+    });
+  }
+
+  finishHeldWrite(result: FileWriteResult): void {
+    this.resolvePendingWrite?.(result);
+    this.pendingWrite = null;
+    this.resolvePendingWrite = null;
+  }
+}
+
+class ObservationSource implements FileObservationSource {
+  observation: FileEditorObservation | null;
+  refreshes = 0;
+  private readonly listeners = new Set<() => void>();
+
+  constructor(observation: FileEditorObservation | null) {
+    this.observation = observation;
+  }
+
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  }
+
+  getObservation(): FileEditorObservation | null {
+    return this.observation;
+  }
+
+  refresh = (): void => {
+    this.refreshes += 1;
+  };
+
+  emit(observation: FileEditorObservation): void {
+    this.observation = observation;
+    for (const listener of this.listeners) listener();
+  }
+}
+
+function ready(
+  modifiedAt = "2026-07-18T00:00:00.000Z",
+  size = 3,
+): Extract<FileVersion, { status: "ready" }> {
+  return { status: "ready", cwd: "/workspace", path: "file.ts", size, modifiedAt };
+}
+
+interface MakeModelInput {
+  content?: string;
+  hasBom?: boolean;
+}
+
+function makeModel(input: MakeModelInput = {}) {
+  const file = {
+    content: input.content ?? "one",
+    hasBom: input.hasBom ?? false,
+    version: ready() as Extract<FileVersion, { status: "ready" }>,
+  };
+  const session = new FileSession(file);
+  const clock = new TestClock();
+  return { model: new FileEditorModel({ file, session, clock }), session, clock };
+}
+
+function observeFile(model: FileEditorModel, file: FileEditorFile): void {
+  model.receiveFileObservation({ status: "ready", file });
+}
+
+function observeVersion(model: FileEditorModel, version: FileEditorObservation): void {
+  model.receiveFileObservation(version);
+}
+
+describe("FileEditorModel", () => {
+  test("tracks whether the current buffer differs from persisted content", async () => {
+    const { model } = makeModel();
+
+    expect(model.getSnapshot().modified).toBe(false);
+    model.edit("two");
+    expect(model.getSnapshot().modified).toBe(true);
+    model.edit("one");
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", modified: false });
+
+    model.edit("saved");
+    await model.save();
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", modified: false });
+  });
+
+  test("adopts a precise revision for otherwise unchanged initial metadata", () => {
+    const { model } = makeModel();
+
+    observeFile(model, {
+      content: "one",
+      hasBom: false,
+      version: { ...ready(), revision: "precise-revision" },
+    });
+
+    expect(model.getSnapshot().observedVersion).toMatchObject({ revision: "precise-revision" });
+  });
+
+  test("adopts an unchanged disk revision without disturbing a dirty buffer", async () => {
+    const { model, session } = makeModel();
+    model.edit("local");
+    observeFile(model, {
+      content: "one",
+      hasBom: false,
+      version: { ...ready(), revision: "replacement-revision" },
+    });
+
+    expect(model.getSnapshot()).toMatchObject({ status: "dirty", content: "local" });
+    await model.save();
+
+    expect(session.writes).toEqual([
+      {
+        content: "local",
+        expectedModifiedAt: "2026-07-18T00:00:00.000Z",
+        expectedRevision: "replacement-revision",
+      },
+    ]);
+  });
+
+  test("adopts an external BOM change before saving a dirty buffer", async () => {
+    const { model, session } = makeModel();
+    model.edit("local");
+    observeFile(model, {
+      content: "one",
+      hasBom: true,
+      version: { ...ready(), revision: "replacement-revision" },
+    });
+
+    await model.save();
+
+    expect(session.writes).toEqual([
+      {
+        content: "\uFEFFlocal",
+        expectedModifiedAt: "2026-07-18T00:00:00.000Z",
+        expectedRevision: "replacement-revision",
+      },
+    ]);
+  });
+
+  test("conflicts when a same-content observation changes the BOM during a save", async () => {
+    const { model, session } = makeModel();
+    session.holdNextWrite();
+    model.edit("saved");
+    const save = model.save();
+    observeFile(model, {
+      content: "saved",
+      hasBom: true,
+      version: ready("2026-07-18T00:00:02.000Z", 6),
+    });
+    session.finishHeldWrite({
+      status: "written",
+      modifiedAt: "2026-07-18T00:00:01.000Z",
+      size: 5,
+    });
+
+    await save;
+
+    expect(model.getSnapshot()).toMatchObject({
+      status: "conflict",
+      observedVersion: { modifiedAt: "2026-07-18T00:00:02.000Z" },
+    });
+  });
+
+  test("ignores a settled observation that was already consumed", () => {
+    const { model } = makeModel();
+    const observation: FileEditorObservation = {
+      status: "ready",
+      file: { content: "one", hasBom: false, version: ready() },
+    };
+    let emissions = 0;
+    model.subscribe(() => {
+      emissions += 1;
+    });
+    model.receiveFileObservation(observation);
+    const emissionsAfterFirstDelivery = emissions;
+
+    model.receiveFileObservation(observation);
+
+    expect(emissions).toBe(emissionsAfterFirstDelivery);
+  });
+
+  test("does not replay the pre-save observation while its refresh is pending", async () => {
+    const { model } = makeModel();
+    const observation: FileEditorObservation = {
+      status: "ready",
+      file: { content: "one", hasBom: false, version: ready() },
+    };
+    model.receiveFileObservation(observation);
+    model.edit("saved");
+    await model.save();
+
+    model.receiveFileObservation(observation);
+
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", content: "saved" });
+  });
+
+  test("does not reload stale bytes after a write conflict", async () => {
+    const { model, session } = makeModel();
+    session.nextWrite = {
+      status: "conflict",
+      version: ready("2026-07-18T00:00:02.000Z", 8),
+    };
+    model.edit("important local work");
+    await model.save();
+
+    await model.reload();
+
+    expect(model.getSnapshot()).toMatchObject({
+      status: "conflict",
+      content: "important local work",
+      observedVersion: { modifiedAt: "2026-07-18T00:00:02.000Z" },
+    });
+  });
+
+  test("reloads a write conflict only after refreshed bytes arrive", async () => {
+    const { model, session } = makeModel();
+    const source = new ObservationSource({
+      status: "ready",
+      file: { content: "one", hasBom: false, version: ready() },
+    });
+    model.connectFileObservations(source);
+    session.nextWrite = {
+      status: "conflict",
+      version: ready("2026-07-18T00:00:02.000Z", 4),
+    };
+    model.edit("local");
+    await model.save();
+
+    await model.reload();
+    expect(source.refreshes).toBe(1);
+    expect(model.getSnapshot().content).toBe("local");
+    source.emit({
+      status: "ready",
+      file: {
+        content: "disk",
+        hasBom: false,
+        version: ready("2026-07-18T00:00:02.000Z", 4),
+      },
+    });
+
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", content: "disk" });
+  });
+
+  test("abandons a deferred reload when its refresh fails", async () => {
+    const { model, session } = makeModel();
+    const source = new ObservationSource({
+      status: "ready",
+      file: { content: "one", hasBom: false, version: ready() },
+    });
+    model.connectFileObservations(source);
+    session.nextWrite = {
+      status: "conflict",
+      version: ready("2026-07-18T00:00:02.000Z", 4),
+    };
+    model.edit("local");
+    await model.save();
+    await model.reload();
+    source.emit({
+      status: "error",
+      cwd: "/workspace",
+      path: "file.ts",
+      error: "File unavailable.",
+    });
+    model.edit("new local work");
+
+    source.emit({
+      status: "ready",
+      file: {
+        content: "disk",
+        hasBom: false,
+        version: ready("2026-07-18T00:00:03.000Z", 4),
+      },
+    });
+
+    expect(model.getSnapshot()).toMatchObject({ status: "conflict", content: "new local work" });
+  });
+
+  test("keeps a newer edit modified when an older save finishes", async () => {
+    const { model, session } = makeModel();
+    session.holdNextWrite();
+    model.edit("saving");
+
+    const save = model.save();
+    model.edit("newer edit");
+    session.finishHeldWrite({
+      status: "written",
+      modifiedAt: "2026-07-18T00:00:01.000Z",
+      size: 6,
+    });
+    await save;
+
+    expect(model.getSnapshot()).toMatchObject({
+      status: "dirty",
+      content: "newer edit",
+      modified: true,
+    });
+  });
+
+  test("autosaves the latest edit after inactivity", async () => {
+    const { model, session, clock } = makeModel();
+
+    model.edit("two");
+    model.edit("three");
+    clock.fire();
+    await Promise.resolve();
+
+    expect(session.writes).toEqual([
+      { content: "three", expectedModifiedAt: "2026-07-18T00:00:00.000Z" },
+    ]);
+    expect(model.getSnapshot().status).toBe("clean");
+  });
+
+  test("keeps CRLF content in file form", async () => {
+    const { model, session } = makeModel({ content: "one\r\ntwo\r\n" });
+
+    expect(model.getSnapshot()).toMatchObject({
+      content: "one\r\ntwo\r\n",
+      lineSeparator: "\r\n",
+    });
+    model.edit("one\r\ntwo\r\nthree\r\n");
+    await model.save();
+
+    expect(session.writes).toEqual([
+      {
+        content: "one\r\ntwo\r\nthree\r\n",
+        expectedModifiedAt: "2026-07-18T00:00:00.000Z",
+      },
+    ]);
+  });
+
+  test("restores a UTF-8 BOM before writing a CRLF file", async () => {
+    const { model, session } = makeModel({ content: "one\r\n", hasBom: true });
+
+    model.edit("saved\r\n");
+    await model.save();
+    model.edit("saved again\r\n");
+    await model.save();
+
+    expect(session.writes).toEqual([
+      {
+        content: "\uFEFFsaved\r\n",
+        expectedModifiedAt: "2026-07-18T00:00:00.000Z",
+      },
+      {
+        content: "\uFEFFsaved again\r\n",
+        expectedModifiedAt: "2026-07-18T00:00:01.000Z",
+      },
+    ]);
+  });
+
+  test("uses the first line separator when a file mixes styles", () => {
+    const { model } = makeModel({ content: "one\r\ntwo\nthree\r" });
+
+    expect(model.getSnapshot().lineSeparator).toBe("\r\n");
+  });
+
+  test("reloads a clean editor when the disk version changes", async () => {
+    const { model, session } = makeModel();
+    session.file = {
+      content: "external",
+      hasBom: false,
+      version: ready("2026-07-18T00:00:02.000Z", 8) as Extract<FileVersion, { status: "ready" }>,
+    };
+
+    observeFile(model, session.file);
+
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", content: "external" });
+  });
+
+  test("adopts the format from a clean remote refresh", async () => {
+    const { model, session } = makeModel({ content: "local\r\n", hasBom: true });
+    session.file = {
+      content: "remote\n",
+      hasBom: false,
+      version: ready("2026-07-18T00:00:02.000Z", 7) as Extract<FileVersion, { status: "ready" }>,
+    };
+
+    observeFile(model, session.file);
+    expect(model.getSnapshot().lineSeparator).toBe("\n");
+    model.edit("saved\n");
+    await model.save();
+
+    expect(session.writes.at(-1)).toEqual({
+      content: "saved\n",
+      expectedModifiedAt: "2026-07-18T00:00:02.000Z",
+    });
+  });
+
+  test("applies consecutive clean disk observations", () => {
+    const { model } = makeModel();
+    const firstVersion = ready("2026-07-18T00:00:02.000Z", 5);
+    const latestVersion = ready("2026-07-18T00:00:03.000Z", 6);
+
+    observeFile(model, { content: "first", hasBom: false, version: firstVersion });
+    observeFile(model, { content: "latest", hasBom: false, version: latestVersion });
+
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", content: "latest" });
+  });
+
+  test("preserves a dirty buffer and overwrites against the newest disk revision", async () => {
+    const { model, session } = makeModel();
+    model.edit("local");
+    observeFile(model, {
+      content: "disk",
+      hasBom: false,
+      version: ready("2026-07-18T00:00:02.000Z", 4),
+    });
+
+    expect(model.getSnapshot()).toMatchObject({ status: "conflict", content: "local" });
+    await model.overwrite();
+
+    expect(session.writes).toEqual([
+      { content: "local", expectedModifiedAt: "2026-07-18T00:00:02.000Z" },
+    ]);
+    expect(model.getSnapshot().status).toBe("clean");
+  });
+
+  test("keeps the local CRLF and BOM when overwriting a conflict", async () => {
+    const { model, session } = makeModel({ content: "one\r\n", hasBom: true });
+    model.edit("local\r\n");
+    observeFile(model, {
+      content: "disk",
+      hasBom: false,
+      version: ready("2026-07-18T00:00:02.000Z", 4),
+    });
+
+    await model.overwrite();
+
+    expect(session.writes).toEqual([
+      {
+        content: "\uFEFFlocal\r\n",
+        expectedModifiedAt: "2026-07-18T00:00:02.000Z",
+      },
+    ]);
+  });
+
+  test("reload discards a conflicted local buffer for the disk contents", async () => {
+    const { model, session } = makeModel();
+    model.edit("local");
+    const diskVersion = ready("2026-07-18T00:00:02.000Z", 4) as Extract<
+      FileVersion,
+      { status: "ready" }
+    >;
+    session.file = { content: "disk", hasBom: false, version: diskVersion };
+    observeFile(model, session.file);
+
+    await model.reload();
+
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", content: "disk" });
+  });
+
+  test("adopts the remote format when reloading a conflict", async () => {
+    const { model, session } = makeModel({ content: "one\r\n", hasBom: true });
+    model.edit("local\r\n");
+    const diskVersion = ready("2026-07-18T00:00:02.000Z", 5) as Extract<
+      FileVersion,
+      { status: "ready" }
+    >;
+    session.file = { content: "disk\n", hasBom: false, version: diskVersion };
+    observeFile(model, session.file);
+
+    await model.reload();
+    model.edit("saved\n");
+    await model.save();
+
+    expect(session.writes.at(-1)).toEqual({
+      content: "saved\n",
+      expectedModifiedAt: "2026-07-18T00:00:02.000Z",
+    });
+  });
+
+  test("reports failed saves without losing the local buffer", async () => {
+    const { model, session } = makeModel();
+    session.nextWrite = new Error("disk full");
+    model.edit("important local work");
+
+    await model.save();
+
+    expect(model.getSnapshot()).toMatchObject({
+      status: "error",
+      content: "important local work",
+      error: "disk full",
+    });
+  });
+
+  test("a deletion conflicts with local changes and stops autosave", () => {
+    const { model, session, clock } = makeModel();
+    model.edit("local");
+    observeVersion(model, { status: "missing", cwd: "/workspace", path: "file.ts" });
+
+    clock.fire();
+
+    expect(model.getSnapshot().status).toBe("conflict");
+    expect(session.writes).toEqual([]);
+  });
+
+  test("clears a transient check error when the recovered file is unchanged", () => {
+    const { model } = makeModel();
+    observeVersion(model, {
+      status: "error",
+      cwd: "/workspace",
+      path: "file.ts",
+      error: "Requested path is not a file",
+    });
+
+    observeFile(model, { content: "one", hasBom: false, version: ready() });
+
+    expect(model.getSnapshot()).toMatchObject({
+      status: "clean",
+      modified: false,
+      observedVersion: { status: "ready" },
+      error: null,
+    });
+  });
+
+  test("resumes autosave when a dirty file recovers unchanged from a check error", async () => {
+    const { model, session, clock } = makeModel();
+    model.edit("local");
+    observeVersion(model, {
+      status: "error",
+      cwd: "/workspace",
+      path: "file.ts",
+      error: "Requested path is not a file",
+    });
+
+    observeFile(model, { content: "one", hasBom: false, version: ready() });
+    clock.fire();
+    await Promise.resolve();
+
+    expect(model.getSnapshot()).toMatchObject({ status: "clean", modified: false });
+    expect(session.writes).toEqual([
+      { content: "local", expectedModifiedAt: "2026-07-18T00:00:00.000Z" },
+    ]);
+  });
+
+  test("dispose cancels pending autosave", () => {
+    const { model, session, clock } = makeModel();
+    model.edit("local");
+
+    model.dispose();
+    clock.fire();
+
+    expect(session.writes).toEqual([]);
+  });
+
+  test("suspends a pending autosave while close confirmation is active", async () => {
+    const { model, session, clock } = makeModel();
+    model.edit("local");
+
+    const resume = model.suspendAutosave();
+    clock.fire();
+    expect(session.writes).toEqual([]);
+
+    resume();
+    clock.fire();
+    await Promise.resolve();
+    expect(session.writes).toHaveLength(1);
+  });
+
+  test("maps conflict versions to one exhaustive callout state", () => {
+    const { model } = makeModel();
+    const snapshot = model.getSnapshot();
+
+    expect(getFileConflictCallout(snapshot)).toBeNull();
+    expect(
+      getFileConflictCallout({
+        ...snapshot,
+        status: "conflict",
+        modified: true,
+        observedVersion: ready("2026-07-18T00:00:01.000Z"),
+      }),
+    ).toEqual({ kind: "changed", canOverwrite: true });
+    expect(
+      getFileConflictCallout({
+        ...snapshot,
+        status: "conflict",
+        observedVersion: { status: "missing", cwd: "/workspace", path: "file.ts" },
+      }),
+    ).toEqual({ kind: "deleted" });
+    expect(
+      getFileConflictCallout({
+        ...snapshot,
+        status: "conflict",
+        observedVersion: {
+          status: "error",
+          cwd: "/workspace",
+          path: "file.ts",
+          error: "unreadable",
+        },
+      }),
+    ).toEqual({ kind: "checkFailed" });
+  });
+});
@@ -0,0 +1,402 @@
+import type { FileVersion, FileWriteResult } from "@getpaseo/protocol/messages";
+
+export type FileEditorStatus = "clean" | "dirty" | "saving" | "conflict" | "error";
+export type FileLineSeparator = "\n" | "\r\n" | "\r";
+
+export interface FileEditorSnapshot {
+  status: FileEditorStatus;
+  content: string;
+  lineSeparator: FileLineSeparator;
+  modified: boolean;
+  version: FileVersion;
+  observedVersion: FileVersion;
+  error: string | null;
+}
+
+export type FileConflictCallout =
+  | { kind: "changed"; canOverwrite: boolean }
+  | { kind: "deleted" }
+  | { kind: "checkFailed" };
+
+export interface FileEditorFile {
+  content: string;
+  hasBom: boolean;
+  version: Extract<FileVersion, { status: "ready" }>;
+}
+
+export interface FileEditorSession {
+  write(input: {
+    content: string;
+    expectedModifiedAt: string;
+    expectedRevision?: string;
+  }): Promise<FileWriteResult>;
+}
+
+export type FileEditorObservation =
+  | { status: "ready"; file: FileEditorFile }
+  | Extract<FileVersion, { status: "missing" | "error" }>;
+
+export interface FileObservationSource {
+  subscribe(listener: () => void): () => void;
+  getObservation(): FileEditorObservation | null;
+  refresh(): void;
+}
+
+type ObservedDiskState = FileEditorObservation | { status: "unsettled"; version: FileVersion };
+
+export interface FileEditorClock {
+  setTimeout(callback: () => void, delayMs: number): ReturnType<typeof setTimeout>;
+  clearTimeout(handle: ReturnType<typeof setTimeout>): void;
+}
+
+const systemClock: FileEditorClock = {
+  setTimeout(callback, delay) {
+    return globalThis.setTimeout(callback, delay);
+  },
+  clearTimeout(handle) {
+    globalThis.clearTimeout(handle);
+  },
+};
+
+export class FileEditorModel {
+  private readonly session: FileEditorSession;
+  private readonly clock: FileEditorClock;
+  private readonly listeners = new Set<() => void>();
+  private snapshot: FileEditorSnapshot;
+  private autosave: ReturnType<typeof setTimeout> | null = null;
+  private saveSequence = 0;
+  private disposed = false;
+  private observedWhileSaving: FileEditorObservation | null = null;
+  private observed: ObservedDiskState;
+  private lastReceivedObservation: FileEditorObservation | null = null;
+  private refreshObservation: (() => void) | null = null;
+  private reloadRequested = false;
+  private persistedContent: string;
+  private hasBom: boolean;
+  private unsubscribeObservationSource: (() => void) | null = null;
+
+  constructor(input: {
+    file: FileEditorFile;
+    session: FileEditorSession;
+    clock?: FileEditorClock;
+  }) {
+    this.session = input.session;
+    this.clock = input.clock ?? systemClock;
+    this.persistedContent = input.file.content;
+    this.hasBom = input.file.hasBom;
+    this.observed = { status: "ready", file: input.file };
+    this.snapshot = {
+      status: "clean",
+      content: input.file.content,
+      lineSeparator: detectLineSeparator(input.file.content),
+      modified: false,
+      version: input.file.version,
+      observedVersion: input.file.version,
+      error: null,
+    };
+  }
+
+  subscribe = (listener: () => void): (() => void) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+
+  getSnapshot = (): FileEditorSnapshot => this.snapshot;
+
+  connectFileObservations(source: FileObservationSource): void {
+    this.disconnectFileObservations();
+    this.refreshObservation = source.refresh;
+    const receiveObservation = () => {
+      const observation = source.getObservation();
+      if (observation) this.receiveFileObservation(observation);
+    };
+    this.unsubscribeObservationSource = source.subscribe(receiveObservation);
+    receiveObservation();
+  }
+
+  disconnectFileObservations(): void {
+    this.unsubscribeObservationSource?.();
+    this.unsubscribeObservationSource = null;
+    this.refreshObservation = null;
+  }
+
+  edit(content: string): void {
+    if (this.disposed || content === this.snapshot.content) return;
+    this.reloadRequested = false;
+    const modified = content !== this.persistedContent;
+    let status: FileEditorStatus = modified ? "dirty" : "clean";
+    if (this.snapshot.status === "conflict") {
+      status = "conflict";
+    }
+    this.setSnapshot({ ...this.snapshot, status, content, modified, error: null });
+    if (status === "dirty") this.scheduleAutosave();
+    else this.clearAutosave();
+  }
+
+  async save(): Promise<void> {
+    if (this.disposed || (this.snapshot.status !== "dirty" && this.snapshot.status !== "error")) {
+      return;
+    }
+    if (this.snapshot.observedVersion.status !== "ready") {
+      this.enterConflict(this.snapshot.observedVersion);
+      return;
+    }
+    await this.performWrite(this.snapshot.observedVersion);
+  }
+
+  receiveFileObservation(observation: FileEditorObservation): void {
+    if (this.disposed || observation === this.lastReceivedObservation) return;
+    this.lastReceivedObservation = observation;
+    const version = observationVersion(observation);
+    this.observed = observation;
+    this.setSnapshot({ ...this.snapshot, observedVersion: version });
+    if (this.snapshot.status === "saving") {
+      this.observedWhileSaving = observation;
+      return;
+    }
+    if (observation.status !== "ready") {
+      this.reloadRequested = false;
+      this.enterConflict(version);
+      return;
+    }
+    if (this.reloadRequested) {
+      this.reloadRequested = false;
+      this.applyFile(observation.file);
+      return;
+    }
+    if (observation.file.content === this.persistedContent) {
+      this.adoptUnchangedFile(observation.file);
+      return;
+    }
+    if (this.snapshot.status === "clean") {
+      this.applyFile(observation.file);
+      return;
+    }
+    this.enterConflict(version);
+  }
+
+  async overwrite(): Promise<void> {
+    if (this.disposed || this.snapshot.status !== "conflict") return;
+    if (this.snapshot.observedVersion.status !== "ready") return;
+    await this.performWrite(this.snapshot.observedVersion);
+  }
+
+  async reload(): Promise<void> {
+    if (this.disposed) return;
+    if (this.observed.status !== "ready") {
+      this.reloadRequested = true;
+      this.refreshObservation?.();
+      return;
+    }
+    this.applyFile(this.observed.file);
+  }
+
+  dispose(): void {
+    this.disposed = true;
+    this.reloadRequested = false;
+    this.saveSequence += 1;
+    this.clearAutosave();
+    this.disconnectFileObservations();
+    this.listeners.clear();
+  }
+
+  suspendAutosave(): () => void {
+    const wasScheduled = this.autosave !== null;
+    this.clearAutosave();
+    let resumed = false;
+    return () => {
+      if (resumed || this.disposed) return;
+      resumed = true;
+      if (wasScheduled && this.snapshot.status === "dirty") this.scheduleAutosave();
+    };
+  }
+
+  private async performWrite(
+    expectedVersion: Extract<FileVersion, { status: "ready" }>,
+  ): Promise<void> {
+    this.clearAutosave();
+    const sequence = ++this.saveSequence;
+    const content = this.snapshot.content;
+    const hasBom = this.hasBom;
+    this.observedWhileSaving = null;
+    this.setSnapshot({ ...this.snapshot, status: "saving", error: null });
+    const serializedContent = hasBom ? `\uFEFF${content}` : content;
+    let result: FileWriteResult;
+    try {
+      result = await this.session.write({
+        content: serializedContent,
+        expectedModifiedAt: expectedVersion.modifiedAt,
+        expectedRevision: expectedVersion.revision,
+      });
+    } catch (error) {
+      if (this.disposed || sequence !== this.saveSequence) return;
+      this.setSnapshot({
+        ...this.snapshot,
+        status: "error",
+        error: error instanceof Error ? error.message : String(error),
+      });
+      return;
+    }
+    if (this.disposed || sequence !== this.saveSequence) return;
+    if (result.status === "error") {
+      this.setSnapshot({ ...this.snapshot, status: "error", error: result.error });
+      return;
+    }
+    if (result.status === "conflict") {
+      this.observed = { status: "unsettled", version: result.version };
+      this.enterConflict(result.version);
+      return;
+    }
+
+    const writtenVersion: Extract<FileVersion, { status: "ready" }> = {
+      status: "ready",
+      cwd: this.snapshot.version.cwd,
+      path: this.snapshot.version.path,
+      size: result.size,
+      modifiedAt: result.modifiedAt,
+      revision: result.revision,
+    };
+    const pending = this.takeObservedWhileSaving();
+    this.persistedContent = content;
+    if (pending && !observationMatchesWrite(pending, content, hasBom)) {
+      const pendingVersion = observationVersion(pending);
+      this.observed = pending;
+      this.setSnapshot({
+        ...this.snapshot,
+        status: "conflict",
+        modified: this.snapshot.content !== this.persistedContent,
+        version: writtenVersion,
+        observedVersion: pendingVersion,
+        error: null,
+      });
+      return;
+    }
+    const settledVersion = pending?.status === "ready" ? pending.file.version : writtenVersion;
+    this.observed = pending ?? { status: "unsettled", version: writtenVersion };
+    const modified = this.snapshot.content !== this.persistedContent;
+    this.setSnapshot({
+      ...this.snapshot,
+      status: modified ? "dirty" : "clean",
+      modified,
+      version: settledVersion,
+      observedVersion: settledVersion,
+      error: null,
+    });
+    if (modified) this.scheduleAutosave();
+  }
+
+  private applyFile(file: FileEditorFile): void {
+    this.clearAutosave();
+    this.saveSequence += 1;
+    this.persistedContent = file.content;
+    this.hasBom = file.hasBom;
+    this.observed = { status: "ready", file };
+    this.setSnapshot({
+      status: "clean",
+      content: file.content,
+      lineSeparator: detectLineSeparator(file.content),
+      modified: false,
+      version: file.version,
+      observedVersion: file.version,
+      error: null,
+    });
+  }
+
+  private takeObservedWhileSaving(): FileEditorObservation | null {
+    const observation = this.observedWhileSaving;
+    this.observedWhileSaving = null;
+    return observation;
+  }
+
+  private enterConflict(version: FileVersion): void {
+    this.clearAutosave();
+    this.setSnapshot({
+      ...this.snapshot,
+      status: "conflict",
+      modified: this.snapshot.content !== this.persistedContent,
+      observedVersion: version,
+      error: version.status === "error" ? version.error : null,
+    });
+  }
+
+  private adoptUnchangedFile(file: FileEditorFile): void {
+    this.hasBom = file.hasBom;
+    this.observed = { status: "ready", file };
+    const modified = this.snapshot.content !== this.persistedContent;
+    const recovering = this.snapshot.status === "conflict";
+    let status = this.snapshot.status;
+    if (recovering) status = modified ? "dirty" : "clean";
+    this.setSnapshot({
+      ...this.snapshot,
+      status,
+      modified,
+      version: file.version,
+      observedVersion: file.version,
+      error: recovering ? null : this.snapshot.error,
+    });
+    if (status === "dirty") this.scheduleAutosave();
+    else this.clearAutosave();
+  }
+
+  private scheduleAutosave(): void {
+    this.clearAutosave();
+    this.autosave = this.clock.setTimeout(() => {
+      this.autosave = null;
+      void this.save();
+    }, 800);
+  }
+
+  private clearAutosave(): void {
+    if (!this.autosave) return;
+    this.clock.clearTimeout(this.autosave);
+    this.autosave = null;
+  }
+
+  private setSnapshot(snapshot: FileEditorSnapshot): void {
+    this.snapshot = snapshot;
+    for (const listener of this.listeners) listener();
+  }
+}
+
+export function getFileConflictCallout(snapshot: FileEditorSnapshot): FileConflictCallout | null {
+  if (snapshot.status !== "conflict") return null;
+  switch (snapshot.observedVersion.status) {
+    case "ready":
+      return { kind: "changed", canOverwrite: snapshot.modified };
+    case "missing":
+      return { kind: "deleted" };
+    case "error":
+      return { kind: "checkFailed" };
+    default:
+      return assertNever(snapshot.observedVersion);
+  }
+}
+
+function assertNever(value: never): never {
+  throw new Error(`Unexpected file version: ${JSON.stringify(value)}`);
+}
+
+function detectLineSeparator(content: string): FileLineSeparator {
+  for (let index = 0; index < content.length; index += 1) {
+    const character = content.charCodeAt(index);
+    if (character === 10) return "\n";
+    if (character === 13) return content.charCodeAt(index + 1) === 10 ? "\r\n" : "\r";
+  }
+  return "\n";
+}
+
+function observationVersion(observation: FileEditorObservation): FileVersion {
+  return observation.status === "ready" ? observation.file.version : observation;
+}
+
+function observationMatchesWrite(
+  observation: FileEditorObservation,
+  content: string,
+  hasBom: boolean,
+): boolean {
+  return (
+    observation.status === "ready" &&
+    observation.file.content === content &&
+    observation.file.hasBom === hasBom
+  );
+}
@@ -0,0 +1,60 @@
+import type { FileReadResult } from "@getpaseo/client/internal/daemon-client";
+import { describe, expect, test } from "vitest";
+import type { LiveFileObservation } from "../live-file/model";
+import { createFileObservationSource, type LiveObservationSource } from "./observation-source";
+
+class TestLiveObservationSource implements LiveObservationSource {
+  observation: LiveFileObservation | null;
+
+  constructor(observation: LiveFileObservation | null) {
+    this.observation = observation;
+  }
+
+  subscribe(): () => void {
+    return () => undefined;
+  }
+
+  getObservation(): LiveFileObservation | null {
+    return this.observation;
+  }
+
+  refresh(): void {}
+}
+
+function readyObservation(): LiveFileObservation {
+  const file: FileReadResult = {
+    bytes: new TextEncoder().encode("one"),
+    mime: "text/plain",
+    size: 3,
+    path: "file.ts",
+    kind: "text",
+    modifiedAt: "2026-07-18T00:00:00.000Z",
+    revision: "revision-1",
+  };
+  return {
+    status: "ready",
+    file,
+    version: {
+      status: "ready",
+      cwd: "/workspace",
+      path: "file.ts",
+      size: file.size,
+      modifiedAt: file.modifiedAt,
+      revision: file.revision,
+    },
+  };
+}
+
+describe("createFileObservationSource", () => {
+  test("returns the same editor observation until the live observation changes", () => {
+    const liveFile = new TestLiveObservationSource(readyObservation());
+    const source = createFileObservationSource(liveFile);
+
+    const first = source.getObservation();
+    const repeated = source.getObservation();
+
+    expect(repeated).toBe(first);
+    liveFile.observation = readyObservation();
+    expect(source.getObservation()).not.toBe(first);
+  });
+});
@@ -0,0 +1,50 @@
+import { explorerFileFromReadResult } from "@/file-explorer/read-result";
+import type { LiveFileObservation } from "../live-file/model";
+import type { FileEditorObservation, FileObservationSource } from "./model";
+
+export interface LiveObservationSource {
+  subscribe(listener: () => void): () => void;
+  getObservation(): LiveFileObservation | null;
+  refresh(): void;
+}
+
+export function createFileObservationSource(
+  liveFile: LiveObservationSource,
+): FileObservationSource {
+  let liveObservation: LiveFileObservation | null = null;
+  let editorObservation: FileEditorObservation | null = null;
+  return {
+    subscribe: liveFile.subscribe,
+    refresh: liveFile.refresh,
+    getObservation() {
+      const nextLiveObservation = liveFile.getObservation();
+      if (nextLiveObservation === liveObservation) return editorObservation;
+      liveObservation = nextLiveObservation;
+      editorObservation = fileEditorObservation(nextLiveObservation);
+      return editorObservation;
+    },
+  };
+}
+
+function fileEditorObservation(
+  observation: LiveFileObservation | null,
+): FileEditorObservation | null {
+  if (!observation || observation.status !== "ready") return observation;
+  const decodedFile = explorerFileFromReadResult(observation.file);
+  if (decodedFile.kind !== "text" || decodedFile.content === undefined) {
+    return {
+      status: "error",
+      cwd: observation.version.cwd,
+      path: observation.version.path,
+      error: "File is no longer text.",
+    };
+  }
+  return {
+    status: "ready",
+    file: {
+      content: decodedFile.content,
+      hasBom: decodedFile.hasBom,
+      version: observation.version,
+    },
+  };
+}
@@ -22,7 +22,6 @@ export function FileEditorView(_props: {
  };
  onCursorChange(position: { line: number; column: number }): void;
  onVimModeChange(mode: string | null): void;
-  onReady(): void;
 }) {
  return (
    <View style={styles.container}>
@@ -4,6 +4,7 @@ import { Annotation, Compartment, EditorState, Transaction } from "@codemirror/s
 import { EditorView } from "@codemirror/view";
 import { getLanguageForFile } from "@getpaseo/highlight";
 import { getCM, vim } from "@replit/codemirror-vim";
+import { isRenderedMarkdownFile } from "@/file-panels";
 import type { WorkspaceFileLocation } from "@/workspace/file-open";
 import type { FileEditorModel } from "./model";
 import { editorBaseExtensions, editorTheme, type EditorVisualTheme } from "./extensions.web";
@@ -17,8 +18,6 @@ interface FileEditorViewProps {
  theme: EditorVisualTheme;
  onCursorChange(position: { line: number; column: number }): void;
  onVimModeChange(mode: string | null): void;
-  /** The editor shows the file's content. */
-  onReady(): void;
 }

 const languageCompartment = new Compartment();
@@ -26,12 +25,8 @@ const wrappingCompartment = new Compartment();
 const themeCompartment = new Compartment();
 const vimCompartment = new Compartment();

-/** Markdown is prose, so its paragraphs wrap; code keeps its lines. */
-const WRAPPED_EXTENSIONS = new Set(["md", "markdown"]);
-
 function wrappingForFile(filename: string) {
-  const extension = filename.split(".").pop()?.toLowerCase() ?? "";
-  return WRAPPED_EXTENSIONS.has(extension) ? EditorView.lineWrapping : [];
+  return isRenderedMarkdownFile(filename) ? EditorView.lineWrapping : [];
 }

 export function FileEditorView({
@@ -43,20 +38,12 @@ export function FileEditorView({
  theme,
  onCursorChange,
  onVimModeChange,
-  onReady,
 }: FileEditorViewProps) {
  const [find] = useState(() => new FileFindModel());
  const hostRef = useRef<HTMLDivElement>(null);
  const viewRef = useRef<EditorView | null>(null);
  const snapshot = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
-  const initial = useRef({
-    filename,
-    model,
-    theme,
-    vimEnabled,
-    content: snapshot.content,
-    onReady,
-  });
+  const initial = useRef({ filename, model, theme, vimEnabled, content: snapshot.content });
  const onCursorChangeRef = useRef(onCursorChange);
  onCursorChangeRef.current = onCursorChange;

@@ -93,7 +80,6 @@ export function FileEditorView({
    });
    viewRef.current = view;
    onCursorChangeRef.current({ line: 1, column: 1 });
-    values.onReady();
    return () => {
      view.destroy();
      viewRef.current = null;
@@ -0,0 +1,61 @@
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { useEffect, useMemo, useState, useSyncExternalStore } from "react";
+import { LiveFileModel, type LiveFileSession } from "./model";
+import { SOURCE_PRESENTATION_BUDGETS } from "../source/presentation";
+import { isWeb } from "@/constants/platform";
+
+export function useLiveFile(input: {
+  client: DaemonClient | null;
+  cwd: string | null;
+  path: string | null;
+  enabled: boolean;
+  liveUpdates: boolean;
+}) {
+  const [model] = useState(() => new LiveFileModel());
+  const session = useMemo<LiveFileSession | null>(() => {
+    if (!input.client) return null;
+    const client = input.client;
+    return {
+      subscribe(target, onVersion) {
+        return client.subscribeFile(target, onVersion);
+      },
+      read(target) {
+        return client.readFile(
+          target.cwd,
+          target.path,
+          undefined,
+          SOURCE_PRESENTATION_BUDGETS[isWeb ? "web" : "native"].plain,
+        );
+      },
+    };
+  }, [input.client]);
+
+  useEffect(() => {
+    if (!input.enabled || !session || !input.cwd || !input.path) {
+      model.close();
+      return;
+    }
+    model.open({
+      session,
+      target: { cwd: input.cwd, path: input.path },
+      liveUpdates: input.liveUpdates,
+    });
+    return () => model.close();
+  }, [input.cwd, input.enabled, input.liveUpdates, input.path, model, session]);
+
+  const snapshot = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
+  return {
+    file: snapshot.observation?.status === "ready" ? snapshot.observation.file : null,
+    error: snapshot.read.status === "error" ? snapshot.read.error : null,
+    // Effects start reads after the first render. An enabled target is therefore
+    // already in the producer's initial/retargeting display state.
+    isFetching:
+      input.enabled &&
+      (snapshot.read.status === "pending" ||
+        (snapshot.read.status === "idle" && snapshot.observation === null)),
+    isRetrying: snapshot.read.status === "pending" && snapshot.read.requested,
+    refresh: model.refresh,
+    model,
+    snapshot,
+  };
+}
@@ -0,0 +1,344 @@
+import type { FileReadResult } from "@getpaseo/client/internal/daemon-client";
+import type { FileVersion } from "@getpaseo/protocol/messages";
+import { describe, expect, it, vi } from "vitest";
+import { LiveFileModel, type LiveFileSession, type LiveFileSubscription } from "./model";
+
+interface Deferred<T> {
+  promise: Promise<T>;
+  resolve(value: T): void;
+  reject(error: Error): void;
+}
+
+function deferred<T>(): Deferred<T> {
+  let resolve!: (value: T) => void;
+  let reject!: (error: Error) => void;
+  const promise = new Promise<T>((onResolve, onReject) => {
+    resolve = onResolve;
+    reject = onReject;
+  });
+  return { promise, resolve, reject };
+}
+
+function ready(revision = "revision-1"): Extract<FileVersion, { status: "ready" }> {
+  return {
+    status: "ready",
+    cwd: "/workspace",
+    path: "file.ts",
+    size: 3,
+    modifiedAt: "2026-07-30T00:00:00.000Z",
+    revision,
+  };
+}
+
+function file(revision = "revision-1", content = "one"): FileReadResult {
+  return {
+    bytes: new TextEncoder().encode(content),
+    mime: "text/plain",
+    size: content.length,
+    path: "file.ts",
+    kind: "text",
+    modifiedAt: "2026-07-30T00:00:00.000Z",
+    revision,
+  };
+}
+
+class TestLiveFileSession implements LiveFileSession {
+  readonly reads: Deferred<FileReadResult>[] = [];
+  subscribeAttempts = 0;
+  private onVersion: ((version: FileVersion) => void) | null = null;
+  private readonly initial: FileVersion;
+
+  constructor(initial: FileVersion = ready()) {
+    this.initial = initial;
+  }
+
+  async subscribe(
+    _target: { cwd: string; path: string },
+    onVersion: (version: FileVersion) => void,
+  ): Promise<LiveFileSubscription> {
+    this.subscribeAttempts += 1;
+    this.onVersion = onVersion;
+    return { initial: this.initial, unsubscribe: () => (this.onVersion = null) };
+  }
+
+  read(): Promise<FileReadResult> {
+    const request = deferred<FileReadResult>();
+    this.reads.push(request);
+    return request.promise;
+  }
+
+  emit(version: FileVersion): void {
+    this.onVersion?.(version);
+  }
+}
+
+class DeferredSubscribeSession implements LiveFileSession {
+  readonly reads: Deferred<FileReadResult>[] = [];
+  readonly subscription = deferred<LiveFileSubscription>();
+  private onVersion: ((version: FileVersion) => void) | null = null;
+
+  subscribe(
+    _target: { cwd: string; path: string },
+    onVersion: (version: FileVersion) => void,
+  ): Promise<LiveFileSubscription> {
+    this.onVersion = onVersion;
+    return this.subscription.promise;
+  }
+
+  read(): Promise<FileReadResult> {
+    const request = deferred<FileReadResult>();
+    this.reads.push(request);
+    return request.promise;
+  }
+
+  emit(version: FileVersion): void {
+    this.onVersion?.(version);
+  }
+}
+
+class FlakySubscriptionSession extends TestLiveFileSession {
+  override async subscribe(
+    target: { cwd: string; path: string },
+    onVersion: (version: FileVersion) => void,
+  ): Promise<LiveFileSubscription> {
+    if (this.subscribeAttempts === 0) {
+      this.subscribeAttempts += 1;
+      throw new Error("Connection closed.");
+    }
+    return super.subscribe(target, onVersion);
+  }
+}
+
+async function waitForRead(
+  session: { reads: Deferred<FileReadResult>[] },
+  count: number,
+): Promise<void> {
+  await vi.waitFor(() => expect(session.reads).toHaveLength(count));
+}
+
+describe("LiveFileModel", () => {
+  it("reports initial and read-pending work before any terminal observation", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({ session, target: { cwd: "/workspace", path: "file.ts" }, liveUpdates: false });
+    await waitForRead(session, 1);
+    expect(model.getSnapshot()).toEqual({
+      observation: null,
+      read: { status: "pending", requested: false },
+    });
+  });
+
+  it("reports read error as terminal and recovers on refresh", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({ session, target: { cwd: "/workspace", path: "file.ts" }, liveUpdates: false });
+    await waitForRead(session, 1);
+    session.reads[0].reject(new Error("read failed"));
+    await vi.waitFor(() =>
+      expect(model.getSnapshot().read).toEqual({ status: "error", error: "read failed" }),
+    );
+    model.refresh();
+    await waitForRead(session, 2);
+    session.reads[1].resolve(file("revision-2"));
+    await vi.waitFor(() => expect(model.getObservation()?.status).toBe("ready"));
+  });
+  it("does not publish a missing candidate when the following read succeeds", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+    await waitForRead(session, 1);
+    session.reads[0].resolve(file());
+    await vi.waitFor(() => expect(model.getObservation()).toMatchObject({ status: "ready" }));
+    const publishedStatuses: string[] = [];
+    model.subscribe(() => {
+      const observation = model.getObservation();
+      if (observation) publishedStatuses.push(observation.status);
+    });
+
+    session.emit({ status: "missing", cwd: "/workspace", path: "file.ts" });
+    await waitForRead(session, 2);
+    session.reads[1].resolve(file());
+    await vi.waitFor(() => expect(model.getSnapshot().read).toEqual({ status: "idle" }));
+
+    expect(publishedStatuses).not.toContain("missing");
+  });
+
+  it("publishes missing when the following read also fails", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+    await waitForRead(session, 1);
+    session.reads[0].resolve(file());
+    await vi.waitFor(() => expect(model.getObservation()?.status).toBe("ready"));
+
+    session.emit({ status: "missing", cwd: "/workspace", path: "file.ts" });
+    await waitForRead(session, 2);
+    session.reads[1].reject(new Error("File not found."));
+
+    await vi.waitFor(() => expect(model.getObservation()?.status).toBe("missing"));
+  });
+
+  it("preserves a missing candidate for its queued confirming read", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+    await waitForRead(session, 1);
+
+    session.emit({ status: "missing", cwd: "/workspace", path: "file.ts" });
+    session.reads[0].resolve(file());
+    await waitForRead(session, 2);
+    session.reads[1].reject(new Error("File not found."));
+
+    await vi.waitFor(() => expect(model.getObservation()?.status).toBe("missing"));
+  });
+
+  it("recovers only from a read begun after a missing observation", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+    await waitForRead(session, 1);
+    session.reads[0].resolve(file());
+    await vi.waitFor(() => expect(model.getObservation()).toMatchObject({ status: "ready" }));
+
+    model.refresh();
+    await waitForRead(session, 2);
+    session.emit({ status: "missing", cwd: "/workspace", path: "file.ts" });
+    session.reads[1].resolve(file("revision-2", "two"));
+
+    await waitForRead(session, 3);
+    expect(model.getObservation()?.status).toBe("ready");
+    expect(model.getSnapshot().read).toEqual({ status: "pending", requested: true });
+
+    session.reads[2].resolve(file("revision-2", "two"));
+    await vi.waitFor(() => {
+      expect(model.getSnapshot()).toMatchObject({
+        observation: {
+          status: "ready",
+          version: { revision: "revision-2" },
+          file: { revision: "revision-2" },
+        },
+        read: { status: "idle" },
+      });
+    });
+  });
+
+  it("keeps an actionable error visible while refresh fails", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+    await waitForRead(session, 1);
+    session.reads[0].resolve(file());
+    await vi.waitFor(() => expect(model.getObservation()).toMatchObject({ status: "ready" }));
+
+    session.emit({
+      status: "error",
+      cwd: "/workspace",
+      path: "file.ts",
+      error: "Requested path is not a file",
+    });
+    await waitForRead(session, 2);
+    expect(model.getSnapshot().read).toEqual({ status: "pending", requested: false });
+    session.reads[1].reject(new Error("File unavailable."));
+
+    await vi.waitFor(() => {
+      expect(model.getSnapshot()).toMatchObject({
+        observation: { status: "error", error: "Requested path is not a file" },
+        read: { status: "error", error: "File unavailable." },
+      });
+    });
+
+    model.refresh();
+    await waitForRead(session, 3);
+    expect(model.getSnapshot().read).toEqual({ status: "pending", requested: true });
+  });
+
+  it("keeps an update that arrives before the subscription response", async () => {
+    const session = new DeferredSubscribeSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+
+    session.emit(ready("revision-2"));
+    session.subscription.resolve({ initial: ready("revision-1"), unsubscribe() {} });
+
+    await waitForRead(session, 1);
+    expect(model.getObservation()).toBeNull();
+  });
+
+  it("retries a failed subscription when the user refreshes", async () => {
+    const session = new FlakySubscriptionSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+    await waitForRead(session, 1);
+    expect(session.subscribeAttempts).toBe(1);
+
+    session.reads[0].resolve(file());
+    await vi.waitFor(() => expect(model.getObservation()?.status).toBe("ready"));
+    model.refresh();
+
+    await waitForRead(session, 2);
+    expect(session.subscribeAttempts).toBe(2);
+    expect(model.getSnapshot().read).toEqual({ status: "pending", requested: true });
+  });
+
+  it("reads once without subscribing when live updates are disabled", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: false,
+    });
+
+    await waitForRead(session, 1);
+    expect(session.subscribeAttempts).toBe(0);
+    expect(model.getSnapshot().read).toEqual({ status: "pending", requested: false });
+  });
+
+  it("ignores a read that completes after the model closes", async () => {
+    const session = new TestLiveFileSession();
+    const model = new LiveFileModel();
+    model.open({
+      session,
+      target: { cwd: "/workspace", path: "file.ts" },
+      liveUpdates: true,
+    });
+    await waitForRead(session, 1);
+
+    model.close();
+    session.reads[0].resolve(file());
+    await Promise.resolve();
+
+    expect(model.getSnapshot()).toEqual({
+      observation: null,
+      read: { status: "idle" },
+    });
+  });
+});
@@ -0,0 +1,272 @@
+import type { FileReadResult } from "@getpaseo/client/internal/daemon-client";
+import type { FileVersion } from "@getpaseo/protocol/messages";
+
+export interface LiveFileTarget {
+  cwd: string;
+  path: string;
+}
+
+export interface LiveFileSubscription {
+  initial: FileVersion;
+  unsubscribe(): void;
+}
+
+export interface LiveFileSession {
+  subscribe(
+    target: LiveFileTarget,
+    onVersion: (version: FileVersion) => void,
+  ): Promise<LiveFileSubscription>;
+  read(target: LiveFileTarget): Promise<FileReadResult>;
+}
+
+export type LiveFileReadState =
+  | { status: "idle" }
+  | { status: "pending"; requested: boolean }
+  | { status: "error"; error: string };
+
+export type LiveFileObservation =
+  | {
+      status: "ready";
+      version: Extract<FileVersion, { status: "ready" }>;
+      file: FileReadResult;
+    }
+  | Extract<FileVersion, { status: "missing" | "error" }>;
+
+export interface LiveFileSnapshot {
+  observation: LiveFileObservation | null;
+  read: LiveFileReadState;
+}
+
+const idleSnapshot: LiveFileSnapshot = {
+  observation: null,
+  read: { status: "idle" },
+};
+
+export class LiveFileModel {
+  private readonly listeners = new Set<() => void>();
+  private snapshot: LiveFileSnapshot = idleSnapshot;
+  private session: LiveFileSession | null = null;
+  private target: LiveFileTarget | null = null;
+  private liveUpdates = false;
+  private unsubscribe: (() => void) | null = null;
+  private subscriptionPending = false;
+  private generation = 0;
+  private issuedReadSequence = 0;
+  private activeReadSequence: number | null = null;
+  private activeReadRequested = false;
+  private observedAfterReadSequence: number | null = null;
+  private candidateVersion: FileVersion | null = null;
+  private refreshQueued = false;
+  private requestedRefreshQueued = false;
+
+  subscribe = (listener: () => void): (() => void) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+
+  getSnapshot = (): LiveFileSnapshot => this.snapshot;
+
+  getObservation = (): LiveFileObservation | null => this.snapshot.observation;
+
+  open(input: { session: LiveFileSession; target: LiveFileTarget; liveUpdates: boolean }): void {
+    this.reset();
+    this.session = input.session;
+    this.target = input.target;
+    this.liveUpdates = input.liveUpdates;
+    const generation = this.generation;
+    if (!input.liveUpdates) {
+      this.scheduleRead(false);
+      return;
+    }
+    void this.startSubscription(generation);
+  }
+
+  close(): void {
+    this.reset();
+  }
+
+  refresh = (): void => {
+    if (!this.session || !this.target) return;
+    if (this.liveUpdates && !this.unsubscribe && !this.subscriptionPending) {
+      void this.startSubscription(this.generation);
+    }
+    this.scheduleRead(true);
+  };
+
+  private scheduleRead(requested: boolean): void {
+    if (this.activeReadSequence !== null) {
+      this.refreshQueued = true;
+      this.activeReadRequested ||= requested;
+      this.requestedRefreshQueued ||= requested;
+      if (requested && this.snapshot.read.status === "pending") {
+        this.setSnapshot({ ...this.snapshot, read: { status: "pending", requested: true } });
+      }
+      return;
+    }
+    this.startRead(requested);
+  }
+
+  private reset(): void {
+    this.generation += 1;
+    this.unsubscribe?.();
+    this.unsubscribe = null;
+    this.session = null;
+    this.target = null;
+    this.liveUpdates = false;
+    this.subscriptionPending = false;
+    this.issuedReadSequence = 0;
+    this.activeReadSequence = null;
+    this.activeReadRequested = false;
+    this.observedAfterReadSequence = null;
+    this.candidateVersion = null;
+    this.refreshQueued = false;
+    this.requestedRefreshQueued = false;
+    this.setSnapshot(idleSnapshot);
+  }
+
+  private async startSubscription(generation: number): Promise<void> {
+    const session = this.session;
+    const target = this.target;
+    if (!session || !target) return;
+    this.subscriptionPending = true;
+    let receivedUpdate = false;
+    try {
+      const subscription = await session.subscribe(target, (version) => {
+        if (generation !== this.generation) return;
+        receivedUpdate = true;
+        this.observeVersion(version);
+      });
+      if (generation !== this.generation) {
+        subscription.unsubscribe();
+        return;
+      }
+      this.subscriptionPending = false;
+      this.unsubscribe = subscription.unsubscribe;
+      if (!receivedUpdate) this.observeVersion(subscription.initial);
+    } catch {
+      if (generation !== this.generation) return;
+      this.subscriptionPending = false;
+      this.scheduleRead(false);
+    }
+  }
+
+  private observeVersion(version: FileVersion): void {
+    this.observedAfterReadSequence = this.issuedReadSequence;
+    this.candidateVersion = version;
+    this.scheduleRead(false);
+  }
+
+  private startRead(requested: boolean): void {
+    const session = this.session;
+    const target = this.target;
+    if (!session || !target) return;
+    const generation = this.generation;
+    const sequence = ++this.issuedReadSequence;
+    this.activeReadSequence = sequence;
+    this.activeReadRequested = requested;
+    this.refreshQueued = false;
+    this.requestedRefreshQueued = false;
+    this.setSnapshot({ ...this.snapshot, read: { status: "pending", requested } });
+    void session.read(target).then(
+      (file) => this.finishRead({ generation, sequence, target, file }),
+      (error) => this.failRead({ generation, sequence, target, error }),
+    );
+  }
+
+  private finishRead(input: {
+    generation: number;
+    sequence: number;
+    target: LiveFileTarget;
+    file: FileReadResult;
+  }): void {
+    if (!this.isActiveRead(input.generation, input.sequence)) return;
+    const requested = this.activeReadRequested;
+    this.activeReadSequence = null;
+    this.activeReadRequested = false;
+    if (this.readPredatesLatestObservation(input.sequence)) {
+      this.startRead(requested || this.takeQueuedRequested());
+      return;
+    }
+    this.observedAfterReadSequence = null;
+    this.candidateVersion = null;
+    this.setSnapshot({
+      observation: {
+        status: "ready",
+        file: input.file,
+        version: readyVersion(input.target, input.file),
+      },
+      read: { status: "idle" },
+    });
+    this.startQueuedRead();
+  }
+
+  private failRead(input: {
+    generation: number;
+    sequence: number;
+    target: LiveFileTarget;
+    error: unknown;
+  }): void {
+    if (!this.isActiveRead(input.generation, input.sequence)) return;
+    const requested = this.activeReadRequested;
+    this.activeReadSequence = null;
+    this.activeReadRequested = false;
+    if (this.readPredatesLatestObservation(input.sequence)) {
+      this.startRead(requested || this.takeQueuedRequested());
+      return;
+    }
+    const message = errorMessage(input.error);
+    const candidate = this.candidateVersion;
+    this.candidateVersion = null;
+    const candidateDescribesFailure =
+      candidate?.status === "missing" || candidate?.status === "error";
+    const observation: LiveFileObservation = candidateDescribesFailure
+      ? candidate
+      : { status: "error", cwd: input.target.cwd, path: input.target.path, error: message };
+    this.setSnapshot({ ...this.snapshot, observation, read: { status: "error", error: message } });
+    this.startQueuedRead();
+  }
+
+  private isActiveRead(generation: number, sequence: number): boolean {
+    return generation === this.generation && sequence === this.activeReadSequence;
+  }
+
+  private readPredatesLatestObservation(sequence: number): boolean {
+    return this.observedAfterReadSequence !== null && sequence <= this.observedAfterReadSequence;
+  }
+
+  private startQueuedRead(): void {
+    if (!this.refreshQueued) return;
+    this.startRead(this.takeQueuedRequested());
+  }
+
+  private takeQueuedRequested(): boolean {
+    const requested = this.requestedRefreshQueued;
+    this.refreshQueued = false;
+    this.requestedRefreshQueued = false;
+    return requested;
+  }
+
+  private setSnapshot(snapshot: LiveFileSnapshot): void {
+    if (snapshot === this.snapshot) return;
+    this.snapshot = snapshot;
+    for (const listener of this.listeners) listener();
+  }
+}
+
+function readyVersion(
+  target: LiveFileTarget,
+  file: FileReadResult,
+): Extract<FileVersion, { status: "ready" }> {
+  return {
+    status: "ready",
+    cwd: target.cwd,
+    path: target.path,
+    size: file.size,
+    modifiedAt: file.modifiedAt,
+    revision: file.revision,
+  };
+}
+
+function errorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	d369c9d36b	feat(subagents): connect fleet MCP delegation to app and parent completion Parented creation enters the relationship owner before resource admission. Initial run evidence drives one qualified completion consumer, while ordinary bound conversations own their directory demand and workspace selectors. Preserve manager-owned archive lifecycles and verify managed callbacks through the parent capability.	2026-10-20 17:41:52 +02:00
Mohamed Boudra	12890f8ab0	feat(subagents): retain fleet membership and origin through app navigation Use the parent ledger to attest membership before the first child snapshot so placement cannot race creation. Bind retained conversations, catalog pushes and actions to their selected origin with separate replica, layout and pending-state owners.	2026-10-20 15:09:50 +02:00
Mohamed Boudra	7c4aa058ff	feat(hosts): bind replica and session lifetime to origin authority	2026-10-20 13:23:04 +02:00
Mohamed Boudra	702bc942b7	fix(agents): retain creation identity and dispatch evidence across hosts	2026-10-20 12:15:51 +02:00
Mohamed Boudra	b1b5010bd2	feat(agents): persist qualified subagent lifecycle and run evidence	2026-10-20 10:57:13 +02:00
Mohamed Boudra	888b54bb44	feat(hosts): resolve qualified agent addresses through shared runtimes Keep agent identity and origin authority stable through disconnects, destination changes, and scoped disposal. Share the resolver with trusted daemon consumers and plugins, using ordinary sessions and per-admission permission ceilings. Expose MCP host discovery through that boundary as the first checkpoint toward durable fleet subagents.	2026-10-20 09:32:17 +02:00
Mohamed Boudra	63c3bb8c42	test(e2e): keep transient developer toasts from stalling checks Concurrent locator handlers can wait for a dismiss button another handler removed. Dismiss existing toast DOM at document lifetime, including its open shadow root, without intercepting app actions.	2026-10-20 08:06:15 +02:00
Mohamed Boudra	569b34263d	refactor(hosts): use the ordinary client contract over channel transports Keep queuing, permission codes and reconnection independent of transport selection. Track submitted request outcomes generically while retaining connection error codes and structured causes.	2026-10-20 07:59:01 +02:00
Mohamed Boudra	71cc853f7b	test(hosts): control physical write backpressure across platforms Hold real TCP writes until assertions finish instead of assuming a paused receiver exhausts every platform receive buffer. Preserve physical send settlement, byte identity, capacity and sibling checks.	2026-10-20 07:59:01 +02:00
Mohamed Boudra	f2dfa83e83	refactor(hosts): remove management settings UI from phase one Keep connected-host management in the CLI and shared SDK while preserving app saved connections and plugin access.	2026-10-20 07:59:01 +02:00
Mohamed Boudra	fb4ca20dbd	fix(hosts): keep compact row actions clear of host labels Give compact connected-host rows separate text and action widths so long names and producer labels cannot compete with primary controls.	2026-10-20 07:59:01 +02:00
Mohamed Boudra	4e2aa97a74	fix(hosts): bound encrypted overload and initial acquisition Check encrypted wire capacity before the async channel converts a resource limit into a physical connection error. Bound initial routed acquisition with the existing client timeout, then enable reconnect after admission.	2026-10-20 07:59:01 +02:00
Mohamed Boudra	5ab9b8dcd4	fix(hosts): share daemon links across isolated routed sessions Multiplex logical sessions over the monitored daemon connection and wrap original binary bytes in routing headers. Admit channels under their authenticated parent and current grants; preserve scoped delivery and physical send completion.	2026-10-20 07:59:01 +02:00
Mohamed Boudra	4284209025	fix(cli): preserve validated addresses in daemon command hints	2026-10-20 07:59:01 +02:00
Mohamed Boudra	6ae87ec7e2	test(hosts): include relay coverage in existing CI contracts	2026-10-20 07:59:01 +02:00
Mohamed Boudra	630e8301ad	fix(hosts): validate safe targets and verify encrypted relay routes	2026-10-20 07:59:01 +02:00
Mohamed Boudra	74bb3e76e4	feat(hosts): connect to saved hosts through a daemon	2026-10-20 07:59:01 +02:00