fix(cli): preserve validated addresses in daemon command hints

test(hosts): include relay coverage in existing CI contracts
fix(hosts): validate safe targets and verify encrypted relay routes
2026-10-19 15:52:49 +00:00 · 2026-10-19 08:52:09 +02:00 · 2026-10-19 08:40:18 +02:00 · 2026-10-19 08:37:39 +02:00 · 2026-10-19 08:37:15 +02:00
294 changed files with 11175 additions and 12981 deletions
@@ -1,8 +1,8 @@
 # Changelog

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

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

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

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

 ### Fixed

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

 ## 0.11.4 - 2026-10-15

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

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

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

 ```
@@ -0,0 +1,55 @@
+# Connected hosts
+
+A saved host belongs to the daemon that stores it. The app's saved connections remain a separate list.
+Connect A to B in A's settings under **Hosts connected to this daemon**, through `paseo --host A host`,
+or through `paseo.hosts`. Consumers select B by its learned `serverId`; management uses the stable
+`registrationId` created before B is reachable.
+
+## Ownership and authority
+
+Credentials live in A's `hosts.json`, written atomically with mode `0600` on POSIX systems. Discovery returns a safe
+target description. Replacement inputs never come back through a read API. Keep this file private
+when collecting diagnostics or backing up daemon state.
+
+The authenticated producer owns its source key. Repeating an unchanged add returns the saved entry,
+including a user's disabled state. Changed input requires an explicit update. Display labels and
+access can be changed by users with `tunnel.manage`; connection and metadata changes require the
+producer or `access.manage`. Removing a producer-managed entry allows that producer to add it again.
+Disabling retains the opt-out.
+
+Each routed API owns a separate session. A derives its identity from the admitted origin session,
+producer, and logical SDK scope. A replaces forwarded identity and grants, and B intersects those
+grants with the authenticated link's authority. Reconnect reads current authority. Changing caller
+permissions closes existing routes. A routed API cannot select a second hop.
+
+A producer that registers a host through a routed API is qualified on B as
+`route:<B principal>:<A serverId>:<A producer>`, with each component percent-encoded. This namespace belongs to the authenticated link
+principal. An ordinary direct B consumer does not become that producer by supplying a source key.
+The optional `server_info.sourceId` reports this producer identity for source-owner controls; it does not describe the authenticated admission principal.
+Trusted server plugins retain the authority of their runtime; they are not sandboxed by this feature.
+
+## Connections and recovery
+
+The shared Node connector owns the target grammar and each connection attempt, including a fresh
+SSH process. SSH reaches an already running daemon. The daemon keeps unreachable registrations and
+retries them. Identity is pinned when discovered. Self and duplicate registrations remain inspectable;
+a changed destination requires explicit identity replacement.
+
+Both daemons must advertise `connectedHosts`. A checks B's capability and identity before forwarding
+session operations. There is no local fallback. An older daemon continues to serve existing local
+operations; requesting this feature gives update guidance.
+
+Disposing a routed API releases its observations and session. It does not remove the saved host or
+affect sibling API scopes. Disposing the origin cascades to its derived scopes. Observations restore
+through the usual owned-subscription contract; requests made while offline fail. Losing a response
+returns `outcome_unknown` with the destination ID. Inspect the destination before retrying a mutation.
+No mutation is automatically replayed.
+
+Host links cap saved registrations, simultaneous routes, frames, per-socket output, and shared queued
+bytes. Slow consumers lose their route with a resource-limit error instead of retaining unbounded
+output. Routed sessions release server resources on disconnect; subscription demand is rebuilt by
+its owning client on reconnect.
+
+See the [SDK reference](../public-docs/sdk/reference.md#clienthosts),
+[CLI reference](../public-docs/cli.md#connected-hosts), and
+[plugin reference](../public-docs/plugins/reference.md#connected-hosts).
@@ -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

@@ -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
@@ -31,6 +31,10 @@ A pairing invitation is neither. It is an expiring, single-use exchange that cre

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

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

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

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

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

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

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

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

 ## Usage sources

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

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

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

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

 A shim that exists for old-app or old-daemon support carries a comment naming it, the version it arrived in, and when it can go:
@@ -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 dismiss Expo's developer error toast through its close button while retaining console logs, so it cannot cover compact bottom actions.
+- 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.
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1 +1 @@
-sha256-ObBdUmNSW+vDjzA7EbCDfZrB0nYDmcWmWe+UCoTMh/M=
+sha256-tSE4nb4E06GFZ8I9UEbo93nlPiAKtW00nkywgKQmMhI=
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -137,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"
  }
 }
@@ -171,7 +171,6 @@ export default {
      [
        "expo-build-properties",
        {
-          ios: { enableSceneSupport: true },
          android: {
            minSdkVersion: 29,
            kotlinVersion: "2.1.20",
@@ -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();
+  }
+});
@@ -833,15 +833,13 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
  await openWorkspaceChanges(page, workspace);
  await page.setViewportSize({ width: 480, height: 900 });

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

    const closeExplorer = page
-      .getByTestId("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) {
@@ -0,0 +1,66 @@
+import { test } from "../support/fixtures";
+import {
+  openRestartableConnectedHosts,
+  beginConnectedHostDraft,
+  reconnectManagingHost,
+  expectConnectedHostDraftRetained,
+  saveConnectedHost,
+  openConnectedHosts,
+  openCompactConnectedHosts,
+  addConnectedHost,
+  expectConnectionError,
+  correctConnection,
+  inspectConnectedHost,
+  expectSavedHostDetails,
+  disableConnectedHost,
+  enableConnectedHost,
+  editConnectedHost,
+  removeConnectedHost,
+} from "../support/helpers/connected-hosts";
+
+test("invalid input stays editable; unreachable hosts remain manageable", async ({
+  page,
+}, testInfo) => {
+  await openConnectedHosts(page);
+  await addConnectedHost(page, "ssh://-invalid", "Build box");
+  await expectConnectionError(page);
+  await correctConnection(page, "tcp://127.0.0.1:1?password=private-secret");
+  await inspectConnectedHost(page, "Build box");
+  await expectSavedHostDetails(page);
+  await page.screenshot({ path: testInfo.outputPath("connected-host-details.png") });
+  await editConnectedHost(page);
+  await disableConnectedHost(page);
+  await enableConnectedHost(page);
+  await removeConnectedHost(page, "Renamed box");
+});
+
+test.describe("compact connected hosts", () => {
+  test.use({ viewport: { width: 390, height: 844 } });
+  test("saved hosts can be inspected and disabled on a phone layout", async ({
+    page,
+  }, testInfo) => {
+    await openCompactConnectedHosts(page);
+    await addConnectedHost(page, "tcp://127.0.0.1:1", "Compact host");
+    await inspectConnectedHost(page, "Compact host");
+    await expectSavedHostDetails(page);
+    await page.screenshot({
+      path: testInfo.outputPath("connected-host-compact.png"),
+      fullPage: true,
+    });
+    await disableConnectedHost(page);
+    await removeConnectedHost(page, "Compact host");
+  });
+});
+
+test("connection loss retains the unsaved name and credential input", async ({ page }) => {
+  const host = await openRestartableConnectedHosts(page);
+  try {
+    await beginConnectedHostDraft(page);
+    await reconnectManagingHost(host);
+    await expectConnectedHostDraftRetained(page);
+    await saveConnectedHost(page);
+    await inspectConnectedHost(page, "Retained draft");
+  } finally {
+    await host.close();
+  }
+});
@@ -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();
-  }
-});
@@ -1,138 +0,0 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import type { Locator, TestInfo } from "@playwright/test";
-import { expect, test, type Page } from "../support/fixtures";
-import { openCommandCenter } from "../support/helpers/command-center";
-import { gotoAppShell } from "../support/helpers/app";
-import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
-import { pluginRequirements } from "../support/helpers/plugin-fixture";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import { getServerId } from "../support/helpers/server-id";
-import {
-  switchWorkspaceViaSidebar,
-  waitForWorkspaceInSidebar,
-} from "../support/helpers/workspace-ui";
-
-const PLUGIN_ID = "plugin-icons-e2e";
-const SVG_PATH = "M4 12l5 5L20 6";
-
-const pluginClientSource = `import React from "react";
-import { Text, View } from "react-native";
-
-const checkIcon = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><path d="${SVG_PATH}" /></svg>';
-
-function BadgeIcon({ size, color }) {
-  return <View testID="plugin-component-icon" style={{ width: size, height: size, borderRadius: size / 2, backgroundColor: color }} />;
-}
-
-function Panel() {
-  return <View><Text>Plugin icon panel</Text></View>;
-}
-
-const panels = [
-  { id: "lucide", title: "Lucide icon panel", icon: "Scan" },
-  { id: "svg", title: "SVG icon panel", icon: { svg: checkIcon } },
-  { id: "component", title: "Component icon panel", icon: BadgeIcon },
-];
-
-export default function contribute(client) {
-  for (const panel of panels) {
-    client.addWorkspacePanel({ ...panel, context: "workspace", Component: Panel });
-    client.addCommandCenterItem({
-      id: panel.id,
-      title: "Open " + panel.title,
-      icon: panel.icon,
-      context: "workspace",
-      onSelect({ openPanel }) { openPanel(panel.id); },
-    });
-  }
-  return () => {};
-}`;
-
-function pluginTab(page: Page, panelId: string): Locator {
-  const identity = `${PLUGIN_ID.length}_${PLUGIN_ID}_${panelId.length}_${panelId}`;
-  return page.getByTestId(`workspace-tab-plugin_workspace_${identity}`).filter({ visible: true });
-}
-
-async function runCommand(page: Page, title: string): Promise<void> {
-  const panel = await openCommandCenter(page);
-  await panel.getByTestId("command-center-input").fill(title);
-  await panel.getByRole("button", { name: title, exact: true }).click();
-  await expect(panel).not.toBeVisible();
-}
-
-async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
-  const screenshot = testInfo.outputPath(`${name}.png`);
-  await page.screenshot({ path: screenshot });
-  await testInfo.attach(name, { path: screenshot, contentType: "image/png" });
-}
-
-test.describe("plugin icons", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  test("renders a Lucide name, inline SVG, and a component", async ({ page }, testInfo) => {
-    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-icons-e2e-"));
-    const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-    const previous = await client.getDaemonConfig();
-    const workspace = await seedWorkspace({ repoPrefix: "plugin-icons-" });
-    await writeFile(
-      path.join(directory, "paseo-plugin.json"),
-      JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
-    );
-    await writeFile(path.join(directory, "index.client.tsx"), pluginClientSource);
-
-    try {
-      await client.patchDaemonConfig({ pluginsEnabled: true });
-      await client.installDirectoryPlugin(directory);
-      await page.setViewportSize({ width: 1280, height: 800 });
-      await gotoAppShell(page);
-      const target = { serverId: getServerId(), workspaceId: workspace.workspaceId };
-      await waitForWorkspaceInSidebar(page, target);
-      await switchWorkspaceViaSidebar({ page, ...target });
-
-      await test.step("Command Center rows draw each icon form", async () => {
-        const panel = await openCommandCenter(page);
-        await panel.getByTestId("command-center-input").fill("icon panel");
-        for (const title of ["Lucide icon panel", "SVG icon panel", "Component icon panel"]) {
-          await expect(
-            panel.getByRole("button", { name: `Open ${title}`, exact: true }),
-          ).toBeVisible();
-        }
-        await expect(
-          panel
-            .getByRole("button", { name: "Open SVG icon panel", exact: true })
-            .locator(`path[d="${SVG_PATH}"]`),
-        ).toBeVisible();
-        await expect(
-          panel
-            .getByRole("button", { name: "Open Component icon panel", exact: true })
-            .getByTestId("plugin-component-icon"),
-        ).toBeVisible();
-        await capture(page, testInfo, "command-center-icons");
-        await page.keyboard.press("Escape");
-      });
-
-      await test.step("workspace panel tabs draw each icon form", async () => {
-        await runCommand(page, "Open Lucide icon panel");
-        await runCommand(page, "Open SVG icon panel");
-        await runCommand(page, "Open Component icon panel");
-        await expect(pluginTab(page, "lucide").locator("svg")).toBeVisible();
-        await expect(pluginTab(page, "svg").locator(`path[d="${SVG_PATH}"]`)).toBeVisible();
-        await expect(
-          pluginTab(page, "component").getByTestId("plugin-component-icon"),
-        ).toBeVisible();
-        await capture(page, testInfo, "workspace-tab-icons");
-      });
-    } finally {
-      try {
-        await client.removePlugin(PLUGIN_ID);
-      } finally {
-        await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
-        await workspace.cleanup();
-        await client.close();
-        await rm(directory, { recursive: true, force: true });
-      }
-    }
-  });
-});
@@ -28,7 +28,6 @@ import {
  closeWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
  waitForWorkspaceSetupProgress,
-  observeSetupPanelTraffic,
 } from "../support/helpers/workspace-setup";

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

-  test("setup panel releases details while retained behind another tab and resubscribes when shown", async ({
-    page,
-  }) => {
-    const client = await connectWorkspaceSetupClient();
-    const repo = await createTempGitRepo("setup-membership-", {
-      paseoConfig: { worktree: { setup: ["echo setup complete"] } },
-    });
-    const traffic = observeSetupPanelTraffic(page);
-    try {
-      await seedProjectForWorkspaceSetup(client, repo.path);
-      const completed = waitForWorkspaceSetupProgress(
-        client,
-        (payload) => payload.status === "completed",
-      );
-      const workspace = await createWorkspaceThroughDaemon(client, {
-        cwd: repo.path,
-        worktreeSlug: "setup-membership",
-      });
-      await completed;
-      await openHomeWithProject(page, repo.path);
-      await navigateToWorkspaceViaSidebar(page, workspace.id);
-      await expectSetupTabNotSeeded(page, workspace.id);
-      await traffic.expectNoDemand();
-      await expectSetupPanel(page);
-      await traffic.expectSubscribed(workspace.id, 1);
-      await expect(page.getByTestId("workspace-setup-log").first()).toContainText("setup complete");
-      await clickNewChat(page);
-      await expectComposerVisible(page);
-      await traffic.expectReleased(0);
-      await expectSetupPanel(page);
-      await traffic.expectSubscribed(workspace.id, 2);
-      await closeSetupTab(page, workspace.id);
-      await traffic.expectReleased(1);
-    } finally {
-      await client.close();
-      await repo.cleanup();
-    }
-  });
-
  daemonTest("streams running and completed setup snapshots for a successful setup", async () => {
    const client = await connectWorkspaceSetupClient();
    const repo = await createTempGitRepo("setup-success-", {
@@ -4,8 +4,8 @@ env APP_ID=sh.paseo.debug
 open "${APP_ID}"
 wait "id=\"workspace-header-menu-trigger\"" 20000
 press "id=\"workspace-explorer-toggle\""
-wait "id=\"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
@@ -1,145 +0,0 @@
-// Run against an Android dev client serving this checkout, with a real software keyboard.
-// node packages/app/e2e/mobile/appearance-keyboard/android.mjs <session> <metro-url> <server-id> [app-id]
-import assert from "node:assert/strict";
-import { execFileSync } from "node:child_process";
-import { mkdirSync } from "node:fs";
-import { resolve } from "node:path";
-import { setTimeout as delay } from "node:timers/promises";
-
-const [, , session, metroUrl, serverId, appId = "sh.paseo.debug"] = process.argv;
-assert(
-  session && metroUrl && serverId,
-  "Pass the agent-device session, Metro URL and connected host ID",
-);
-const artifacts = resolve(".dev/agent-device-artifacts/appearance-keyboard-android");
-mkdirSync(artifacts, { recursive: true });
-
-function ad(...args) {
-  return execFileSync("agent-device", ["--session", session, ...args], {
-    encoding: "utf8",
-    timeout: 60_000,
-  });
-}
-
-function evaluate(expression) {
-  return ad("cdp", "runtime", "eval", "--expr", expression, "--json");
-}
-
-// Read the mounted app's public React Native APIs through Metro. Accessibility
-// snapshots with Gboard open can block while waiting for an idle hierarchy.
-const reactNative = `Array.from(__r.getModules().values()).find(
-  m => m.verboseName?.endsWith("/react-native/index.js")
-).publicModule.exports`;
-
-function measureFocusedInput() {
-  evaluate(`(() => {
-    const rn = ${reactNative};
-    globalThis.__appearanceKeyboardMeasurement = null;
-    rn.TextInput.State.currentlyFocusedInput()?.measureInWindow((x, y, width, height) => {
-      globalThis.__appearanceKeyboardMeasurement = JSON.stringify({
-        x, y, width, height,
-        statusBarHeight: rn.StatusBar.currentHeight,
-        scale: rn.PixelRatio.get(),
-        keyboard: rn.Keyboard.metrics(),
-      });
-    });
-  })()`);
-  const value = JSON.parse(evaluate("globalThis.__appearanceKeyboardMeasurement"));
-  return value ? JSON.parse(value) : null;
-}
-
-async function waitForFocusedInput() {
-  let measurement;
-  let previous;
-  let stable = 0;
-  const deadline = Date.now() + 30_000;
-  do {
-    measurement = measureFocusedInput();
-    const current = measurement?.keyboard
-      ? [measurement.y, measurement.height, measurement.keyboard.screenY].map(Math.round).join(",")
-      : null;
-    stable = measurement?.keyboard && current === previous ? stable + 1 : 0;
-    previous = current;
-    if (stable >= 3) break;
-    await delay(150);
-  } while (Date.now() < deadline);
-
-  assert(stable >= 3, `Focused input and keyboard must settle: ${JSON.stringify(measurement)}`);
-  return measurement;
-}
-
-ad("open", appId, "--platform", "android", "--no-test-ime");
-const targets = ad("cdp", "target", "list", "--url", metroUrl)
-  .split("\n")
-  .filter((line) => line.includes(appId));
-assert.equal(targets.length, 1, "Connect only the test app to this Metro server");
-ad("cdp", "target", "select", targets[0].split(/\s+/)[0]);
-
-try {
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  ad("open", appId, "paseo://settings", "--platform", "android", "--no-test-ime");
-  ad("wait", "text", "Appearance", "5000");
-  ad("open", appId, "paseo://settings/appearance", "--platform", "android", "--no-test-ime");
-  ad("wait", "text", "Code size", "5000");
-  const snapshot = JSON.parse(ad("snapshot", "-i", "--json"));
-  const numericFields = snapshot.data.nodes.filter(
-    (node) => node.type === "android.widget.EditText" && /^\d+$/.test(node.value ?? ""),
-  );
-  assert.equal(numericFields.length, 3, "All three font sizes must be visible without scrolling");
-  ad("screenshot", resolve(artifacts, "before-keyboard.png"));
-  // Appearance orders Interface size, Content size, then Code size.
-  ad("press", `@${numericFields[2].ref}`);
-
-  const measurement = await waitForFocusedInput();
-  // Android measureInWindow excludes the status bar, Keyboard.metrics uses screen coordinates.
-  const inputBottom = measurement.y + measurement.height + measurement.statusBarHeight;
-  const keyboardTop = measurement.keyboard.screenY;
-  console.log(JSON.stringify({ inputBottom, keyboardTop, measurement }));
-  ad("screenshot", resolve(artifacts, "keyboard.png"));
-  assert(
-    inputBottom <= keyboardTop + 1 / measurement.scale,
-    "Code size must be fully visible above the number keyboard (within one physical pixel)",
-  );
-  console.log("PASS: focusing Code size reveals the whole field above the keyboard");
-
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  ad(
-    "open",
-    appId,
-    `paseo://settings/hosts/${encodeURIComponent(serverId)}/plugins`,
-    "--platform",
-    "android",
-    "--no-test-ime",
-  );
-  ad("wait", "text", "Plugin source", "5000");
-  const plugins = JSON.parse(ad("snapshot", "-i", "--json"));
-  const source = plugins.data.nodes.find((node) => node.type === "android.widget.EditText");
-  assert(source, "The connected host must support installing plugins from source");
-  ad("press", `@${source.ref}`);
-  ad("type", "qa-source");
-  const pluginMeasurement = await waitForFocusedInput();
-  // A FormTextInput draws its border and padding on the native input's parent.
-  // Measure that visible frame, rather than accepting only the text as visible.
-  const hierarchy = JSON.parse(ad("snapshot", "--json")).data.nodes;
-  const focused = hierarchy.find((node) => node.type === "android.widget.EditText" && node.focused);
-  assert(focused, "Plugin source must remain focused after typing");
-  assert.equal(focused.value, "qa-source", "Typed source must remain in the focused field");
-  const frame = hierarchy.find((node) => node.index === focused.parentIndex);
-  assert(frame, "The source input's visible frame must be present in the native hierarchy");
-  assert(
-    frame.rect.height > focused.rect.height,
-    "Measure the surrounding frame, including padding",
-  );
-  const frameBottom = frame.rect.y + frame.rect.height;
-  const pluginKeyboardTop = pluginMeasurement.keyboard.screenY * pluginMeasurement.scale;
-  console.log(JSON.stringify({ frameBottom, keyboardTop: pluginKeyboardTop, frame: frame.rect }));
-  ad("screenshot", resolve(artifacts, "plugin-source-keyboard.png"));
-  assert(
-    frameBottom <= pluginKeyboardTop + 1,
-    "Plugin source frame must be fully visible above the keyboard (within one physical pixel)",
-  );
-  console.log("PASS: focusing Plugin source reveals the whole field frame above the keyboard");
-} finally {
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  evaluate("delete globalThis.__appearanceKeyboardMeasurement");
-}
@@ -130,13 +130,6 @@ const test = daemonTest.extend<{
        await ws.close({ code: 1008, reason: "Blocked connection to localhost:6767 during e2e." });
      });

-      // Expo's development LogBox toast overlaps bottom actions on compact screens.
-      // Dismiss its UI through the close button; console errors still go into the test log.
-      const dismissDevToast = page
-        .locator("#error-toast")
-        .getByRole("button", { name: "", exact: true });
-      await page.addLocatorHandler(dismissDevToast, () => dismissDevToast.click());
-
      const entries: string[] = [];

      page.on("console", (message) => {
@@ -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"],
@@ -0,0 +1,117 @@
+import { expect, type Page } from "@playwright/test";
+import { gotoAppShell, openSettings } from "./app";
+import { openCompactSettings, openHostSection } from "./settings";
+import { getServerId } from "./server-id";
+
+export async function openConnectedHosts(page: Page) {
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openHostSection(page, getServerId(), "host");
+  await expect(page.getByText("No hosts connected to this daemon", { exact: true })).toBeVisible();
+}
+export async function addConnectedHost(page: Page, connection: string, label: string) {
+  await page.getByRole("button", { name: "Add host", exact: true }).click();
+  await page.getByRole("textbox", { name: "Connection string", exact: true }).fill(connection);
+  await page.getByRole("textbox", { name: "Host name", exact: true }).fill(label);
+  await page.getByRole("textbox", { name: "Metadata", exact: true }).fill('{"team":"infra"}');
+  await saveConnectedHost(page);
+}
+export async function saveConnectedHost(page: Page) {
+  await page.getByRole("button", { name: "Save host", exact: true }).click();
+}
+export async function expectConnectionError(page: Page) {
+  await expect(page.getByText("Invalid host connection.", { exact: false })).toBeVisible();
+  await expect(page.getByRole("textbox", { name: "Connection string", exact: true })).toBeVisible();
+}
+export async function correctConnection(page: Page, value: string) {
+  await page.getByRole("textbox", { name: "Connection string", exact: true }).fill(value);
+  await saveConnectedHost(page);
+}
+export async function inspectConnectedHost(page: Page, label: string) {
+  await expect(
+    page.getByText(/^(connecting|offline|error|online|disabled) · (Enabled|Disabled) · User$/),
+  ).toBeVisible();
+  await page.getByRole("button", { name: `Details for ${label}`, exact: true }).click();
+  await expect(page.getByText("Connected host details", { exact: true })).toBeVisible();
+}
+export async function expectSavedHostDetails(page: Page) {
+  await expect(page.getByText('{"team":"infra"}', { exact: true })).toBeVisible();
+  await expect(page.getByText("Never", { exact: true })).toBeVisible();
+  await expect(
+    page.getByRole("textbox", { name: "Replacement connection", exact: true }),
+  ).toHaveValue("");
+}
+export async function disableConnectedHost(page: Page) {
+  await page.getByRole("button", { name: "Cancel", exact: true }).click();
+  await page.getByRole("button", { name: "Disable", exact: true }).click();
+  await expect(page.getByText(/disabled · Disabled/)).toBeVisible();
+}
+export async function enableConnectedHost(page: Page) {
+  await page.getByRole("button", { name: "Enable", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Disable", exact: true })).toBeVisible();
+}
+export async function removeConnectedHost(page: Page, label: string) {
+  await inspectConnectedHost(page, label);
+  page.once("dialog", (dialog) => dialog.accept());
+  await page.getByRole("button", { name: "Remove host", exact: true }).click();
+  await expect(page.getByText("No hosts connected to this daemon", { exact: true })).toBeVisible();
+}
+
+export async function openCompactConnectedHosts(page: Page) {
+  await gotoAppShell(page);
+  await openCompactSettings(page, new URL(page.url()).pathname);
+  await openHostSection(page, getServerId(), "host");
+  await expect(page.getByText("No hosts connected to this daemon", { exact: true })).toBeVisible();
+}
+
+import { startIsolatedHostDaemon, type IsolatedHostDaemon } from "./isolated-host-daemon";
+import { addDirectHostFromSettings, selectSettingsHost } from "./settings";
+
+export async function openRestartableConnectedHosts(page: Page): Promise<IsolatedHostDaemon> {
+  const host = await startIsolatedHostDaemon("srv_connected_host_draft");
+  await gotoAppShell(page);
+  await openSettings(page);
+  await addDirectHostFromSettings(page, { host: "127.0.0.1", port: host.port });
+  await selectSettingsHost(page, host.serverId);
+  await openHostSection(page, host.serverId, "host");
+  await expect(page.getByText("No hosts connected to this daemon", { exact: true })).toBeVisible();
+  return host;
+}
+export async function beginConnectedHostDraft(page: Page) {
+  await page.getByRole("button", { name: "Add host", exact: true }).click();
+  await page.getByRole("textbox", { name: "Host name", exact: true }).fill("Retained draft");
+  await page
+    .getByRole("textbox", { name: "Connection string", exact: true })
+    .fill("tcp://127.0.0.1:1?password=draft-secret");
+}
+export async function reconnectManagingHost(host: IsolatedHostDaemon) {
+  await host.restart();
+}
+export async function expectConnectedHostDraftRetained(page: Page) {
+  await expect(page.getByRole("textbox", { name: "Host name", exact: true })).toHaveValue(
+    "Retained draft",
+    { timeout: 30000 },
+  );
+  await expect(page.getByRole("textbox", { name: "Connection string", exact: true })).toHaveValue(
+    "tcp://127.0.0.1:1?password=draft-secret",
+  );
+}
+
+export async function editConnectedHost(page: Page) {
+  await page.getByRole("switch", { name: "Replace destination identity", exact: true }).click();
+  await saveConnectedHost(page);
+  await expect(
+    page.getByText("Identity replacement requires a replacement connection", { exact: true }),
+  ).toBeVisible();
+  await page
+    .getByRole("textbox", { name: "Replacement connection", exact: true })
+    .fill("tcp://127.0.0.1:1?password=replacement-secret");
+  await page.getByRole("textbox", { name: "Host name", exact: true }).fill("Renamed box");
+  await page.getByRole("textbox", { name: "Metadata", exact: true }).fill('{"team":"tools"}');
+  await saveConnectedHost(page);
+  await inspectConnectedHost(page, "Renamed box");
+  await expect(page.getByText('{"team":"tools"}', { exact: true })).toBeVisible();
+  await expect(
+    page.getByRole("textbox", { name: "Replacement connection", exact: true }),
+  ).toHaveValue("");
+}
@@ -24,7 +24,6 @@ interface E2EDaemonClientConfig {
  clientType: "cli";
  appVersion?: string;
  webSocketFactory?: NodeWebSocketFactory;
-  capabilities?: Record<string, unknown>;
 }

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

 /**
@@ -53,7 +51,6 @@ export async function connectDaemonClient<ClientInstance extends { connect(): Pr
    clientType: "cli",
    appVersion: options.appVersion ?? loadAppVersion(),
    webSocketFactory: createNodeWebSocketFactory(),
-    capabilities: options.capabilities,
  });
  await client.connect();
  return client;
@@ -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 });
 }
@@ -35,8 +35,6 @@ export type { WorkspaceSetupDaemonClient };
 export async function connectWorkspaceSetupClient(): Promise<WorkspaceSetupDaemonClient> {
  const client = await connectDaemonClient<WorkspaceSetupDaemonClient>({
    clientIdPrefix: "workspace-setup",
-    // COMPAT(workspaceSetupObservation): legacy streaming coverage; remove after 2027-04-19.
-    capabilities: { workspace_setup_observation: false },
  });
  // Establish demand before a caller can launch setup. Client close releases it.
  try {
@@ -328,51 +326,3 @@ export async function waitForWorkspaceSetupProgress(
    });
  });
 }
-
-/** Observe the browser's actual setup membership without requesting any output. */
-export function observeSetupPanelTraffic(page: Page) {
-  const subscriptions: Array<{ workspaceId: string; subscriptionId: string }> = [];
-  const releases = new Set<string>();
-  const requests: string[] = [];
-  let legacySetupDemand = false;
-  const outputWorkspaces: string[] = [];
-  page.on("websocket", (socket) => {
-    socket.on("framesent", ({ payload }) => {
-      const frame = JSON.parse(String(payload));
-      if (frame.type !== "session") return;
-      if (frame.message?.type === "subscription.release.request")
-        releases.add(frame.message.subscriptionId);
-      if (frame.message?.type === "workspace.setup.subscribe.request")
-        requests.push(frame.message.workspaceId);
-      if (
-        frame.message?.type === "session.events.set_subscription.request" &&
-        frame.message.events.includes("workspace_setup_progress")
-      )
-        legacySetupDemand = true;
-    });
-    socket.on("framereceived", ({ payload }) => {
-      const frame = JSON.parse(String(payload));
-      if (frame.type !== "session") return;
-      if (frame.message?.type === "workspace.setup.subscribe.response")
-        subscriptions.push(frame.message.payload);
-      if (frame.message?.type === "workspace_setup_progress")
-        outputWorkspaces.push(frame.message.payload.workspaceId);
-    });
-  });
-  return {
-    async expectNoDemand() {
-      expect(requests).toEqual([]);
-      expect(legacySetupDemand).toBe(false);
-      expect(subscriptions).toEqual([]);
-      expect(outputWorkspaces).toEqual([]);
-    },
-    async expectSubscribed(workspaceId: string, count: number) {
-      await expect.poll(() => subscriptions.length).toBe(count);
-      expect(subscriptions[count - 1].workspaceId).toBe(workspaceId);
-      expect(requests).toEqual(Array(count).fill(workspaceId));
-    },
-    async expectReleased(index: number) {
-      await expect.poll(() => releases.has(subscriptions[index].subscriptionId)).toBe(true);
-    },
-  };
-}
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -58,11 +58,11 @@
    "@marijn/find-cluster-break": "^1.0.2",
    "@mattermost/react-native-paste-input": "2.0.1",
    "@react-native-async-storage/async-storage": "2.2.0",
-    "@react-native-masked-view/masked-view": "0.3.2",
-    "@react-native/normalize-colors": "0.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",
@@ -75,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",
@@ -111,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",
@@ -151,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",
@@ -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;
@@ -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);
  });
 });
@@ -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";
@@ -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",
      });
    });
@@ -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>
  );
 }
@@ -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} />
@@ -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";
@@ -33,7 +33,7 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
  },
  overlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    justifyContent: "center",
    alignItems: "center",
  },
@@ -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,
@@ -1,4 +1,4 @@
-import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
+import type { GitAction, GitActions } from "@/git/policy";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import type {
  WorkspacePanelPlacement,
@@ -581,7 +581,9 @@ export function buildWorkspaceCommandCenterContributions(
    ...(source.capabilities.canSplitPanes ? buildPaneContributions(source) : []),
  ];

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

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

 const SCROLL_CONTENT_GROW = { flexGrow: 1 };
-const ABSOLUTE_FILL_STYLE = { ...StyleSheet.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",
@@ -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: {
@@ -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);
+  });
 });
@@ -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,
+    });
+  });
+});
@@ -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),
+  };
+}
@@ -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;
@@ -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,
+  },
+}));
@@ -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);
-});
@@ -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: {
@@ -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);
  });
 });
@@ -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
@@ -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,
  },
@@ -1,15 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { builtinFilePanels, isRenderedMarkdownFile } from "./catalog";
-import { resolveFilePanel } from "./resolve";
-
-function filePreviewRenderKind(path: string) {
-  const { panel } = resolveFilePanel({
-    file: { path, kind: "text", size: 100, hasBytes: false },
-    candidates: builtinFilePanels,
-    associations: {},
-  });
-  return panel ? panel.id.slice("builtin:".length) : null;
-}
+import { filePreviewRenderKind, isRenderedMarkdownFile } from "@/components/file-pane-render-mode";

 describe("isRenderedMarkdownFile", () => {
  it("detects .md files", () => {
@@ -48,39 +38,3 @@ describe("filePreviewRenderKind", () => {
    expect(filePreviewRenderKind("index.html.erb")).toBe(null);
  });
 });
-
-describe("built-in file panels", () => {
-  it.each(["png", "jpg", "jpeg", "gif", "webp", "svg"])(
-    "registers the image extension %s",
-    (extension) => {
-      const resolution = resolveFilePanel({
-        file: {
-          path: `/capture.${extension.toUpperCase()}`,
-          kind: "image",
-          size: 512,
-          hasBytes: true,
-        },
-        candidates: builtinFilePanels,
-        associations: { [`ext:${extension}`]: "builtin:markdown" },
-      });
-      expect(resolution.panel?.id).toBe("builtin:image");
-      expect(
-        resolveFilePanel({
-          file: { path: "capture.png", kind: "binary", size: 512, hasBytes: false },
-          candidates: builtinFilePanels,
-          associations: {},
-        }).panel,
-      ).toBeNull();
-    },
-  );
-
-  it("does not impose a new preview size limit on built-in text panels", () => {
-    expect(
-      resolveFilePanel({
-        file: { path: "notes.md", kind: "text", size: 11 * 1024 * 1024, hasBytes: false },
-        candidates: builtinFilePanels,
-        associations: {},
-      }).panel?.id,
-    ).toBe("builtin:markdown");
-  });
-});
@@ -0,0 +1,17 @@
+export type FilePreviewRenderKind = "markdown" | "html";
+
+export function isRenderedMarkdownFile(filePath: string): boolean {
+  const normalizedPath = filePath.trim().toLowerCase();
+  return normalizedPath.endsWith(".md") || normalizedPath.endsWith(".markdown");
+}
+
+function isRenderedHtmlFile(filePath: string): boolean {
+  const normalizedPath = filePath.trim().toLowerCase();
+  return normalizedPath.endsWith(".html") || normalizedPath.endsWith(".htm");
+}
+
+export function filePreviewRenderKind(filePath: string): FilePreviewRenderKind | null {
+  if (isRenderedMarkdownFile(filePath)) return "markdown";
+  if (isRenderedHtmlFile(filePath)) return "html";
+  return null;
+}
@@ -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 (
@@ -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,
@@ -1,14 +1,10 @@
 import { useMemo, type ReactNode } from "react";
-import { Platform, ScrollView, Text, View } from "react-native";
-import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
+import { ScrollView, Text, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet } from "react-native-unistyles";
 import { BackHeader } from "@/components/headers/back-header";
 import { MenuHeader } from "@/components/headers/menu-header";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { SPACING } from "@/styles/theme";
-
-const PageScrollView = Platform.OS === "android" ? KeyboardAwareScrollView : ScrollView;

 interface PageLayoutProps {
  title?: string;
@@ -46,13 +42,7 @@ export function PageLayout({
      ) : (
        <MenuHeader borderless />
      )}
-      <PageScrollView
-        // Leave room for field borders and padding around the focused native input.
-        {...(Platform.OS === "android" ? { bottomOffset: SPACING[4] } : {})}
-        style={styles.scroll}
-        contentContainerStyle={scrollContentStyle}
-        testID={testID}
-      >
+      <ScrollView style={styles.scroll} contentContainerStyle={scrollContentStyle} testID={testID}>
        <View style={styles.content}>
          {showTitle ? (
            <View style={styles.titleRow} testID={titleTestID}>
@@ -64,7 +54,7 @@ export function PageLayout({
          ) : null}
          {children}
        </View>
-      </PageScrollView>
+      </ScrollView>
    </View>
  );
 }
@@ -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",
@@ -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,
+  },
 }));
@@ -147,7 +147,7 @@ function getPreviewFrameStyle(position: SplitDropZonePosition) {

 const styles = StyleSheet.create((theme) => ({
  overlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    zIndex: 40,
  },
  previewOverlay: {
@@ -1171,7 +1171,7 @@ const styles = StyleSheet.create((theme) => ({
    minHeight: 0,
  },
  attachOverlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    alignItems: "center",
    justifyContent: "center",
    backgroundColor: "rgba(0, 0, 0, 0.16)",
@@ -1765,7 +1765,7 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
  },
  desktopOverlayWeb: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    pointerEvents: "auto" as const,
  },
  desktopBackdrop: {
@@ -81,6 +81,6 @@ export function FloatingPanelPortalHost({

 const styles = StyleSheet.create({
  host: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
  },
 });
@@ -86,6 +86,6 @@ const styles = StyleSheet.create({
    minHeight: 0,
  },
  host: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
  },
 });
@@ -527,7 +527,7 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
  },
  overlayWeb: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    pointerEvents: "auto" as const,
  },
  backdrop: {
@@ -66,9 +66,9 @@ export const PressHighlight = forwardRef<View, PressHighlightProps>(function Pre

 const styles = StyleSheet.create({
  highlight: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
  },
  highlightFill: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
  },
 });
@@ -68,7 +68,7 @@ const styles = StyleSheet.create((theme) => ({
    borderWidth: 0,
  },
  badgeBackground: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    borderRadius: theme.borderRadius.md,
    backgroundColor: theme.colors.surface3,
    opacity: theme.opacity[50],
@@ -1,12 +0,0 @@
-import { createContext, useContext } from "react";
-import type { TabDropPreview } from "./split-container-tab-drop-preview";
-import type { SplitDropZoneHover } from "./split-drop-zone";
-export const WorkspaceTabDragContext = createContext<{
-  activeDragTabId: string | null;
-  dropPreview: SplitDropZoneHover | null;
-  tabDropPreview: TabDropPreview | null;
-  externalDndContext: boolean;
-}>({ activeDragTabId: null, dropPreview: null, tabDropPreview: null, externalDndContext: false });
-export function useWorkspaceTabDrag() {
-  return useContext(WorkspaceTabDragContext);
-}
@@ -1,9 +0,0 @@
-export function acceptsWorkspaceTabDrop(
-  allowCrossPane: boolean,
-  sourcePaneId: string,
-  destination: { kind: "workspace-tab" | "split-pane-drop"; paneId: string },
-): boolean {
-  return (
-    allowCrossPane || (destination.kind === "workspace-tab" && sourcePaneId === destination.paneId)
-  );
-}
@@ -1,5 +0,0 @@
-import type { ComponentProps } from "react";
-import type { WorkspaceTabDragScope as WebScope } from "./workspace-tab-drag-scope.web";
-export function WorkspaceTabDragScope({ children }: ComponentProps<typeof WebScope>) {
-  return children;
-}
@@ -1,494 +0,0 @@
-import { useCallback, useMemo, useState, type ReactNode } from "react";
-import { View, Text } from "react-native";
-import { useTranslation } from "react-i18next";
-import { StyleSheet } from "react-native-unistyles";
-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 { computeTabDropPreview, type TabDropPreview } from "./split-container-tab-drop-preview";
-import { resolveSplitDropPosition, type SplitDropZoneHover } from "./split-drop-zone";
-import { getWorkspacePaneDescriptors } from "@/screens/workspace/workspace-pane-state";
-import {
-  WorkspaceTabPresentationResolver,
-  WorkspaceTabIcon,
-} from "@/screens/workspace/workspace-tab-presentation";
-import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
-import {
-  collectAllPanes,
-  createWorkspaceLayoutWithExplorerSidebar,
-  type WorkspaceLayout,
-  type SplitPane,
-} from "@/stores/workspace-layout-store";
-import type { WorkspaceTab } from "@/workspace-tabs/model";
-import { panelTargetSupportsHost } from "@/plugins/workspace-panels/locations";
-import { acceptsWorkspaceTabDrop } from "./workspace-tab-drag-policy";
-import { WorkspaceTabDragContext } from "./workspace-tab-drag-context";
-interface WorkspaceTabDragData {
-  kind: "workspace-tab";
-  paneId: string;
-  tabId: string;
-}
-
-interface SplitPaneDropData {
-  kind: "split-pane-drop";
-  paneId: string;
-}
-
-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 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);
-};
-
-const EMPTY_LAYOUT = createWorkspaceLayoutWithExplorerSidebar();
-
-interface WorkspaceTabDragScopeProps {
-  children: ReactNode;
-  layout: WorkspaceLayout | null;
-  explorerSidebarPaneId: string | null;
-  allowCrossPane: boolean;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  uiTabs: WorkspaceTab[];
-  onMoveTabToPane: (tabId: string, paneId: string) => void;
-  onReorderTabsInPane: (paneId: string, tabIds: string[]) => void;
-  onSplitPane: (input: {
-    tabId: string;
-    targetPaneId: string;
-    position: "left" | "right" | "top" | "bottom";
-  }) => void;
-}
-export function WorkspaceTabDragScope({
-  children,
-  layout,
-  explorerSidebarPaneId,
-  allowCrossPane,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  uiTabs,
-  onMoveTabToPane,
-  onReorderTabsInPane,
-  onSplitPane,
-}: WorkspaceTabDragScopeProps) {
-  const [activeDragTabId, setActiveDragTabId] = useState<string | null>(null);
-  const [dropPreview, setDropPreview] = useState<SplitDropZoneHover | null>(null);
-  const [tabDropPreview, setTabDropPreview] = useState<TabDropPreview | null>(null);
-  const sensors = useSensors(
-    useSensor(PointerSensor, {
-      activationConstraint: {
-        distance: 8,
-      },
-    }),
-    useSensor(KeyboardSensor, {
-      coordinateGetter: sortableKeyboardCoordinates,
-    }),
-  );
-
-  const panesById = useMemo(
-    () => new Map(collectAllPanes((layout ?? EMPTY_LAYOUT).root).map((pane) => [pane.id, pane])),
-    [layout],
-  );
-  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 ||
-        !overData ||
-        !acceptsWorkspaceTabDrop(allowCrossPane, activeData.paneId, overData)
-      ) {
-        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 }));
-    },
-    [allowCrossPane, 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 &&
-        overData &&
-        event.over &&
-        acceptsWorkspaceTabDrop(allowCrossPane, activeData.paneId, overData)
-      ) {
-        if (overData?.kind === "workspace-tab") {
-          applyTabDropEnd({ activeData, overData });
-        } else if (overData?.kind === "split-pane-drop") {
-          applyPaneDropEnd({ activeData, overData });
-        }
-      }
-
-      setDropPreview(null);
-      setTabDropPreview(null);
-    },
-    [allowCrossPane, applyTabDropEnd, applyPaneDropEnd],
-  );
-
-  const context = useMemo(
-    () => ({ activeDragTabId, dropPreview, tabDropPreview, externalDndContext: true }),
-    [activeDragTabId, dropPreview, tabDropPreview],
-  );
-  return (
-    <DndContext
-      sensors={sensors}
-      collisionDetection={dropCollisionDetection}
-      onDragStart={handleDragStart}
-      onDragMove={updateDropPreview}
-      onDragOver={updateDropPreview}
-      onDragCancel={handleDragCancel}
-      onDragEnd={handleDragEnd}
-    >
-      <WorkspaceTabDragContext value={context}>{children}</WorkspaceTabDragContext>
-      <DragOverlay dropAnimation={null}>
-        {activeDragTabId ? (
-          <DragOverlayTabChip
-            tabId={activeDragTabId}
-            uiTabs={uiTabs}
-            normalizedServerId={normalizedServerId}
-            normalizedWorkspaceId={normalizedWorkspaceId}
-          />
-        ) : null}
-      </DragOverlay>
-    </DndContext>
-  );
-}
-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();
-  return (
-    <WorkspaceTabPresentationResolver
-      tab={tab}
-      serverId={normalizedServerId}
-      workspaceId={normalizedWorkspaceId}
-    >
-      {(presentation) => {
-        const label =
-          presentation.titleState === "loading" ? t("common.states.loading") : presentation.label;
-
-        return (
-          <View style={styles.dragOverlayChip}>
-            <WorkspaceTabIcon presentation={presentation} active size={14} backdrop="surface1" />
-            <Text numberOfLines={1} style={styles.dragOverlayLabel}>
-              {label}
-            </Text>
-          </View>
-        );
-      }}
-    </WorkspaceTabPresentationResolver>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  dragOverlayChip: {
-    backgroundColor: theme.colors.surface1,
-    borderColor: theme.colors.borderAccent,
-    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: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    flexShrink: 1,
-  },
-}));
@@ -415,10 +415,11 @@ export function WorkspaceDraftAgentTab({
      openWorkspaceChanges({
        isCompact: isCompactFormFactor,
        workspaceKey: buildWorkspaceTabPersistenceKey({ serverId, workspaceId: workspaceId ?? "" }),
+        checkout: { serverId, cwd: composerState.workingDir, isGit: true },
        preferences: openInSidePane,
      });
    },
-    [isCompactFormFactor, openInSidePane, serverId, workspaceId],
+    [composerState.workingDir, isCompactFormFactor, openInSidePane, serverId, workspaceId],
  );

  const {
@@ -0,0 +1,315 @@
+import { useCallback, useEffect, useState, useSyncExternalStore } from "react";
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { createPaseoApi, type HostSummary, type HostDirectory } from "@getpaseo/client";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import {
+  SettingsCard,
+  SettingsRow,
+  SettingsInput,
+  SettingsSwitch,
+  SettingsSection,
+} from "@/components/settings";
+import { Button } from "@/components/ui/button";
+import { Field, FormTextInput } from "@/components/ui/form-field";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { settingsStyles } from "@/styles/settings";
+import { confirmDialog } from "@/utils/confirm-dialog";
+import { ConnectedHostsModel, type Editor } from "./model";
+
+export function ConnectedHostsSection({ serverId }: { serverId: string }) {
+  const client = useHostRuntimeClient(serverId);
+  const connected = useHostRuntimeIsConnected(serverId);
+  return (
+    <SettingsSection title="Hosts connected to this daemon">
+      {client ? (
+        <ConnectedHosts key={serverId} client={client} connected={connected} />
+      ) : (
+        <SettingsCard>
+          <SettingsRow label="Connect to this daemon to manage its hosts" />
+        </SettingsCard>
+      )}
+    </SettingsSection>
+  );
+}
+function useModel(client: DaemonClient, connected: boolean) {
+  const [model] = useState(() => new ConnectedHostsModel(createPaseoApi(client)));
+  useEffect(() => {
+    model.setConnected(connected);
+  }, [model, connected]);
+  useEffect(() => model.close, [model]);
+  return model;
+}
+function ConnectedHosts({ client, connected }: { client: DaemonClient; connected: boolean }) {
+  const model = useModel(client, connected);
+  const state = useSyncExternalStore(model.subscribe, model.getState, model.getState);
+  const info = client.getLastServerInfoMessage();
+  const canManage = info?.permissions?.includes("tunnel.manage") === true;
+  const directory = state.load.status === "loaded" ? state.load.directory : null;
+  const editor = state.editor;
+  return (
+    <View style={styles.section}>
+      {state.load.status === "loading" ? (
+        <SettingsCard>
+          <SettingsRow label="Loading connected hosts…" />
+        </SettingsCard>
+      ) : null}
+      {state.load.status === "error" ? (
+        <SettingsCard>
+          <SettingsRow label="Could not load connected hosts" error={state.load.error}>
+            <Button variant="outline" size="sm" onPress={model.start}>
+              Retry
+            </Button>
+          </SettingsRow>
+        </SettingsCard>
+      ) : null}
+      {directory ? (
+        <HostList
+          directory={directory}
+          model={model}
+          canManage={canManage}
+          pending={state.pending !== null}
+        />
+      ) : null}
+      {directory && canManage && !editor ? (
+        <Button variant="outline" size="sm" disabled={state.pending !== null} onPress={model.add}>
+          Add host
+        </Button>
+      ) : null}
+      {editor ? (
+        <HostEditor
+          key={editor.key}
+          editor={editor}
+          directory={directory}
+          model={model}
+          canManage={canManage}
+          manageSources={info?.permissions?.includes("access.manage") === true}
+          sourceId={info?.sourceId}
+          pending={state.pending !== null}
+        />
+      ) : null}
+      {state.error ? (
+        <SettingsCard>
+          <SettingsRow label="Host change failed" error={state.error}>
+            <Button variant="ghost" size="sm" onPress={model.dismissError}>
+              Dismiss
+            </Button>
+          </SettingsRow>
+        </SettingsCard>
+      ) : null}
+      {state.pending ? (
+        <Text accessibilityLiveRegion="polite" style={settingsStyles.rowHint}>
+          Saving host change…
+        </Text>
+      ) : null}
+    </View>
+  );
+}
+function HostList({
+  directory,
+  model,
+  canManage,
+  pending,
+}: {
+  directory: HostDirectory;
+  model: ConnectedHostsModel;
+  canManage: boolean;
+  pending: boolean;
+}) {
+  return (
+    <SettingsCard>
+      {directory.hosts.length === 0 ? (
+        <SettingsRow label="No hosts connected to this daemon" />
+      ) : (
+        directory.hosts.map((host) => (
+          <HostRow
+            key={host.registrationId}
+            host={host}
+            model={model}
+            canManage={canManage}
+            pending={pending}
+          />
+        ))
+      )}
+    </SettingsCard>
+  );
+}
+function HostRow({
+  host,
+  model,
+  canManage,
+  pending,
+}: {
+  host: HostSummary;
+  model: ConnectedHostsModel;
+  canManage: boolean;
+  pending: boolean;
+}) {
+  const edit = useCallback(() => model.edit(host), [host, model]);
+  const toggle = useCallback(() => void model.setEnabled(host), [host, model]);
+  return (
+    <SettingsRow
+      label={host.label ?? host.serverId ?? host.registrationId}
+      hint={`${host.status} · ${host.enabled ? "Enabled" : "Disabled"} · ${sourceLabel(host.source.id)}`}
+    >
+      <View style={styles.actions}>
+        <Button
+          variant="outline"
+          size="sm"
+          disabled={pending}
+          onPress={edit}
+          accessibilityLabel={`Details for ${host.label ?? host.registrationId}`}
+        >
+          Details
+        </Button>
+        {canManage ? (
+          <Button variant="outline" size="sm" disabled={pending} onPress={toggle}>
+            {host.enabled ? "Disable" : "Enable"}
+          </Button>
+        ) : null}
+      </View>
+    </SettingsRow>
+  );
+}
+function HostDetails({ host }: { host: HostSummary }) {
+  return (
+    <SettingsCard>
+      <SettingsRow label="Registration" hint={host.registrationId} />
+      <SettingsRow label="Server ID" hint={host.serverId ?? "Not discovered"} />
+      <SettingsRow label="Connection" hint={host.targetDescription} />
+      <SettingsRow label="Metadata" hint={JSON.stringify(host.metadata)} />
+      <SettingsRow label="Status" hint={host.status} />
+      <SettingsRow label="Source" hint={sourceLabel(host.source.id)} />
+      <SettingsRow label="Source identity" hint={host.source.id} />
+      <SettingsRow label="Source key" hint={host.source.key} />
+      <SettingsRow label="Last online" hint={host.lastOnlineAt ?? "Never"} />
+      <SettingsRow label="Next retry" hint={host.nextRetryAt ?? "None scheduled"} />
+      {host.error ? <SettingsRow label={host.error.code} error={host.error.message} /> : null}
+    </SettingsCard>
+  );
+}
+function HostEditor({
+  editor,
+  directory,
+  model,
+  canManage,
+  manageSources,
+  sourceId,
+  pending,
+}: {
+  editor: Editor;
+  directory: HostDirectory | null;
+  model: ConnectedHostsModel;
+  canManage: boolean;
+  manageSources: boolean;
+  sourceId: string | undefined;
+  pending: boolean;
+}) {
+  const compact = useIsCompactFormFactor();
+  const detail =
+    directory?.hosts.find((host) => host.registrationId === editor.host?.registrationId) ??
+    editor.host;
+  const editSource = !detail || manageSources || detail.source.id === sourceId;
+  const remove = useCallback(async () => {
+    if (!detail) return;
+    const confirmed = await confirmDialog({
+      title: "Remove connected host?",
+      message:
+        detail.source.id === "owner"
+          ? "This removes the saved connection. The host's agents and workspaces keep running."
+          : `Managed by ${detail.source.id}. Its source can add it again. Disable the host to keep access off.`,
+      confirmLabel: "Remove",
+      destructive: true,
+    });
+    if (confirmed) await model.remove(detail);
+  }, [detail, model]);
+  return (
+    <View style={styles.section}>
+      <Text style={settingsStyles.rowTitle}>{detail ? "Connected host details" : "Add host"}</Text>
+      {detail ? <HostDetails host={detail} /> : null}
+      {canManage ? (
+        <SettingsCard>
+          <SettingsInput
+            label="Host name"
+            initialValue={editor.label}
+            onChangeText={model.setLabel}
+            disabled={pending}
+          />
+          {editSource ? (
+            <SettingsInput
+              label={detail ? "Replacement connection" : "Connection string"}
+              initialValue={editor.connection}
+              onChangeText={model.setConnection}
+              secureTextEntry
+              disabled={pending}
+            />
+          ) : null}
+          {detail && editSource ? (
+            <SettingsSwitch
+              label="Replace destination identity"
+              value={editor.replaceIdentity}
+              onValueChange={model.setReplaceIdentity}
+              disabled={pending}
+            />
+          ) : null}
+        </SettingsCard>
+      ) : null}
+      {canManage && editSource ? (
+        <Field label="Metadata">
+          <FormTextInput
+            accessibilityLabel="Metadata"
+            initialValue={editor.metadata}
+            onChangeText={model.setMetadata}
+            multiline
+            editable={!pending}
+            size={compact ? "md" : "sm"}
+          />
+        </Field>
+      ) : null}
+      <View style={styles.actions}>
+        {canManage ? (
+          <Button
+            variant="default"
+            size="sm"
+            loading={pending}
+            disabled={pending}
+            onPress={model.save}
+          >
+            Save host
+          </Button>
+        ) : null}
+        <Button variant="ghost" size="sm" disabled={pending} onPress={model.cancel}>
+          Cancel
+        </Button>
+        {canManage && detail && editSource ? (
+          <Button variant="outline" size="sm" disabled={pending} onPress={remove}>
+            Remove host
+          </Button>
+        ) : null}
+      </View>
+    </View>
+  );
+}
+const styles = StyleSheet.create((theme) => ({
+  section: { gap: theme.spacing[3] },
+  actions: { flexDirection: "row", flexWrap: "wrap", gap: theme.spacing[2] },
+}));
+
+function sourceLabel(sourceId: string): string {
+  if (sourceId === "owner") return "User";
+  if (sourceId.startsWith("plugin:")) return `Plugin: ${sourceId.slice("plugin:".length)}`;
+  if (sourceId.startsWith("route:")) {
+    const components = sourceId.split(":");
+    let producer: string;
+    try {
+      producer = decodeURIComponent(components[3] ?? "");
+    } catch {
+      return "User (via host)";
+    }
+    return producer.startsWith("plugin:")
+      ? `Plugin: ${producer.slice("plugin:".length)} (via host)`
+      : "User (via host)";
+  }
+  return "User";
+}
@@ -0,0 +1,192 @@
+import type {
+  PaseoApi,
+  HostSummary,
+  HostUpdate,
+  HostDirectory,
+  OwnedSubscription,
+} from "@getpaseo/client";
+
+export interface Editor {
+  key: number;
+  host: HostSummary | null;
+  connection: string;
+  label: string;
+  metadata: string;
+  replaceIdentity: boolean;
+}
+type Load =
+  | { status: "loading" }
+  | { status: "error"; error: string }
+  | { status: "loaded"; directory: HostDirectory };
+interface State {
+  load: Load;
+  editor: Editor | null;
+  pending: string | null;
+  error: string | null;
+}
+
+/** Owns fetch/observation, form sequencing and mutation state outside React. */
+export class ConnectedHostsModel {
+  private state: State = { load: { status: "loading" }, editor: null, pending: null, error: null };
+  private readonly listeners = new Set<() => void>();
+  private observation?: OwnedSubscription<HostDirectory>;
+  private generation = 0;
+  private editorKey = 0;
+  private connected = false;
+  setConnected = (connected: boolean) => {
+    this.connected = connected;
+    if (connected && !this.observation) this.start();
+    else if (!connected)
+      this.publish({
+        load: {
+          status: "error",
+          error:
+            "Connection to this daemon was lost. Reconnect to continue; your edits are retained.",
+        },
+      });
+  };
+  constructor(private readonly api: PaseoApi) {}
+  getState = () => this.state;
+  subscribe = (listener: () => void) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+  private publish(patch: Partial<State>) {
+    this.state = { ...this.state, ...patch };
+    for (const listener of this.listeners) listener();
+  }
+  start = () => {
+    if (!this.connected) {
+      this.publish({
+        load: { status: "error", error: "Connect to this daemon to load its hosts." },
+      });
+      return;
+    }
+    const generation = ++this.generation;
+    void this.observation?.release();
+    this.publish({ load: { status: "loading" } });
+    try {
+      const observation = this.api.hosts.observe();
+      this.observation = observation;
+      observation.subscribe({
+        snapshot: (directory) => {
+          if (generation === this.generation)
+            this.publish({ load: { status: "loaded", directory } });
+        },
+        update: (message) => {
+          if (generation === this.generation && message.type === "hosts.changed")
+            this.publish({ load: { status: "loaded", directory: message.payload.directory } });
+        },
+        error: (error) => {
+          if (generation === this.generation)
+            this.publish({ load: { status: "error", error: describe(error) } });
+        },
+      });
+      void observation.ready.catch((error) => {
+        if (generation === this.generation)
+          this.publish({ load: { status: "error", error: describe(error) } });
+      });
+    } catch (error) {
+      this.publish({ load: { status: "error", error: describe(error) } });
+    }
+  };
+  close = () => {
+    this.generation++;
+    void this.observation?.release();
+    void this.api.dispose();
+    this.listeners.clear();
+  };
+  edit = (host: HostSummary | null) => {
+    if (this.state.pending) return;
+    this.publish({
+      error: null,
+      editor: {
+        key: ++this.editorKey,
+        host,
+        connection: "",
+        label: host?.label ?? "",
+        metadata: JSON.stringify(host?.metadata ?? {}, null, 2),
+        replaceIdentity: false,
+      },
+    });
+  };
+  add = () => this.edit(null);
+  setLabel = (label: string) => this.set({ label });
+  setConnection = (connection: string) => this.set({ connection });
+  setMetadata = (metadata: string) => this.set({ metadata });
+  setReplaceIdentity = (replaceIdentity: boolean) => this.set({ replaceIdentity });
+  set = (patch: Partial<Omit<Editor, "host" | "key">>) => {
+    if (this.state.editor) this.publish({ editor: { ...this.state.editor, ...patch } });
+  };
+  cancel = () => {
+    if (!this.state.pending) this.publish({ editor: null, error: null });
+  };
+  dismissError = () => this.publish({ error: null });
+  private async mutate(id: string, operation: () => Promise<unknown>): Promise<void> {
+    if (this.state.pending) return;
+    this.publish({ pending: id, error: null });
+    try {
+      await operation();
+      this.publish({
+        load: { status: "loaded", directory: await this.api.hosts.list() },
+        editor: null,
+      });
+    } catch (error) {
+      this.publish({ error: describe(error) });
+    } finally {
+      this.publish({ pending: null });
+    }
+  }
+  save = () =>
+    this.mutate("save", async () => {
+      const editor = this.state.editor;
+      if (!editor) return;
+      let metadata: Record<string, string>;
+      try {
+        const value: unknown = JSON.parse(editor.metadata);
+        if (
+          !value ||
+          typeof value !== "object" ||
+          Array.isArray(value) ||
+          Object.values(value).some((entry) => typeof entry !== "string")
+        )
+          throw new Error("invalid");
+        metadata = value as Record<string, string>;
+      } catch {
+        throw new Error("Metadata must be a JSON object with string values.");
+      }
+      if (editor.host) {
+        const patch: HostUpdate = {
+          label: editor.label.trim() || null,
+          replaceIdentity: editor.replaceIdentity,
+        };
+        if (JSON.stringify(metadata) !== JSON.stringify(editor.host.metadata))
+          patch.metadata = metadata;
+        if (editor.connection.trim()) {
+          patch.connection = editor.connection.trim();
+        }
+        await this.api.hosts.update(editor.host.registrationId, patch);
+      } else
+        await this.api.hosts.add({
+          connection: editor.connection.trim(),
+          label: editor.label.trim() || undefined,
+          metadata,
+        });
+    });
+  setEnabled = (host: HostSummary) =>
+    this.mutate(host.registrationId, () =>
+      this.api.hosts.update(host.registrationId, { enabled: !host.enabled }),
+    );
+  remove = (host: HostSummary) =>
+    this.mutate(host.registrationId, () => this.api.hosts.remove(host.registrationId));
+}
+function describe(error: unknown): string {
+  if (
+    error &&
+    typeof error === "object" &&
+    "userMessage" in error &&
+    typeof error.userMessage === "string"
+  )
+    return error.userMessage;
+  return error instanceof Error ? error.message : "Host operation failed. Retry when connected.";
+}
@@ -33,7 +33,7 @@ export {
  getIsElectronMac as getIsElectronRuntimeMac,
 } from "./platform";

-/** Below 600 points, sidebars overlay the workspace. Medium and wider layouts dock them. */
+/** Compact layouts are the breakpoints below `md`. */
 export function isCompactBreakpoint(breakpoint: string | undefined): boolean {
  return breakpoint === "xs" || breakpoint === "sm";
 }
@@ -36,6 +36,7 @@ import {
  useSessionStore,
  type SessionState,
 } from "@/stores/session-store";
+import { useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import { sendOsNotification } from "@/utils/os-notifications";
 import { getIsAppActivelyVisible, getIsAppVisible } from "@/utils/app-visibility";
 import {
@@ -167,6 +168,11 @@ function resolveAgentAttentionNotification(
  });
 }

+type WorkspaceSetupProgressPayload = Extract<
+  SessionOutboundMessage,
+  { type: "workspace_setup_progress" }
+>["payload"];
+
 function notifyVoiceAbortFailure(
  data: Extract<SessionOutboundMessage, { type: "activity_log" }>["payload"],
  notifyError: (message: string) => void,
@@ -219,6 +225,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
  const setPendingPermissions = useSessionStore((state) => state.setPendingPermissions);
  const updateSessionServerInfo = useSessionStore((state) => state.updateSessionServerInfo);
  const setViewedTimelineSync = useSessionStore((state) => state.setViewedTimelineSync);
+  const upsertWorkspaceSetupProgress = useWorkspaceSetupStore((state) => state.upsertProgress);

  // Track focused agent for heartbeat
  const focusedAgentId = useSessionStore(
@@ -358,6 +365,13 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    }
  }, [flushAgentLastActivity, serverId, isConnected, setInitializingAgents]);

+  const applyWorkspaceSetupProgress = useCallback(
+    (payload: WorkspaceSetupProgressPayload) => {
+      upsertWorkspaceSetupProgress({ serverId, payload });
+    },
+    [serverId, upsertWorkspaceSetupProgress],
+  );
+
  useEffect(() => {
    const setAgentInitializing = createSetAgentInitializing(serverId, setInitializingAgents);
    const onStream = (message: SessionOutboundMessage) => {
@@ -494,6 +508,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
        "agent_permission_resolved",
        "agent.provider_subagents.update",
        "checkout_status_update",
+        "workspace_setup_progress",
        "status.server_info",
      ],
      { notifications: true },
@@ -532,6 +547,11 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      applyCheckoutStatusUpdateFromEvent({ queryClient, serverId, message });
    });

+    const unsubWorkspaceSetupProgress = onFeed("workspace_setup_progress", (message) => {
+      if (message.type !== "workspace_setup_progress") return;
+      applyWorkspaceSetupProgress(message.payload);
+    });
+
    const unsubStatus = onFeed("status", (message) => {
      if (message.type !== "status") return;
      const serverInfo = parseServerInfoStatusPayload(message.payload);
@@ -690,6 +710,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      unsubProviderSubagentUpdate();
      unsubAgentAttention();
      unsubCheckoutStatusUpdate();
+      unsubWorkspaceSetupProgress();
      unsubStatus();
      unsubPermissionRequest();
      unsubPermissionResolved();
@@ -711,6 +732,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    setAgents,
    setPendingPermissions,
    notifyAgentAttention,
+    applyWorkspaceSetupProgress,
    updateSessionServerInfo,
    toast,
    voiceRuntime,
@@ -1,7 +1,7 @@
 import { useCallback, useMemo } 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, useUnistyles } from "react-native-unistyles";
 import { ArrowUpRight, Check, Terminal } from "lucide-react-native";
 import { Button } from "@/components/ui/button";
@@ -4,7 +4,7 @@ import { Annotation, Compartment, EditorState, Transaction } from "@codemirror/s
 import { EditorView } from "@codemirror/view";
 import { getLanguageForFile } from "@getpaseo/highlight";
 import { getCM, vim } from "@replit/codemirror-vim";
-import { isRenderedMarkdownFile } from "@/file-panels";
+import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
 import type { WorkspaceFileLocation } from "@/workspace/file-open";
 import type { FileEditorModel } from "./model";
 import { editorBaseExtensions, editorTheme, type EditorVisualTheme } from "./extensions.web";
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { withPreviewCsp } from "./html-preview-csp";
+import { withPreviewCsp } from "@/file-pane/html-preview-csp";

 describe("withPreviewCsp", () => {
  it("places the policy before the complete source document", () => {
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { htmlPreviewNavigationKind } from "./html-preview-navigation";
+import { htmlPreviewNavigationKind } from "@/file-pane/html-preview-navigation";

 describe("htmlPreviewNavigationKind", () => {
  it("allows the WebView's initial document URLs", () => {
@@ -1,13 +1,20 @@
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import React, { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { ScrollView as RNScrollView, Text, View } from "react-native";
+import { StyleSheet, UnistylesRuntime, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useSessionStore, type ExplorerFile } from "@/stores/session-store";
-import { FilePanelPreview, resolveFilePreviewPanel, type FilePanel } from "@/file-panels";
+import { filePreviewRenderKind } from "@/components/file-pane-render-mode";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
 import { getFileNameFromPath } from "@/attachments/utils";
 import { resolveFilePreviewReadTarget } from "@/file-explorer/preview-target";
@@ -21,6 +28,8 @@ import { useLiveFile } from "./live-file/hook";
 import { useFilePreview } from "./preview-lifecycle/hook";
 import { resolveFilePreviewLifecycle } from "./preview-lifecycle/model";
 import { FilePanelBar } from "./bar";
+import { FileHtmlPreview } from "./html-preview";
+import { FileMarkdownPreview } from "./markdown-preview";
 import { FileEditorModel, getFileConflictCallout, type FileConflictCallout } from "./editor/model";
 import { createFileObservationSource } from "./editor/observation-source";
 import { FileEditorView } from "./editor/view";
@@ -30,25 +39,7 @@ import type { LiveFileModel } from "./live-file/model";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import { usePublishPanelInstanceAttributes } from "@/panels/panel-instance-attributes";
 import type { Theme } from "@/styles/theme";
-
-// CodeMirror and native source rendering consume appearance as props. Subscribe at the
-// rendering leaf so theme updates reconfigure it without replacing the editor/model.
-const sourceAppearance = (theme: Theme) => ({
-  theme: {
-    colorScheme: theme.colorScheme,
-    background: theme.colors.surface0,
-    foreground: theme.colors.foreground,
-    cursor: theme.colors.terminal.cursor,
-    foregroundMuted: theme.colors.foregroundMuted,
-    border: theme.colors.border,
-    selection: theme.colors.terminal.selectionBackground,
-    monoFont: theme.fontFamily.mono,
-    codeFontSize: theme.fontSize.code,
-    syntax: theme.colors.syntax,
-  },
-});
-const ThemedFileEditorView = withUnistyles(FileEditorView, sourceAppearance);
-const ThemedFileSourceView = withUnistyles(FileSourceView, sourceAppearance);
+import { ZoomableImage } from "@/components/zoomable-viewport/image";

 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const foregroundMutedColorMapping = (theme: Theme) => ({
@@ -56,7 +47,6 @@ const foregroundMutedColorMapping = (theme: Theme) => ({
 });

 interface FilePreviewBodyProps {
-  panel: FilePanel | null;
  preview: ExplorerFile | null;
  mode?: "preview" | "source";
  isLoading: boolean;
@@ -100,14 +90,31 @@ function ReadonlySource({
  location: WorkspaceFileLocation;
  navigationRevision: number;
 }) {
+  const theme = UnistylesRuntime.getTheme();
  const { t } = useTranslation();
+  const visualTheme = useMemo(
+    () => ({
+      colorScheme: theme.colorScheme,
+      background: theme.colors.surface0,
+      foreground: theme.colors.foreground,
+      cursor: theme.colors.terminal.cursor,
+      foregroundMuted: theme.colors.foregroundMuted,
+      border: theme.colors.border,
+      selection: theme.colors.terminal.selectionBackground,
+      monoFont: theme.fontFamily.mono,
+      codeFontSize: theme.fontSize.code,
+      syntax: theme.colors.syntax,
+    }),
+    [theme],
+  );
  return (
-    <ThemedFileSourceView
+    <FileSourceView
      content={preview.content ?? ""}
      filename={filename}
      location={location}
      navigationRevision={navigationRevision}
      size={preview.size}
+      theme={visualTheme}
      tooLargeMessage={t("panels.file.tooLargeToDisplay")}
    />
  );
@@ -124,7 +131,6 @@ function TooLargeSource({ size }: { size?: number }) {
 }

 function FilePreviewBody({
-  panel,
  preview,
  mode,
  isLoading,
@@ -138,6 +144,14 @@ function FilePreviewBody({
 }: FilePreviewBodyProps) {
  const { t } = useTranslation();
  const filePath = location.path;
+  // A line target means the caller wants to land on that line, so fall back to
+  // the highlighted source view even for renderable files.
+  const renderKind =
+    preview?.kind === "text" && !location.lineStart && mode !== "source"
+      ? filePreviewRenderKind(filePath)
+      : null;
+
+  const previewScrollRef = useRef<RNScrollView>(null);

  if (isLoading && !preview) {
    return (
@@ -156,21 +170,36 @@ function FilePreviewBody({
    );
  }

-  const showSource = preview.kind === "text" && (Boolean(location.lineStart) || mode === "source");
-  if (panel && !showSource) {
-    return (
-      <FilePanelPreview
-        panel={panel}
-        content={preview.content ?? ""}
-        filePath={filePath}
-        workspaceRoot={workspaceRoot}
-        client={client}
-        serverId={serverId}
-        imagePreviewUri={imagePreviewUri}
-      />
-    );
-  }
  if (preview.kind === "text") {
+    if (renderKind === "html") {
+      // The HTML document owns its own scrolling, so no ScrollView wrapper here.
+      return (
+        <View style={styles.previewScrollContainer}>
+          <FileHtmlPreview html={preview.content ?? ""} testID="file-html-preview" />
+        </View>
+      );
+    }
+
+    if (renderKind === "markdown") {
+      return (
+        <View style={styles.previewScrollContainer}>
+          <RNScrollView
+            ref={previewScrollRef}
+            style={styles.previewContent}
+            showsVerticalScrollIndicator
+          >
+            <FileMarkdownPreview
+              source={preview.content ?? ""}
+              filePath={filePath}
+              workspaceRoot={workspaceRoot}
+              client={client}
+              serverId={serverId}
+            />
+          </RNScrollView>
+        </View>
+      );
+    }
+
    return (
      <ReadonlySource
        preview={preview}
@@ -181,6 +210,19 @@ function FilePreviewBody({
    );
  }

+  if (preview.kind === "image") {
+    if (!imagePreviewUri) {
+      return (
+        <View style={styles.centerState}>
+          <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
+          <Text style={styles.loadingText}>{t("panels.file.loading")}</Text>
+        </View>
+      );
+    }
+
+    return <ZoomableImage uri={imagePreviewUri} testID="image-file-preview" />;
+  }
+
  return (
    <View style={styles.centerState}>
      <Text style={styles.emptyText}>{t("panels.file.binaryPreviewUnavailable")}</Text>
@@ -201,7 +243,6 @@ export function FilePane({
  navigationRevision: number;
 }) {
  const { t } = useTranslation();
-  const { settings } = useAppSettings();
  const isMobile = useIsCompactFormFactor();
  const [previewMode, setPreviewMode] = useState<"preview" | "source">("preview");

@@ -251,12 +292,7 @@ export function FilePane({

  const { file: preview, imageAttachment } = resolveFilePreviewLifecycle(previewLifecycle);
  const imagePreviewUri = useAttachmentPreviewUrl(imageAttachment);
-  const panel = resolveFilePreviewPanel({
-    preview,
-    path: location.path,
-    associations: settings.filePanelAssociations,
-  });
-  const isRenderable = preview?.kind === "text" && panel !== null;
+  const isRenderable = isRenderablePreview(preview, location.path);
  const editable = isEditableTextFile({
    preview,
    supportsEditing,
@@ -272,7 +308,6 @@ export function FilePane({

  return (
    <FilePanePresentation
-      panel={panel}
      serverId={serverId}
      workspaceRoot={normalizedWorkspaceRoot}
      client={client}
@@ -298,6 +333,10 @@ export function FilePane({
  );
 }

+function isRenderablePreview(preview: ExplorerFile | null, path: string): boolean {
+  return preview?.kind === "text" && filePreviewRenderKind(path) !== null;
+}
+
 function isEditableTextFile(input: {
  preview: ExplorerFile | null;
  supportsEditing: boolean;
@@ -311,7 +350,6 @@ function isEditableTextFile(input: {
 }

 function FilePanePresentation({
-  panel,
  serverId,
  workspaceRoot,
  client,
@@ -334,7 +372,6 @@ function FilePanePresentation({
  navigationRevision,
  imagePreviewUri,
 }: {
-  panel: FilePanel | null;
  serverId: string;
  workspaceRoot: string;
  client: DaemonClient | null;
@@ -370,7 +407,6 @@ function FilePanePresentation({
  if (editable && client && readTarget && preview?.kind === "text") {
    return (
      <EditableFilePane
-        panel={panel}
        key={`${serverId}:${readTarget.cwd}:${readTarget.path}`}
        serverId={serverId}
        workspaceRoot={workspaceRoot}
@@ -423,7 +459,6 @@ function FilePanePresentation({
        />
      ) : null}
      <FilePreviewBody
-        panel={panel}
        preview={preview}
        mode={previewMode}
        isLoading={isLoading}
@@ -440,7 +475,6 @@ function FilePanePresentation({
 }

 function EditableFilePane({
-  panel,
  serverId,
  workspaceRoot,
  client,
@@ -458,7 +492,6 @@ function EditableFilePane({
  location,
  navigationRevision,
 }: {
-  panel: FilePanel | null;
  serverId: string;
  workspaceRoot: string;
  client: DaemonClient;
@@ -513,6 +546,34 @@ function EditableFilePane({
  const snapshot = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
  const suspendPendingSave = useCallback(() => model.suspendAutosave(), [model]);
  usePublishPanelInstanceAttributes({ modified: snapshot.modified, suspendPendingSave });
+  const theme = UnistylesRuntime.getTheme();
+  const visualTheme = useMemo(
+    () => ({
+      colorScheme: theme.colorScheme,
+      background: theme.colors.surface0,
+      foreground: theme.colors.foreground,
+      cursor: theme.colors.terminal.cursor,
+      foregroundMuted: theme.colors.foregroundMuted,
+      border: theme.colors.border,
+      selection: theme.colors.terminal.selectionBackground,
+      monoFont: theme.fontFamily.mono,
+      codeFontSize: theme.fontSize.code,
+      syntax: theme.colors.syntax,
+    }),
+    [
+      theme.colors.border,
+      theme.colors.foreground,
+      theme.colors.foregroundMuted,
+      theme.colors.surface0,
+      theme.colors.syntax,
+      theme.colors.terminal.cursor,
+      theme.colors.terminal.selectionBackground,
+      theme.colorScheme,
+      theme.fontFamily.mono,
+      theme.fontSize.code,
+    ],
+  );
+
  useEffect(() => () => model.dispose(), [model]);

  const handleReload = useCallback(() => {
@@ -566,18 +627,18 @@ function EditableFilePane({
        onModeChange={onModeChange}
      />
      {showSource ? (
-        <ThemedFileEditorView
+        <FileEditorView
          model={model}
          filename={filename}
          location={location}
          navigationRevision={navigationRevision}
          vimEnabled={settings.vimKeybindings}
+          theme={visualTheme}
          onCursorChange={setCursor}
          onVimModeChange={handleVimModeChange}
        />
      ) : (
        <FilePreviewBody
-          panel={panel}
          preview={renderedPreview}
          mode={mode}
          isLoading={isLoading}
@@ -647,4 +708,15 @@ const styles = StyleSheet.create((theme) => ({
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.base,
  },
+  previewScrollContainer: {
+    flex: 1,
+    minHeight: 0,
+  },
+  previewContent: {
+    flex: 1,
+    minHeight: 0,
+  },
+  previewCodeScrollContent: {
+    padding: theme.spacing[4],
+  },
 }));
@@ -1,92 +0,0 @@
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { ScrollView, Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { useTranslation } from "react-i18next";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import { ZoomableImage } from "@/components/zoomable-viewport/image";
-import type { Theme } from "@/styles/theme";
-import { FileHtmlPreview } from "./html-preview";
-import { FileMarkdownPreview } from "./markdown-preview";
-import type { builtinFilePanels } from "./catalog";
-
-interface FilePanelPreviewProps {
-  content: string;
-  filePath: string;
-  workspaceRoot: string;
-  client: DaemonClient | null;
-  serverId: string;
-  imagePreviewUri: string | null;
-}
-
-function MarkdownPanel(props: FilePanelPreviewProps) {
-  return (
-    <View style={styles.previewScrollContainer}>
-      <ScrollView style={styles.previewContent} showsVerticalScrollIndicator>
-        <FileMarkdownPreview
-          source={props.content}
-          filePath={props.filePath}
-          workspaceRoot={props.workspaceRoot}
-          client={props.client}
-          serverId={props.serverId}
-        />
-      </ScrollView>
-    </View>
-  );
-}
-
-function HtmlPanel({ content }: FilePanelPreviewProps) {
-  return (
-    <View style={styles.previewScrollContainer}>
-      <FileHtmlPreview html={content} testID="file-html-preview" />
-    </View>
-  );
-}
-
-const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-function ImagePanel({ imagePreviewUri }: FilePanelPreviewProps) {
-  const { t } = useTranslation();
-  if (!imagePreviewUri) {
-    return (
-      <View style={styles.centerState}>
-        <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
-        <Text style={styles.loadingText}>{t("panels.file.loading")}</Text>
-      </View>
-    );
-  }
-  return <ZoomableImage uri={imagePreviewUri} testID="image-file-preview" />;
-}
-
-const components = {
-  "builtin:markdown": MarkdownPanel,
-  "builtin:html": HtmlPanel,
-  "builtin:image": ImagePanel,
-};
-
-export function FilePanelPreview({
-  panel,
-  ...props
-}: FilePanelPreviewProps & {
-  panel: (typeof builtinFilePanels)[number];
-}) {
-  const Component = components[panel.id];
-  return <Component {...props} />;
-}
-
-const styles = StyleSheet.create((theme) => ({
-  previewScrollContainer: { flex: 1, minHeight: 0 },
-  previewContent: { flex: 1, minHeight: 0 },
-  centerState: {
-    flex: 1,
-    alignItems: "center",
-    justifyContent: "center",
-    gap: theme.spacing[3],
-    padding: theme.spacing[4],
-  },
-  loadingText: {
-    marginTop: theme.spacing[2],
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-  },
-}));
@@ -1,28 +0,0 @@
-import { filePanelExtension, type FilePanelCandidate } from "./resolve";
-
-const markdownPanel = {
-  id: "builtin:markdown",
-  files: { extensions: ["md", "markdown"] },
-  document: "text",
-  maxBytes: Infinity,
-} as const satisfies FilePanelCandidate;
-
-export const builtinFilePanels = [
-  markdownPanel,
-  {
-    id: "builtin:html",
-    files: { extensions: ["html", "htm"] },
-    document: "text",
-    maxBytes: Infinity,
-  },
-  {
-    id: "builtin:image",
-    files: { extensions: ["png", "jpg", "jpeg", "gif", "webp", "svg"] },
-    document: "bytes",
-    maxBytes: Infinity,
-  },
-] as const satisfies readonly FilePanelCandidate[];
-
-export function isRenderedMarkdownFile(path: string): boolean {
-  return markdownPanel.files.extensions.some((extension) => extension === filePanelExtension(path));
-}
@@ -1,23 +0,0 @@
-import type { ExplorerFile } from "@/stores/session-store";
-import { builtinFilePanels } from "./catalog";
-import { resolveFilePanel } from "./resolve";
-
-export { resolveFilePanel, type FilePanelCandidate, type FilePanelFile } from "./resolve";
-export { builtinFilePanels, isRenderedMarkdownFile } from "./catalog";
-export { FilePanelPreview } from "./builtin";
-
-export type FilePanel = (typeof builtinFilePanels)[number];
-
-export function resolveFilePreviewPanel(input: {
-  preview: ExplorerFile | null;
-  path: string;
-  associations: Readonly<Record<string, string>>;
-}) {
-  const { preview, path, associations } = input;
-  if (!preview) return null;
-  return resolveFilePanel({
-    file: { path, kind: preview.kind, size: preview.size, hasBytes: preview.kind === "image" },
-    candidates: builtinFilePanels,
-    associations,
-  }).panel;
-}
@@ -1,105 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveFilePanel, type FilePanelCandidate, type FilePanelFile } from "./resolve";
-
-const markdown: FilePanelCandidate = {
-  id: "builtin:markdown",
-  files: { extensions: ["md", "markdown"] },
-  document: "text",
-  maxBytes: Infinity,
-};
-const alternative: FilePanelCandidate = { ...markdown, id: "plugin:notes/markdown" };
-const file: FilePanelFile = { path: "/docs/README.MD", kind: "text", size: 100, hasBytes: true };
-
-function resolve(
-  overrides: Partial<Parameters<typeof resolveFilePanel<FilePanelCandidate>>[0]> = {},
-) {
-  return resolveFilePanel({
-    file,
-    candidates: [markdown, alternative],
-    associations: {},
-    ...overrides,
-  });
-}
-
-describe("resolveFilePanel", () => {
-  it("uses the associated candidate before catalog order", () => {
-    expect(resolve({ associations: { "ext:md": alternative.id } })).toEqual({
-      panel: alternative,
-      candidates: [markdown, alternative],
-      selectorKey: "ext:md",
-    });
-  });
-  it("ignores an absent association without deleting it", () => {
-    const associations = { "ext:md": "plugin:absent/markdown" };
-    expect(resolve({ associations }).panel).toBe(markdown);
-    expect(associations).toEqual({ "ext:md": "plugin:absent/markdown" });
-  });
-  it("uses a single candidate and preserves catalog order for multiple candidates", () => {
-    expect(resolve({ candidates: [alternative] }).panel).toBe(alternative);
-    expect(resolve().panel).toBe(markdown);
-    expect(resolve({ candidates: [alternative, markdown] }).panel).toBe(alternative);
-  });
-  it("returns the floor when no selector matches", () => {
-    expect(resolve({ file: { ...file, path: "index.ts" } })).toEqual({
-      panel: null,
-      candidates: [],
-      selectorKey: "ext:ts",
-    });
-  });
-  it("filters text panels for binary files even with an association", () => {
-    expect(
-      resolve({ file: { ...file, kind: "binary" }, associations: { "ext:md": markdown.id } }).panel,
-    ).toBeNull();
-  });
-  it("requires bytes for bytes panels and accepts binary files with bytes", () => {
-    const bytes: FilePanelCandidate = { ...alternative, document: "bytes" };
-    expect(resolve({ file: { ...file, hasBytes: false }, candidates: [bytes] }).panel).toBeNull();
-    expect(resolve({ file: { ...file, kind: "binary" }, candidates: [bytes] }).panel).toBe(bytes);
-  });
-  it("includes the maxBytes boundary and skips oversized associated panels", () => {
-    const limited = { ...alternative, maxBytes: 100 };
-    expect(resolve({ candidates: [limited] }).panel).toBe(limited);
-    expect(
-      resolve({
-        file: { ...file, size: 101 },
-        candidates: [limited, markdown],
-        associations: { "ext:md": limited.id },
-      }).panel,
-    ).toBe(markdown);
-  });
-  it("uses exact basename keys when an eligible candidate matches by filename", () => {
-    const named = { ...alternative, files: { extensions: [], filenames: ["README.MD"] } };
-    expect(
-      resolve({ candidates: [markdown, named], associations: { "name:README.MD": named.id } }),
-    ).toEqual({
-      panel: named,
-      candidates: [markdown, named],
-      selectorKey: "name:README.MD",
-    });
-    expect(resolve({ file: { ...file, path: "README.md" }, candidates: [named] }).panel).toBeNull();
-  });
-  it("uses extension keys when filename candidates were filtered out", () => {
-    const named = {
-      ...alternative,
-      maxBytes: 1,
-      files: { extensions: [], filenames: ["README.MD"] },
-    };
-    expect(resolve({ candidates: [named, markdown] }).selectorKey).toBe("ext:md");
-  });
-  it.each(["/src/Dockerfile", "C:\\src\\Dockerfile"])(
-    "matches an extensionless exact filename: %s",
-    (path) => {
-      const named = { ...alternative, files: { extensions: [], filenames: ["Dockerfile"] } };
-      expect(resolve({ file: { ...file, path }, candidates: [named] })).toEqual({
-        panel: named,
-        candidates: [named],
-        selectorKey: "name:Dockerfile",
-      });
-    },
-  );
-  it("normalizes extension selectors and keeps extensionless files distinct", () => {
-    const upper = { ...alternative, files: { extensions: ["MD"] } };
-    expect(resolve({ candidates: [upper] }).panel).toBe(upper);
-    expect(resolve({ file: { ...file, path: "README" } }).selectorKey).toBe("ext:");
-  });
-});
@@ -1,63 +0,0 @@
-export interface FilePanelFile {
-  path: string;
-  kind: "text" | "image" | "binary";
-  size: number;
-  hasBytes: boolean;
-}
-
-export interface FilePanelSelector {
-  extensions: readonly string[];
-  filenames?: readonly string[];
-}
-
-export interface FilePanelCandidate {
-  id: string;
-  files: FilePanelSelector;
-  document: "text" | "bytes";
-  maxBytes: number;
-}
-
-export interface FilePanelResolution<Candidate> {
-  panel: Candidate | null;
-  candidates: readonly Candidate[];
-  selectorKey: string;
-}
-
-export function filePanelExtension(path: string): string {
-  const name = filePanelBasename(path);
-  const dot = name.lastIndexOf(".");
-  return dot < 0 ? "" : name.slice(dot + 1).toLowerCase();
-}
-
-function filePanelBasename(path: string): string {
-  return path.trim().split(/[\\/]/).pop() ?? "";
-}
-
-function matchesSelector(file: FilePanelFile, selector: FilePanelSelector): boolean {
-  if (selector.filenames?.includes(filePanelBasename(file.path))) return true;
-  const extension = filePanelExtension(file.path);
-  return selector.extensions.some((entry) => entry.toLowerCase() === extension);
-}
-
-export function resolveFilePanel<Candidate extends FilePanelCandidate>(input: {
-  file: FilePanelFile;
-  candidates: readonly Candidate[];
-  associations: Readonly<Record<string, string>>;
-}): FilePanelResolution<Candidate> {
-  const { file, associations } = input;
-  const candidates = input.candidates.filter((candidate) => {
-    const documentAvailable = candidate.document === "text" ? file.kind === "text" : file.hasBytes;
-    return (
-      documentAvailable && file.size <= candidate.maxBytes && matchesSelector(file, candidate.files)
-    );
-  });
-  const filename = filePanelBasename(file.path);
-  const matchedFilename = candidates.some((candidate) =>
-    candidate.files.filenames?.includes(filename),
-  );
-  const selectorKey = matchedFilename ? `name:${filename}` : `ext:${filePanelExtension(file.path)}`;
-  const association = associations[selectorKey];
-  const panel =
-    candidates.find((candidate) => candidate.id === association) ?? candidates[0] ?? null;
-  return { panel, candidates, selectorKey };
-}
@@ -15,7 +15,7 @@ import { Shortcut } from "@/components/ui/shortcut";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import type { ShortcutKey } from "@/utils/format-shortcut";
-import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
+import type { GitAction, GitActions } from "@/git/policy";
 import { useGitActionRunner } from "@/git/use-actions";
 import { buttonControlHeight, HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";

@@ -129,10 +129,14 @@ export function GitActionsSplitButton({
    [theme.colors.surface2],
  );

-  const menuOnlyActions = [
-    ...(gitActions.primary ? [gitActions.primary] : []),
-    ...actionsWithoutPrimary(gitActions),
-  ];
+  const menuOnlyActions = useMemo(
+    () => [
+      ...(gitActions.primary ? [gitActions.primary] : []),
+      ...gitActions.secondary,
+      ...gitActions.menu,
+    ],
+    [gitActions.menu, gitActions.primary, gitActions.secondary],
+  );

  if (menuOnly) {
    if (menuOnlyActions.length === 0) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	d4c5a3a349	fix(cli): preserve validated addresses in daemon command hints	2026-10-19 08:52:09 +02:00
Mohamed Boudra	12baedf656	test(hosts): include relay coverage in existing CI contracts	2026-10-19 08:40:18 +02:00
Mohamed Boudra	b81f6c1350	fix(hosts): validate safe targets and verify encrypted relay routes	2026-10-19 08:37:39 +02:00
Mohamed Boudra	a954ded4be	feat(hosts): connect to saved hosts through a daemon	2026-10-19 08:37:15 +02:00