test(server): reproduce ACP restart after failed process termination

Refs #3256 and #7472. A real ACP subprocess remains alive when the injected termination dependency returns kill-timeout. The following prompt starts a second live subprocess, violating exclusive runtime ownership. This regression test intentionally fails on the inspected contributor commit.

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>

.github/workflows/ci.yml

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

.github/workflows/desktop-packages.yml

@@ -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/**"

CLAUDE.md

@@ -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                                           |
@@ -107,8 +106,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

README.zh-CN.md

@@ -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 的首页和文档中。
 
 ## 相关项目
 

docs/agent-lifecycle.md

@@ -50,6 +50,15 @@ older cancellation from settling a newer turn. If interruption is rejected or ti
 keeps its active foreground turn and replacement, reload, rewind, and Stop report the failure.
 Accepting new work after an ambiguous interruption would create a split-brain session.
 
+A forced settlement leaves two owners of "is a turn running": the manager has settled the run, while
+the provider session still holds the turn slot it never confirmed ending. `AgentSession.abandonForegroundTurn`
+is the optional seam for that case. The manager calls it after force-canceling, and only then. A
+provider that implements it must make the session usable again, not just clear a local flag: the ACP
+adapter kills the process that owned the turn and drops the slot, and its next `startTurn` resumes the
+durable session in a new process. Clearing the slot while reusing a runtime that may still be working
+would be the split-brain shape this section forbids. Providers that omit the hook keep today's
+behavior, and a rejected release is logged without undoing the settlement.
+
 ## Relationships
 
 Agents can launch other agents via the agent-scoped `create_agent` MCP tool. Agent-scoped creation is always asynchronous and always stamps `paseo.parent-agent-id`, pointing back at the caller. Omit `workspaceId` to use the caller's workspace, or pass an existing workspace ID returned by `create_workspace`. Placement never changes parentage.
@@ -71,8 +80,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.

docs/android.md

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

docs/explorer-sidebar.md

@@ -11,7 +11,7 @@ contracts.
 
 ## Panel host contract
 
-Every panel registers its supported `PaneHost` values and presentation. Launchers derive
+Every desktop panel registers its supported `PaneHost` values and presentation. Launchers derive
 fixed-target labels and icons from that registration, filter by host, and never substitute one
 panel type for another. Tab moves reject unsupported destinations, and placement resolves only to
 a compatible pane.
@@ -21,10 +21,7 @@ so a pane’s + menu omits each while that pane already contains it. Closing one
 item available again. Other compatible tabs, including agents, terminals, files, and diffs,
 can move between Explorer and main panes.
 Keep panel implementations independent of either shell. `WorkspacePanelHost` owns mounting and
-retention. The shared Explorer owns its tab rail; its shared frame owns visibility, activity and
-close-gesture lifetime. Platform adapters own resizing and inset geometry.
-The host keeps three recently used tabs plus modified tabs; unmodified tabs beyond that budget
-can remount. Native retained content stays live, while web chat uses its existing deferred Freeze.
+retention, while each shell owns its tabs, focus, dragging, resizing, and shortcuts.
 
 ## Sheets
 
@@ -43,11 +40,11 @@ remounts its panel. Revealing a target that already has a sheet uncovers that sh
 ones above it, except ones holding unsaved work, which stay where they are. Opening a sheet as a tab
 dismisses the sheets above it, since the tab would sit under them. The stack is not persisted.
 
-Sheets are modal and cover the whole compact workspace, including the header and Explorer. A sheet's header is its drag
+Sheets are modal and cover the whole compact column, header included. A sheet's header is its drag
 handle, because the panel scrolls on its own and content panning would fight it. Its trailing rail
 holds icon buttons only (`SheetHeaderIconButton`): Open as tab is the full-screen glyph beside
 Close, so the title keeps its width. The sheets present
-from the shared workspace's `SheetHostScope`, so their panels read the navigator and every
+from inside the compact column's `SheetHostScope`, so their panels read the navigator and every
 workspace provider an ordinary pane has without a context bridge
 ([floating-panels.md Gotcha 6](floating-panels.md#gotcha-6--bottom-sheet-refs-are-not-lifecycle-truth)).
 
@@ -59,16 +56,12 @@ the sheet's tab into a pane, and edits the autosave has not started writing are
 ## Explorer sidebar
 
 `packages/app/src/workspace-tabs/explorer-sidebar.ts` owns show, hide, toggle, and view selection.
-One Explorer host stays beside the center column across compact overlays and docks. Keep its
-providers and gesture roots at the same React position when width or appearance changes. The
-workspace route preserves panel ancestry during appearance updates. Appearance-dependent leaves
-subscribe to theme changes; the file editor reconfigures its existing editor theme compartment.
-Ordinary leaf routes retain the stack appearance policy.
-The shell is outside the workspace split canvas so it divides the full workspace, including the header. It has its own persisted width and resize handle. Main-pane splits
+On desktop, the shell is rendered outside the workspace split canvas so it divides the full
+workspace, including the header. It has its own persisted width and resize handle. Main-pane splits
 never read or modify that width.
 
 `packages/app/src/workspace-tabs/open-supporting-view.ts` owns semantic Changes and pull-request
-opens. Compact and wide native layouts select the matching workspace tab in Explorer. Desktop Changes opens
+opens. Compact and wide native layouts select the matching Explorer tab. Desktop Changes opens
 follow the shared diff preference. Desktop pull requests use their Main panel, On the side, or
 Explorer sidebar setting. Automatic PR discovery follows that preference once per workspace without
 interrupting the user's work. Closing the tab opts that workspace out of future automatic opens,
@@ -83,37 +76,18 @@ literal `"explorer"` pane id and `explorerPaneIdByWorkspace` key for compatibili
 
 Explorer uses the shared workspace tab row and ordinary tab context menus. Files and Changes
 hide their close buttons through the panel manifest; close them from the tab context menu.
-Other tabs reveal the close control on hover. The + menu opens compatible panels in the dock, including Agent and terminal profiles.
-Web also supports dragging agents and terminals into Explorer.
+Other tabs reveal the close control on hover. The + menu opens compatible panels in the dock and
+omits Agent and terminal profiles. Agents and terminals can still be dragged into Explorer.
 Bulk-close actions apply only to the dock's tabs. Explorer tabs can be reordered and dragged
 between compatible panes, but the dock cannot be split or maximized. Selecting an Explorer tab
-does not change workspace focus. Web dragging shares the workspace drag scope; compact layouts
-accept only reordering inside the source pane.
+does not change workspace focus.
 
-Cmd+E shows or hides Explorer without changing its selected view. All layouts use the same
-workspace tabs, launcher, and panel host. Below 600 points the shell is the swipeable Explorer
-overlay; at 600 points and above it reserves width beside the workspace. Native docking keeps its
-touch resize handle. Full workspace splits remain a separate web-only capability.
-
-The dock reserves at least 240 points and the workspace 360. App navigation yields when it cannot
-share the remaining width with both. This keeps a portrait tablet from rendering three unusably
-narrow columns; widening restores navigation without changing its saved open state.
-
-Compact panel gestures own overlay visibility; the workspace layout owns its tab selection and
-contents on every platform. Explicit pane destinations bypass compact sheet placement, so choosing
-a panel in Explorer's + menu keeps it there. Ordinary compact file and subagent look-ups still use
-the sheet policy. Resolving an existing main tab reveals center immediately; a new file sheet
-keeps Explorer underneath and closing the sheet uncovers it. Semantic navigation resolves the
-actual destination before revealing it, including deduplicated targets.
-
-Compact overlay selection and saved dock visibility are independent. Folding changes geometry,
-not either mode’s visibility intent. Native workspace retention remains one workspace; web retains
-up to ten with its existing inactive TTL.
-
-PR discovery belongs to the active workspace: split layouts discover while active, and other
-layouts discover while Explorer is active. The rail requests summary status; selected visible PR
-content also requests timeline data. Inactive consumers read cached data without request demand.
-Discovery uses ordinary PR tabs and their existing once-per-workspace close opt-out.
+Cmd+E shows or hides Explorer without changing its selected view. Compact layouts use the combined
+full-screen Explorer overlay for Changes, Files, and pull requests, and close it after a file opens. Compact Changes has no tree rail; its overview is the Jump to file action (`packages/app/src/git/jump-to-file/`), a sheet over the same changed-files tree the desktop rail renders.
+Wide native layouts without pane splits use the same combined content in a resizable inline dock;
+opening a file leaves that dock visible. Both presentations keep their selection in the panel store
+and reuse the layout store's per-workspace Explorer width. They do not create a second Explorer
+lifecycle.
 
 ## Side pane
 

docs/expo-router.md

@@ -157,9 +157,7 @@ a small `withUnistyles` boundary without subscribing the route tree itself to
 every Unistyles runtime update.
 
 Navigators keep their identity across appearance changes. `ThemedStack` remounts
-each ordinary screen's content below the native stack when appearance tokens change.
-Workspace screens own retained panel lifetimes and update appearance at their
-leaves through `screenOwnedAppearance` ([Explorer](explorer-sidebar.md)). A
+each screen's content below the native stack when appearance tokens change; a
 keyed wrapper above a stack remounts the stack itself, and Android crashes when
 that happens while a FragmentManager transaction is running, which settings
 hydration at startup makes likely. A screen that mounts a nested navigator (the

docs/i18n.md

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

docs/mobile-panels.md

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

docs/plugins.md

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

docs/release.md

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

docs/testing.md

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

docs/website-i18n.md

@@ -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 (`**注意**：这里`).

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-Et1ofRqkqFoGETnbeqXuy2RerFT0kkk5F+VwDXak+fk=
+sha256-ObBdUmNSW+vDjzA7EbCDfZrB0nYDmcWmWe+UCoTMh/M=

package.json

@@ -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",
@@ -140,21 +137,16 @@
     "oxlint-tsgolint": "^0.22.1",
     "patch-package": "^8.0.1",
     "playwright": "^1.56.1",
-    "react-dom": "19.2.3",
     "typescript": "^5.9.3",
     "ws": "^8.20.0"
   },
   "overrides": {
     "@codemirror/language": "6.12.4",
     "@codemirror/view": "6.43.6",
-    "expo": "~57.0.30",
-    "expo-router": "~57.0.28",
     "lightningcss": "1.30.1",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
-    "react-native": "0.86.3",
-    "react-native-gesture-handler": "~2.32.0",
-    "react-native-reanimated": "4.5.1",
-    "react-native-worklets": "0.10.1"
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "react-native-reanimated": "4.3.1",
+    "react-native-worklets": "0.8.3"
   }
 }

packages/app/app.config.js

@@ -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
@@ -172,7 +171,6 @@ export default {
       [
         "expo-build-properties",
         {
-          ios: { enableSceneSupport: true },
           android: {
             minSdkVersion: 29,
             kotlinVersion: "2.1.20",
@@ -182,7 +180,7 @@ export default {
         },
       ],
       ...buildProfile.fdroidPlugins,
-      ...(isProfileBuild || isWatchdogBuild ? [withAndroidProfileable] : []),
+      ...(isProfileBuild ? [withAndroidProfileable] : []),
     ],
     experiments: {
       typedRoutes: true,
@@ -192,9 +190,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",

packages/app/e2e/browser/add-changed-file-to-chat.spec.ts

@@ -2,56 +2,48 @@ import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { test, expect, type Page } from "../support/fixtures";
 import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
-import { openChangesPanel, openChangesTreePanel } from "../support/helpers/workspace-tabs";
+import { openChangesPanel } from "../support/helpers/workspace-tabs";
 
 function visibleComposer(page: Page) {
   return page.locator("textarea[data-composer-input]").filter({ visible: true }).first();
 }
 
-for (const width of [1400, 390]) {
-  test(`adds a changed file to the focused chat without replacing its composer draft at ${width}px`, async ({
-    page,
-  }) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "add-file-to-chat-",
-      title: "Target chat",
-    });
-    const relativePath = "src/changed file.ts";
-
-    try {
-      await mkdir(path.join(workspace.cwd, "src"), { recursive: true });
-      await writeFile(path.join(workspace.cwd, relativePath), "export const changed = true;\n");
-      await workspace.client.checkoutRefresh(workspace.cwd);
-
-      await page.setViewportSize({ width, height: 900 });
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
-      });
-
-      const agentComposer = visibleComposer(page);
-      await expect(agentComposer).toBeEditable({ timeout: 30_000 });
-      await agentComposer.fill("Preserve this thought");
-
-      if (width < 600) await openChangesTreePanel(page);
-      else await openChangesPanel(page);
-      const changedFile = page.getByTestId("diff-file-0-toggle");
-      await expect(changedFile).toBeVisible({ timeout: 30_000 });
-      await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
-      await page.getByTestId("diff-file-0-add-to-chat").click();
-
-      const attachment = page.getByTestId("composer-workspace-file-attachment-pill");
-      if (width < 600)
-        await expect(
-          page.getByTestId("workspace-explorer-sidebar").filter({ visible: true }),
-        ).toHaveCount(0);
-      await expect(attachment).toContainText("changed file.ts");
-      await expect(attachment).toContainText(relativePath);
-      await expect(agentComposer).toHaveValue("Preserve this thought");
-      if (width >= 600) await expect(agentComposer).toBeFocused();
-      else await expect(agentComposer).toBeEditable();
-    } finally {
-      await workspace.cleanup();
-    }
+test("adds a changed file to the focused chat without replacing its composer draft", async ({
+  page,
+}) => {
+  const workspace = await seedMockAgentWorkspace({
+    repoPrefix: "add-file-to-chat-",
+    title: "Target chat",
   });
-}
+  const relativePath = "src/changed file.ts";
+
+  try {
+    await mkdir(path.join(workspace.cwd, "src"), { recursive: true });
+    await writeFile(path.join(workspace.cwd, relativePath), "export const changed = true;\n");
+    await workspace.client.checkoutRefresh(workspace.cwd);
+
+    await page.setViewportSize({ width: 1400, height: 900 });
+    await openAgentRoute(page, {
+      workspaceId: workspace.workspaceId,
+      agentId: workspace.agentId,
+    });
+
+    const agentComposer = visibleComposer(page);
+    await expect(agentComposer).toBeEditable({ timeout: 30_000 });
+    await agentComposer.fill("Preserve this thought");
+
+    await openChangesPanel(page);
+    const changedFile = page.getByText("changed file.ts", { exact: true }).first();
+    await expect(changedFile).toBeVisible({ timeout: 30_000 });
+    await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+    await page.getByTestId("diff-file-0-add-to-chat").click();
+
+    const attachment = page.getByTestId("composer-workspace-file-attachment-pill");
+    await expect(attachment).toContainText("changed file.ts");
+    await expect(attachment).toContainText(relativePath);
+    await expect(agentComposer).toHaveValue("Preserve this thought");
+    await expect(agentComposer).toBeFocused();
+  } finally {
+    await workspace.cleanup();
+  }
+});

packages/app/e2e/browser/changes-pane.spec.ts

@@ -832,19 +832,14 @@ 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")
-    .filter({ visible: true });
+  const compactChangesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
   if (!(await compactChangesTab.isVisible())) {
     await page.getByTestId("workspace-explorer-toggle").first().click();
   }
   await expect(compactChangesTab).toBeVisible();
   await compactChangesTab.click();
-  const compactExplorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  const compactExplorer = page.getByTestId("explorer-content-area").filter({ visible: true });
   await expect(compactExplorer.getByTestId("changes-header")).toBeVisible();
 
   const actions = compactExplorer.getByTestId("changes-actions-menu-trigger");
@@ -881,27 +876,6 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
   ).toContainText("Scroll long lines");
 });
 
-test("compact Explorer renders inline hunks with a saved tree-only desktop preference", async ({
-  page,
-}) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await page.addInitScript(
-    ({ key }) => {
-      localStorage.setItem(key, JSON.stringify({ inlineDiff: false, layout: "split" }));
-    },
-    { key: CHANGES_PREFERENCES_KEY },
-  );
-  const explorer = await openCompactChanges(page, workspace);
-  await expect(explorer.getByTestId("git-diff-canvas")).toBeVisible();
-  await expect(explorer.getByTestId("diff-file-0-toggle")).toBeVisible();
-  await explorer.getByTestId("diff-file-0-toggle").click({ button: "right" });
-  page.once("dialog", (dialog) => dialog.accept());
-  await page.getByTestId("diff-file-0-revert").click();
-  await expect
-    .poll(() => readFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), "utf8"))
-    .toBe(BEFORE);
-});
-
 test("compact Changes jumps to a file from the changed-files sheet", async ({ page }) => {
   const workspace = await createWorkspaceWithMountedTabDiff({ includeNestedFolders: true });
   await useUnwrappedDiffLines(page);
@@ -1700,10 +1674,10 @@ async function openCompactChanges(page: Page, workspace: DirtyWorkspace): Promis
   await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
   await page.reload();
   await page.getByTestId("workspace-explorer-toggle").first().click();
-  const changesTab = page.getByTestId("workspace-tab-changes_tree").filter({ visible: true });
+  const changesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
   await expect(changesTab).toBeVisible({ timeout: 30_000 });
   await changesTab.click();
-  const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  const explorer = page.getByTestId("explorer-content-area").filter({ visible: true });
   await expect(explorer.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
   return explorer;
 }
@@ -1847,14 +1821,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));

packages/app/e2e/browser/compact-git-actions-menu.spec.ts

@@ -45,10 +45,10 @@ async function openCompactActionsMenu(page: Page, workspaceId: string) {
   await page.goto(buildHostWorkspaceRoute(getServerId(), workspaceId));
   await page.reload();
   await page.getByTestId("workspace-explorer-toggle").first().click();
-  const changesTab = page.getByTestId("workspace-tab-changes_tree").filter({ visible: true });
+  const changesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
   await expect(changesTab).toBeVisible({ timeout: 30_000 });
   await changesTab.click();
-  const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  const explorer = page.getByTestId("explorer-content-area").filter({ visible: true });
   await expect(explorer.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
 
   const trigger = explorer.getByTestId("changes-actions-menu-trigger");

packages/app/e2e/browser/composer-diff-stat.spec.ts

@@ -125,7 +125,7 @@ test("composer diff stat opens the compact explorer instead of a Changes tab", a
     });
 
     const closeExplorer = page
-      .getByTestId("workspace-explorer-sidebar")
+      .getByTestId("explorer-header")
       .getByRole("button", { name: "Close Explorer sidebar" });
     await expect(closeExplorer).not.toBeInViewport();
 
@@ -809,7 +809,7 @@ async function expectUnmatchedFeedback(page: Page) {
 }
 
 function compactReviewSurface(page: Page) {
-  return page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  return page.getByTestId("explorer-content-area").filter({ visible: true });
 }
 async function openCompactReviewExplorer(
   page: Page,
@@ -847,10 +847,7 @@ async function scrollReviewToLastLine(page: Page) {
 
 async function revealCompactChanges(page: Page) {
   await page.getByTestId("workspace-explorer-toggle").first().click();
-  await page
-    .getByTestId("workspace-explorer-sidebar")
-    .getByTestId("workspace-tab-changes_tree")
-    .click();
+  await page.getByTestId("explorer-header").getByText("Changes", { exact: true }).click();
   await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
 }
 async function expectReviewEditorBody(page: Page, body: string) {

packages/app/e2e/browser/explorer-sidebar.spec.ts

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

packages/app/e2e/browser/file-change-conflicts.spec.ts

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

packages/app/e2e/browser/file-editing.spec.ts

@@ -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();
   });
 

packages/app/e2e/browser/folder-links.spec.ts

@@ -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);
 }

packages/app/e2e/browser/markdown-relative-links.spec.ts

@@ -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();
-});

packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts

@@ -247,7 +247,9 @@ test.describe("New workspace: fullscreen composer across the compact breakpoint"
       await expectNewWorkspaceDraft(page, `${draft} wide`);
     });
 
-    // Exercise the terminal prompt's fullscreen and compact launch sheet on the phone.
+    // Terminal mode and its prompt are screen state, and the shell remounts the screen
+    // at the breakpoint, so the terminal prompt's fullscreen is exercised on the phone
+    // layout only.
     await test.step("terminal: the prompt's fullscreen shows only exit and Launch", async () => {
       await resizeComposerViewport(page, "portrait");
       // The compact launch control opens a sheet, not the desktop menu.

packages/app/e2e/browser/plugin-buttons.spec.ts

@@ -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);
-});

packages/app/e2e/browser/plugin-file-panel-examples.spec.ts

@@ -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();
-  }
-});

packages/app/e2e/browser/plugin-file-panel-picker.spec.ts

@@ -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();
-  }
-});

packages/app/e2e/browser/plugin-file-panel-settings.spec.ts

@@ -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();
-});

packages/app/e2e/browser/plugin-file-panels.spec.ts

@@ -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 });
-  }
-});

packages/app/e2e/browser/plugin-host-ui.spec.ts

@@ -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";
@@ -6,11 +5,15 @@ import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import {
+  expectMobileAgentSidebarVisible,
+  openMobileAgentSidebar,
+} from "../support/helpers/sidebar";
 
 const PLUGIN_ID = "plugin-host-ui-e2e";
 
 const PLUGIN_SOURCE = `import { usePaseo } from "@getpaseo/plugin/client";
-import { Icon, Modal, useToast } from "@getpaseo/plugin/client/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";
@@ -88,6 +91,12 @@ async function useCompactLayout(page: Page): Promise<void> {
   await page.setViewportSize({ width: 390, height: 844 });
 }
 
+async function reopenHostUiPluginFromCompactSidebar(page: Page): Promise<void> {
+  await openMobileAgentSidebar(page);
+  await expectMobileAgentSidebarVisible(page);
+  await page.getByRole("button", { name: "Host UI", exact: true }).click();
+}
+
 async function openPluginModal(page: Page): Promise<void> {
   await page.getByRole("button", { name: "Open plugin modal", exact: true }).click();
 }
@@ -149,6 +158,7 @@ test("plugin modal adapts its presentation and preserves host contexts", async (
 
     await test.step("compact layouts preserve host contexts inside a sheet", async () => {
       await useCompactLayout(page);
+      await reopenHostUiPluginFromCompactSidebar(page);
       await openPluginModal(page);
       await expectCompactPluginSheet(page);
       await savePluginIssue(page);
@@ -167,10 +177,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);
-});

packages/app/e2e/browser/plugin-modal-body.spec.ts

@@ -2,6 +2,10 @@ import { copyPluginExample } from "../support/helpers/plugin-fixture";
 import { expect, test as base, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import {
+  openMobileAgentSidebar,
+  expectMobileAgentSidebarVisible,
+} from "../support/helpers/sidebar";
 
 async function openExample(page: Page, example: string) {
   await page.getByRole("button", { name: `Open ${example}`, exact: true }).click();
@@ -118,7 +122,9 @@ async function openWideExamples(page: Page) {
 
 async function openCompactExamples(page: Page) {
   await page.setViewportSize({ width: 390, height: 844 });
-  await expect(page.getByRole("button", { name: "Open Form", exact: true })).toBeVisible();
+  await openMobileAgentSidebar(page);
+  await expectMobileAgentSidebarVisible(page);
+  await page.getByRole("button", { name: "Modal examples", exact: true }).click();
 }
 
 async function expectDeniedCopyFeedback(page: Page) {

packages/app/e2e/browser/plugin-timeline.spec.ts

@@ -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);
-});

packages/app/e2e/browser/plugin-workspace-panels.spec.ts

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

packages/app/e2e/browser/sidebar-mobile-menu-sheets.spec.ts

@@ -15,7 +15,6 @@ async function closeMenuSheet(page: Page): Promise<void> {
 
 test("project and workspace kebabs open action sheets on compact layouts", async ({ page }) => {
   const seeded = await seedWorkspace({ repoPrefix: "sidebar-mobile-menu-sheet-" });
-  const secondProject = await seedWorkspace({ repoPrefix: "sidebar-mobile-menu-filter-" });
 
   try {
     await gotoAppShell(page);
@@ -27,7 +26,6 @@ test("project and workspace kebabs open action sheets on compact layouts", async
       /^Grouping/,
       /^Title/,
       "Show",
-      "Project",
       "Show background",
     ]);
     await closeMenuSheet(page);
@@ -55,7 +53,6 @@ test("project and workspace kebabs open action sheets on compact layouts", async
     });
     await expect(page.getByText("Workspace actions", { exact: true })).toBeVisible();
   } finally {
-    await secondProject.cleanup();
     await seeded.cleanup();
   }
 });

packages/app/e2e/browser/sidebar-nav-settings.spec.ts

@@ -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()] });

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

@@ -624,9 +624,7 @@ test.describe("Half-screen desktop layout", () => {
     await expect(page.getByTestId("sidebar-settings")).not.toBeVisible();
   });
 
-  test("yields app navigation to Explorer and restores it when Explorer closes", async ({
-    page,
-  }) => {
+  test("keeps app navigation beside the Explorer pane", async ({ page }) => {
     const workspace = await seedWorkspace({ repoPrefix: "sidebar-half-screen-explorer-" });
 
     try {
@@ -638,7 +636,7 @@ test.describe("Half-screen desktop layout", () => {
       const explorerToggle = page.getByTestId("workspace-explorer-toggle").first();
       await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toBeVisible();
       await expect(explorerToggle).toHaveAccessibleName("Close Explorer sidebar");
-      await expect(page.getByTestId("sidebar-global-new-workspace")).not.toBeVisible();
+      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
       await expect(page.getByTestId("workspace-explorer-sidebar")).toBeVisible();
       await expect(
         page

packages/app/e2e/browser/usage-modal.spec.ts

@@ -608,10 +608,7 @@ for (const compact of [false, true]) {
       if (compact) await openCompactSidebar(page);
       await openUsageFromIcon(page);
       await expectLoginErrors(page, ["Claude: Initial failure"]);
-      await test.step("developer errors do not interrupt freshness inspection", async () => {
-        await page.evaluate(() => console.error("E2E: developer toast while Usage is open"));
-        await expectLoginUsageFreshness(page, "No successful update", compact);
-      });
+      await expectLoginUsageFreshness(page, "No successful update", compact);
 
       await fixture.setReport({
         status: "available",

packages/app/e2e/browser/workspace-scripts-menu-resize.spec.ts

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

packages/app/e2e/browser/workspace-setup-streaming.spec.ts

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

packages/app/e2e/mobile/agent-device/file-context-menu.ios.ad

@@ -4,8 +4,8 @@ env APP_ID=sh.paseo.debug
 open "${APP_ID}"
 wait "id=\"workspace-header-menu-trigger\"" 20000
 press "id=\"workspace-explorer-toggle\""
-wait "id=\"workspace-tab-files\"" 10000
-press "id=\"workspace-tab-files\""
+wait "id=\"explorer-tab-files\"" 10000
+press "id=\"explorer-tab-files\""
 wait "id=\"file-explorer-row-0\"" 10000
 longpress "id=\"file-explorer-row-0\"" 600
 wait "id=\"file-explorer-row-0-context-menu-content\"" 10000

packages/app/e2e/support/developer-ui.mjs

@@ -1,15 +0,0 @@
-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 });
-}

packages/app/e2e/support/fixtures.ts

@@ -1,5 +1,4 @@
 import { test as base, expect, type Page } from "@playwright/test";
-import { hideDeveloperToasts } from "./developer-ui.mjs";
 import { startOutdatedDaemon, type OutdatedDaemon } from "./helpers/daemon-update";
 import { startE2EWorker } from "./helpers/e2e-worker";
 import { getE2EDaemonPort } from "./helpers/daemon-port";
@@ -131,8 +130,6 @@ const test = daemonTest.extend<{
         await ws.close({ code: 1008, reason: "Blocked connection to localhost:6767 during e2e." });
       });
 
-      await hideDeveloperToasts(page);
-
       const entries: string[] = [];
 
       page.on("console", (message) => {

packages/app/e2e/support/global-setup.ts

@@ -134,8 +134,6 @@ function startMetro(port: number, buffer: ReturnType<typeof createLineBuffer>):
     env: {
       ...process.env,
       BROWSER: "none",
-      // Automation never opens native DevTools or installs its desktop shell.
-      EXPO_UNSTABLE_HEADLESS: "1",
       ...(process.env.E2E_DESKTOP_RUNTIME === "1" ? { PASEO_WEB_PLATFORM: "electron" } : {}),
     },
     stdio: ["ignore", "pipe", "pipe"],

packages/app/e2e/support/helpers/composer.ts

@@ -363,11 +363,10 @@ export async function resizeComposerViewport(
   await page.setViewportSize(sizes[orientation]);
   // Before the app has loaded there is no layout to wait for.
   if (page.url() === "about:blank") return;
-  // The shell and editor survive the breakpoint. Wait for the shell's layout
-  // marker to update before interacting with the resized composer.
-  await expect(
-    page.getByTestId(orientation === "landscape" ? "wide-shell" : "compact-shell"),
-  ).toBeVisible();
+  // Crossing the compact breakpoint remounts the shell and the editor. Anything that
+  // follows (a shortcut, a locator) belongs to the layout the new size implies, so
+  // wait for that layout before returning.
+  await expect(page.getByTestId("compact-shell")).toHaveCount(orientation === "landscape" ? 0 : 1);
 }
 export async function selectComposerDraftRange(
   page: Page,

packages/app/e2e/support/helpers/context-window.ts

@@ -37,7 +37,7 @@ export async function hoverContextWindowMeter(page: Page, name = METER_NAME): Pr
   await page.getByRole("img", { name, exact: true }).hover({ timeout: 30_000 });
   const card = contextWindowDetails(page);
   await expect(card).toBeVisible();
-  await expect(card).toBeInViewport({ ratio: 1 });
+  await expect(card).toBeInViewport();
   return card;
 }
 

packages/app/e2e/support/helpers/markdown-file-panel-plugin.ts

@@ -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 ?? {};
-  });
-}

packages/app/e2e/support/helpers/plugin-timeline.ts

@@ -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();
-  }
-}

packages/app/e2e/support/helpers/plugin-translations.ts

@@ -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();
-  }
-}

packages/app/e2e/support/helpers/settings.ts

@@ -24,7 +24,6 @@ const SECTION_LABELS = {
   appearance: "Appearance",
   sidebar: "Sidebar",
   editor: "Editor",
-  files: "Files",
   terminal: "Terminal",
   browser: "Browser",
   shortcuts: "Shortcuts",

packages/app/e2e/support/helpers/sidebar.ts

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

packages/app/e2e/support/helpers/workspace-setup.ts

@@ -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");
-}

packages/app/index.ts

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

packages/app/metro.config.cjs

@@ -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);
   }

packages/app/modules/paseo-diff-prototype/cpp/jni.cpp

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

packages/app/modules/paseo-diff-prototype/cpp/layout.cpp

@@ -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());

packages/app/modules/paseo-native-trace/android/build.gradle

@@ -13,7 +13,3 @@ useDefaultAndroidSdkVersions()
 android {
   namespace "sh.paseo.trace"
 }
-
-dependencies {
-  testImplementation "junit:junit:4.13.2"
-}

packages/app/modules/paseo-native-trace/android/src/main/java/sh/paseo/trace/DiagnosticRecorder.kt

@@ -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()
-  }
-}

packages/app/modules/paseo-native-trace/android/src/main/java/sh/paseo/trace/DownloadsLogStorage.kt

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

packages/app/modules/paseo-native-trace/android/src/main/java/sh/paseo/trace/HeartbeatWatchdog.kt

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

packages/app/modules/paseo-native-trace/android/src/main/java/sh/paseo/trace/PaseoNativeTraceModule.kt

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

packages/app/modules/paseo-native-trace/android/src/main/java/sh/paseo/trace/RotatingLog.kt

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

packages/app/modules/paseo-native-trace/android/src/test/java/sh/paseo/trace/HeartbeatWatchdogTest.kt

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

packages/app/modules/paseo-native-trace/android/src/test/java/sh/paseo/trace/RotatingLogTest.kt

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

packages/app/package.json

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

packages/app/plugins/with-paste-input.js

@@ -4,33 +4,26 @@ const {
   IOSConfig,
   withAppDelegate,
   withDangerousMod,
-  withInfoPlist,
   withPodfile,
 } = require("expo/config-plugins");
 
+const MODULE_SETUP = "    PasteInputModule.setup(factory.rootViewFactory)";
+const REACT_NATIVE_START_END = "      launchOptions: launchOptions)\n#endif";
 const BRIDGING_HEADER_IMPORT = "#import <react-native-paste-input/PasteInputModule.h>";
-const SCENE_DELEGATE = `
-@objc(PaseoSceneDelegate)
-class PaseoSceneDelegate: ExpoAppSceneDelegate {
-  override func scene(
-    _ scene: UIScene,
-    willConnectTo session: UISceneSession,
-    options connectionOptions: UIScene.ConnectionOptions
-  ) {
-    super.scene(scene, willConnectTo: session, options: connectionOptions)
-    guard let provider = UIApplication.shared.delegate as? ExpoReactNativeFactoryProvider,
-      let factory = provider.reactNativeFactory else { return }
-    PasteInputModule.setup(factory.rootViewFactory)
-  }
-}
-`;
+const PODFILE_NEW_ARCH_DISABLED =
+  "ENV['RCT_NEW_ARCH_ENABLED'] ||= '0' if podfile_properties['newArchEnabled'] == 'false'";
+const PODFILE_NEW_ARCH_ENABLED =
+  "ENV['RCT_NEW_ARCH_ENABLED'] ||= '1' if podfile_properties['newArchEnabled'] == 'true'";
 
 function configurePasteInputAppDelegate(contents) {
-  if (contents.includes("class PaseoSceneDelegate:")) return contents;
-  if (!contents.includes("ExpoReactNativeFactoryProvider")) {
-    throw new Error("Paste input requires Expo scene support");
+  const configured = contents.replace(`\n${MODULE_SETUP}`, "");
+  if (!configured.includes(REACT_NATIVE_START_END)) {
+    throw new Error("Could not register paste input after React Native starts");
   }
-  return `${contents.trimEnd()}\n${SCENE_DELEGATE}`;
+  return configured.replace(
+    REACT_NATIVE_START_END,
+    `      launchOptions: launchOptions)\n${MODULE_SETUP}\n#endif`,
+  );
 }
 
 function configurePasteInputBridgingHeader(contents) {
@@ -40,6 +33,19 @@ function configurePasteInputBridgingHeader(contents) {
   return `${contents.trimEnd()}\n${BRIDGING_HEADER_IMPORT}\n`;
 }
 
+function configurePasteInputPodfile(contents) {
+  if (contents.includes(PODFILE_NEW_ARCH_ENABLED)) {
+    return contents;
+  }
+  if (!contents.includes(PODFILE_NEW_ARCH_DISABLED)) {
+    throw new Error("Could not configure the new architecture for paste input");
+  }
+  return contents.replace(
+    PODFILE_NEW_ARCH_DISABLED,
+    `${PODFILE_NEW_ARCH_DISABLED}\n${PODFILE_NEW_ARCH_ENABLED}`,
+  );
+}
+
 function withPasteInput(config) {
   const withDelegate = withAppDelegate(config, (modConfig) => {
     if (modConfig.modResults.language !== "swift") {
@@ -48,18 +54,7 @@ function withPasteInput(config) {
     modConfig.modResults.contents = configurePasteInputAppDelegate(modConfig.modResults.contents);
     return modConfig;
   });
-  const withScene = withInfoPlist(withDelegate, (modConfig) => {
-    const scenes =
-      modConfig.modResults.UIApplicationSceneManifest?.UISceneConfigurations
-        ?.UIWindowSceneSessionRoleApplication;
-    if (!scenes || scenes.length !== 1) {
-      throw new Error("Paste input requires Expo's single scene configuration");
-    }
-    scenes[0].UISceneDelegateClassName = "PaseoSceneDelegate";
-    return modConfig;
-  });
-  const withPods = withPodfile(withScene, (modConfig) => {
-    // Paste input checks this legacy flag even though RN 0.86 only supports Fabric.
+  const withPods = withPodfile(withDelegate, (modConfig) => {
     modConfig.modResults.contents = configurePasteInputPodfile(modConfig.modResults.contents);
     return modConfig;
   });
@@ -84,9 +79,4 @@ function withPasteInputBridgingHeader(config) {
 module.exports = withPasteInput;
 module.exports.configurePasteInputAppDelegate = configurePasteInputAppDelegate;
 module.exports.configurePasteInputBridgingHeader = configurePasteInputBridgingHeader;
-
-function configurePasteInputPodfile(contents) {
-  const flag = "ENV['RCT_NEW_ARCH_ENABLED'] = '1'";
-  return contents.includes(flag) ? contents : `${flag}\n${contents}`;
-}
 module.exports.configurePasteInputPodfile = configurePasteInputPodfile;

packages/app/plugins/with-paste-input.test.ts

@@ -7,14 +7,22 @@ const {
 } = require("./with-paste-input");
 
 describe("withPasteInput", () => {
-  it("registers paste input after Expo connects the React Native scene", () => {
-    const source = "class AppDelegate: ExpoAppDelegate, ExpoReactNativeFactoryProvider {}";
+  it("registers the module after React Native starts", () => {
+    const source = [
+      "import ReactAppDependencyProvider",
+      "",
+      "    bindReactNativeFactory(factory)",
+      "    factory.startReactNative(",
+      '      withModuleName: "main",',
+      "      in: window,",
+      "      launchOptions: launchOptions)",
+      "#endif",
+    ].join("\n");
     const configured = configurePasteInputAppDelegate(source);
-    expect(configured).toContain("class PaseoSceneDelegate: ExpoAppSceneDelegate");
-    expect(configured.indexOf("super.scene(")).toBeLessThan(
-      configured.indexOf("PasteInputModule.setup("),
+
+    expect(configured).toContain(
+      "      launchOptions: launchOptions)\n    PasteInputModule.setup(factory.rootViewFactory)\n#endif",
     );
-    expect(configured).toContain("provider.reactNativeFactory");
     expect(configurePasteInputAppDelegate(configured)).toBe(configured);
   });
 
@@ -25,11 +33,15 @@ describe("withPasteInput", () => {
     expect(configured).toContain("#import <react-native-paste-input/PasteInputModule.h>");
     expect(configurePasteInputBridgingHeader(configured)).toBe(configured);
   });
-  it("enables the legacy new-architecture flag required by the paste input podspec", () => {
+
+  it("sets the new architecture environment before CocoaPods evaluates dependencies", () => {
     const source =
-      "require File.join(File.dirname(`node --print \"require.resolve('expo/package.json')\"`), 'scripts/autolinking')";
+      "ENV['RCT_NEW_ARCH_ENABLED'] ||= '0' if podfile_properties['newArchEnabled'] == 'false'";
     const configured = configurePasteInputPodfile(source);
-    expect(configured).toBe("ENV['RCT_NEW_ARCH_ENABLED'] = '1'\n" + source);
+
+    expect(configured).toContain(
+      "ENV['RCT_NEW_ARCH_ENABLED'] ||= '1' if podfile_properties['newArchEnabled'] == 'true'",
+    );
     expect(configurePasteInputPodfile(configured)).toBe(configured);
   });
 });

packages/app/src/agent-skills/index.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
-import { useFocusEffect } from "expo-router/react-navigation";
+import { useFocusEffect } from "@react-navigation/native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { ArrowUpRight, Blocks, Check, Settings2 } from "lucide-react-native";
 import type { AgentSkillOperation, AgentSkillsStatus } from "@getpaseo/protocol/messages";

packages/app/src/agent-stream/presentation.test.ts

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

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

@@ -445,6 +445,11 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
           serverId: resolvedServerId,
           workspaceId: context.workspaceId ?? "",
         }),
+        checkout: {
+          serverId: resolvedServerId,
+          cwd: context.cwd,
+          isGit: context.projectPlacement?.checkout?.isGit ?? true,
+        },
         view: "files",
       });
     });

packages/app/src/app/_layout.tsx

@@ -1,6 +1,3 @@
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
-import { useIsExplorerSidebarOpen } from "@/workspace-tabs/explorer-sidebar";
 import { ComposerEditingSessionsProvider } from "@/composer/editing-session";
 import "@/styles/unistyles";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
@@ -44,7 +41,7 @@ import { DesktopWindowControls } from "@/components/desktop/window-controls";
 import { SidebarModelProvider } from "@/components/sidebar/sidebar-model";
 import { WorkspacePinShortcutHandler } from "@/components/workspace-pin-shortcut-handler";
 import { WorkspaceRenameHost } from "@/components/workspace-rename-host";
-import { WorkspaceExplorerOpenGesture } from "@/mobile-panels/explorer-open-gesture";
+import { CompactExplorerSidebarHost } from "@/components/compact-explorer-sidebar-host";
 import { ProviderSettingsHost } from "@/components/provider-settings-host";
 import { WorkspaceSetupDialog } from "@/components/workspace-setup-dialog";
 import { WorkspaceShortcutTargetsSubscriber } from "@/components/workspace-shortcut-targets-subscriber";
@@ -93,6 +90,7 @@ import { useGlobalNewWorkspaceAction } from "@/hooks/use-global-new-workspace-ac
 import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
 import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
+import { resolveExplorerSidebarPresentation } from "@/workspace-tabs/explorer-sidebar";
 import { KeyboardShiftProvider } from "@/keyboard/shift";
 import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
@@ -470,15 +468,17 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
   const isFocusModeEnabled = usePanelStore((state) => state.desktop.focusModeEnabled);
   const isDesktopAgentListOpen = usePanelStore((state) => state.desktop.agentListOpen);
   const sidebarWidth = usePanelStore((state) => state.sidebarWidth);
-  const { width: windowWidth } = useWindowDimensions();
-  const insets = useSafeAreaInsets();
-  const viewportWidth = windowWidth - insets.left - insets.right;
+  const { width: viewportWidth } = useWindowDimensions();
 
   const cycleTheme = useCallback(() => {
     void updateSettings({ theme: getNextThemePreference(settings.theme) });
   }, [settings.theme, updateSettings]);
 
   const isCompactLayout = useIsCompactFormFactor();
+  const explorerSidebarPresentation = resolveExplorerSidebarPresentation({
+    isCompact: isCompactLayout,
+  });
+  const usesCompactExplorerHost = explorerSidebarPresentation !== "pane";
   useCompactWebViewportZoomLock(isCompactLayout);
   const pathname = usePathname();
   const isWorkspaceRoute = parseHostWorkspaceRouteFromPathname(pathname) !== null;
@@ -516,15 +516,7 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
   useActiveWorktreeNewAction();
   useGlobalNewWorkspaceAction();
 
-  const activeWorkspace = useActiveWorkspaceSelection();
-  const explorerVisible = useIsExplorerSidebarOpen({
-    isCompact: isCompactLayout,
-    workspaceKey: activeWorkspace
-      ? `${activeWorkspace.serverId}:${activeWorkspace.workspaceId}`
-      : null,
-  });
   const appContentMinimumWidth = resolveDesktopAppContentMinimum({
-    explorerVisible: isWorkspaceRoute && explorerVisible,
     isSettingsRoute: pathname.includes("/settings"),
   });
   const desktopSidebarMounted = hasMountedDesktopSidebar && !isWorkspaceFocusModeEnabled;
@@ -556,25 +548,28 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
   if (isWeb) {
     themedSidebarChrome = <AppearanceStyleBoundary>{sidebarChrome}</AppearanceStyleBoundary>;
   }
-  const workspaceChromeStyle = useMemo(
-    () => [rowStyle, !isCompactLayout && { paddingLeft: insets.left, paddingRight: insets.right }],
-    [insets.left, insets.right, isCompactLayout],
-  );
   const workspaceChrome = (
-    <View style={workspaceChromeStyle}>
+    <View style={rowStyle}>
       <WorkspaceLayoutModePublisher />
       {!isCompactLayout ? (
         <WindowChromeRegion corners={appChromeLayout.sidebarCorners}>
           {themedSidebarChrome}
         </WindowChromeRegion>
       ) : null}
-      <WorkspaceExplorerOpenGesture enabled={chromeEnabled && isCompactLayout}>
-        <WindowChromeRegion
-          corners={isCompactLayout && chromeEnabled ? "both" : appChromeLayout.contentCorners}
+      {usesCompactExplorerHost ? (
+        <CompactExplorerSidebarHost
+          enabled={chromeEnabled}
+          presentation={explorerSidebarPresentation === "dock" ? "dock" : "overlay"}
         >
+          <WindowChromeRegion corners={chromeEnabled ? "both" : appChromeLayout.contentCorners}>
+            <View style={flexStyle}>{children}</View>
+          </WindowChromeRegion>
+        </CompactExplorerSidebarHost>
+      ) : (
+        <WindowChromeRegion corners={appChromeLayout.contentCorners}>
           <View style={flexStyle}>{children}</View>
         </WindowChromeRegion>
-      </WorkspaceExplorerOpenGesture>
+      )}
     </View>
   );
 
@@ -625,27 +620,15 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
     </View>
   );
 
-  return (
-    <AppContainerLifetime compactGesturesEnabled={chromeEnabled && isCompactLayout}>
-      {surface}
-    </AppContainerLifetime>
+  const content = isCompactLayout ? (
+    <MobileGestureWrapper chromeEnabled={chromeEnabled}>{surface}</MobileGestureWrapper>
+  ) : (
+    surface
   );
-}
 
-function AppContainerLifetime({
-  children,
-  compactGesturesEnabled,
-}: {
-  children: ReactNode;
-  compactGesturesEnabled: boolean;
-}) {
   return (
     <ComposerEditingSessionsProvider>
-      <CommandCenterProvider>
-        <MobileGestureWrapper chromeEnabled={compactGesturesEnabled}>
-          {children}
-        </MobileGestureWrapper>
-      </CommandCenterProvider>
+      <CommandCenterProvider>{content}</CommandCenterProvider>
     </ComposerEditingSessionsProvider>
   );
 }
@@ -679,15 +662,10 @@ function MobileGestureWrapper({
   chromeEnabled: boolean;
 }) {
   const openGesture = useOpenAgentListGesture(chromeEnabled);
-  const isCompactLayout = useIsCompactFormFactor();
 
   return (
     <GestureDetector gesture={openGesture} touchAction={MOBILE_WEB_GESTURE_TOUCH_ACTION}>
-      <View
-        collapsable={false}
-        style={layoutStyles.surfaceFill}
-        testID={isCompactLayout ? "compact-shell" : "wide-shell"}
-      >
+      <View collapsable={false} style={layoutStyles.surfaceFill} testID="compact-shell">
         {children}
       </View>
     </GestureDetector>

packages/app/src/app/h/[serverId]/_layout.tsx

@@ -10,8 +10,6 @@ const HOST_STACK_SCREEN_OPTIONS = {
   animation: "none" as const,
 };
 
-const SCREEN_OWNED_APPEARANCE = ["workspace/[workspaceId]/index"] as const;
-
 const AGENT_SCREEN_OPTIONS = { gestureEnabled: false };
 
 export default function HostRouteLayout() {
@@ -36,10 +34,7 @@ function KnownHostRoute() {
   }
 
   const stack = (
-    <ThemedStack
-      screenOptions={HOST_STACK_SCREEN_OPTIONS}
-      screenOwnedAppearance={SCREEN_OWNED_APPEARANCE}
-    >
+    <ThemedStack screenOptions={HOST_STACK_SCREEN_OPTIONS}>
       <Stack.Screen name="index" />
       <Stack.Screen name="workspace/[workspaceId]/index" />
       <Stack.Screen name="agent/[agentId]" options={AGENT_SCREEN_OPTIONS} />

packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
-import { useNavigation } from "expo-router/react-navigation";
+import { useNavigation } from "@react-navigation/native";
 import { StyleSheet, View } from "react-native";
 import { useGlobalSearchParams, useLocalSearchParams, useRootNavigationState } from "expo-router";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";

packages/app/src/app/pair-scan.tsx

@@ -33,7 +33,7 @@ const styles = StyleSheet.create((theme) => ({
     flex: 1,
   },
   overlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
     justifyContent: "center",
     alignItems: "center",
   },

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

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

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

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

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

@@ -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) => {

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

@@ -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" } };

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

@@ -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";
 }
 

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

@@ -943,7 +943,7 @@ const styles = StyleSheet.create((theme) => ({
     alignItems: "center",
     paddingTop: theme.spacing[12],
   },
-  backdrop: { ...StyleSheet.absoluteFill, backgroundColor: "rgba(0, 0, 0, 0.5)" },
+  backdrop: { ...StyleSheet.absoluteFillObject, backgroundColor: "rgba(0, 0, 0, 0.5)" },
   panel: {
     width: 640,
     height: 560,

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

@@ -66,7 +66,7 @@ export interface SheetHeader {
 }
 
 const SCROLL_CONTENT_GROW = { flexGrow: 1 };
-const ABSOLUTE_FILL_STYLE = { ...StyleSheet.absoluteFill };
+const ABSOLUTE_FILL_STYLE = { ...StyleSheet.absoluteFillObject };
 const NATIVE_DIALOG_SNAP_POINTS = ["100%"];
 
 const styles = StyleSheet.create((theme) => ({
@@ -77,7 +77,7 @@ const styles = StyleSheet.create((theme) => ({
     backgroundColor: "transparent",
   },
   desktopOverlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
     backgroundColor: "rgba(0,0,0,0.55)",
     justifyContent: "center",
     alignItems: "center",

packages/app/src/components/add-project-flow.tsx

@@ -1007,7 +1007,7 @@ const styles = StyleSheet.create((theme) => ({
     paddingTop: theme.spacing[12],
   },
   backdrop: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
     backgroundColor: "rgba(0, 0, 0, 0.5)",
   },
   panel: {

packages/app/src/components/appearance-style-boundary.test.ts

@@ -20,53 +20,54 @@ describe("appearanceStyleBoundaryKey", () => {
 // This is a placement contract against the production JSX, not a simulated native mount.
 // Native Gesture Handler/Fabric lifetime behavior is verified on the release app.
 describe("retained native gesture host appearance placement", () => {
-  it.each([["../app/_layout.tsx", ["sidebarChrome", "themedSidebarChrome"], true]] as const)(
-    "keeps native hosts outside appearance keys in %s",
-    (path, hosts, hasWebKeys) => {
-      const source = ts.createSourceFile(
-        path,
-        readFileSync(new URL(path, import.meta.url), "utf8"),
-        ts.ScriptTarget.Latest,
-        true,
-        ts.ScriptKind.TSX,
-      );
-      let hostsFound = 0;
-      let webKeysFound = 0;
-      function visit(node: ts.Node) {
-        let name: string | undefined;
-        if (ts.isIdentifier(node)) name = node.text;
-        if (ts.isJsxSelfClosingElement(node)) name = node.tagName.getText(source);
-        if (name && hosts.some((host) => host === name)) {
-          hostsFound++;
-          let webOnly = false;
-          let keyed = false;
-          for (
-            let child = node, parent = node.parent;
-            parent;
-            child = parent, parent = parent.parent
-          ) {
-            if (
-              ts.isIfStatement(parent) &&
-              parent.expression.getText(source) === "isWeb" &&
-              parent.thenStatement === child
-            )
-              webOnly = true;
-            if (
-              ts.isJsxElement(parent) &&
-              parent.openingElement.tagName.getText(source) === "AppearanceStyleBoundary"
-            )
-              keyed = true;
-          }
-          if (keyed && webOnly) webKeysFound++;
-          expect(keyed && !webOnly, `${name} is remounted on native appearance changes`).toBe(
-            false,
-          );
+  it.each([
+    ["../app/_layout.tsx", ["sidebarChrome", "themedSidebarChrome"]],
+    [
+      "./compact-explorer-sidebar-host.tsx",
+      ["explorer", "themedExplorer", "CompactExplorerSidebar", "NativeExplorerSidebarDock"],
+    ],
+  ] as const)("keeps native hosts outside appearance keys in %s", (path, hosts) => {
+    const source = ts.createSourceFile(
+      path,
+      readFileSync(new URL(path, import.meta.url), "utf8"),
+      ts.ScriptTarget.Latest,
+      true,
+      ts.ScriptKind.TSX,
+    );
+    let hostsFound = 0;
+    let webKeysFound = 0;
+    function visit(node: ts.Node) {
+      let name: string | undefined;
+      if (ts.isIdentifier(node)) name = node.text;
+      if (ts.isJsxSelfClosingElement(node)) name = node.tagName.getText(source);
+      if (name && hosts.some((host) => host === name)) {
+        hostsFound++;
+        let webOnly = false;
+        let keyed = false;
+        for (
+          let child = node, parent = node.parent;
+          parent;
+          child = parent, parent = parent.parent
+        ) {
+          if (
+            ts.isIfStatement(parent) &&
+            parent.expression.getText(source) === "isWeb" &&
+            parent.thenStatement === child
+          )
+            webOnly = true;
+          if (
+            ts.isJsxElement(parent) &&
+            parent.openingElement.tagName.getText(source) === "AppearanceStyleBoundary"
+          )
+            keyed = true;
         }
-        ts.forEachChild(node, visit);
+        if (keyed && webOnly) webKeysFound++;
+        expect(keyed && !webOnly, `${name} is remounted on native appearance changes`).toBe(false);
       }
-      visit(source);
-      expect(hostsFound).toBeGreaterThan(0);
-      if (hasWebKeys) expect(webKeysFound).toBeGreaterThan(0);
-    },
-  );
+      ts.forEachChild(node, visit);
+    }
+    visit(source);
+    expect(hostsFound).toBeGreaterThan(0);
+    expect(webKeysFound).toBeGreaterThan(0);
+  });
 });

packages/app/src/components/compact-explorer-sidebar-host-state.test.ts

@@ -0,0 +1,106 @@
+import { describe, expect, it } from "vitest";
+import {
+  resolveCompactExplorerSidebarHostModel,
+  type CompactExplorerSidebarHostModel,
+} from "@/components/compact-explorer-sidebar-host-state";
+import type { WorkspaceDescriptor } from "@/stores/session-store";
+
+function createWorkspace(
+  input: Partial<WorkspaceDescriptor> & Pick<WorkspaceDescriptor, "id">,
+): WorkspaceDescriptor {
+  return {
+    id: input.id,
+    projectId: input.projectId ?? "project-1",
+    projectDisplayName: input.projectDisplayName ?? "Project 1",
+    projectRootPath: input.projectRootPath ?? "/repo",
+    workspaceDirectory: input.workspaceDirectory ?? "/repo",
+    projectKind: input.projectKind ?? "git",
+    workspaceKind: input.workspaceKind ?? "local_checkout",
+    name: input.name ?? "main",
+    status: input.status ?? "done",
+    archivingAt: input.archivingAt ?? null,
+    statusEnteredAt: null,
+    diffStat: input.diffStat ?? null,
+    scripts: input.scripts ?? [],
+  };
+}
+
+function createModel(
+  overrides: Partial<CompactExplorerSidebarHostModel> = {},
+): CompactExplorerSidebarHostModel {
+  return {
+    serverId: overrides.serverId ?? "server-1",
+    workspaceId: overrides.workspaceId ?? "workspace-a",
+    persistenceKey: overrides.persistenceKey ?? "server-1:workspace-a",
+    workspaceRoot: overrides.workspaceRoot ?? "/repo/a",
+    isGit: overrides.isGit ?? true,
+  };
+}
+
+describe("resolveCompactExplorerSidebarHostModel", () => {
+  it("retains the last workspace root for the same active selection while the workspace reloads", () => {
+    const previous = createModel();
+
+    const result = resolveCompactExplorerSidebarHostModel({
+      previous,
+      selection: { serverId: "server-1", workspaceId: "workspace-a" },
+      workspace: null,
+      isGit: false,
+    });
+
+    expect(result).toEqual({
+      serverId: "server-1",
+      workspaceId: "workspace-a",
+      persistenceKey: "server-1:workspace-a",
+      workspaceRoot: "/repo/a",
+      isGit: true,
+    });
+  });
+
+  it("switches ownership to the active workspace instead of leaking the previous one", () => {
+    const previous = createModel();
+
+    const result = resolveCompactExplorerSidebarHostModel({
+      previous,
+      selection: { serverId: "server-1", workspaceId: "workspace-b" },
+      workspace: null,
+      isGit: false,
+    });
+
+    expect(result).toEqual({
+      serverId: "server-1",
+      workspaceId: "workspace-b",
+      persistenceKey: "server-1:workspace-b",
+      workspaceRoot: "",
+      isGit: false,
+    });
+  });
+
+  it("does not retain a previous owner when there is no active workspace selection", () => {
+    const result = resolveCompactExplorerSidebarHostModel({
+      previous: createModel(),
+      selection: null,
+      workspace: null,
+      isGit: false,
+    });
+
+    expect(result).toBeNull();
+  });
+
+  it("uses the current workspace directory when it is available", () => {
+    const result = resolveCompactExplorerSidebarHostModel({
+      previous: null,
+      selection: { serverId: "server-1", workspaceId: "workspace-a" },
+      workspace: createWorkspace({ id: "workspace-a", workspaceDirectory: "/repo/current" }),
+      isGit: true,
+    });
+
+    expect(result).toEqual({
+      serverId: "server-1",
+      workspaceId: "workspace-a",
+      persistenceKey: "server-1:workspace-a",
+      workspaceRoot: "/repo/current",
+      isGit: true,
+    });
+  });
+});

packages/app/src/components/compact-explorer-sidebar-host-state.ts

@@ -0,0 +1,59 @@
+import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
+import type { ActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
+import type { WorkspaceDescriptor } from "@/stores/session-store";
+
+export interface CompactExplorerSidebarHostModel {
+  serverId: string;
+  workspaceId: string;
+  persistenceKey: string;
+  workspaceRoot: string;
+  isGit: boolean;
+}
+
+interface ResolveCompactExplorerSidebarHostModelInput {
+  previous: CompactExplorerSidebarHostModel | null;
+  selection: ActiveWorkspaceSelection | null;
+  workspace: WorkspaceDescriptor | null;
+  isGit: boolean;
+}
+
+function trimNonEmpty(value: string | null | undefined): string | null {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+export function resolveCompactExplorerSidebarHostModel(
+  input: ResolveCompactExplorerSidebarHostModelInput,
+): CompactExplorerSidebarHostModel | null {
+  const serverId = trimNonEmpty(input.selection?.serverId);
+  const workspaceId = trimNonEmpty(input.selection?.workspaceId);
+  if (!serverId || !workspaceId) {
+    return null;
+  }
+
+  const persistenceKey = buildWorkspaceTabPersistenceKey({ serverId, workspaceId });
+  if (!persistenceKey) {
+    return null;
+  }
+
+  const previousForSelection =
+    input.previous &&
+    input.previous.serverId === serverId &&
+    input.previous.workspaceId === workspaceId
+      ? input.previous
+      : null;
+
+  return {
+    serverId,
+    workspaceId,
+    persistenceKey,
+    workspaceRoot:
+      trimNonEmpty(input.workspace?.workspaceDirectory) ??
+      previousForSelection?.workspaceRoot ??
+      "",
+    isGit: input.workspace ? input.isGit : (previousForSelection?.isGit ?? input.isGit),
+  };
+}

packages/app/src/components/compact-explorer-sidebar-host.tsx

@@ -0,0 +1,216 @@
+import { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { View, type LayoutChangeEvent } from "react-native";
+import { GestureDetector } from "react-native-gesture-handler";
+import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
+import { useWorkspace } from "@/stores/session-store-hooks";
+import {
+  CompactExplorerSidebar,
+  NativeExplorerSidebarDock,
+} from "@/components/compact-explorer-sidebar";
+import { useOpenFileExplorerGesture } from "@/mobile-panels/gestures";
+import { useIsMobilePanelActive } from "@/mobile-panels/provider";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { usePanelStore } from "@/stores/panel-store";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
+import { useWorkspaceCheckoutStatus } from "@/screens/workspace/use-workspace-checkout-status";
+import { openWorkspaceFileFromExplorer } from "@/screens/workspace/workspace-file-open-command";
+import { isWeb } from "@/constants/platform";
+import { DiffDocumentWorkspaceCacheProvider } from "@/git/diff-document/workspace-cache";
+import {
+  resolveCompactExplorerSidebarHostModel,
+  type CompactExplorerSidebarHostModel,
+} from "@/components/compact-explorer-sidebar-host-state";
+import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
+
+interface CompactExplorerOpenGestureSurfaceProps {
+  children: ReactNode;
+  enabled: boolean;
+  onOpenExplorer: () => void;
+}
+
+const COMPACT_WEB_GESTURE_TOUCH_ACTION = isWeb ? "auto" : "pan-y";
+
+function CompactExplorerOpenGestureSurface({
+  children,
+  enabled,
+  onOpenExplorer,
+}: CompactExplorerOpenGestureSurfaceProps) {
+  const explorerOpenGesture = useOpenFileExplorerGesture({
+    enabled,
+    onOpen: onOpenExplorer,
+  });
+
+  return (
+    <GestureDetector gesture={explorerOpenGesture} touchAction={COMPACT_WEB_GESTURE_TOUCH_ACTION}>
+      <View style={styles.fill}>{children}</View>
+    </GestureDetector>
+  );
+}
+
+function useActiveCompactExplorerSidebarModel(
+  enabled: boolean,
+): CompactExplorerSidebarHostModel | null {
+  const selection = useActiveWorkspaceSelection();
+  const workspace = useWorkspace(selection?.serverId ?? null, selection?.workspaceId ?? null);
+  const isExplorerActive = useIsMobilePanelActive("file-explorer");
+  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
+  const client = useHostRuntimeClient(selection?.serverId ?? "");
+  const isConnected = useHostRuntimeIsConnected(selection?.serverId ?? "");
+  const retainedModelRef = useRef<CompactExplorerSidebarHostModel | null>(null);
+  const { checkoutQuery } = useWorkspaceCheckoutStatus({
+    client,
+    isConnected,
+    isRouteFocused: enabled && selection !== null,
+    normalizedServerId: selection?.serverId ?? "",
+    normalizedWorkspaceId: selection?.workspaceId ?? "",
+    workspaceDirectory: workspace?.workspaceDirectory || null,
+  });
+  const resolvedModel = useMemo(
+    () =>
+      resolveCompactExplorerSidebarHostModel({
+        previous: isExplorerActive ? retainedModelRef.current : null,
+        selection,
+        workspace,
+        isGit: checkoutQuery.data?.isGit ?? false,
+      }),
+    [checkoutQuery.data?.isGit, isExplorerActive, selection, workspace],
+  );
+
+  useEffect(() => {
+    if (!selection) {
+      retainedModelRef.current = null;
+      if (enabled && isExplorerActive) {
+        showMobileAgent();
+      }
+      return;
+    }
+    if (!isExplorerActive) {
+      retainedModelRef.current = null;
+      return;
+    }
+    if (resolvedModel) {
+      retainedModelRef.current = resolvedModel;
+    }
+  }, [enabled, isExplorerActive, resolvedModel, selection, showMobileAgent]);
+
+  return selection ? (resolvedModel ?? (isExplorerActive ? retainedModelRef.current : null)) : null;
+}
+
+interface CompactExplorerSidebarHostProps {
+  children: ReactNode;
+  enabled: boolean;
+  presentation: "overlay" | "dock";
+}
+
+export function CompactExplorerSidebarHost({
+  children,
+  enabled,
+  presentation,
+}: CompactExplorerSidebarHostProps) {
+  const model = useActiveCompactExplorerSidebarModel(enabled);
+  const [containerWidth, setContainerWidth] = useState(0);
+  const openCompactFileExplorer = usePanelStore((state) => state.openCompactFileExplorer);
+  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
+  const openTab = useWorkspaceLayoutStore((state) => state.openTab);
+  const openWorkspaceTabInFocusedPane = useCallback(
+    (workspaceKey: string, target: WorkspaceTabTarget) =>
+      openTab({ workspaceKey, target, intent: "reveal" }),
+    [openTab],
+  );
+  const focusWorkspaceTab = useWorkspaceLayoutStore((state) => state.focusTab);
+
+  const handleOpenExplorer = useCallback(() => {
+    if (!model?.workspaceRoot) {
+      return;
+    }
+    openCompactFileExplorer({
+      serverId: model.serverId,
+      cwd: model.workspaceRoot,
+      isGit: model.isGit,
+    });
+  }, [model, openCompactFileExplorer]);
+
+  const handleOpenFile = useCallback(
+    (filePath: string) => {
+      if (!model) {
+        return;
+      }
+      openWorkspaceFileFromExplorer({
+        filePath,
+        persistenceKey: model.persistenceKey,
+        closeExplorerAfterOpen: presentation === "overlay",
+        showMobileAgent,
+        openWorkspaceTabInFocusedPane,
+        focusWorkspaceTab,
+      });
+    },
+    [focusWorkspaceTab, model, openWorkspaceTabInFocusedPane, presentation, showMobileAgent],
+  );
+
+  const handleContainerLayout = useCallback((event: LayoutChangeEvent) => {
+    const nextWidth = event.nativeEvent.layout.width;
+    setContainerWidth((current) => (current === nextWidth ? current : nextWidth));
+  }, []);
+
+  const explorer =
+    enabled && model ? (
+      <DiffDocumentWorkspaceCacheProvider key={model.persistenceKey}>
+        {presentation === "dock" ? (
+          <NativeExplorerSidebarDock
+            serverId={model.serverId}
+            workspaceId={model.workspaceId}
+            workspaceRoot={model.workspaceRoot}
+            isGit={model.isGit}
+            persistenceKey={model.persistenceKey}
+            containerWidth={containerWidth}
+            onOpenFile={handleOpenFile}
+          />
+        ) : (
+          <CompactExplorerSidebar
+            serverId={model.serverId}
+            workspaceId={model.workspaceId}
+            workspaceRoot={model.workspaceRoot}
+            isGit={model.isGit}
+            onOpenFile={handleOpenFile}
+          />
+        )}
+      </DiffDocumentWorkspaceCacheProvider>
+    ) : null;
+
+  let themedExplorer = explorer;
+  if (isWeb) {
+    themedExplorer = <AppearanceStyleBoundary>{explorer}</AppearanceStyleBoundary>;
+  }
+
+  if (presentation === "dock") {
+    return (
+      <View style={styles.row} onLayout={handleContainerLayout}>
+        <View style={styles.fill}>{children}</View>
+        {themedExplorer}
+      </View>
+    );
+  }
+
+  return (
+    <>
+      <CompactExplorerOpenGestureSurface
+        enabled={enabled && Boolean(model?.workspaceRoot)}
+        onOpenExplorer={handleOpenExplorer}
+      >
+        {children}
+      </CompactExplorerOpenGestureSurface>
+      {themedExplorer}
+    </>
+  );
+}
+
+const styles = {
+  fill: {
+    flex: 1,
+  },
+  row: {
+    flex: 1,
+    flexDirection: "row",
+  },
+} as const;

packages/app/src/components/compact-explorer-sidebar.tsx

@@ -0,0 +1,574 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { View, Text, Pressable } from "react-native";
+import { Gesture } from "react-native-gesture-handler";
+import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
+import { scheduleOnRN } from "react-native-worklets";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
+import { X } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { formatPrTabLabel, PullRequestTabIcon } from "@/git/pull-request-panel";
+import {
+  usePanelStore,
+  selectIsCompactFileExplorerOpen,
+  type ExplorerTab,
+} from "@/stores/panel-store";
+import { useCloseFileExplorerGesture } from "@/mobile-panels/gestures";
+import { useIsMobilePanelActive } from "@/mobile-panels/provider";
+import { MobilePanelOverlay } from "@/mobile-panels/presentation";
+import {
+  HEADER_INNER_HEIGHT,
+  HEADER_INNER_HEIGHT_MOBILE,
+  HEADER_TOP_PADDING_MOBILE,
+  useIsCompactFormFactor,
+} from "@/constants/layout";
+import { ChangesSurface } from "@/git/diff-pane";
+import { changesStateSchema, defaultChangesState, type ChangesState } from "@/panels/changes/state";
+import { FileExplorerPane } from "./file-explorer-pane";
+import { useKeyboardShiftStyle } from "@/keyboard/shift";
+import { shouldUseCompactExplorerKeyboardPadding } from "@/keyboard/shift";
+import { WindowChromeSafeArea } from "@/utils/desktop-window";
+import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
+import { RetainedPanel, RetainedPanelActivity } from "@/components/retained-panel";
+import { useMountedTabSet } from "@/screens/workspace/use-mounted-tab-set";
+import { usePullRequestPanelAvailability } from "@/panels/pull-request-availability";
+import { PullRequestContent } from "@/panels/pull-request";
+import { useAddFileToChat } from "@/panels/use-add-file-to-chat";
+import { SidebarResizeHandle } from "@/components/sidebar-resize-handle";
+import {
+  SIDEBAR_RESIZE_ACTIVATION_OFFSET,
+  SIDEBAR_RESIZE_FAIL_OFFSET,
+} from "@/components/sidebar-resize-handle-layout";
+import {
+  EXPLORER_TAB_RAIL_INSET,
+  explorerSidebarCloseButtonLayout,
+  resolveExplorerSidebarWidth,
+} from "@/components/explorer-sidebar-layout";
+import { ToolbarButton } from "@/components/ui/pane-content-toolbar";
+import { mutedIconColorMapping } from "@/components/ui/icon-button-chrome";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+
+const ThemedX = withUnistyles(X);
+
+function logExplorerSidebar(_event: string, _details: Record<string, unknown>): void {}
+
+interface ExplorerSidebarProps {
+  serverId: string;
+  workspaceId?: string | null;
+  workspaceRoot: string;
+  isGit: boolean;
+  onOpenFile?: (filePath: string) => void;
+}
+
+interface ExplorerSidebarSharedState {
+  explorerTab: ExplorerTab;
+  handleTabPress: (tab: ExplorerTab) => void;
+}
+
+function useExplorerSidebarSharedState({
+  serverId,
+  workspaceRoot,
+  isGit,
+}: Pick<ExplorerSidebarProps, "serverId" | "workspaceRoot" | "isGit">): ExplorerSidebarSharedState {
+  const explorerTab = usePanelStore((state) => state.explorerTab);
+  const setExplorerTabForCheckout = usePanelStore((state) => state.setExplorerTabForCheckout);
+  const handleTabPress = useCallback(
+    (tab: ExplorerTab) => {
+      setExplorerTabForCheckout({ serverId, cwd: workspaceRoot, isGit, tab });
+    },
+    [isGit, serverId, setExplorerTabForCheckout, workspaceRoot],
+  );
+
+  return { explorerTab, handleTabPress };
+}
+
+export function CompactExplorerSidebar({
+  serverId,
+  workspaceId,
+  workspaceRoot,
+  isGit,
+  onOpenFile,
+}: ExplorerSidebarProps) {
+  const { theme } = useUnistyles();
+  const insets = useSafeAreaInsets();
+  const isActive = useIsMobilePanelActive("file-explorer");
+  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
+  const { explorerTab, handleTabPress } = useExplorerSidebarSharedState({
+    serverId,
+    workspaceRoot,
+    isGit,
+  });
+  const usePanelKeyboardPadding = shouldUseCompactExplorerKeyboardPadding({ isGit, explorerTab });
+  const { style: mobileKeyboardInsetStyle } = useKeyboardShiftStyle({
+    mode: "padding",
+    enabled: usePanelKeyboardPadding,
+  });
+  const { gesture: closeGesture } = useCloseFileExplorerGesture();
+
+  const handleClose = useCallback(
+    (reason: string) => {
+      logExplorerSidebar("handleClose", {
+        reason,
+        isOpen: isActive,
+      });
+      showMobileAgent();
+    },
+    [isActive, showMobileAgent],
+  );
+
+  const handleHeaderClose = useCallback(() => handleClose("header-close-button"), [handleClose]);
+
+  const mobileSidebarStyle = useMemo(
+    () => [
+      {
+        paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE,
+        paddingBottom: usePanelKeyboardPadding ? 0 : insets.bottom,
+        backgroundColor: theme.colors.surfaceSidebar,
+      },
+      mobileKeyboardInsetStyle,
+    ],
+    [
+      insets.bottom,
+      insets.top,
+      mobileKeyboardInsetStyle,
+      theme.colors.surfaceSidebar,
+      usePanelKeyboardPadding,
+    ],
+  );
+
+  return (
+    <RetainedPanelActivity active={isActive}>
+      <MobilePanelOverlay
+        panel="file-explorer"
+        closeGesture={closeGesture}
+        panelStyle={mobileSidebarStyle}
+      >
+        <ExplorerSidebarContent
+          activeTab={explorerTab}
+          onTabPress={handleTabPress}
+          onClose={handleHeaderClose}
+          serverId={serverId}
+          workspaceId={workspaceId}
+          workspaceRoot={workspaceRoot}
+          isGit={isGit}
+          isOpen={isActive}
+          onOpenFile={onOpenFile}
+        />
+      </MobilePanelOverlay>
+    </RetainedPanelActivity>
+  );
+}
+
+interface NativeExplorerSidebarDockProps extends ExplorerSidebarProps {
+  persistenceKey: string;
+  containerWidth: number;
+}
+
+export function NativeExplorerSidebarDock({
+  serverId,
+  workspaceId,
+  workspaceRoot,
+  isGit,
+  onOpenFile,
+  persistenceKey,
+  containerWidth,
+}: NativeExplorerSidebarDockProps) {
+  const { theme } = useUnistyles();
+  const insets = useSafeAreaInsets();
+  const isOpen = usePanelStore(selectIsCompactFileExplorerOpen);
+  const showMobileAgent = usePanelStore((state) => state.showMobileAgent);
+  const storedWidth = useWorkspaceLayoutStore(
+    (state) => state.explorerSidebarWidthByWorkspace[persistenceKey],
+  );
+  const resizeExplorerSidebar = useWorkspaceLayoutStore((state) => state.resizeExplorerSidebar);
+  const visibleWidth = resolveExplorerSidebarWidth({
+    requestedWidth: storedWidth,
+    containerWidth,
+  });
+  const resizeWidth = useSharedValue(visibleWidth);
+  const startWidthRef = useRef(visibleWidth);
+  const [resizePressed, setResizePressed] = useState(false);
+  const { explorerTab, handleTabPress } = useExplorerSidebarSharedState({
+    serverId,
+    workspaceRoot,
+    isGit,
+  });
+
+  useEffect(() => {
+    resizeWidth.value = visibleWidth;
+  }, [resizeWidth, visibleWidth]);
+
+  const showResizeGrip = useCallback(() => setResizePressed(true), []);
+  const hideResizeGrip = useCallback(() => setResizePressed(false), []);
+  const commitWidth = useCallback(
+    (width: number) => resizeExplorerSidebar(persistenceKey, width),
+    [persistenceKey, resizeExplorerSidebar],
+  );
+  const resizeGesture = useMemo(
+    () =>
+      Gesture.Pan()
+        .enabled(true)
+        .hitSlop({ left: 8, right: 8, top: 0, bottom: 0 })
+        .onBegin(() => scheduleOnRN(showResizeGrip))
+        .activeOffsetX([-SIDEBAR_RESIZE_ACTIVATION_OFFSET, SIDEBAR_RESIZE_ACTIVATION_OFFSET])
+        .failOffsetY([-SIDEBAR_RESIZE_FAIL_OFFSET, SIDEBAR_RESIZE_FAIL_OFFSET])
+        .onStart((event) => {
+          startWidthRef.current = visibleWidth + event.translationX;
+          resizeWidth.value = visibleWidth;
+        })
+        .onUpdate((event) => {
+          resizeWidth.value = resolveExplorerSidebarWidth({
+            requestedWidth: startWidthRef.current - event.translationX,
+            containerWidth,
+          });
+        })
+        .onEnd(() => runOnJS(commitWidth)(resizeWidth.value))
+        .onFinalize(() => scheduleOnRN(hideResizeGrip)),
+    [commitWidth, containerWidth, hideResizeGrip, resizeWidth, showResizeGrip, visibleWidth],
+  );
+  const animatedWidthStyle = useAnimatedStyle(() => ({ width: resizeWidth.value }));
+  const dockStyle = useMemo(
+    () => [
+      styles.nativeDock,
+      {
+        display: isOpen ? ("flex" as const) : ("none" as const),
+        paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE,
+        backgroundColor: theme.colors.surfaceSidebar,
+      },
+      animatedWidthStyle,
+    ],
+    [animatedWidthStyle, insets.top, isOpen, theme.colors.surfaceSidebar],
+  );
+  const dockContentStyle = useMemo(
+    () => [styles.nativeDockContent, { borderLeftColor: theme.colors.border }],
+    [theme.colors.border],
+  );
+
+  return (
+    <RetainedPanelActivity active={isOpen}>
+      <Animated.View style={dockStyle} testID="native-explorer-sidebar-dock">
+        <View style={dockContentStyle}>
+          <SidebarResizeHandle
+            edge="left"
+            gesture={resizeGesture}
+            pressed={resizePressed}
+            testID="native-explorer-sidebar-resize-handle"
+          />
+          <ExplorerSidebarContent
+            activeTab={explorerTab}
+            onTabPress={handleTabPress}
+            onClose={showMobileAgent}
+            serverId={serverId}
+            workspaceId={workspaceId}
+            workspaceRoot={workspaceRoot}
+            isGit={isGit}
+            isOpen={isOpen}
+            onOpenFile={onOpenFile}
+          />
+        </View>
+      </Animated.View>
+    </RetainedPanelActivity>
+  );
+}
+
+interface ExplorerTabButtonProps {
+  tab: ExplorerTab;
+  active: boolean;
+  label?: string;
+  onTabPress: (tab: ExplorerTab) => void;
+  testID: string;
+  children?: React.ReactNode;
+}
+
+function ExplorerTabButton({
+  tab,
+  active,
+  label,
+  onTabPress,
+  testID,
+  children,
+}: ExplorerTabButtonProps) {
+  const isCompact = useIsCompactFormFactor();
+  const handlePress = useCallback(() => onTabPress(tab), [onTabPress, tab]);
+  const tabStyle = useMemo(
+    () => [styles.tab(isCompact), active && styles.tabActive],
+    [active, isCompact],
+  );
+  const tabTextStyle = useMemo(() => [styles.tabText, active && styles.tabTextActive], [active]);
+  return (
+    <Pressable testID={testID} style={tabStyle} onPress={handlePress}>
+      {children}
+      {label !== undefined ? <Text style={tabTextStyle}>{label}</Text> : null}
+    </Pressable>
+  );
+}
+
+interface SidebarContentProps {
+  activeTab: ExplorerTab;
+  onTabPress: (tab: ExplorerTab) => void;
+  onClose: () => void;
+  serverId: string;
+  workspaceId?: string | null;
+  workspaceRoot: string;
+  isGit: boolean;
+  isOpen: boolean;
+  onOpenFile?: (filePath: string) => void;
+}
+
+function ExplorerSidebarContent({
+  activeTab,
+  onTabPress,
+  onClose,
+  serverId,
+  workspaceId,
+  workspaceRoot,
+  isGit,
+  isOpen,
+  onOpenFile,
+}: SidebarContentProps) {
+  const { theme } = useUnistyles();
+  const { t } = useTranslation();
+  const isCompact = useIsCompactFormFactor();
+  const closeButtonLayout = explorerSidebarCloseButtonLayout(isCompact);
+  const closeButtonStyle = useMemo(
+    () => ({ width: closeButtonLayout.size, height: closeButtonLayout.size }),
+    [closeButtonLayout.size],
+  );
+  // The close glyph shares the trailing rail with the toolbar rows below it.
+  const headerRightSectionStyle = useMemo(
+    () => [styles.headerRightSection, { paddingRight: closeButtonLayout.trailingPadding }],
+    [closeButtonLayout.trailingPadding],
+  );
+  const { prPane, showPullRequest: showPrTab } = usePullRequestPanelAvailability({
+    serverId,
+    cwd: workspaceRoot,
+    isGit,
+    requested: activeTab === "pr",
+    enabled: isOpen,
+    timelineEnabled: activeTab === "pr",
+  });
+  const requestedTab: ExplorerTab =
+    !isGit && (activeTab === "changes" || activeTab === "pr") ? "files" : activeTab;
+  const resolvedTab: ExplorerTab = requestedTab === "pr" && !showPrTab ? "changes" : requestedTab;
+  const prTabLabel = formatPrTabLabel(prPane.prNumber);
+  const availableTabs = useMemo<ExplorerTab[]>(() => {
+    const tabs: ExplorerTab[] = isGit ? ["changes", "files"] : ["files"];
+    if (isGit && showPrTab) tabs.push("pr");
+    return tabs;
+  }, [isGit, showPrTab]);
+  const { mountedTabIds } = useMountedTabSet({
+    activeTabId: resolvedTab,
+    allTabIds: availableTabs,
+    cap: availableTabs.length,
+  });
+
+  return (
+    <View style={styles.sidebarContent} pointerEvents="auto">
+      {/* Header with tabs and close button */}
+      <WindowChromeSafeArea placement="inline" style={styles.header} testID="explorer-header">
+        <TitlebarDragRegion />
+        <View style={styles.tabsContainer(isCompact)}>
+          {isGit && (
+            <ExplorerTabButton
+              tab="changes"
+              active={resolvedTab === "changes"}
+              label={t("workspace.tabs.explorerSidebar.changes")}
+              onTabPress={onTabPress}
+              testID="explorer-tab-changes"
+            />
+          )}
+          <ExplorerTabButton
+            tab="files"
+            active={resolvedTab === "files"}
+            label={t("workspace.tabs.explorerSidebar.files")}
+            onTabPress={onTabPress}
+            testID="explorer-tab-files"
+          />
+          {isGit && showPrTab && (
+            <ExplorerTabButton
+              tab="pr"
+              active={resolvedTab === "pr"}
+              label={prTabLabel}
+              onTabPress={onTabPress}
+              testID="explorer-tab-pr"
+            >
+              <PullRequestTabIcon
+                forge={prPane.forge}
+                size={13}
+                color={
+                  resolvedTab === "pr" ? theme.colors.foreground : theme.colors.foregroundMuted
+                }
+              />
+            </ExplorerTabButton>
+          )}
+        </View>
+        <View style={headerRightSectionStyle}>
+          <ToolbarButton
+            compact={isCompact}
+            style={closeButtonStyle}
+            hitSlop={closeButtonLayout.hitSlop}
+            label={t("workspace.tabs.explorerSidebar.close")}
+            onPress={onClose}
+            testID="explorer-close"
+            nativeID="explorer-close"
+          >
+            <ThemedX size={closeButtonLayout.iconSize} uniProps={mutedIconColorMapping} />
+          </ToolbarButton>
+        </View>
+      </WindowChromeSafeArea>
+
+      {/* Content based on active tab */}
+      <View style={styles.contentArea} testID="explorer-content-area">
+        {mountedTabIds.has("changes") ? (
+          <RetainedPanel active={resolvedTab === "changes"}>
+            <ChangedFilesPane
+              serverId={serverId}
+              workspaceId={workspaceId}
+              workspaceRoot={workspaceRoot}
+              isOpen={isOpen}
+              onOpenFile={onOpenFile}
+            />
+          </RetainedPanel>
+        ) : null}
+        {mountedTabIds.has("files") ? (
+          <RetainedPanel active={resolvedTab === "files"}>
+            <FilesPane
+              serverId={serverId}
+              workspaceId={workspaceId}
+              workspaceRoot={workspaceRoot}
+              onOpenFile={onOpenFile}
+            />
+          </RetainedPanel>
+        ) : null}
+        {mountedTabIds.has("pr") ? (
+          <RetainedPanel active={resolvedTab === "pr"}>
+            <PrTabContent
+              serverId={serverId}
+              workspaceId={workspaceId}
+              cwd={workspaceRoot}
+              prPane={prPane}
+            />
+          </RetainedPanel>
+        ) : null}
+      </View>
+    </View>
+  );
+}
+
+function ChangedFilesPane({
+  serverId,
+  workspaceId,
+  workspaceRoot,
+  isOpen,
+  onOpenFile,
+}: Pick<
+  SidebarContentProps,
+  "serverId" | "workspaceId" | "workspaceRoot" | "isOpen" | "onOpenFile"
+>) {
+  const { addFile, canAddToChat } = useAddFileToChat({ serverId, workspaceId });
+  const [changesState, setChangesState] = useState<ChangesState>(() =>
+    changesStateSchema.parse(defaultChangesState),
+  );
+  return (
+    <ChangesSurface
+      serverId={serverId}
+      workspaceId={workspaceId}
+      cwd={workspaceRoot}
+      enabled={isOpen}
+      onOpenFile={onOpenFile}
+      onAddToChat={canAddToChat ? addFile : undefined}
+      state={changesState}
+      onStateChange={setChangesState}
+    />
+  );
+}
+
+function FilesPane({
+  serverId,
+  workspaceId,
+  workspaceRoot,
+  onOpenFile,
+}: Pick<SidebarContentProps, "serverId" | "workspaceId" | "workspaceRoot" | "onOpenFile">) {
+  const { addFile, canAddToChat } = useAddFileToChat({ serverId, workspaceId });
+  return (
+    <FileExplorerPane
+      serverId={serverId}
+      workspaceId={workspaceId}
+      workspaceRoot={workspaceRoot}
+      onOpenFile={onOpenFile}
+      onAddToChat={canAddToChat ? addFile : undefined}
+    />
+  );
+}
+
+const PrTabContent = PullRequestContent;
+
+const styles = StyleSheet.create((theme) => ({
+  nativeDock: {
+    position: "relative",
+    height: "100%",
+    minHeight: 0,
+    overflow: "hidden",
+  },
+  nativeDockContent: {
+    position: "relative",
+    flex: 1,
+    minHeight: 0,
+    borderLeftWidth: 1,
+  },
+  sidebarContent: {
+    flex: 1,
+    minHeight: 0,
+    overflow: "hidden",
+  },
+  header: {
+    position: "relative",
+    height: {
+      xs: HEADER_INNER_HEIGHT_MOBILE,
+      md: HEADER_INNER_HEIGHT,
+    },
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.border,
+  },
+  tabsContainer: (isCompact: boolean) => ({
+    flexDirection: "row",
+    gap: theme.spacing[1],
+    // With the tab's own horizontal padding this puts the label on the pane's
+    // leading rail, the same way the desktop tab rail does.
+    paddingLeft: isCompact ? EXPLORER_TAB_RAIL_INSET : theme.spacing[2],
+  }),
+  tab: (isCompact: boolean) => ({
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingVertical: theme.spacing[2],
+    paddingHorizontal: isCompact ? theme.spacing[2] : theme.spacing[3],
+    borderRadius: theme.borderRadius.md,
+  }),
+  tabActive: {
+    backgroundColor: theme.colors.surfaceSidebarHover,
+  },
+  tabText: {
+    fontSize: theme.fontSize.base,
+    fontWeight: theme.fontWeight.normal,
+    color: theme.colors.foregroundMuted,
+  },
+  tabTextActive: {
+    color: theme.colors.foreground,
+  },
+  tabTextMuted: {
+    opacity: 0.8,
+  },
+  headerRightSection: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  contentArea: {
+    flex: 1,
+    minHeight: 0,
+  },
+}));

packages/app/src/components/desktop-sidebar-layout.test.ts

@@ -101,25 +101,3 @@ describe("desktop sidebar layout", () => {
     ).toBe(true);
   });
 });
-
-it("reserves room for Explorer and the workspace before showing app navigation", () => {
-  const contentMinimumWidth = resolveDesktopAppContentMinimum({
-    isSettingsRoute: false,
-    explorerVisible: true,
-  });
-  expect(contentMinimumWidth).toBe(600);
-  expect(
-    canDesktopAppSidebarShare({
-      contentMinimumWidth,
-      requestedSidebarWidth: 320,
-      viewportWidth: 744,
-    }),
-  ).toBe(false);
-  expect(
-    canDesktopAppSidebarShare({
-      contentMinimumWidth,
-      requestedSidebarWidth: 320,
-      viewportWidth: 951,
-    }),
-  ).toBe(true);
-});

packages/app/src/components/desktop-sidebar-layout.ts

@@ -1,4 +1,3 @@
-import { EXPLORER_WORKSPACE_MIN_WIDTH } from "@/components/explorer-sidebar-layout";
 import { SETTINGS_DESKTOP_SPLIT_MIN_WIDTH } from "@/constants/layout";
 import { MAX_SIDEBAR_WIDTH, MIN_SIDEBAR_WIDTH } from "@/stores/panel-store";
 
@@ -63,12 +62,8 @@ export function resolveDesktopSidebarWidth(input: {
   });
 }
 
-export function resolveDesktopAppContentMinimum(input: {
-  isSettingsRoute: boolean;
-  explorerVisible?: boolean;
-}): number {
-  if (input.isSettingsRoute) return SETTINGS_DESKTOP_SPLIT_MIN_WIDTH;
-  return input.explorerVisible ? EXPLORER_WORKSPACE_MIN_WIDTH : 0;
+export function resolveDesktopAppContentMinimum(input: { isSettingsRoute: boolean }): number {
+  return input.isSettingsRoute ? SETTINGS_DESKTOP_SPLIT_MIN_WIDTH : 0;
 }
 
 export function canDesktopAppSidebarShare(input: {

packages/app/src/components/explorer-sidebar-layout.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import {
+  explorerSidebarCloseButtonLayout,
   resolveExplorerSidebarDockSizes,
   resolveExplorerSidebarWidth,
 } from "@/components/explorer-sidebar-layout";
@@ -16,7 +17,24 @@ describe("Explorer sidebar layout", () => {
   it("has no fixed maximum while preserving room for the workspace body", () => {
     expect(resolveExplorerSidebarWidth({ requestedWidth: 100, containerWidth: 1200 })).toBe(240);
     expect(resolveExplorerSidebarWidth({ requestedWidth: 900, containerWidth: 1600 })).toBe(900);
-    expect(resolveExplorerSidebarWidth({ requestedWidth: 900, containerWidth: 1200 })).toBe(840);
-    expect(resolveExplorerSidebarWidth({ requestedWidth: 600, containerWidth: 750 })).toBe(390);
+    expect(resolveExplorerSidebarWidth({ requestedWidth: 900, containerWidth: 1200 })).toBe(800);
+    expect(resolveExplorerSidebarWidth({ requestedWidth: 600, containerWidth: 750 })).toBe(350);
+  });
+});
+
+describe("Explorer close action", () => {
+  it("preserves the wide-native touch target and glyph rail", () => {
+    const layout = explorerSidebarCloseButtonLayout(false);
+    expect(layout.size).toBe(34);
+    expect(layout.iconSize).toBe(18);
+    expect(layout.size + layout.hitSlop * 2).toBe(50);
+    expect(layout.trailingPadding + (layout.size - layout.iconSize) / 2).toBe(16);
+  });
+
+  it("keeps the compact close glyph on the pane rail", () => {
+    const layout = explorerSidebarCloseButtonLayout(true);
+    expect(layout.size).toBe(32);
+    expect(layout.iconSize).toBe(18);
+    expect(layout.trailingPadding + (layout.size - layout.iconSize) / 2).toBe(8);
   });
 });

packages/app/src/components/explorer-sidebar-layout.ts

@@ -1,13 +1,36 @@
+import {
+  paneContentToolbarIconSize,
+  paneContentToolbarTrailingPadding,
+} from "@/components/ui/pane-content-toolbar";
+import { smallIconButtonChromeFrameSize } from "@/components/ui/icon-button-chrome";
+
+export function explorerSidebarCloseButtonLayout(compact: boolean) {
+  // The inline native dock retains its padded close action and touch slop.
+  if (!compact) {
+    return { size: 34, iconSize: 18, hitSlop: 8, trailingPadding: 8 };
+  }
+  return {
+    size: smallIconButtonChromeFrameSize(compact),
+    iconSize: paneContentToolbarIconSize(compact),
+    hitSlop: 0,
+    trailingPadding: paneContentToolbarTrailingPadding(compact, "glyph"),
+  };
+}
+
+/**
+ * Outer inset of an Explorer tab rail. With each tab's own horizontal padding it puts
+ * the tab label on the pane's shared leading rail (`treeRowPaddingLeft(0)`).
+ */
+export const EXPLORER_TAB_RAIL_INSET = 4;
+
 const DEFAULT_EXPLORER_SIDEBAR_WIDTH = 320;
 const MIN_EXPLORER_SIDEBAR_WIDTH = 240;
-const MIN_WORKSPACE_BODY_WIDTH = 360;
-export const EXPLORER_WORKSPACE_MIN_WIDTH = MIN_EXPLORER_SIDEBAR_WIDTH + MIN_WORKSPACE_BODY_WIDTH;
+const MIN_WORKSPACE_BODY_WIDTH = 400;
 
 export function resolveExplorerSidebarWidth(input: {
   requestedWidth?: number;
   containerWidth: number;
 }): number {
-  "worklet";
   const requestedWidth = input.requestedWidth ?? DEFAULT_EXPLORER_SIDEBAR_WIDTH;
   const maximumVisibleWidth =
     input.containerWidth > 0

packages/app/src/components/file-drop/file-drop-backdrop.tsx

@@ -46,7 +46,7 @@ export function FileDropBackdrop() {
 
 const positionStyles = RNStyleSheet.create({
   overlay: {
-    ...RNStyleSheet.absoluteFill,
+    ...RNStyleSheet.absoluteFillObject,
     alignItems: "center",
     justifyContent: "center",
     zIndex: 1000,
@@ -55,7 +55,7 @@ const positionStyles = RNStyleSheet.create({
 
 const styles = StyleSheet.create((theme) => ({
   backdrop: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
     backgroundColor: theme.colors.surface0,
     opacity: 0.7,
   },

packages/app/src/components/headers/compact-header.tsx

@@ -52,15 +52,8 @@ export function CompactHeader({
 }: CompactHeaderProps) {
   const insets = useSafeAreaInsets();
   const rootStyle = useMemo(
-    () => [
-      styles.root,
-      {
-        paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE,
-        marginLeft: insets.left,
-        marginRight: insets.right,
-      },
-    ],
-    [insets.top, insets.left, insets.right],
+    () => [styles.root, { paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE }],
+    [insets.top],
   );
 
   return (

packages/app/src/components/left-sidebar.tsx

@@ -679,9 +679,7 @@ function DesktopSidebar({
   const hasActiveHostFilter = useSidebarViewStore((state) => state.hostFilters.length > 0);
   const sidebarWidth = usePanelStore((state) => state.sidebarWidth);
   const setSidebarWidth = usePanelStore((state) => state.setSidebarWidth);
-  const { width: windowWidth } = useWindowDimensions();
-  const insets = useSafeAreaInsets();
-  const viewportWidth = windowWidth - insets.left - insets.right;
+  const { width: viewportWidth } = useWindowDimensions();
   const visibleSidebarWidth = resolveDesktopSidebarWidth({
     requestedWidth: sidebarWidth,
     viewportWidth,

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

@@ -2761,7 +2761,7 @@ const styles = StyleSheet.create((theme) => ({
     justifyContent: "center",
   },
   workspaceArchivingOverlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
     borderRadius: theme.borderRadius.lg,
     backgroundColor: `${theme.colors.surface0}cc`,
     alignItems: "center",

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

@@ -1,4 +1,3 @@
-import { useWorkspaceTabDrag } from "./workspace-tab-drag-context";
 import {
   Fragment,
   memo,
@@ -12,14 +11,35 @@ import {
   type SetStateAction,
 } from "react";
 import { useStableEvent } from "@/hooks/use-stable-event";
-import { View, type LayoutChangeEvent } from "react-native";
+import {
+  DndContext,
+  DragOverlay,
+  KeyboardSensor,
+  PointerSensor,
+  closestCenter,
+  pointerWithin,
+  useSensor,
+  useSensors,
+  type CollisionDetection,
+  type DragEndEvent,
+  type DragMoveEvent,
+  type DragOverEvent,
+  type DragStartEvent,
+} from "@dnd-kit/core";
+import { arrayMove, sortableKeyboardCoordinates } from "@dnd-kit/sortable";
+import { View, Text, type LayoutChangeEvent } from "react-native";
 import Animated, {
   useAnimatedStyle,
   useSharedValue,
   type SharedValue,
 } from "react-native-reanimated";
-import { StyleSheet } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { ResizeHandle } from "@/components/resize-handle";
+import {
+  resolveExplorerSidebarDockSizes,
+  resolveExplorerSidebarWidth,
+} from "@/components/explorer-sidebar-layout";
 import { RetainedPanel } from "@/components/retained-panel";
 import {
   hasMultipleVisiblePanes,
@@ -28,26 +48,41 @@ import {
 } from "@/components/split-container-focus";
 import { shouldFocusPaneFromEventTarget } from "@/components/split-container-pane-focus";
 import {
+  removeWindowChromeCorner,
   WindowChromeRegion,
   WindowChromeSafeArea,
   useWindowChromeCorners,
-  removeWindowChromeCorner,
   type WindowChromeCorners,
 } from "@/utils/desktop-window";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
-import { type TabDropPreview } from "@/components/split-container-tab-drop-preview";
-import { SplitDropZone, type SplitDropZoneHover } from "@/components/split-drop-zone";
-import { deriveWorkspacePaneState } from "@/screens/workspace/workspace-pane-state";
+import {
+  computeTabDropPreview,
+  type TabDropPreview,
+} from "@/components/split-container-tab-drop-preview";
+import {
+  SplitDropZone,
+  resolveSplitDropPosition,
+  type SplitDropZoneHover,
+} from "@/components/split-drop-zone";
+import {
+  deriveWorkspacePaneState,
+  getWorkspacePaneDescriptors,
+} from "@/screens/workspace/workspace-pane-state";
 import type { WorkspacePaneContentModel } from "@/screens/workspace/workspace-pane-content";
 import { WorkspacePanelHost } from "@/screens/workspace/workspace-panel-host";
 import {
   WorkspaceDesktopTabsRow,
   type WorkspaceDesktopTabRowItem,
 } from "@/screens/workspace/workspace-desktop-tabs-row";
+import { ExplorerSidebarDock } from "@/screens/workspace/explorer-sidebar";
+import {
+  WorkspaceTabPresentationResolver,
+  WorkspaceTabIcon,
+} from "@/screens/workspace/workspace-tab-presentation";
 import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
 import {
-  collectAllPanes,
   createDefaultLayout,
+  findPaneById,
   useWorkspaceLayoutStore,
   type SplitNode,
   type SplitPane,
@@ -55,11 +90,14 @@ import {
 } from "@/stores/workspace-layout-store";
 import type { WorkspaceTab } from "@/workspace-tabs/model";
 import { recordRenderProfileReasons, RenderProfile } from "@/utils/render-profiler";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { isNative } from "@/constants/platform";
+import { panelTargetSupportsHost } from "@/plugins/workspace-panels/locations";
 
 interface SplitContainerProps {
   layout: WorkspaceLayout;
   renderMainHeader?: () => ReactNode;
+  renderExplorerSidebarHeaderAction?: () => ReactNode;
   workspaceKey: string;
   normalizedServerId: string;
   normalizedWorkspaceId: string;
@@ -102,6 +140,41 @@ interface SplitContainerProps {
   onExitFocusMode: () => void;
 }
 
+interface WorkspaceTabDragData {
+  kind: "workspace-tab";
+  paneId: string;
+  tabId: string;
+}
+
+interface SplitPaneDropData {
+  kind: "split-pane-drop";
+  paneId: string;
+}
+
+const EMPTY_SPLIT_NODES: SplitNode[] = [];
+const EMPTY_SPLIT_SIZES: number[] = [];
+const EXPLORER_SIDEBAR_RESIZE_GROUP_ID = "explorer-sidebar";
+
+function isWorkspaceTabDragData(data: unknown): data is WorkspaceTabDragData {
+  return typeof data === "object" && data !== null && Reflect.get(data, "kind") === "workspace-tab";
+}
+
+function isSplitPaneDropData(data: unknown): data is SplitPaneDropData {
+  return (
+    typeof data === "object" && data !== null && Reflect.get(data, "kind") === "split-pane-drop"
+  );
+}
+
+function asWorkspaceTabDragData(data: unknown): WorkspaceTabDragData | undefined {
+  return isWorkspaceTabDragData(data) ? data : undefined;
+}
+
+function asDragOverData(data: unknown): WorkspaceTabDragData | SplitPaneDropData | undefined {
+  if (isWorkspaceTabDragData(data)) return data;
+  if (isSplitPaneDropData(data)) return data;
+  return undefined;
+}
+
 interface SplitNodeViewProps extends Omit<
   SplitContainerProps,
   "layout" | "onMoveTabToPane" | "onSelectTabInPane"
@@ -139,12 +212,105 @@ interface SplitPaneViewProps extends Omit<
   tabDropPreview: TabDropPreview | null;
 }
 
-const EMPTY_SPLIT_NODES: SplitNode[] = [];
-const EMPTY_SPLIT_SIZES: number[] = [];
+interface DragMoveRects {
+  translatedRect: { left: number; top: number; width: number; height: number };
+  overRect: { left: number; top: number; width: number; height: number };
+}
+
+function resolveDragMoveRects(
+  event: Pick<DragMoveEvent, "active" | "over"> | Pick<DragOverEvent, "active" | "over">,
+): DragMoveRects | null {
+  const translatedRect = event.active.rect.current.translated;
+  const overRect = event.over?.rect;
+  if (!translatedRect || !overRect || overRect.width <= 0 || overRect.height <= 0) {
+    return null;
+  }
+  return { translatedRect, overRect };
+}
+
+function computeTabOverDropPreview(input: {
+  activeData: WorkspaceTabDragData;
+  overData: WorkspaceTabDragData;
+  rects: DragMoveRects;
+  panesById: Map<string, SplitPane>;
+  uiTabs: WorkspaceTab[];
+}): TabDropPreview | null {
+  const { activeData, overData, rects, panesById, uiTabs } = input;
+  const targetPane = panesById.get(overData.paneId) ?? null;
+  if (!targetPane) {
+    return null;
+  }
+  const targetTabs = getWorkspacePaneDescriptors({ pane: targetPane, tabs: uiTabs });
+  return computeTabDropPreview({
+    activePaneId: activeData.paneId,
+    activeTabId: activeData.tabId,
+    overPaneId: overData.paneId,
+    overTabId: overData.tabId,
+    targetTabs,
+    activeRect: {
+      left: rects.translatedRect.left,
+      width: rects.translatedRect.width,
+    },
+    overRect: {
+      left: rects.overRect.left,
+      width: rects.overRect.width,
+    },
+  });
+}
+
+function computePaneOverDropPreview(input: {
+  overData: SplitPaneDropData;
+  rects: DragMoveRects;
+}): SplitDropZoneHover | null {
+  const { overData, rects } = input;
+  const centerX = rects.translatedRect.left + rects.translatedRect.width / 2;
+  const centerY = rects.translatedRect.top + rects.translatedRect.height / 2;
+  const relativeX = centerX - rects.overRect.left;
+  const relativeY = centerY - rects.overRect.top;
+  if (
+    Number.isNaN(relativeX) ||
+    Number.isNaN(relativeY) ||
+    relativeX < 0 ||
+    relativeX > rects.overRect.width ||
+    relativeY < 0 ||
+    relativeY > rects.overRect.height
+  ) {
+    return null;
+  }
+  return {
+    paneId: overData.paneId,
+    position: resolveSplitDropPosition({
+      width: rects.overRect.width,
+      height: rects.overRect.height,
+      x: relativeX,
+      y: relativeY,
+    }),
+  };
+}
+
+const dropCollisionDetection: CollisionDetection = (args) => {
+  const pointerHits = pointerWithin(args);
+  const tabHits = pointerHits.filter(
+    (entry) => entry.data?.droppableContainer.data.current?.kind === "workspace-tab",
+  );
+  if (tabHits.length > 0) {
+    return tabHits;
+  }
+
+  const paneHits = pointerHits.filter(
+    (entry) => entry.data?.droppableContainer.data.current?.kind === "split-pane-drop",
+  );
+  if (paneHits.length > 0) {
+    return paneHits;
+  }
+
+  return closestCenter(args);
+};
 
 export function SplitContainer({
   layout,
   renderMainHeader,
+  renderExplorerSidebarHeaderAction,
   workspaceKey,
   normalizedServerId,
   normalizedWorkspaceId,
@@ -169,6 +335,8 @@ export function SplitContainer({
   onFocusPane,
   onSplitPane,
   onSplitPaneEmpty,
+  onMoveTabToPane,
+  onSelectTabInPane,
   onResizeSplit,
   onReorderTabsInPane,
   focusModeEnabled,
@@ -176,7 +344,9 @@ export function SplitContainer({
 }: SplitContainerProps) {
   const inheritedWindowChromeCorners = useWindowChromeCorners();
   const windowChromeCorners = focusModeEnabled ? inheritedWindowChromeCorners : "none";
-  const { activeDragTabId, dropPreview, tabDropPreview } = useWorkspaceTabDrag();
+  const [activeDragTabId, setActiveDragTabId] = useState<string | null>(null);
+  const [dropPreview, setDropPreview] = useState<SplitDropZoneHover | null>(null);
+  const [tabDropPreview, setTabDropPreview] = useState<TabDropPreview | null>(null);
   const [maximizedPane, setMaximizedPane] = useState<{
     workspaceKey: string;
     paneId: string;
@@ -187,6 +357,22 @@ export function SplitContainer({
     (state) => state.explorerSidebarPaneIdByWorkspace[workspaceKey] ?? null,
   );
 
+  const sensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: {
+        distance: 8,
+      },
+    }),
+    useSensor(KeyboardSensor, {
+      coordinateGetter: sortableKeyboardCoordinates,
+    }),
+  );
+
+  const panesById = useMemo(() => collectPanesById(layout.root), [layout.root]);
+  const explorerSidebarPane = useMemo(
+    () => findPaneById(layout.root, explorerSidebarPaneId),
+    [layout.root, explorerSidebarPaneId],
+  );
   const mainRoot = useMemo(
     () => removePaneFromSplitTree(layout.root, explorerSidebarPaneId),
     [layout.root, explorerSidebarPaneId],
@@ -222,71 +408,437 @@ export function SplitContainer({
       }),
     [focusModeEnabled, layout.focusedPaneId, mainRoot],
   );
-  const explorerPane = explorerSidebarPaneId
-    ? collectAllPanes(layout.root).find((pane) => pane.id === explorerSidebarPaneId)
-    : null;
-  const mainColumnWindowChromeCorners =
-    !focusModeEnabled && explorerPane && !explorerPane.hidden
-      ? removeWindowChromeCorner(inheritedWindowChromeCorners, "top-right")
-      : inheritedWindowChromeCorners;
+  const storedExplorerSidebarWidth = useWorkspaceLayoutStore(
+    (state) => state.explorerSidebarWidthByWorkspace[workspaceKey],
+  );
+  const resizeExplorerSidebar = useWorkspaceLayoutStore((state) => state.resizeExplorerSidebar);
+  const [workspaceShellWidth, setWorkspaceShellWidth] = useState(0);
+  const [previewExplorerSidebarWidth, setPreviewExplorerSidebarWidth] = useState<number | null>(
+    null,
+  );
+  const requestedExplorerSidebarWidth = previewExplorerSidebarWidth ?? storedExplorerSidebarWidth;
+  const explorerSidebarWidth = resolveExplorerSidebarWidth({
+    requestedWidth: requestedExplorerSidebarWidth,
+    containerWidth: workspaceShellWidth,
+  });
+  const explorerSidebarDockSizes = useMemo(
+    () =>
+      resolveExplorerSidebarDockSizes({
+        requestedWidth: requestedExplorerSidebarWidth,
+        containerWidth: workspaceShellWidth,
+      }),
+    [requestedExplorerSidebarWidth, workspaceShellWidth],
+  );
+  const renderExplorerSidebarDock = Boolean(
+    !focusModeEnabled && explorerSidebarPane && explorerSidebarPane.hidden !== true,
+  );
+  const mainColumnWindowChromeCorners = renderExplorerSidebarDock
+    ? removeWindowChromeCorner(inheritedWindowChromeCorners, "top-right")
+    : inheritedWindowChromeCorners;
   const mainColumnStyle = styles.mainColumn;
+  const explorerSidebarDockStyle = useMemo(
+    () => [styles.explorerSidebarDock, inlineUnistylesStyle({ width: explorerSidebarWidth })],
+    [explorerSidebarWidth],
+  );
+  const handleWorkspaceShellLayout = useCallback((event: LayoutChangeEvent) => {
+    const nextWidth = event.nativeEvent.layout.width;
+    setWorkspaceShellWidth((current) => (current === nextWidth ? current : nextWidth));
+  }, []);
+  const previewExplorerSidebarResize = useCallback(
+    (_groupId: string, sizes: number[]) => {
+      const nextRatio = sizes[1];
+      if (nextRatio !== undefined) {
+        setPreviewExplorerSidebarWidth(
+          resolveExplorerSidebarWidth({
+            requestedWidth: nextRatio * workspaceShellWidth,
+            containerWidth: workspaceShellWidth,
+          }),
+        );
+      }
+    },
+    [workspaceShellWidth],
+  );
+  const commitExplorerSidebarResize = useCallback(
+    (_groupId: string, sizes: number[]) => {
+      setPreviewExplorerSidebarWidth(null);
+      const nextRatio = sizes[1];
+      if (nextRatio !== undefined) {
+        resizeExplorerSidebar(
+          workspaceKey,
+          resolveExplorerSidebarWidth({
+            requestedWidth: nextRatio * workspaceShellWidth,
+            containerWidth: workspaceShellWidth,
+          }),
+        );
+      }
+    },
+    [resizeExplorerSidebar, workspaceKey, workspaceShellWidth],
+  );
   const renderRoot = useMemo(() => wrapRootPaneForStableMount(splitRoot.root), [splitRoot.root]);
+  const handleDragStart = useCallback((event: DragStartEvent) => {
+    const data = asWorkspaceTabDragData(event.active.data.current);
+    if (!data) {
+      setActiveDragTabId(null);
+      setDropPreview(null);
+      setTabDropPreview(null);
+      return;
+    }
+    setActiveDragTabId(data.tabId);
+  }, []);
+
+  const handleDragCancel = useCallback(() => {
+    setActiveDragTabId(null);
+    setDropPreview(null);
+    setTabDropPreview(null);
+  }, []);
+
+  const updateDropPreview = useCallback(
+    (event: Pick<DragMoveEvent, "active" | "over"> | Pick<DragOverEvent, "active" | "over">) => {
+      const activeData = asWorkspaceTabDragData(event.active.data.current);
+      const overData = asDragOverData(event.over?.data.current);
+
+      if (activeData?.kind !== "workspace-tab") {
+        setDropPreview(null);
+        setTabDropPreview(null);
+        return;
+      }
+
+      const rects = resolveDragMoveRects(event);
+      if (!rects) {
+        setDropPreview(null);
+        setTabDropPreview(null);
+        return;
+      }
+
+      const activeTab = uiTabs.find((tab) => tab.tabId === activeData.tabId) ?? null;
+      const destinationPaneId =
+        overData?.kind === "workspace-tab" || overData?.kind === "split-pane-drop"
+          ? overData.paneId
+          : null;
+      const destinationHost = destinationPaneId === explorerSidebarPaneId ? "explorer" : "main";
+      if (
+        !activeTab ||
+        !panelTargetSupportsHost(normalizedServerId, activeTab.target, destinationHost)
+      ) {
+        setDropPreview(null);
+        setTabDropPreview(null);
+        return;
+      }
+
+      if (overData?.kind === "workspace-tab") {
+        const preview = computeTabOverDropPreview({
+          activeData,
+          overData,
+          rects,
+          panesById,
+          uiTabs,
+        });
+        setDropPreview(null);
+        setTabDropPreview(preview);
+        return;
+      }
+
+      setTabDropPreview(null);
+      if (overData?.kind !== "split-pane-drop") {
+        setDropPreview(null);
+        return;
+      }
+
+      setDropPreview(computePaneOverDropPreview({ overData, rects }));
+    },
+    [normalizedServerId, panesById, explorerSidebarPaneId, uiTabs],
+  );
+
+  const applyTabDropEnd = useCallback(
+    (input: { activeData: WorkspaceTabDragData; overData: WorkspaceTabDragData }): void => {
+      const { activeData, overData } = input;
+      const sourcePane = panesById.get(activeData.paneId) ?? null;
+      const targetPane = panesById.get(overData.paneId) ?? null;
+      if (!sourcePane || !targetPane) {
+        return;
+      }
+
+      const sourceTabs = getWorkspacePaneDescriptors({ pane: sourcePane, tabs: uiTabs });
+      const targetTabs = getWorkspacePaneDescriptors({ pane: targetPane, tabs: uiTabs });
+      const sourceIndex = sourceTabs.findIndex((tab) => tab.tabId === activeData.tabId);
+      const resolvedTabDropPreview =
+        tabDropPreview?.paneId === overData.paneId ? tabDropPreview : null;
+      if (sourceIndex < 0 || !resolvedTabDropPreview) {
+        return;
+      }
+
+      if (activeData.paneId === overData.paneId) {
+        if (sourceIndex !== resolvedTabDropPreview.insertionIndex) {
+          const nextTabs = arrayMove(
+            sourceTabs,
+            sourceIndex,
+            resolvedTabDropPreview.insertionIndex,
+          );
+          onReorderTabsInPane(
+            activeData.paneId,
+            nextTabs.map((tab) => tab.tabId),
+          );
+        }
+        return;
+      }
+
+      const nextTargetTabIds = targetTabs.map((tab) => tab.tabId);
+      nextTargetTabIds.splice(resolvedTabDropPreview.insertionIndex, 0, activeData.tabId);
+      onMoveTabToPane(activeData.tabId, overData.paneId);
+      onReorderTabsInPane(overData.paneId, nextTargetTabIds);
+    },
+    [onMoveTabToPane, onReorderTabsInPane, panesById, tabDropPreview, uiTabs],
+  );
+
+  const applyPaneDropEnd = useCallback(
+    (input: { activeData: WorkspaceTabDragData; overData: SplitPaneDropData }): void => {
+      const { activeData, overData } = input;
+      if (dropPreview?.paneId !== overData.paneId) {
+        return;
+      }
+      if (dropPreview.position === "center") {
+        if (activeData.paneId !== overData.paneId) {
+          onMoveTabToPane(activeData.tabId, overData.paneId);
+        }
+        return;
+      }
+      onSplitPane({
+        tabId: activeData.tabId,
+        targetPaneId: overData.paneId,
+        position: dropPreview.position,
+      });
+    },
+    [dropPreview, onMoveTabToPane, onSplitPane],
+  );
+
+  const handleDragEnd = useCallback(
+    (event: DragEndEvent) => {
+      const activeData = asWorkspaceTabDragData(event.active.data.current);
+      const overData = asDragOverData(event.over?.data.current);
+
+      setActiveDragTabId(null);
+
+      if (activeData?.kind === "workspace-tab" && event.over) {
+        if (overData?.kind === "workspace-tab") {
+          applyTabDropEnd({ activeData, overData });
+        } else if (overData?.kind === "split-pane-drop") {
+          applyPaneDropEnd({ activeData, overData });
+        }
+      }
+
+      setDropPreview(null);
+      setTabDropPreview(null);
+    },
+    [applyTabDropEnd, applyPaneDropEnd],
+  );
+
   return (
     <RenderProfile id="SplitContainer">
-      <View style={styles.workspaceShell}>
-        <WindowChromeRegion corners={mainColumnWindowChromeCorners}>
-          <View style={mainColumnStyle}>
-            {renderMainHeader?.()}
-            {splitRoot.usesFallbackStrip && <WindowChromeSafeArea placement="below" />}
-            {renderRoot ? (
-              <SplitNodeView
-                node={renderRoot}
-                workspaceKey={workspaceKey}
-                uiTabs={uiTabs}
-                focusedPaneId={layout.focusedPaneId}
-                normalizedServerId={normalizedServerId}
-                normalizedWorkspaceId={normalizedWorkspaceId}
-                isWorkspaceFocused={isWorkspaceFocused}
-                hoveredCloseTabKey={hoveredCloseTabKey}
-                setHoveredCloseTabKey={setHoveredCloseTabKey}
-                closingTabIds={closingTabIds}
-                onNavigateTab={onNavigateTab}
-                onCloseTab={onCloseTab}
-                onCopyResumeCommand={onCopyResumeCommand}
-                onCopyAgentId={onCopyAgentId}
-                onCopyTerminalId={onCopyTerminalId}
-                onCopyFilePath={onCopyFilePath}
-                onReloadAgent={onReloadAgent}
-                onRenameTab={onRenameTab}
-                onCloseTabsToLeft={onCloseTabsToLeft}
-                onCloseTabsToRight={onCloseTabsToRight}
-                onCloseOtherTabs={onCloseOtherTabs}
-                onCreateNewTab={onCreateNewTab}
-                buildPaneContentModel={buildPaneContentModel}
-                onFocusPane={onFocusPane}
-                onSplitPane={onSplitPane}
-                onSplitPaneEmpty={onSplitPaneEmpty}
-                onResizeSplit={onResizeSplit}
-                onReorderTabsInPane={onReorderTabsInPane}
-                activeDragTabId={activeDragTabId}
-                showDropZones={activeDragTabId !== null}
-                dropPreview={dropPreview}
-                tabDropPreview={tabDropPreview}
-                windowChromeCorners={splitRoot.usesFallbackStrip ? "none" : windowChromeCorners}
-                maximizedPaneId={maximizedPaneId}
-                workspaceHasMultiplePanes={workspaceHasMultiplePanes}
-                onTogglePaneMaximized={handleTogglePaneMaximized}
-                focusModeEnabled={focusModeEnabled}
-                onExitFocusMode={onExitFocusMode}
+      <DndContext
+        sensors={sensors}
+        collisionDetection={dropCollisionDetection}
+        onDragStart={handleDragStart}
+        onDragMove={updateDropPreview}
+        onDragOver={updateDropPreview}
+        onDragCancel={handleDragCancel}
+        onDragEnd={handleDragEnd}
+      >
+        <View style={styles.workspaceShell} onLayout={handleWorkspaceShellLayout}>
+          <WindowChromeRegion corners={mainColumnWindowChromeCorners}>
+            <View style={mainColumnStyle}>
+              {renderMainHeader?.()}
+              {splitRoot.usesFallbackStrip && <WindowChromeSafeArea placement="below" />}
+              {renderRoot ? (
+                <SplitNodeView
+                  node={renderRoot}
+                  workspaceKey={workspaceKey}
+                  uiTabs={uiTabs}
+                  focusedPaneId={layout.focusedPaneId}
+                  normalizedServerId={normalizedServerId}
+                  normalizedWorkspaceId={normalizedWorkspaceId}
+                  isWorkspaceFocused={isWorkspaceFocused}
+                  hoveredCloseTabKey={hoveredCloseTabKey}
+                  setHoveredCloseTabKey={setHoveredCloseTabKey}
+                  closingTabIds={closingTabIds}
+                  onNavigateTab={onNavigateTab}
+                  onCloseTab={onCloseTab}
+                  onCopyResumeCommand={onCopyResumeCommand}
+                  onCopyAgentId={onCopyAgentId}
+                  onCopyTerminalId={onCopyTerminalId}
+                  onCopyFilePath={onCopyFilePath}
+                  onReloadAgent={onReloadAgent}
+                  onRenameTab={onRenameTab}
+                  onCloseTabsToLeft={onCloseTabsToLeft}
+                  onCloseTabsToRight={onCloseTabsToRight}
+                  onCloseOtherTabs={onCloseOtherTabs}
+                  onCreateNewTab={onCreateNewTab}
+                  buildPaneContentModel={buildPaneContentModel}
+                  onFocusPane={onFocusPane}
+                  onSplitPane={onSplitPane}
+                  onSplitPaneEmpty={onSplitPaneEmpty}
+                  onResizeSplit={onResizeSplit}
+                  onReorderTabsInPane={onReorderTabsInPane}
+                  activeDragTabId={activeDragTabId}
+                  showDropZones={activeDragTabId !== null}
+                  dropPreview={dropPreview}
+                  tabDropPreview={tabDropPreview}
+                  windowChromeCorners={splitRoot.usesFallbackStrip ? "none" : windowChromeCorners}
+                  maximizedPaneId={maximizedPaneId}
+                  workspaceHasMultiplePanes={workspaceHasMultiplePanes}
+                  onTogglePaneMaximized={handleTogglePaneMaximized}
+                  focusModeEnabled={focusModeEnabled}
+                  onExitFocusMode={onExitFocusMode}
+                />
+              ) : null}
+            </View>
+          </WindowChromeRegion>
+          {renderExplorerSidebarDock && explorerSidebarPane ? (
+            <>
+              <ResizeHandle
+                testID="workspace-explorer-sidebar-resize-handle"
+                direction="horizontal"
+                hitAreaAlignment="end"
+                groupId={EXPLORER_SIDEBAR_RESIZE_GROUP_ID}
+                index={0}
+                sizes={explorerSidebarDockSizes}
+                containerSize={workspaceShellWidth}
+                onPreviewResizeSplit={previewExplorerSidebarResize}
+                onResizeSplit={commitExplorerSidebarResize}
               />
-            ) : null}
-          </View>
-        </WindowChromeRegion>
-      </View>
+              <View style={explorerSidebarDockStyle}>
+                <ExplorerSidebarDock
+                  pane={explorerSidebarPane}
+                  uiTabs={uiTabs}
+                  normalizedServerId={normalizedServerId}
+                  normalizedWorkspaceId={normalizedWorkspaceId}
+                  isWorkspaceFocused={isWorkspaceFocused}
+                  closingTabIds={closingTabIds}
+                  onSelectTab={onSelectTabInPane}
+                  onCloseTab={onCloseTab}
+                  onCreateNewTab={onCreateNewTab}
+                  hoveredCloseTabKey={hoveredCloseTabKey}
+                  setHoveredCloseTabKey={setHoveredCloseTabKey}
+                  onCopyResumeCommand={onCopyResumeCommand}
+                  onCopyAgentId={onCopyAgentId}
+                  onCopyTerminalId={onCopyTerminalId}
+                  onCopyFilePath={onCopyFilePath}
+                  onReloadAgent={onReloadAgent}
+                  onRenameTab={onRenameTab}
+                  onCloseTabsToLeft={onCloseTabsToLeft}
+                  onCloseTabsToRight={onCloseTabsToRight}
+                  onCloseOtherTabs={onCloseOtherTabs}
+                  onExitFocusMode={onExitFocusMode}
+                  buildPaneContentModel={buildPaneContentModel}
+                  onReorderTabsInPane={onReorderTabsInPane}
+                  activeDragTabId={activeDragTabId}
+                  tabDropPreview={tabDropPreview}
+                  headerAction={renderExplorerSidebarHeaderAction?.()}
+                />
+              </View>
+            </>
+          ) : null}
+        </View>
+        <DragOverlay dropAnimation={null}>
+          {activeDragTabId ? (
+            <DragOverlayTabChip
+              tabId={activeDragTabId}
+              uiTabs={uiTabs}
+              normalizedServerId={normalizedServerId}
+              normalizedWorkspaceId={normalizedWorkspaceId}
+            />
+          ) : null}
+        </DragOverlay>
+      </DndContext>
     </RenderProfile>
   );
 }
 
+function DragOverlayTabChip({
+  tabId,
+  uiTabs,
+  normalizedServerId,
+  normalizedWorkspaceId,
+}: {
+  tabId: string;
+  uiTabs: WorkspaceTab[];
+  normalizedServerId: string;
+  normalizedWorkspaceId: string;
+}) {
+  const tab = uiTabs.find((t) => t.tabId === tabId);
+  const descriptor = useMemo<WorkspaceTabDescriptor | null>(
+    () =>
+      tab
+        ? {
+            key: tab.tabId,
+            tabId: tab.tabId,
+            kind: tab.target.kind,
+            target: tab.target,
+          }
+        : null,
+    [tab],
+  );
+  if (!descriptor) {
+    return null;
+  }
+  return (
+    <DragOverlayTabChipInner
+      tab={descriptor}
+      normalizedServerId={normalizedServerId}
+      normalizedWorkspaceId={normalizedWorkspaceId}
+    />
+  );
+}
+
+function DragOverlayTabChipInner({
+  tab,
+  normalizedServerId,
+  normalizedWorkspaceId,
+}: {
+  tab: WorkspaceTabDescriptor;
+  normalizedServerId: string;
+  normalizedWorkspaceId: string;
+}) {
+  const { t } = useTranslation();
+  const { theme } = useUnistyles();
+
+  const chipStyle = useMemo(
+    () => [
+      styles.dragOverlayChip,
+      {
+        backgroundColor: theme.colors.surface1,
+        borderColor: theme.colors.borderAccent,
+      },
+    ],
+    [theme.colors.surface1, theme.colors.borderAccent],
+  );
+  const chipLabelStyle = useMemo(
+    () => [styles.dragOverlayLabel, { color: theme.colors.foreground }],
+    [theme.colors.foreground],
+  );
+
+  return (
+    <WorkspaceTabPresentationResolver
+      tab={tab}
+      serverId={normalizedServerId}
+      workspaceId={normalizedWorkspaceId}
+    >
+      {(presentation) => {
+        const label =
+          presentation.titleState === "loading" ? t("common.states.loading") : presentation.label;
+
+        return (
+          <View style={chipStyle}>
+            <WorkspaceTabIcon presentation={presentation} active size={14} backdrop="surface1" />
+            <Text numberOfLines={1} style={chipLabelStyle}>
+              {label}
+            </Text>
+          </View>
+        );
+      }}
+    </WorkspaceTabPresentationResolver>
+  );
+}
+
 function SplitGroupChild({
   resizeFlex,
   index,
@@ -765,6 +1317,21 @@ const SplitPaneView = memo(function SplitPaneView({
   );
 });
 
+function collectPanesById(node: SplitNode): Map<string, SplitPane> {
+  const next = new Map<string, SplitPane>();
+  function visit(current: SplitNode) {
+    if (current.kind === "pane") {
+      next.set(current.pane.id, current.pane);
+      return;
+    }
+    for (const child of current.group.children) {
+      visit(child);
+    }
+  }
+  visit(node);
+  return next;
+}
+
 function getNodeKey(node: SplitNode): string {
   if (node.kind === "pane") {
     return node.pane.id;
@@ -829,6 +1396,12 @@ const styles = StyleSheet.create((theme) => ({
     minWidth: 0,
     minHeight: 0,
   },
+  explorerSidebarDock: {
+    flexShrink: 0,
+    minWidth: 240,
+    minHeight: 0,
+    backgroundColor: theme.colors.surfaceSidebar,
+  },
   group: {
     flex: 1,
     minWidth: 0,
@@ -863,4 +1436,18 @@ const styles = StyleSheet.create((theme) => ({
     minWidth: 0,
     minHeight: 0,
   },
+  dragOverlayChip: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[1],
+    borderRadius: theme.borderRadius.md,
+    borderWidth: 1,
+    maxWidth: 200,
+  },
+  dragOverlayLabel: {
+    fontSize: theme.fontSize.base,
+    flexShrink: 1,
+  },
 }));