chore(release): cut 0.6.0

docs: add 0.6.0 changelog
Wait for authoritative provider readiness before prompting (#3821 )
2026-10-15 13:52:39 +00:00 · 2026-08-25 15:58:11 +02:00 · 2026-08-25 15:50:49 +02:00 · 2026-08-25 15:28:06 +02:00 · 2026-08-25 14:58:35 +02:00 · 2026-08-25 13:50:54 +02:00
374 changed files with 11365 additions and 14022 deletions
@@ -52,7 +52,7 @@ jobs:
          filters: .github/ci-paths.yml

      - name: Validate CI contracts
-        run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/sync-fdroid-changelogs.test.mjs
+        run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs

  format:
    name: format
@@ -1,5 +1,32 @@
 # Changelog

+## 0.6.0 - 2026-08-25
+
+### Changed
+
+- Restored the dedicated Explorer sidebar with Files and Changes by default, replacing the empty user-directed Side panel introduced in 0.5.0 ([#3826](https://github.com/getpaseo/paseo/pull/3826))
+- Changed content opened to the side to use an ordinary closable workspace pane instead of the Explorer sidebar ([#3826](https://github.com/getpaseo/paseo/pull/3826))
+- Restored the resizable combined Explorer dock on tablets ([#3826](https://github.com/getpaseo/paseo/pull/3826))
+
+### Added
+
+- Added per-action settings for opening files, changes, subagents, and pull requests in the main panel or on the side ([#3826](https://github.com/getpaseo/paseo/pull/3826))
+- Added New tab and drag support for compatible files, diffs, agents, terminals, pull requests, and plugin panels in Explorer ([#3826](https://github.com/getpaseo/paseo/pull/3826))
+- Added standalone Diff tabs while keeping an optional persisted inline-diff mode in Changes ([#3826](https://github.com/getpaseo/paseo/pull/3826))
+- Added custom Windows and Linux window controls ([#3826](https://github.com/getpaseo/paseo/pull/3826))
+
+### Fixed
+
+- Fixed OpenCode turns failing when the first event-stream connection stalls during startup ([#3814](https://github.com/getpaseo/paseo/pull/3814))
+- Fixed OpenCode prompts starting before the provider reports a ready connection ([#3821](https://github.com/getpaseo/paseo/pull/3821))
+
+## 0.5.2 - 2026-08-24
+
+### Fixed
+
+- Fixed workspaces crashing on Android tablets and foldables in non-compact layouts ([#3760](https://github.com/getpaseo/paseo/pull/3760) by [@jeid64](https://github.com/jeid64))
+- Fixed app settings resetting when builds sharing a profile recognize different settings ([#3787](https://github.com/getpaseo/paseo/pull/3787))
+
 ## 0.5.1 - 2026-08-23

 ### Fixed
@@ -21,47 +21,46 @@ This is an npm workspace monorepo:

 At the start of non-trivial work, list `docs/` and skim anything relevant to the task.

-| Doc                                                                  | What's in it                                                                                                                   |
-| -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| [docs/product.md](docs/product.md)                                   | What Paseo is, who it's for, where it's going                                                                                  |
-| [docs/architecture.md](docs/architecture.md)                         | System design, package layering, WebSocket protocol, agent lifecycle, data flow                                                |
-| [docs/agent-lifecycle.md](docs/agent-lifecycle.md)                   | Agent states, parent/child relationships, archive semantics, tabs vs archive, subagents track                                  |
-| [docs/data-model.md](docs/data-model.md)                             | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
-| [docs/glossary.md](docs/glossary.md)                                 | Authoritative terminology — UI label wins, no synonyms                                                                         |
-| [docs/coding-standards.md](docs/coding-standards.md)                 | Type hygiene, error handling, state design, React patterns, file organization                                                  |
-| [docs/design.md](docs/design.md)                                     | Design system — tokens, buttons, hierarchy, density, alignment rails, states, what's forbidden                                 |
-| [docs/forms.md](docs/forms.md)                                       | Form architecture — non-React form model, form kit, load-state gating; the schedule form is the golden example                 |
-| [docs/hover.md](docs/hover.md)                                       | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
-| [docs/unistyles.md](docs/unistyles.md)                               | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
-| [docs/floating-panels.md](docs/floating-panels.md)                   | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
-| [docs/menus.md](docs/menus.md)                                       | The menu engine — popover vs sheet, submenu pages, hover intent, when a decision earns a submenu                               |
-| [docs/expo-router.md](docs/expo-router.md)                           | Expo Router route ownership, startup restore, and native blank-screen gotchas                                                  |
-| [docs/file-icons.md](docs/file-icons.md)                             | Material icon theme integration for the file explorer                                                                          |
-| [docs/providers.md](docs/providers.md)                               | Adding a new agent provider end-to-end                                                                                         |
-| [docs/forge-providers.md](docs/forge-providers.md)                   | Adding a git forge: registry/manifest, drop-in checklist, self-host/GHES, the two facts tiers                                  |
-| [docs/custom-providers.md](docs/custom-providers.md)                 | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
-| [docs/plugins.md](docs/plugins.md)                                   | Local plugin manifest, directory source config, RPCs, native surfaces, and attachment sources                                  |
-| [docs/service-proxy.md](docs/service-proxy.md)                       | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
-| [docs/development.md](docs/development.md)                           | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
-| [docs/rpc-namespacing.md](docs/rpc-namespacing.md)                   | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
-| [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/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                            |
-| [docs/file-observation.md](docs/file-observation.md)                 | Recursive watcher ownership, Linux constraints, teardown invariants, and Parcel comparison                                     |
-| [docs/testing.md](docs/testing.md)                                   | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
-| [docs/qa.md](docs/qa.md)                                             | QA evidence bar for pull requests — platform matrix, version drift, performance, UI proof                                      |
-| [docs/mobile-testing.md](docs/mobile-testing.md)                     | Maestro and mobile test workflows                                                                                              |
-| [docs/mobile-panels.md](docs/mobile-panels.md)                       | Compact left/center/right panel ownership, worklet motion, gesture revisions, and Fabric constraints                           |
-| [docs/side-panel.md](docs/side-panel.md)                             | The Side panel surface — its three renderings, tab placement intents, pane lifecycle, and the routing preference               |
-| [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md)       | Isolated in-process daemon test harness                                                                                        |
-| [docs/browser-capture-harness.md](docs/browser-capture-harness.md)   | Real-Electron browser screenshot harness and compositor-surface gotcha                                                         |
-| [docs/android.md](docs/android.md)                                   | App variants, local/cloud builds, EAS workflows, version codes, F-Droid source builds and store metadata                       |
-| [docs/docker.md](docs/docker.md)                                     | Running the daemon and bundled web UI in Docker, volumes, agent images, security                                               |
-| [docs/release.md](docs/release.md)                                   | Release playbook, draft releases, completion checklist                                                                         |
-| [docs/terminal-activity.md](docs/terminal-activity.md)               | Terminal activity indicators — source-agnostic tracker, agent hook reporting, adding a new hook provider                       |
-| [SECURITY.md](SECURITY.md)                                           | Relay threat model, E2E encryption, DNS rebinding, agent auth                                                                  |
-| [public-docs/hub/security.md](public-docs/hub/security.md)           | Public Hub guide — trust boundaries, untrusted triggers, provider controls, and output authority                               |
+| Doc                                                                | What's in it                                                                                                                   |
+| ------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------ |
+| [docs/product.md](docs/product.md)                                 | What Paseo is, who it's for, where it's going                                                                                  |
+| [docs/architecture.md](docs/architecture.md)                       | System design, package layering, WebSocket protocol, agent lifecycle, data flow                                                |
+| [docs/agent-lifecycle.md](docs/agent-lifecycle.md)                 | Agent states, parent/child relationships, archive semantics, tabs vs archive, subagents track                                  |
+| [docs/data-model.md](docs/data-model.md)                           | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
+| [docs/glossary.md](docs/glossary.md)                               | Authoritative terminology — UI label wins, no synonyms                                                                         |
+| [docs/coding-standards.md](docs/coding-standards.md)               | Type hygiene, error handling, state design, React patterns, file organization                                                  |
+| [docs/design.md](docs/design.md)                                   | Design system — tokens, buttons, hierarchy, density, alignment rails, states, what's forbidden                                 |
+| [docs/forms.md](docs/forms.md)                                     | Form architecture — non-React form model, form kit, load-state gating; the schedule form is the golden example                 |
+| [docs/hover.md](docs/hover.md)                                     | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
+| [docs/unistyles.md](docs/unistyles.md)                             | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
+| [docs/floating-panels.md](docs/floating-panels.md)                 | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
+| [docs/menus.md](docs/menus.md)                                     | The menu engine — popover vs sheet, submenu pages, hover intent, when a decision earns a submenu                               |
+| [docs/expo-router.md](docs/expo-router.md)                         | Expo Router route ownership, startup restore, and native blank-screen gotchas                                                  |
+| [docs/file-icons.md](docs/file-icons.md)                           | Material icon theme integration for the file explorer                                                                          |
+| [docs/providers.md](docs/providers.md)                             | Adding a new agent provider end-to-end                                                                                         |
+| [docs/forge-providers.md](docs/forge-providers.md)                 | Adding a git forge: registry/manifest, drop-in checklist, self-host/GHES, the two facts tiers                                  |
+| [docs/custom-providers.md](docs/custom-providers.md)               | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
+| [docs/plugins.md](docs/plugins.md)                                 | Local plugin manifest, directory source config, RPCs, native surfaces, and attachment sources                                  |
+| [docs/service-proxy.md](docs/service-proxy.md)                     | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
+| [docs/development.md](docs/development.md)                         | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
+| [docs/rpc-namespacing.md](docs/rpc-namespacing.md)                 | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
+| [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/terminal-performance.md](docs/terminal-performance.md)       | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
+| [docs/file-observation.md](docs/file-observation.md)               | Recursive watcher ownership, Linux constraints, teardown invariants, and Parcel comparison                                     |
+| [docs/testing.md](docs/testing.md)                                 | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
+| [docs/qa.md](docs/qa.md)                                           | QA evidence bar for pull requests — platform matrix, version drift, performance, UI proof                                      |
+| [docs/mobile-testing.md](docs/mobile-testing.md)                   | Maestro and mobile test workflows                                                                                              |
+| [docs/mobile-panels.md](docs/mobile-panels.md)                     | Compact left/center/right panel ownership, worklet motion, gesture revisions, and Fabric constraints                           |
+| [docs/explorer-sidebar.md](docs/explorer-sidebar.md)               | Explorer sidebar and ordinary side-pane host contracts, lifecycle, placement, and routing preferences                          |
+| [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md)     | Isolated in-process daemon test harness                                                                                        |
+| [docs/browser-capture-harness.md](docs/browser-capture-harness.md) | Real-Electron browser screenshot harness and compositor-surface gotcha                                                         |
+| [docs/android.md](docs/android.md)                                 | App variants, local/cloud builds, EAS workflows                                                                                |
+| [docs/docker.md](docs/docker.md)                                   | Running the daemon and bundled web UI in Docker, volumes, agent images, security                                               |
+| [docs/release.md](docs/release.md)                                 | Release playbook, draft releases, completion checklist                                                                         |
+| [docs/terminal-activity.md](docs/terminal-activity.md)             | Terminal activity indicators — source-agnostic tracker, agent hook reporting, adding a new hook provider                       |
+| [SECURITY.md](SECURITY.md)                                         | Relay threat model, E2E encryption, DNS rebinding, agent auth                                                                  |
+| [public-docs/hub/security.md](public-docs/hub/security.md)         | Public Hub guide — trust boundaries, untrusted triggers, provider controls, and output authority                               |

 ### Writing docs

@@ -1,52 +0,0 @@
-# Agent stream performance
-
-How assistant text gets from a provider to the screen, and why it is paced on the way. Read this before changing `packages/server/src/server/agent/agent-stream-coalescer.ts`, the reducer queue in `packages/app/src/timeline/session-stream-reducers.ts`, or the reveal in `packages/app/src/hooks/use-revealed-text.ts`.
-
-For terminal output, which is a separate pipeline with separate budgets, see [terminal-performance.md](terminal-performance.md).
-
-## The pipeline
-
-```
-provider deltas (every provider streams incrementally)
-  → AgentStreamCoalescer (daemon, leading + trailing, ≤1 message per 60ms per agent)
-  → recordTimeline: one canonical row per flushed item
-  → agent_stream ws message
-  → reducer queue (app, one commit per frame) → session store
-  → paced reveal (app, per assistant/reasoning item) → markdown blocks → paint
-```
-
-Every provider delivers incremental text, so there is no provider that needs special handling: Claude via `includePartialMessages`, Codex via `agent_message_delta`, ACP agents via `agent_message_chunk`, Pi and OMP via `text_delta`.
-
-## Why the reveal is paced
-
-Arrival is lumpy and there is no fixing that at the source. A 60ms coalescing window carries however many characters the model produced in those 60ms, which swings by an order of magnitude within a single turn. Painting each delta as it lands makes the size of those lumps visible, and that is what reads as jagged.
-
-So arrival sets a _target_ and the reveal rate is derived from the backlog instead. A burst makes the text catch up faster; it does not make the text jump. Shrinking the coalescing window does not fix this — it makes the lumps smaller and more frequent, at the cost of message rate on a daemon loop that already contends with terminal frames and per-message relay encryption.
-
-## Invariants
-
- **The coalescer is leading + trailing.** The first delta after an idle window flushes synchronously; only the rest of the burst waits for the trailing timer. Reverting to trailing-only adds a full window to the first character of every turn. Same shape and the same reason as `TerminalOutputCoalescer`.
- **The leading flush adds a canonical row, and that is fine.** A burst's first chunk lands as its own timeline row. `mergeAssistantChunks` / `mergeReasoningChunks` in `timeline-projection.ts` join contiguous same-turn rows, and clients read the projected timeline, so history is unaffected. Tests that assert on raw rows have to account for the extra row; tests that assert on what a client sees do not.
- **The store holds the full text; only the rendered slice is paced.** Copy, selection, the chat outline, and scroll geometry all read the same string the user can see. Pacing the store instead would leave the bottom anchor chasing a content height that is ahead of the reveal.
- **First sight of a text is revealed whole.** Only growth is paced. This is what makes history hydration, timeline replay, a virtualized row remounting on scroll, and an already-finished message all render complete on first paint without a special case for each.
- **Leaving `phase: "streaming"` snaps the reveal.** A completed turn must never be left holding characters. `layoutStream` sets the phase, so anything outside the live head with an active turn is already complete.
- **The reducer queue commits on a frame, with a timer as the ceiling.** A frame callback never fires in a hidden tab, so a timer races it and wins when nothing is painting — the store has to keep advancing either way.
-
-## Measuring
-
- **Smoothness (user-perceived):** `packages/app/e2e/browser/agent-stream-smoothness.spec.ts`, gated behind `PASEO_AGENT_STREAM_PERF_E2E=1`. Drives the mock provider's `bursty-stream` model and reports coefficient of variation of characters painted per frame (smoothness) plus p95 gap between visible updates (stalls). Both numbers are needed: a stalled stream is perfectly smooth.
- **Reproducing bursty arrival:** the `bursty-stream` model in `mock-load-test-agent.ts` emits uneven runs of tokens separated by idle gaps. Burst sizes come from a seeded generator, so a run repeats exactly.
- **Rate policy in isolation:** `computeRevealStep` in `packages/app/src/agent-stream/text-reveal.ts` is pure; `text-reveal.test.ts` covers convergence and burst flattening without a renderer.
-
-Healthy numbers (2026-08, Expo web against a local dev daemon, real Claude Haiku agent, ~8.5s samples during active streaming). Setting `TEXT_REVEAL_HORIZON_MS` to 0 makes the reveal paint on arrival, which is how the baseline column was taken:
-
-|                                  | paint on arrival | paced |
-| -------------------------------- | ---------------- | ----- |
-| frames that advanced the text    | 6%               | 87%   |
-| chars-per-frame CV               | 4.11             | 1.86  |
-| gap between visible updates, p50 | 317ms            | 17ms  |
-| gap between visible updates, p95 | 383ms            | 17ms  |
-
-Total characters painted is roughly the same either way — the reveal changes when they land, not how many arrive.
-
-Measure the **total** length across every `assistant-message` element, not the last one. A turn emits many assistant messages, so the tail element keeps changing identity and its length is not monotonic; sampling only the tail reads those handovers as resets and reports almost no growth. `sampleStreamFrames` does this correctly.
@@ -15,9 +15,7 @@ EAS profiles: `development`, `production`, and `production-apk` in `packages/app

 ## Version codes

-`packages/app/native-release-version.js` is the single definition of native and F-Droid version-code math. Do not re-derive these numbers anywhere else — a drifted copy produces changelog files that match no published APK, and nothing fails loudly.
-
-The base version code comes from the package version:
+`packages/app/app.config.js` derives Android `versionCode` from the package version with:

 ```text
 major * 1_000_000 + minor * 1_000 + patch
@@ -147,37 +145,6 @@ Keep the excluded npm packages installed. Normal builds use them, while the F-Dr

 The EAS `production-apk` profile uses the large Android resource class. Release builds compile the native ABIs and run Hermes bundling in the same Gradle invocation; the default worker can exhaust its remaining memory and kill Hermes with exit code 137 even when Gradle's own heap is correctly sized.

-### F-Droid store metadata
-
-F-Droid reads the store listing from `fastlane/metadata/android/<locale>/` **at the repo root**. This location provides the best compatibility with the F-Droid release process.
-
-```text
-fastlane/metadata/android/
-├── en-US/                      (F-Droid fallback locale, mandatory)
-│   ├── title.txt               (<=50 chars)
-│   ├── short_description.txt   (<=80 chars)
-│   ├── full_description.txt    (<=4000 chars, limited HTML)
-│   ├── images/
-│   │   ├── icon.png            (512x512)
-│   │   ├── featureGraphic.png  (1024x500)
-│   │   └── phoneScreenshots/   (1.png, 2.png, ...)
-│   └── changelogs/             (generated — see below)
-├── ja/
-└── zh-CN/
-```
-
-Locale directories generally match `packages/app/src/i18n/locales.ts`, but note that `en` becomes `en-US`.
-
-F-Droid changelogs are generated from `CHANGELOG.md`. Run `npm run fdroid:changelogs`; `npm run fdroid:changelogs:check` verifies without writing. It is wired into the npm `version` lifecycle, so a release picks it up automatically and `git add -A` stages the result.
-
-One changelog must be generated per-ABI-split, so each version will create **four** identical version-coded entries. F-Droid caps changelogs at 500 characters, so the generator strips some content and adds a link to the full notes.
-
-Stable sync fails loudly if `CHANGELOG.md` has no entry for the version being cut. That is intentional — the release checklist requires the entry to be committed first, so an abort here means the checklist was skipped.
-
-Because the generator runs off the version in `package.json`, it must run **before** the tag is created: fdroidserver only reads metadata from the tag it builds, so the file for version N has to exist in the commit N points at.
-
-Beta releases are an explicit no-op: they do not create or rewrite F-Droid changelog files. Stable releases and promotions generate the four ABI entries from their final changelog.
-
 ### React version lockstep

 Keep `react` and `react-dom` pinned to the React version embedded by the current `react-native` release. React Native `0.81.x` embeds `react-native-renderer` `19.1.0`, so `packages/app` must use React `19.1.0`. Bumping React to a newer patch can build successfully but crash at JS startup on Android with `Incompatible React versions`, leaving the app on the native splash screen.
@@ -104,7 +104,7 @@ Cross-platform React Native app that connects to one or more daemons.

 - Expo Router navigation (`/h/[serverId]/workspace/[workspaceId]`, `/h/[serverId]/agent/[agentId]`, etc.). The `workspaceId` URL segment is an opaque workspace id, not a directly meaningful filesystem path.
 - `HostRuntimeController` manages saved host connections, reconnection, and per-host runtime state
- `runtime/replica-cache` keeps the complete project, workspace, and active-agent directory plus one short focused timeline tail in a row store. It restores before navigation becomes ready and leaves remote hydration flags false.
+- `runtime/replica-cache` keeps the complete project, workspace, and active-agent directory plus one short focused timeline tail in AsyncStorage. It restores before navigation becomes ready and leaves remote hydration flags false.
 - `runtime/directory-sync` owns directory reconciliation. On reconnect it passes the persisted per-entity cursor through `project.list`, `fetch_workspaces`, and `fetch_agents`; the daemon returns each entity's latest projection when its sequence is newer, plus tombstones.
 - `workspace-labels` owns one sequenced catalog replica per connected host, the deterministic cross-host projection that surfaces spanning hosts use (the filter page, the manager), and the per-host resolution a workspace row's chips use. Two hosts may give one name different colors, so a row resolves against its own host's catalog and a merged answer would be wrong there. Catalogs never synchronize between hosts; assignment creates a missing definition only on the target host. On the daemon, catalog and assignment rewrites share a journaled commit boundary. Startup recovery completes that commit before workspace or catalog publication.
 - `SessionContext` wraps the daemon client for the active session
@@ -115,15 +115,12 @@ Cross-platform React Native app that connects to one or more daemons.

 The replica cache paints stale data immediately while the host connects. Directory cursors are
 reconciliation checkpoints; cached entities remain non-authoritative until the daemon answers.
-Pending permission requests are not restored from it. The row store is not encrypted, so the cached
+Pending permission requests are not restored from it. AsyncStorage is not encrypted, so the cached
 timeline tail may contain source code, prompts, and tool output; encrypted-at-rest storage is a
-separate product/security decision. Agents, workspaces, and projects have individual rows; the
-focused timeline tail and directory checkpoint each have one row per host. Writes serialize only
-rows whose in-memory identities changed. Restore validates every row before hydration; one invalid
-row clears the cache and starts cold. The 32 MiB byte budget is tracked incrementally from row
-payload lengths and evicts whole hosts in least-recently-written order. After restart, that order is
-an approximation rebuilt from the row store's `readAll()` order. Browser and Electron builds use
-IndexedDB. Native builds use expo-sqlite.
+separate product/security decision. Its serialized payload has a 32 MiB byte budget and evicts whole
+host snapshots in least-recently-written order; a single oversized host is omitted rather than
+partially restored. Browser and Electron builds store it in IndexedDB. Native builds use
+AsyncStorage, and Android reserves 64 MiB for that database.

 The three directory entity types have independent monotonic sequences and share one daemon
 generation. The daemon retains only the latest projection per entity and bounded tombstones, not an
@@ -62,6 +62,10 @@ The button is `<Button>` (`packages/app/src/components/ui/button.tsx`). It has f

 `ghost` is structural and non-committal — no border, no fill. Back arrows, header toggles, "Load more" footers (`packages/app/src/screens/sessions-screen.tsx:54-63`), more-affordances. Ghost is used when the affordance is part of the chrome, not a decision.

+Header and toolbar controls use `interactionHighlight` for hovered, pressed, open, and selected
+backgrounds. It is a translucent semantic fill so the same control works over the main surface and
+the sidebar. Apply it as `backgroundColor`; setting `opacity` on the control also fades its content.
+
 `destructive` is filled with `destructive`. It only appears inside a confirm. The button on the page is `outline`; the destructive button is the confirm button inside the dialog.

 Sizes: `xs` for ultra-tight inline triggers. `sm` for any button sitting in a row. `md` is the page default. `lg` is reserved for large standalone CTAs.
@@ -155,6 +159,8 @@ On a narrow desktop route, app navigation yields to the rendered content topolog

 Electron window controls are top-corner obstructions, not a compact-layout condition. Rendered surfaces declare which top corners they physically occupy; only those corners receive clearance. Full-window overlays redeclare both corners. A focused split pane owns both corners; if focus restoration temporarily exposes the full split tree, the split boundary reserves one top strip instead of assigning a control rectangle to an arbitrarily narrow leaf. The 720px desktop breakpoint preserves the default 320px sidebar and target 400px center width when the Explorer is closed; it is product policy, not an obstruction gate.

+Windows and Linux controls are fixed window chrome, outside scrolling header content. A tab rail that reaches them ends at their obstruction and shows the shared overflow fade. On macOS, the Explorer toggle occupies a fixed top-right window slot so opening and closing Explorer does not move the pointer target.
+
 A new list+detail feature copies the settings shell. A new workspace-shaped feature copies the workspace shell. Inventing a third shape happens in design review, not in a PR.

 ---
@@ -242,13 +242,13 @@ focused invalidation capture; React Native's generated stacks make that mode hig
 Set `PASEO_PROFILE_TRACE_FOCUS=1` to include focus targets, durations, and JavaScript call stacks in
 the scenario report. This mode wraps `HTMLElement.focus`, so use it only for diagnosis.

-For the desktop Side panel toggle, run the app against the root checkout's daemon and use:
+For the desktop Explorer sidebar toggle, run the app against the root checkout's daemon and use:

 ```bash
 npm run profile:explorer-toggle --workspace=@getpaseo/app
 ```

-The harness verifies port `6768`, opens the Paseo workspace, creates and warms the Side panel pane,
+The harness verifies port `6768`, opens the Paseo workspace, creates and warms the Explorer pane,
 records an idle control, then measures settled and 50 ms burst Cmd+E toggles. It reports
 input-to-DOM and input-to-paint latency, React commits, mounts, unmounts, and DOM mutations. Set
 `PASEO_PROFILE_TRACE_PATH=/tmp/explorer-toggle.trace.json` or
@@ -278,6 +278,17 @@ That report includes input and composer height changes plus React work grouped i
 stream, and ancestor/root scopes. Ancestor/root timings include descendant work because the Profiler
 boundaries are nested. A printable key after an empty newline should not change either height.

+### Preview Windows and Linux window controls on macOS
+
+Desktop development can replace native macOS traffic lights with Paseo's custom controls:
+
+```bash
+PASEO_DESKTOP_WINDOW_CONTROLS=windows npm run dev:desktop
+PASEO_DESKTOP_WINDOW_CONTROLS=linux npm run dev:desktop
+```
+
+The override is rejected in packaged builds. Restart the desktop process when changing it.
+
 ### Desktop macOS compositor watchdog

 macOS display sleep can leave Chromium's GPU-process display link — the vsync
@@ -0,0 +1,74 @@
+# Explorer sidebar and side pane
+
+The Explorer sidebar and the side pane share panel implementations, but they have different shell
+contracts.
+
+| Surface          | Purpose                      | Lifecycle                                  |
+| ---------------- | ---------------------------- | ------------------------------------------ |
+| Explorer sidebar | Files and Changes navigation | Cmd+E shows or hides the dedicated dock    |
+| Side pane        | Ordinary workspace content   | Created and closed like any workspace pane |
+
+## Panel host contract
+
+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.
+
+Files and Changes are the Explorer defaults and its singleton navigation views. Other compatible
+tabs, including agents, terminals, files, and diffs, can move between Explorer and main panes.
+Keep panel implementations independent of either shell. `WorkspacePanelHost` owns mounting and
+retention, while each shell owns its tabs, focus, dragging, resizing, and shortcuts.
+
+## Explorer sidebar
+
+`packages/app/src/workspace-tabs/explorer-sidebar.ts` owns show, hide, toggle, and view selection.
+On desktop, the shell is rendered outside the workspace split canvas so it divides the full
+workspace, including the header. It has its own persisted width and resize handle. Main-pane splits
+never read or modify that width.
+
+The persisted layout still contains the Explorer pane so tabs survive reloads. The renderer removes
+that pane from the workspace split tree and docks it separately. Persisted identifiers retain the
+literal `"explorer"` pane id and `explorerPaneIdByWorkspace` key for compatibility.
+
+The tab rail has no inline add or close controls. Its context menu opens a New Tab launcher and
+toggles the singleton Files and Changes views. Individual tab menus close instances or move
+compatible tabs to main. Explorer tabs can be reordered, but the dock cannot be split. Selecting
+an Explorer tab does not change workspace focus.
+
+Cmd+E selects Changes for Git workspaces and Files otherwise. Compact layouts use the combined
+full-screen Explorer overlay and close it after a file opens. 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
+
+`packages/app/src/workspace-tabs/open-beside.ts` owns content opened beside the user's work. The
+layout store remembers one ordinary pane per workspace. The first side open creates a full-height
+right split around the workspace root; later side opens reuse it.
+
+Closing the pane or moving away its final tab removes it normally and clears the remembered id. A
+later side open creates a new pane. There is no hidden side-pane lifecycle.
+
+Placement intent still controls existing tabs:
+
+| Mode      | New target                  | Existing target                   |
+| --------- | --------------------------- | --------------------------------- |
+| `pane`    | opens in the requested pane | moves to the requested pane       |
+| `prefer`  | opens in the requested pane | stays where the user placed it    |
+| `focused` | opens in the focused pane   | focuses it where it already lives |
+| `ambient` | opens in a compatible pane  | focuses it where it already lives |
+
+Explicit **Open to Side** uses `pane`. Implicit opens use `prefer`, so a preference affects only a
+new target and never yanks an existing tab out of a user-selected pane.
+
+## Routing preferences
+
+Desktop **Settings → Layout → Open in side pane** has independent switches for Explorer Files,
+Explorer Changes, chat files, diff files, subagents, pull requests, and Changes links. All switches
+default off. Mobile ignores them.
+
+Panels request an implicit open through the narrow `openPreferredTarget(target, source)` pane
+contract. Entry points outside panels use `openPreferredWorkspaceTarget`. Do not branch on a
+specific shell inside a panel.
@@ -26,9 +26,8 @@ For forge `acme`, the expected end state is:
 3. **App modules** - a forge splits into a pure logic half and a view half so
   logic consumers (URL builders, merge-capability, native checks, and the
   Node-based e2e harness) never pull the client rendering stack:
-   - `packages/app/src/git/forges/acme.ts` - logic: `id`, optional `urlGrammar`
-     (source links and pasted issue/change-request reference paths), optional
-     `facts` (schema, merge-capability, native-check fallbacks). No
+   - `packages/app/src/git/forges/acme.ts` - logic: `id`, optional `urlGrammar`,
+     optional `facts` (schema, merge-capability, native-check fallbacks). No
     React/React-Native imports. Register in `CLIENT_FORGE_LOGIC_MODULES` in
     `packages/app/src/git/forges/index.ts`.
   - `packages/app/src/git/forges/acme.view.tsx` - view: `icon` (SVG component
@@ -58,20 +57,8 @@ schema-mismatched facts render neutrally instead of failing the whole message
 parse. This is the version-skew win: an old client can receive facts from a
 newer forge and still show the PR/MR in a neutral state.

-Check results keep a stable normalized `status` for aggregation and an optional
-open `traits: string[]` for composable forge-neutral refinements such as
-`manual`, `action_required`, and `warning`. Consumers ignore unknown traits and
-fall back to `status`; `rawStatus` preserves provider-native detail. Do not add
-provider vocabulary to the normalized status union. Producers and the
-presentation layer share the trait constants in
-`packages/protocol/src/check-traits.ts` — use those instead of string literals
-so classification and emission cannot drift apart.
-
 Shipped GitHub compatibility stays separate:

- The forge compatibility layer first shipped in `v0.2.0-beta.1`. Its initial
-  six-month cleanup target is `2027-01-17`, after supported client and daemon
-  floors reach stable `v0.2.0`.
 - `status.github` remains accepted for released peers.
 - The server keeps the `COMPAT(forgeSpecific)` mirror that copies GitHub facts
  into `status.github` for older clients.
@@ -125,7 +112,7 @@ rendering stack:
 `acme.ts` exports a `ClientForgeLogicModule`:

 - `id`
- optional `urlGrammar` (including `referencePaths` for composer auto-attachment)
+- optional `urlGrammar`
 - optional `facts` registration (schema, merge-capability, native-check fallbacks)

 `acme.view.tsx` exports a `ClientForgeViewModule`:
@@ -194,27 +181,10 @@ are stale, run `npm run build:server`.
  real shims tagged with `COMPAT(name)`.
 - Gitea-family facts use `forgeSpecific.forge === "gitea"` even when the
  top-level brand is Forgejo or Codeberg.
- Gitea's legacy Actions task endpoint cannot filter by commit, may enforce a
-  page size below the requested limit, and omits rerun-attempt numbers. Walk a
-  bounded number of pages using `total_count` and filter locally. Preserve
-  ambiguous same-run tasks: display names are not stable job identities, so
-  name-based deduplication can hide a real failure.
- A blocked Gitea Actions task is not necessarily manual: only add the
-  `action_required` trait when the matching run metadata reports
-  `need_approval`.
 - Brand icons are bundled React components, so they cannot come from protocol
  manifest data.
 - Source URL grammars are app-side because blob/tree path syntax is
  forge-specific. If a forge has no grammar, omit the "Open on ..." source link
  rather than constructing a wrong URL.
- Pasted issue/change-request URL recognition is also app-side and registry
-  driven. Put the forge's route infixes in `urlGrammar.referencePaths`; the
-  neutral extractor matches the pasted host and full repository path against
-  the current remote before it invokes cwd-routed forge search. Do not add a
-  central forge switch or guess a self-hosted Gitea-family brand from URL shape.
 - GitLab pipeline status constants belong to the GitLab adapter/client module,
  not protocol.
- GitLab `manual` jobs need `allow_failure` to distinguish optional gray jobs
-  (`manual`) from blocking jobs (`manual` plus `action_required`). A failed
-  allowed-failure job carries the `warning` trait, and `canceling` remains active
-  until GitLab reports a terminal status.
@@ -19,7 +19,8 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **MR** — GitLab merge request. UI label for GitLab change requests only; do not use MR for GitHub/Gitea/Forgejo.
 - **Worktree** — Paseo-managed git worktree (`~/.paseo/worktrees/{name}`); also a `workspaceKind` value. User-facing creation treats it as the `worktree` workspace isolation choice. Code and `paseo.json` retain worktree terminology for git lifecycle implementation. Forbidden: "Checkout" as a product synonym.
 - **Repository / Remote** — Internal Git observations. They may produce mutable kind, branch, and project-grouping metadata but never the host-local project ID, root, display name, or workspace membership. No UI label.
- **Side panel** — The companion surface beside the user's work, holding Changes, Files, the pull request, and tabs an agent opens alongside its output. UI: "Side panel". Code: `packages/app/src/workspace-tabs/side-panel.ts`; the persisted pane id and layout key keep the pre-rename `explorer` spelling. See [side-panel.md](side-panel.md). Forbidden: "Explorer" as the name of the surface — **File Explorer** is only the Files view inside it.
+- **Explorer sidebar** — The dedicated navigation dock containing the Files and Changes trees. UI: "Explorer sidebar". Code: `packages/app/src/workspace-tabs/explorer-sidebar.ts`; persisted pane identifiers retain the `explorer` spelling. See [explorer-sidebar.md](explorer-sidebar.md).
+- **Side pane** — An ordinary right-side workspace pane used for content opened beside the user's work. It closes and participates in workspace splits like every other main-host pane. See [explorer-sidebar.md](explorer-sidebar.md#side-pane). Forbidden: "Side panel".
 - **Directory-backed surface** — A right-sidebar surface whose content is determined by the workspace's `cwd`, so two workspaces on the same directory see identical content: git diff/status, forge change-request info, file preview/explorer contents. Keyed by `(serverId, cwd)`, never `workspaceId`. See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace-owned state** — Per-workspace state that never leaks to a same-`cwd` sibling: tabs, agents, terminals, panes, title, plus review drafts, diff-mode overrides, composer attachments, and file-explorer open/expand state. Keyed by `workspaceId` (`cwd` only as a fallback for old payloads). See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace status bucket** — Aggregate activity signal for a workspace row. Same-`cwd` workspaces intentionally share agent and terminal status buckets, while tab, agent, and terminal visibility remains scoped by `workspaceId`.
@@ -165,6 +165,10 @@ RPC. Snapshot DTOs are deeply readonly and frozen at runtime so plugin code cann
 app state or a memoized selection. Panels use one persisted
 `plugin` workspace-tab target, so reload, disable, removal, and restoration resolve through the
 current installed-plugin catalog. A missing contribution renders unavailable inside the tab.
+Panels declare `locations: ["workspace", "explorer"]` to opt into Explorer hosting; omission means
+workspace only. Location controls hosting, not context. An agent panel target keeps its `agentId`
+when moved between hosts. Explorer configuration can create workspace-context panels and remove
+existing agent-context instances, but it cannot create an agent panel without an agent-aware command.

 Command Center callbacks use the selected host's existing `PaseoApi` for normal Paseo operations.
 They use typed plugin RPC only for plugin-specific backend work. Navigation is limited to the
@@ -436,7 +436,6 @@ This ensures the checkout ref matches the actual code on `main` with the fix inc
 ## Notes

 - `version:all:*` bumps root + syncs workspace versions and `@getpaseo/*` dependency versions
- The npm `version` lifecycle regenerates F-Droid changelog files from `CHANGELOG.md` for stable releases only (`npm run fdroid:changelogs`) and stages them, so the release tag carries them. Betas are a no-op. A stable run **aborts the release** if `CHANGELOG.md` has no entry for the version being cut — commit the changelog entry first. See [docs/android.md](android.md) for why these files are generated per ABI.
 - `release:prepare` refreshes workspace `node_modules` links to prevent stale types
 - `npm run dev:desktop` and `npm run build:desktop` target the Electron desktop package in `packages/desktop`
 - If `release:publish` partially fails, re-run it — npm skips already-published versions
@@ -1,98 +0,0 @@
-# Side panel
-
-The companion surface beside the user's work: Changes, Files, the pull request, and
-anything an agent asks to show alongside its output.
-
-Everything that opens, reveals, hides, or asks about it goes through
-`packages/app/src/workspace-tabs/side-panel.ts`. Nothing else branches on which
-surface the current layout uses.
-
-## Three renderings, two facts
-
-| Layout                 | Rendering                                       |
-| ---------------------- | ----------------------------------------------- |
-| compact                | slide-over overlay, owned by the panel store    |
-| non-compact + splits   | dedicated right pane, owned by the layout store |
-| non-compact, no splits | ordinary tabs in the focused pane               |
-
-The third case is the one that bites. A native tablet renders one pane at a time and
-the tab row only lists the focused pane's tabs, so anything routed into a separate
-side panel pane there disappears with no way back.
-
-## Placement
-
-Where a tab lands is an intent the caller declares, not something the store infers
-from a `paneId` that happens to be in scope. `WorkspaceTabPlacement`
-(`packages/app/src/stores/workspace-layout-actions.ts`) has four modes, and the
-difference between them only shows up when the tab is already open somewhere:
-
-| Mode      | New tab           | Tab already open             |
-| --------- | ----------------- | ---------------------------- |
-| `pane`    | opens in the pane | **moves** to the pane        |
-| `prefer`  | opens in the pane | stays where the user left it |
-| `focused` | focused pane      | focuses it in place          |
-| `ambient` | focused pane      | focuses it in place          |
-
-`pane` is a pane-local affordance — that pane's `+` menu, its empty-state launcher.
-The user is placing the tab and expects it to arrive.
-
-`prefer` is an implicit supporting open — an agent's file link or a failed workspace
-setup. It has an opinion about new tabs only. Yanking a tab out of the pane the user
-deliberately moved it to is the failure this mode exists to prevent.
-
-`ambient` differs from `focused` in one rule: reconciliation opens tabs with nobody
-behind the click, and the side panel can hold focus from an earlier reveal, so an
-ambient open of something the user works _in_ (an agent, a terminal, a browser) is
-pushed out of the side panel. A `focused` open honours the focused pane whatever it
-is, because the user is standing in it.
-
-Deduplication lives in `openTabInLayoutFocused`, so it obeys the placement intent for
-every caller. Do not re-place a tab after opening it.
-
-## Lifecycle
-
-The side panel lives in the ordinary split tree, so it is a pane like any other until
-it empties or the user dismisses it:
-
- **Close pane** on the side panel **hides** it; its tabs are waiting on the next reveal.
- **Close pane** on any other pane **removes** it.
- Closing the Side panel's final tab hides the pane. Revealing it returns the empty launcher.
-  This is close-only: claiming or dragging that tab to another pane leaves the empty Side panel
-  visible.
- Nothing takes the last visible pane away. `closePane` will not remove it, and
-  neither `closePane` nor `hideSidePanel` will hide it — including the header toggle
-  reaching `hideSidePanel` after every other pane is gone. The gate is one check in
-  `setPaneHiddenInLayout`; do not add a second one upstream.
-
-`closePane` in the layout store owns that distinction. React renders the button and
-does not decide what it means.
-
-Dragging a pane's last tab into another pane collapses the source pane — except the
-side panel, which the user summons and expects to find again, split size and all.
-
-## What the side panel never does
-
-It does not seed itself. Revealing it opens an empty pane with the launcher; the user
-picks what goes in. Detecting a pull request makes the launcher's card available and
-opens nothing. A failed workspace setup adds a background tab to the main pane.
-Running and successful setup never seed tabs.
-
-## Routing preference
-
-**Settings → General → Open supporting tabs in the Side panel**, on by default,
-persisted in client app settings as `openSupportingTabsInSidePanel`. Off means new
-supporting tabs land in the focused pane instead. Mobile ignores it. Explicit actions
-— the header toggle, a pane's `+` menu, the empty-state launcher — are never subject
-to it. The Changes keyboard shortcut and the diff-stat pill above an agent composer are
-supporting opens: they follow the preference and focus an existing Changes tab wherever
-the user left it. When Changes is already visible in the Side panel, the diff-stat pill
-hides the panel without closing the tab. A different visible Side panel tab switches to
-Changes instead.
-
-## The name
-
-The product surface is the **Side panel**. **File Explorer** is still the name of the
-Files view inside it. Persisted identifiers keep their pre-rename spelling: the pane
-id is the literal string `"explorer"` (`SIDE_PANEL_PANE_ID`) and the persisted layout
-key is `explorerPaneIdByWorkspace`. The persisted state schema is strict, so renaming
-either would fail every saved blob and wipe the layout it describes.
@@ -43,6 +43,6 @@ Terminal frames share the daemon main event loop with all agent traffic. The `ev

 ## Known remaining contention (follow-up candidates)

- A single large `agent_stream` message (e.g. a 250KB diff payload) measurably delays terminal echo (~100ms-class dips) — cost is split between daemon serialization and app-side parse/render on the shared browser main thread. See [agent-stream-performance.md](agent-stream-performance.md) for that pipeline's own budgets.
+- A single large `agent_stream` message (e.g. a 250KB diff payload) measurably delays terminal echo (~100ms-class dips) — cost is split between daemon serialization and app-side parse/render on the shared browser main thread.
 - Relay-attached clients pay pure-JS tweetnacl encryption on the daemon main loop (`packages/relay/src/encrypted-channel.ts`). Negotiated binary application frames stay binary ciphertext and avoid base64 encode/decode; text and mixed-version traffic remain base64 WebSocket text frames.
 - `sendToClient` re-stringifies session messages per socket; only matters for multi-socket connections.
@@ -189,6 +189,9 @@ Test suites in this repo are heavy. Running them in bulk freezes the machine, es
 - 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.
+- 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.

 ## Pull-request test routing

@@ -1,37 +0,0 @@
-Paseo is a client for AI coding agents that run on your own machine. Your dev environment, in your pocket.
-
-Paseo runs a local server called the daemon on your computer. It manages your coding agents and streams their output in real time. This app connects to that daemon, so your code never leaves your machine and there is no cloud service in between.
-
-<b>Supported agents</b>
-
-<ul>
-<li>Claude Code</li>
-<li>Codex</li>
-<li>GitHub Copilot</li>
-<li>OpenCode</li>
-<li>Pi</li>
-</ul>
-
-You bring your own provider credentials and use your existing subscriptions. Paseo adds no markup and no inference costs of its own.
-
-<b>What you can do</b>
-
-<ul>
-<li>Start agents, watch them work, and answer their questions from your phone</li>
-<li>Run several agents in parallel across projects and git worktrees</li>
-<li>Review diffs, browse commit history, and edit files</li>
-<li>Work with pull requests from GitHub, GitLab, Gitea, Forgejo, and Codeberg</li>
-<li>Open a terminal in any workspace</li>
-<li>Dictate prompts or talk through a problem in voice mode</li>
-<li>Schedule agents to run on a recurring basis</li>
-</ul>
-
-<b>Privacy</b>
-
-No telemetry, no tracking, no account required. The app talks only to daemons you point it at. Remote access goes through an end-to-end encrypted relay that cannot read your traffic, or over your own network or VPN if you prefer.
-
-<b>You need a daemon to connect to</b>
-
-This app is not useful on its own. Install the Paseo daemon on the computer where your code and agent CLIs live, then pair this app with it from Settings. The desktop app bundles the daemon, or you can run it from npm, Docker, or Nix.
-
-Setup instructions: https://paseo.sh
@@ -1 +0,0 @@
-../../../../../../packages/website/public/phone-1.png
@@ -1 +0,0 @@
-../../../../../../packages/website/public/phone-2.png
@@ -1 +0,0 @@
-../../../../../../packages/website/public/phone-3.png
@@ -1 +0,0 @@
-Monitor and control your local AI coding agents from anywhere
@@ -1 +0,0 @@
-Paseo
@@ -1,37 +0,0 @@
-Paseo は、自分のマシン上で動作する AI コーディングエージェントのクライアントです。あなたの開発環境を、ポケットの中に。
-
-Paseo はデーモンと呼ばれるローカルサーバーをあなたのコンピューター上で実行します。デーモンがコーディングエージェントを管理し、その出力をリアルタイムに配信します。このアプリはそのデーモンに接続するため、コードがマシンの外に出ることはなく、間にクラウドサービスも入りません。
-
-<b>対応エージェント</b>
-
-<ul>
-<li>Claude Code</li>
-<li>Codex</li>
-<li>GitHub Copilot</li>
-<li>OpenCode</li>
-<li>Pi</li>
-</ul>
-
-プロバイダーの認証情報はご自身のものを使用し、既存のサブスクリプションをそのまま活用できます。Paseo が独自の手数料や推論コストを追加することはありません。
-
-<b>できること</b>
-
-<ul>
-<li>スマートフォンからエージェントを起動し、作業を確認し、質問に回答する</li>
-<li>プロジェクトや git worktree をまたいで複数のエージェントを並列実行する</li>
-<li>差分のレビュー、コミット履歴の閲覧、ファイルの編集</li>
-<li>GitHub、GitLab、Gitea、Forgejo、Codeberg のプルリクエストを扱う</li>
-<li>任意のワークスペースでターミナルを開く</li>
-<li>音声でプロンプトを入力したり、音声モードで問題を相談する</li>
-<li>エージェントを定期実行するようスケジュールする</li>
-</ul>
-
-<b>プライバシー</b>
-
-テレメトリー、トラッキング、アカウント登録は一切ありません。アプリは、あなたが指定したデーモンにのみ通信します。リモートアクセスは通信内容を読み取れないエンドツーエンド暗号化リレーを経由するか、ご自身のネットワークや VPN を利用できます。
-
-<b>接続先のデーモンが必要です</b>
-
-このアプリは単体では機能しません。コードとエージェント CLI があるコンピューターに Paseo デーモンをインストールし、設定画面からこのアプリをペアリングしてください。デスクトップアプリにはデーモンが同梱されています。npm、Docker、Nix から実行することもできます。
-
-セットアップ手順: https://paseo.sh
@@ -1 +0,0 @@
-ローカルのAIコーディングエージェントをどこからでも操作
@@ -1,37 +0,0 @@
-Paseo 是运行在你自己机器上的 AI 编程 agents 的客户端。把你的开发环境装进口袋。
-
-Paseo 会在你的电脑上运行一个名为 daemon 的本地服务，由它管理编程 agents 并实时推送输出。本应用连接到该 daemon，因此你的代码不会离开你的机器，中间也没有任何云服务。
-
-<b>支持的 agents</b>
-
-<ul>
-<li>Claude Code</li>
-<li>Codex</li>
-<li>GitHub Copilot</li>
-<li>OpenCode</li>
-<li>Pi</li>
-</ul>
-
-你使用自己的提供商凭据和现有订阅。Paseo 不加价，也不产生自己的推理费用。
-
-<b>你可以做什么</b>
-
-<ul>
-<li>在手机上启动 agents、查看进展并回答它们的提问</li>
-<li>跨项目和 git worktree 并行运行多个 agents</li>
-<li>审查差异、浏览提交历史、编辑文件</li>
-<li>处理来自 GitHub、GitLab、Gitea、Forgejo 和 Codeberg 的合并请求</li>
-<li>在任意工作区打开终端</li>
-<li>用语音输入提示，或在语音模式下讨论问题</li>
-<li>将 agents 设置为定期运行</li>
-</ul>
-
-<b>隐私</b>
-
-没有遥测、没有追踪、无需账号。应用只与你指定的 daemon 通信。远程访问通过无法读取你流量的端到端加密中继，或者你也可以使用自己的网络或 VPN。
-
-<b>你需要一个可连接的 daemon</b>
-
-本应用无法独立使用。请在存放代码和 agent CLI 的电脑上安装 Paseo daemon，然后在设置中将本应用与其配对。桌面应用已内置 daemon，你也可以通过 npm、Docker 或 Nix 运行。
-
-安装说明：https://paseo.sh
@@ -1 +0,0 @@
-随时随地监控和控制本地的 AI 编程 agents
@@ -1 +1 @@
-sha256-13Q44pEU+V2M/wnitVAlBarYxAqWkGkXrE+w5qUCf7o=
+sha256-TRZej2L43C3go4NWe496Dqs/4A+0GivCRtGzt3pX2dw=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.5.1",
+  "version": "0.6.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
@@ -15070,12 +15070,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/await-lock": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/await-lock/-/await-lock-2.2.2.tgz",
-      "integrity": "sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw==",
-      "license": "MIT"
-    },
    "node_modules/axios": {
      "version": "1.13.6",
      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
@@ -21342,20 +21336,6 @@
        "node": ">=8.0"
      }
    },
-    "node_modules/expo-sqlite": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/expo-sqlite/-/expo-sqlite-16.0.10.tgz",
-      "integrity": "sha512-tUOKxE9TpfneRG3eOfbNfhN9236SJ7IiUnP8gCqU7umd9DtgDGB/5PhYVVfl+U7KskgolgNoB9v9OZ9iwXN8Eg==",
-      "license": "MIT",
-      "dependencies": {
-        "await-lock": "^2.2.2"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-native": "*"
-      }
-    },
    "node_modules/expo-system-ui": {
      "version": "6.0.9",
      "resolved": "https://registry.npmjs.org/expo-system-ui/-/expo-system-ui-6.0.9.tgz",
@@ -21801,16 +21781,6 @@
      "license": "MIT",
      "optional": true
    },
-    "node_modules/fake-indexeddb": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/fake-indexeddb/-/fake-indexeddb-6.2.5.tgz",
-      "integrity": "sha512-CGnyrvbhPlWYMngksqrSSUT1BAVP49dZocrHuK0SvtR0D5TMs5wP0o3j7jexDJW01KSadjBp1M/71o/KR3nD1w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=18"
-      }
-    },
    "node_modules/fast-copy": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-4.0.2.tgz",
@@ -36170,7 +36140,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -36230,7 +36200,6 @@
        "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",
@@ -36272,7 +36241,6 @@
        "@testing-library/dom": "^10.4.1",
        "@testing-library/react": "^16.3.2",
        "@types/markdown-it": "^14.1.2",
-        "@types/node": "~22.19.0",
        "@types/qrcode": "^1.5.6",
        "@types/react": "~19.2.0",
        "@types/turndown": "^5.0.6",
@@ -36286,7 +36254,6 @@
        "eslint": "^9.25.0",
        "eslint-config-expo": "~10.0.0",
        "expo-gradle-jvmargs": "^1.1.2",
-        "fake-indexeddb": "^6.2.5",
        "jsdom": "^20.0.3",
        "material-icon-theme": "^5.32.0",
        "playwright": "^1.56.1",
@@ -36824,16 +36791,6 @@
        "node": ">=18"
      }
    },
-    "packages/app/node_modules/@types/node": {
-      "version": "22.19.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.21.tgz",
-      "integrity": "sha512-VMeFBSCKQKmm2swI2kW51SFusDqekC6q9trBCvJ/JliDchFSuoYYKN7yVNjPthP1HKZcx3U1gI/wTcEBjEFKTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
    "packages/app/node_modules/@xterm/addon-clipboard": {
      "version": "0.3.0-beta.213",
      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.213.tgz",
@@ -37235,12 +37192,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.5.1",
-        "@getpaseo/protocol": "0.5.1",
-        "@getpaseo/server": "0.5.1",
+        "@getpaseo/client": "0.6.0",
+        "@getpaseo/protocol": "0.6.0",
+        "@getpaseo/server": "0.6.0",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -37487,10 +37444,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
-        "@getpaseo/protocol": "0.5.1",
-        "@getpaseo/relay": "0.5.1",
+        "@getpaseo/protocol": "0.6.0",
+        "@getpaseo/relay": "0.6.0",
        "zod": "^4.4.3"
      },
      "devDependencies": {
@@ -37501,7 +37458,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -37744,7 +37701,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -38640,7 +38597,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -38669,12 +38626,12 @@
    },
    "packages/plugin": {
      "name": "@getpaseo/plugin",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
-        "@getpaseo/client": "0.5.1",
+        "@getpaseo/client": "0.6.0",
        "@types/node": "^20.9.0",
        "@types/react": "~19.2.0",
        "react": "19.1.0",
@@ -38683,14 +38640,14 @@
        "zod": "^4.4.3"
      },
      "peerDependencies": {
-        "@getpaseo/client": "0.5.1",
+        "@getpaseo/client": "0.6.0",
        "react": "19.1.0",
        "zod": "^4.4.3"
      }
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "zod": "^4.4.3"
      },
@@ -38703,7 +38660,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -38921,17 +38878,17 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "0.3.220",
        "@anthropic-ai/sdk": "^0.104.2",
        "@babel/parser": "^7.29.8",
-        "@getpaseo/client": "0.5.1",
-        "@getpaseo/highlight": "0.5.1",
-        "@getpaseo/plugin": "0.5.1",
-        "@getpaseo/protocol": "0.5.1",
-        "@getpaseo/relay": "0.5.1",
+        "@getpaseo/client": "0.6.0",
+        "@getpaseo/highlight": "0.6.0",
+        "@getpaseo/plugin": "0.6.0",
+        "@getpaseo/protocol": "0.6.0",
+        "@getpaseo/relay": "0.6.0",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
@@ -39983,7 +39940,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.5.1",
+  "version": "0.6.0",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -84,8 +84,6 @@
    "android:release": "npm run android:production --workspace=@getpaseo/app",
    "android:clear": "npm run android:clear --workspace=@getpaseo/app",
    "android:clean": "npm run android:clean --workspace=@getpaseo/app",
-    "fdroid:changelogs": "node scripts/sync-fdroid-changelogs.mjs",
-    "fdroid:changelogs:check": "node scripts/sync-fdroid-changelogs.mjs --check",
    "ios": "npm run ios --workspace=@getpaseo/app",
    "web": "npm run web --workspace=@getpaseo/app",
    "dev:desktop": "cross-env PASEO_LISTEN=127.0.0.1:6768 npm run dev --workspace=@getpaseo/desktop",
@@ -93,7 +91,7 @@
    "build:desktop": "npm run build:app-deps:clean && cd packages/app && cross-env PASEO_WEB_PLATFORM=electron npx expo export --platform web && cd ../.. && npm run build --workspace=@getpaseo/desktop --",
    "db:query": "npm run db:query --workspace=@getpaseo/server --",
    "cli": "./scripts/dev-home.sh npx tsx packages/cli/src/index.js",
-    "version": "npm run version:sync-internal && npm run fdroid:changelogs && npm run release:prepare && git add -A",
+    "version": "npm run version:sync-internal && npm run release:prepare && git add -A",
    "version:sync-internal": "node scripts/sync-workspace-versions.mjs",
    "release:prepare": "npm install --workspaces --include-workspace-root",
    "version:all:patch": "node scripts/set-release-version.mjs --mode patch",
@@ -442,21 +442,40 @@ function formatFrames(frames: TurnFrame[], centers: number | number[]): string {
    .join("\n");
 }

+function submittedRowContentTop(frame: TurnFrame | undefined): number | undefined {
+  const viewportTop = frame?.userRow.rect?.top;
+  const scrollTop = frame?.scroll.scrollTop;
+  return viewportTop == null || scrollTop == null ? undefined : viewportTop + scrollTop;
+}
+
 function expectRowContinuity(frames: TurnFrame[]): void {
  const first = frames.findIndex((frame) => hasPaintedLayout(frame.userRow));
-  const baseline = frames[first]?.userRow.rect?.top;
+  const baselineFrame = frames[first];
+  const baselineContentTop = submittedRowContentTop(baselineFrame);
  const disappeared = frames.findIndex(
    (frame, index) => index > first && !hasPaintedLayout(frame.userRow),
  );
  const reappeared = frames.findIndex(
    (frame, index) => index > disappeared && disappeared >= 0 && hasPaintedLayout(frame.userRow),
  );
-  const shifted = frames.findIndex(
-    (frame, index) =>
+  const contentShifted = frames.findIndex((frame, index) => {
+    const contentTop = submittedRowContentTop(frame);
+    return (
      index > first &&
      hasPaintedLayout(frame.userRow) &&
-      baseline !== undefined &&
-      Math.abs((frame.userRow.rect?.top ?? baseline) - baseline) > 1,
+      baselineContentTop !== undefined &&
+      contentTop !== undefined &&
+      Math.abs(contentTop - baselineContentTop) > 1
+    );
+  });
+  const viewportChanged = frames.findIndex(
+    (frame, index) =>
+      index > first &&
+      [
+        geometryChanged(frame.scroll.rect?.top, baselineFrame?.scroll.rect?.top),
+        geometryChanged(frame.scroll.rect?.height, baselineFrame?.scroll.rect?.height),
+        geometryChanged(frame.scroll.clientHeight, baselineFrame?.scroll.clientHeight),
+      ].some(Boolean),
  );
  const attachmentMissing = frames.findIndex(
    (frame, index) => index >= first && !hasPaintedLayout(frame.attachment),
@@ -468,16 +487,18 @@ function expectRowContinuity(frames: TurnFrame[]): void {
          `submitted row disappeared for ${Math.max(0, reappeared - disappeared)} recorded frames (${Math.max(0, (frames[reappeared]?.at ?? frames.at(-1)?.at ?? 0) - frames[disappeared].at).toFixed(1)}ms) before authoritative recovery`,
        ]
      : []),
-    ...(shifted >= 0
+    ...(contentShifted >= 0
      ? [
-          `submitted row moved from ${baseline?.toFixed(1)} to ${frames[shifted].userRow.rect?.top.toFixed(1)}`,
+          `submitted row moved in scroll content from ${baselineContentTop?.toFixed(1)} to ${submittedRowContentTop(frames[contentShifted])?.toFixed(1)}`,
        ]
      : []),
+    ...(viewportChanged >= 0 ? ["scroll viewport geometry changed"] : []),
    ...(attachmentMissing >= 0 ? ["submitted image attachment left the painted layout"] : []),
  ];
  let failure = Math.max(0, first);
  if (attachmentMissing >= 0) failure = attachmentMissing;
-  if (shifted >= 0) failure = shifted;
+  if (viewportChanged >= 0) failure = viewportChanged;
+  if (contentShifted >= 0) failure = contentShifted;
  if (disappeared >= 0) failure = disappeared;
  expect(
    violations,
@@ -3,13 +3,10 @@ import { expect, test, type Page } from "../support/fixtures";
 import { expectAgentIdle, expectAgentReadyToInterrupt } from "../support/helpers/agent-stream";
 import {
  cancelAgent,
-  fillComposerDraft,
  expectComposerDraft,
  expectComposerVisible,
  submitMessage,
 } from "../support/helpers/composer";
-import { expectNearBottom, scrollChatAwayFromBottom } from "../support/helpers/agent-bottom-anchor";
-import { holdRewindCompletion } from "../support/helpers/agent-timeline-gate";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 async function completeSubmittedTurn(
@@ -45,13 +42,9 @@ async function expectTurnCompletesNormally(
 }

 test.describe("Agent message rewind", () => {
-  test("rewinds a submitted prompt without replaying history and preserves a human draft", async ({
-    page,
-  }) => {
+  test("rewinds a submitted prompt and restores it to the composer", async ({ page }) => {
    test.setTimeout(90_000);
-    const retainedPrompt = "Keep this completed turn after rewind.";
-    const rewoundPrompt = "Remove this completed turn after rewind.";
-    const preservedDraft = "Keep this human draft after rewind.";
+    const prompt = "Restore this submitted prompt after rewind.";
    const agent = await seedMockAgentWorkspace({
      repoPrefix: "message-rewind-roundtrip-",
      title: "Message rewind roundtrip",
@@ -59,30 +52,14 @@ test.describe("Agent message rewind", () => {
    });

    try {
-      const rewindCompletion = await holdRewindCompletion(page, agent.agentId);
      await openAgentRoute(page, agent);
      await expectComposerVisible(page);
-      await completeSubmittedTurn(page, agent, retainedPrompt);
-      const userMessage = await completeSubmittedTurn(page, agent, rewoundPrompt);
-      await scrollChatAwayFromBottom(page, {
-        deltaY: -900,
-        minDistanceFromBottom: 300,
-      });
-      await fillComposerDraft(page, preservedDraft);
-      rewindCompletion.clearTimelineStreamCount();
+      const userMessage = await completeSubmittedTurn(page, agent, prompt);

-      const rewind = rewindConversation(page, userMessage, rewoundPrompt);
-      await rewindCompletion.waitForDelayedResponse();
-      await expect(page.getByTestId("rewind-menu-conversation")).toBeDisabled();
-      expect(rewindCompletion.timelineStreamCount()).toBe(0);
-      rewindCompletion.release();
-      await rewind;
+      await rewindConversation(page, userMessage, prompt);

-      await expect(page.getByTestId("user-message").filter({ hasText: rewoundPrompt })).toHaveCount(
-        0,
-      );
-      await expectComposerDraft(page, preservedDraft);
-      await expectNearBottom(page);
+      await expect(page.getByText("(end of synthetic stream)", { exact: true })).toHaveCount(0);
+      await expectComposerDraft(page, prompt);
    } finally {
      await agent.cleanup();
    }
@@ -1,151 +0,0 @@
-import { test, expect } from "../support/fixtures";
-import { awaitAssistantMessage } from "../support/helpers/agent-stream";
-import { startRunningMockAgent } from "../support/helpers/composer";
-import {
-  sampleStreamFrames,
-  summarizeStreamSmoothness,
-} from "../support/helpers/stream-smoothness";
-
-/**
- * Streaming smoothness, measured on the path the user actually sees.
- *
- * The mock provider's "bursty-stream" model emits tokens in uneven runs separated
- * by idle gaps, which is how real models arrive. Sampling and the statistics live
- * in ../support/helpers/stream-smoothness.ts, which also documents what the two
- * numbers mean.
- *
- * Budgets are deliberately loose. This spec exists to catch a regression in the
- * shape of the stream, not to pin exact numbers on shared CI hardware. For
- * reference, on a local dev daemon the paced reveal measures a CV around 1.3–1.5
- * against 2.7 when painting deltas as they arrive.
- */
-
-const SAMPLE_WINDOW_MS = 6_000;
-const CHARS_PER_FRAME_CV_BUDGET = 2;
-const UPDATE_GAP_P95_BUDGET_MS = 250;
-const REACT_COMMIT_P95_BUDGET_MS = 12;
-const REACT_COMMIT_COUNT_BUDGET = 600;
-const RUN_AGENT_STREAM_PERF = process.env.PASEO_AGENT_STREAM_PERF_E2E === "1";
-const agentStreamPerfDescribe = RUN_AGENT_STREAM_PERF ? test.describe : test.describe.skip;
-
-interface ReactCommit {
-  id: string;
-  phase: "mount" | "update" | "nested-update";
-  actualDuration: number;
-  baseDuration: number;
-  startTime: number;
-  commitTime: number;
-}
-
-agentStreamPerfDescribe("Agent stream smoothness", () => {
-  test("reveals bursty model output at a steady rate", async ({ page }, testInfo) => {
-    test.setTimeout(120_000);
-    await page.addInitScript(() => {
-      Reflect.set(globalThis, "__PASEO_RENDER_PROFILE_ENABLED__", true);
-    });
-
-    const agent = await startRunningMockAgent(page, {
-      prefix: "stream-smoothness-",
-      model: "bursty-stream",
-      prompt: "Stream bursty output for smoothness measurement.",
-    });
-    try {
-      await awaitAssistantMessage(page);
-      await page.evaluate(() => {
-        const reset = Reflect.get(globalThis, "__PASEO_RESET_RENDER_PROFILE__");
-        if (typeof reset !== "function") {
-          throw new Error("Render profiler did not initialize");
-        }
-        reset();
-      });
-
-      const samples = await sampleStreamFrames(page, { sampleWindowMs: SAMPLE_WINDOW_MS });
-      const report = summarizeStreamSmoothness(samples, SAMPLE_WINDOW_MS);
-      const reactCommits = await readStreamReactCommits(page);
-      const reactReport = summarizeReactCommits(reactCommits);
-
-      await testInfo.attach("agent-stream-smoothness-report", {
-        body: JSON.stringify(report, null, 2),
-        contentType: "application/json",
-      });
-      await testInfo.attach("agent-stream-react-profile", {
-        body: JSON.stringify(reactReport, null, 2),
-        contentType: "application/json",
-      });
-      console.log(`[perf] Agent stream React: ${JSON.stringify(reactReport)}`);
-      console.log(`[perf] Agent stream smoothness: ${JSON.stringify(report)}`);
-
-      expect(
-        report.growthFrames,
-        "the stream must actually produce text during the sample window",
-      ).toBeGreaterThan(20);
-      expect(
-        report.charsPerFrameCv,
-        `characters painted per frame should be steady (cv < ${CHARS_PER_FRAME_CV_BUDGET})`,
-      ).toBeLessThan(CHARS_PER_FRAME_CV_BUDGET);
-      expect(
-        report.updateGapP95Ms,
-        `the text should not stall (p95 gap < ${UPDATE_GAP_P95_BUDGET_MS}ms)`,
-      ).toBeLessThan(UPDATE_GAP_P95_BUDGET_MS);
-      expect(reactReport.count, "streaming should produce measured React commits").toBeGreaterThan(
-        20,
-      );
-      expect(
-        reactReport.count,
-        `the reveal should cap commits below ${REACT_COMMIT_COUNT_BUDGET} per sample window`,
-      ).toBeLessThan(REACT_COMMIT_COUNT_BUDGET);
-      expect(
-        reactReport.actualDurationP95Ms,
-        `React commits should stay below ${REACT_COMMIT_P95_BUDGET_MS}ms at p95`,
-      ).toBeLessThan(REACT_COMMIT_P95_BUDGET_MS);
-    } finally {
-      await agent.cleanup();
-    }
-  });
-});
-
-async function readStreamReactCommits(
-  page: Parameters<typeof sampleStreamFrames>[0],
-): Promise<ReactCommit[]> {
-  return await page.evaluate(() => {
-    const samples = Reflect.get(globalThis, "__PASEO_RENDER_PROFILE__");
-    if (!Array.isArray(samples)) {
-      return [];
-    }
-    return samples.filter(
-      (sample): sample is ReactCommit =>
-        typeof sample === "object" &&
-        sample !== null &&
-        typeof Reflect.get(sample, "id") === "string" &&
-        Reflect.get(sample, "id").startsWith("AgentStreamSection:"),
-    );
-  });
-}
-
-function summarizeReactCommits(commits: readonly ReactCommit[]) {
-  const durations = commits
-    .map((commit) => commit.actualDuration)
-    .sort((left, right) => left - right);
-  const total = durations.reduce((sum, duration) => sum + duration, 0);
-  return {
-    count: commits.length,
-    actualDurationTotalMs: round2(total),
-    actualDurationMeanMs: round2(commits.length > 0 ? total / commits.length : 0),
-    actualDurationP50Ms: percentile(durations, 50),
-    actualDurationP95Ms: percentile(durations, 95),
-    actualDurationMaxMs: durations.at(-1) ?? 0,
-  };
-}
-
-function round2(value: number): number {
-  return Math.round(value * 100) / 100;
-}
-
-function percentile(sorted: readonly number[], percentileValue: number): number {
-  if (sorted.length === 0) {
-    return 0;
-  }
-  return sorted[
-    Math.min(sorted.length - 1, Math.floor((sorted.length - 1) * (percentileValue / 100)))
-  ];
-}
@@ -30,11 +30,7 @@ const cleanupTasks: CleanupTask[] = [];
 const APP_SETTINGS_KEY = "@paseo:app-settings";

 function changesTree(page: Page) {
-  return page.getByTestId("changes-tree-rail-tree");
-}
-
-function changesContent(page: Page) {
-  return page.getByTestId("changes-tree-rail-content");
+  return page.getByTestId("changes-file-tree").filter({ visible: true });
 }

 async function readFileIfPresent(filePath: string): Promise<string | null> {
@@ -264,7 +260,8 @@ test("Changes opens the populated committed comparison for a clean checkout", as
  await openWorkspaceChangesSurface(page, workspace);

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

@@ -272,19 +269,19 @@ test("Changes expires a manual comparison when checkout dirtiness changes", asyn
  const workspace = await createWorkspaceWithMountedTabDiff();
  await openWorkspaceChanges(page, workspace);

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

  await mode.click();
  await page.getByTestId("changes-diff-mode-committed").click();
  await expect(mode).toContainText("Committed");
-  await expect(panel.getByRole("button", { name: "See uncommitted changes" })).toBeVisible();
+  await expect(tree.getByRole("button", { name: "See uncommitted changes" })).toBeVisible();

  execFileSync("git", ["add", "--all"], { cwd: workspace.repoPath });
  execFileSync("git", ["commit", "-m", "Commit working changes"], { cwd: workspace.repoPath });
  await expect(mode).toContainText("Committed");
-  await expect(panel.getByRole("button", { name: "See uncommitted changes" })).toHaveCount(0, {
+  await expect(tree.getByRole("button", { name: "See uncommitted changes" })).toHaveCount(0, {
    timeout: 30_000,
  });

@@ -297,7 +294,8 @@ test("an empty Changes comparison links to the populated comparison", async ({ p
  await openWorkspaceChangesSurface(page, workspace);

  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
-  const mode = panel.getByTestId("changes-diff-status-trigger");
+  const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
+  const mode = tree.getByTestId("changes-diff-status-trigger");
  await mode.click();
  await page.getByTestId("changes-diff-mode-committed").click();
  await expect(panel.getByText("committed-only.ts", { exact: true })).toBeVisible();
@@ -305,8 +303,8 @@ test("an empty Changes comparison links to the populated comparison", async ({ p
  await mode.click();
  await page.getByTestId("changes-diff-mode-uncommitted").click();

-  await expect(panel.getByText("No uncommitted changes", { exact: true })).toBeVisible();
-  const seeCommitted = panel.getByRole("button", { name: "See committed changes" });
+  await expect(tree.getByText("No uncommitted changes", { exact: true })).toBeVisible();
+  const seeCommitted = tree.getByRole("button", { name: "See committed changes" });
  await expect(seeCommitted).toBeVisible();
  await seeCommitted.click();
  await expect(mode).toContainText("Committed");
@@ -321,7 +319,7 @@ test("changes file actions open below the right-click without a reserved kebab",
  await openWorkspaceChanges(page, workspace);

  await expect(page.getByTestId("diff-file-1")).toContainText("zz-deleted.ts");
-  const deletedFileName = page.getByText("zz-deleted.ts", { exact: true });
+  const deletedFileName = page.getByTestId("diff-file-1-name");
  await expect(deletedFileName).toHaveCSS("user-select", "none");
  await deletedFileName.dblclick();
  expect(await page.evaluate(() => window.getSelection()?.toString() ?? "")).toBe("");
@@ -432,7 +430,6 @@ test("changes context menus duplicate files and folders", async ({ page }) => {
    .poll(() => readFileIfPresent(path.join(workspace.repoPath, "src/use-mounted-tab-set copy.ts")))
    .toBe(AFTER);

-  await page.getByTestId("changes-toggle-tree").click();
  await changesTree(page).getByTestId("diff-folder-src-toggle").click({ button: "right" });
  await page.getByTestId("diff-folder-src-duplicate").click();
  await expect
@@ -447,8 +444,6 @@ test("changes tree aligns every file status after its diff stat", async ({ page
  });
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
-  await page.getByTestId("changes-toggle-tree").click();
-
  const tree = changesTree(page);
  const modifiedRow = tree.getByTestId("diff-tree-file-0");
  const deletedRow = tree.getByTestId("diff-tree-file-1");
@@ -471,7 +466,6 @@ test("changes context menu recursively collapses descendant folders", async ({ p
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);

-  await page.getByTestId("changes-toggle-tree").click();
  const tree = changesTree(page);
  await expect(tree.getByTestId("diff-folder-src/zz-folder")).toBeVisible();
  await expect(tree.getByTestId("diff-folder-src/zz-folder/nested")).toBeVisible();
@@ -516,7 +510,6 @@ test("changes context menus expose folder revert and restore a file after confir
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);

-  await page.getByTestId("changes-toggle-tree").click();
  const tree = changesTree(page);
  await tree.getByTestId("diff-folder-src-toggle").click({ button: "right" });
  const folderRevert = page.getByTestId("diff-folder-src-revert");
@@ -649,6 +642,11 @@ test("Changes keeps review navigation and controls inside its workspace tab", as

  const visiblePanel = page.getByTestId("working-diff-panel").filter({ visible: true });
  await expect(visiblePanel).toBeVisible();
+  await expect(visiblePanel.getByTestId("changes-repository-header")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-branch-switcher")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-diff-status-trigger")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-selected-diff-stat")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-header")).toHaveCount(1);
  await expect(visiblePanel.getByText("use-mounted-tab-set.ts", { exact: true })).toBeVisible();
  await expect(visiblePanel).toContainText("zz-deleted.ts");
  await expect(visiblePanel.getByTestId("changes-primary-cta")).toHaveCount(0);
@@ -658,34 +656,30 @@ test("Changes keeps review navigation and controls inside its workspace tab", as
  await visiblePanel.getByTestId("diff-file-0-toggle").click();
  await expect(visiblePanel.getByTestId("diff-file-0-body")).not.toBeVisible();

-  // Collapse-all and the layout switch are overflow-menu items, not toolbar icons.
-  const diffOptions = visiblePanel.getByRole("button", { name: "Diff options" });
-  await expect(page.getByTestId("changes-toggle-collapse-all")).toHaveCount(0);
-  await diffOptions.click();
-  // A workspace tab has nowhere to open itself, so the menu withholds that item.
+  await expect(visiblePanel.getByRole("button", { name: "Diff options" })).toHaveCount(0);
  await expect(page.getByTestId("changes-open-tab")).toHaveCount(0);
-  await page.getByTestId("changes-toggle-collapse-all").click();
-  await diffOptions.click();
-  await expect(page.getByTestId("changes-toggle-collapse-all")).toContainText("Expand all files");
-  await page.getByTestId("changes-toggle-collapse-all").click();
+  const collapseFiles = visiblePanel.getByTestId("changes-toggle-collapse-all");
+  await expect(collapseFiles).toHaveAttribute("aria-label", "Collapse all files");
+  await collapseFiles.click();
+  await expect(collapseFiles).toHaveAttribute("aria-label", "Expand all files");
+  await collapseFiles.click();
  await expect(visiblePanel.getByTestId("diff-file-0-body")).toBeVisible();

-  const layoutItem = page.getByTestId("changes-toggle-layout");
-  await diffOptions.click();
-  await expect(layoutItem).toContainText("Side-by-side diff");
-  // Leading icon only: the layout is still unified, so no trailing check.
-  await expect(layoutItem.locator("svg")).toHaveCount(1);
-  await layoutItem.click();
-  await diffOptions.click();
-  await expect(layoutItem.locator("svg")).toHaveCount(2);
+  const layout = visiblePanel.getByTestId("changes-toggle-layout");
+  await expect(layout).toHaveAttribute("aria-label", "Switch to side-by-side diff");
+  await layout.click();
+  await expect(layout).toHaveAttribute("aria-label", "Switch to unified diff");

-  await expect(page.getByText("Hide whitespace", { exact: true })).toBeVisible();
-  await expect(page.getByText("Wrap long lines", { exact: true })).toBeVisible();
-  await expect(page.getByTestId("changes-refresh")).toHaveText("Refresh");
-  await page.getByText("Wrap long lines", { exact: true }).click();
-  await diffOptions.click();
-  await expect(page.getByText("Scroll long lines", { exact: true })).toBeVisible();
-  await page.keyboard.press("Escape");
+  const whitespace = visiblePanel.getByTestId("changes-toggle-whitespace");
+  await expect(whitespace).toHaveAttribute("aria-label", "Hide whitespace");
+  const wrapLines = visiblePanel.getByTestId("changes-toggle-wrap-lines");
+  await expect(wrapLines).toHaveAttribute("aria-label", "Wrap long lines");
+  await expect(visiblePanel.getByTestId("changes-refresh")).toHaveAttribute(
+    "aria-label",
+    "Refresh",
+  );
+  await wrapLines.click();
+  await expect(wrapLines).toHaveAttribute("aria-label", "Scroll long lines");
  await expect(page.getByTestId(/^workspace-working-diff-close-/)).toHaveCount(1);

  await writeFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), BEFORE);
@@ -701,151 +695,23 @@ test("Changes keeps review navigation and controls inside its workspace tab", as
  await expect(visiblePanel.getByRole("img", { name: "Deleted" })).toBeVisible();
 });

-test("desktop Changes toggles a navigation tree beside the expanded diff document", async ({
-  page,
-}, testInfo) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  await expectFlatFileList(page);
-  await expect(page.getByTestId("changes-layout-unified")).toHaveCount(0);
-  await expect(page.getByTestId("changes-layout-split")).toHaveCount(0);
-  // The tree toggle is the one icon action that stays outside the overflow menu.
-  await expect(page.getByTestId("changes-toggle-tree")).toBeVisible();
-  const [changesToolbarBox, treeToggleBox, optionsBox, treeGlyphBox, optionsGlyphBox] =
-    await Promise.all([
-      page.getByTestId("changes-header").boundingBox(),
-      page.getByTestId("changes-toggle-tree").boundingBox(),
-      page.getByRole("button", { name: "Diff options" }).boundingBox(),
-      page.getByTestId("changes-toggle-tree").locator("svg").boundingBox(),
-      page.getByRole("button", { name: "Diff options" }).locator("svg").boundingBox(),
-    ]);
-  if (!changesToolbarBox || !treeToggleBox || !optionsBox || !treeGlyphBox || !optionsGlyphBox) {
-    throw new Error("Changes toolbar geometry could not be measured");
-  }
-  expect(changesToolbarBox.height).toBe(36);
-  expect(treeToggleBox.width).toBe(24);
-  expect(treeToggleBox.height).toBe(24);
-  expect(optionsBox.width).toBe(24);
-  expect(optionsBox.height).toBe(24);
-  expect(treeGlyphBox.width).toBe(14);
-  expect(treeGlyphBox.height).toBe(14);
-  expect(optionsGlyphBox.width).toBe(14);
-  expect(optionsGlyphBox.height).toBe(14);
-  const diffOptions = page.getByRole("button", { name: "Diff options" });
-  const diffOptionsRestBackground = await diffOptions.evaluate(
-    (element) => getComputedStyle(element).backgroundColor,
-  );
-  await diffOptions.hover();
-  const diffOptionsHoverBackground = await diffOptions.evaluate(
-    (element) => getComputedStyle(element).backgroundColor,
-  );
-  expect(diffOptionsHoverBackground).not.toBe(diffOptionsRestBackground);
-  await page.getByTestId("changes-toggle-tree").hover();
-  expect(
-    await page
-      .getByTestId("changes-toggle-tree")
-      .evaluate((element) => getComputedStyle(element).backgroundColor),
-  ).toBe(diffOptionsHoverBackground);
-  await expect(page.getByTestId("changes-toggle-collapse-all")).toHaveCount(0);
-  await expect(page.getByTestId("changes-toggle-layout")).toHaveCount(0);
-
-  await page.getByTestId("changes-options-menu").click();
-  await expect(page.getByTestId("changes-options-menu-content")).toBeVisible();
-  await expect(page.getByTestId("changes-toggle-collapse-all")).toContainText("Collapse all files");
-  await expect(page.getByTestId("changes-toggle-layout")).toContainText("Side-by-side diff");
-  await expect(page.getByTestId("changes-toggle-whitespace")).toContainText("Hide whitespace");
-  await expect(page.getByTestId("changes-toggle-wrap-lines")).toContainText("Wrap long lines");
-  await expect(page.getByTestId("changes-refresh")).toHaveText("Refresh");
-  await page.getByTestId("changes-toggle-whitespace").click();
-  await page.getByTestId("changes-options-menu").click();
-  await expect(page.getByTestId("changes-toggle-whitespace")).toContainText("Show whitespace");
-  await page.keyboard.press("Escape");
-
-  await scrollToLowerUnwrappedDiffRows(page);
-  await page.getByTestId("changes-toggle-tree").click();
-  await expect(page.getByTestId("changes-toggle-tree")).toHaveAttribute("aria-selected", "true");
-  expect(
-    await page
-      .getByTestId("changes-toggle-tree")
-      .evaluate((element) => getComputedStyle(element).backgroundColor),
-  ).toBe(diffOptionsHoverBackground);
-  const tree = changesTree(page);
-  const content = changesContent(page);
-  await expect(tree.getByTestId("diff-folder-src")).toBeVisible();
-  await expect(tree.getByTestId("diff-folder-src").getByText("src", { exact: true })).toHaveCSS(
-    "user-select",
-    "none",
-  );
-  await expect(tree.getByTestId("diff-tree-file-0")).toBeVisible();
-  await expect(tree.getByTestId("diff-folder-src-toggle").locator("svg")).toHaveCount(1);
-  const folderToggleBounds = await tree.getByTestId("diff-folder-src-toggle").boundingBox();
-  const folderChevronBounds = await tree
-    .getByTestId("diff-folder-src-toggle")
-    .locator("svg")
-    .boundingBox();
-  expect(folderToggleBounds).not.toBeNull();
-  expect(folderChevronBounds).not.toBeNull();
-  expect(folderChevronBounds!.y + folderChevronBounds!.height / 2).toBeCloseTo(
-    folderToggleBounds!.y + folderToggleBounds!.height / 2,
-    0,
-  );
-  const folderLabelBounds = await tree
-    .getByTestId("diff-folder-src")
-    .getByText("src", { exact: true })
-    .boundingBox();
-  const fileLabelBounds = await tree
-    .getByTestId("diff-tree-file-0")
-    .getByText("use-mounted-tab-set.ts", { exact: true })
-    .boundingBox();
-  expect(folderLabelBounds).not.toBeNull();
-  expect(fileLabelBounds).not.toBeNull();
-  expect(fileLabelBounds!.x - folderLabelBounds!.x).toBeCloseTo(12, 0);
-
-  const folderToggle = tree.getByTestId("diff-folder-src-toggle");
-  await folderToggle.click();
-  await expect(folderToggle).toHaveAttribute("aria-selected", "true");
-  await expect(tree.getByTestId("diff-tree-file-0")).toHaveCount(0);
-  await folderToggle.click();
-  await expect(folderToggle).toHaveAttribute("aria-selected", "true");
-  await expect(tree.getByTestId("diff-tree-file-0")).toBeVisible();
-
-  const fileToggle = tree.getByTestId("diff-tree-file-0-toggle");
-  await fileToggle.click({ button: "right" });
-  await expect(fileToggle).toHaveAttribute("aria-selected", "true");
-  await expect(folderToggle).toHaveAttribute("aria-selected", "false");
-  await expect(page.getByTestId("diff-tree-file-0-context-menu")).toBeVisible();
-  await page.keyboard.press("Escape");
-
-  await fileToggle.click();
-  await expect(content.getByTestId("diff-file-0-body")).toBeVisible();
-  const contentBounds = await content.boundingBox();
-  const focusedFileBounds = await content.getByTestId("diff-file-0").boundingBox();
-  expect(contentBounds).not.toBeNull();
-  expect(focusedFileBounds).not.toBeNull();
-  expect(focusedFileBounds!.y).toBeGreaterThanOrEqual(contentBounds!.y);
-  expect(focusedFileBounds!.y).toBeLessThan(contentBounds!.y + 80);
-
-  await tree.getByTestId("diff-folder-src-toggle").click();
-  await expect(tree.getByTestId("diff-tree-file-0")).toHaveCount(0);
-
-  await page.getByTestId("changes-toggle-tree").click();
-  await expect(page.getByTestId("changes-toggle-tree")).toHaveAttribute("aria-selected", "false");
-  await expectFlatFileList(page);
-  const screenshot = testInfo.outputPath("changes-toolbar.png");
-  await page.screenshot({ path: screenshot });
-  await testInfo.attach("changes-toolbar", { path: screenshot, contentType: "image/png" });
-});
-
 test("compact Changes keeps its actions compact and menu-only", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff();
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
  await page.setViewportSize({ width: 480, height: 900 });

-  const actions = page.getByTestId("changes-actions-menu-trigger").filter({ visible: true });
-  const options = page.getByRole("button", { name: "Diff options" }).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("explorer-content-area").filter({ visible: true });
+  await expect(compactExplorer.getByTestId("changes-header")).toBeVisible();
+
+  const actions = compactExplorer.getByTestId("changes-actions-menu-trigger");
+  const options = compactExplorer.getByRole("button", { name: "Diff options" });
  const [actionsBox, optionsBox, glyphBox] = await Promise.all([
    actions.boundingBox(),
    options.boundingBox(),
@@ -873,7 +739,9 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
  await expect(wrapLines).toBeVisible();
  await wrapLines.click();
  await options.click();
-  await expect(page.getByTestId("changes-toggle-wrap-lines")).toContainText("Scroll long lines");
+  await expect(
+    page.getByTestId("changes-options-menu-content").getByTestId("changes-toggle-wrap-lines"),
+  ).toContainText("Scroll long lines");
 });

 test("canvas diff stays sharp while its workspace pane is resized", async ({ page }) => {
@@ -883,7 +751,9 @@ test("canvas diff stays sharp while its workspace pane is resized", async ({ pag

  const canvas = page.getByTestId("git-diff-canvas");
  const root = page.getByTestId("git-diff-canvas-root");
-  const handle = page.getByTestId("workspace-split-resize-handle").getByRole("separator");
+  const handle = page
+    .getByTestId("workspace-explorer-sidebar-resize-handle")
+    .getByRole("separator");
  await expect(handle).toBeVisible();
  await expect
    .poll(async () => {
@@ -904,11 +774,11 @@ test("canvas diff stays sharp while its workspace pane is resized", async ({ pag
      };
    }),
  ]);
-  if (!handleBounds) throw new Error("Workspace split resize handle has no bounds");
+  if (!handleBounds) throw new Error("Explorer sidebar resize handle has no bounds");

  await page.mouse.move(handleBounds.x + handleBounds.width / 2, handleBounds.y + 120);
  await page.mouse.down();
-  await page.mouse.move(handleBounds.x - 120, handleBounds.y + 120);
+  await page.mouse.move(handleBounds.x + 120, handleBounds.y + 120);
  await page.evaluate(() => new Promise<void>((resolve) => requestAnimationFrame(() => resolve())));

  const duringDrag = await Promise.all([
@@ -1074,6 +944,7 @@ test("canvas diff uses the overlay scrollbar and its thumb controls vertical scr
  if (!bounds) throw new Error("Diff overlay scrollbar thumb has no bounds");
  await page.mouse.move(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
  await page.mouse.down();
+  await expect(grab).toHaveCSS("cursor", "grabbing");
  await page.mouse.move(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2 + 180);
  await page.mouse.up();

@@ -1313,24 +1184,20 @@ async function setOpenChangesPresentation(
  page: Page,
  requestedPresentation: { layout: "unified" | "split"; wrapLines: boolean },
 ): Promise<void> {
-  const options = page.getByRole("button", { name: "Diff options" }).filter({ visible: true });
-
-  await options.click();
-  const layoutItem = page.getByTestId("changes-toggle-layout");
-  const currentLayout = (await layoutItem.locator("svg").count()) === 2 ? "split" : "unified";
+  const diffPanel = page.getByTestId("working-diff-panel").filter({ visible: true });
+  const layoutItem = diffPanel.getByTestId("changes-toggle-layout");
+  const currentLayout =
+    (await layoutItem.getAttribute("aria-label")) === "Switch to unified diff"
+      ? "split"
+      : "unified";
  if (currentLayout !== requestedPresentation.layout) {
    await layoutItem.click();
-  } else {
-    await page.keyboard.press("Escape");
  }

-  await options.click();
-  const wrapItem = page.getByTestId("changes-toggle-wrap-lines");
-  const currentWrapLines = (await wrapItem.locator("svg").count()) === 2;
+  const wrapItem = diffPanel.getByTestId("changes-toggle-wrap-lines");
+  const currentWrapLines = (await wrapItem.getAttribute("aria-label")) === "Scroll long lines";
  if (currentWrapLines !== requestedPresentation.wrapLines) {
    await wrapItem.click();
-  } else {
-    await page.keyboard.press("Escape");
  }
 }

@@ -1365,12 +1232,6 @@ async function releaseBrowserFontLoads(page: Page): Promise<void> {
  });
 }

-async function expectFlatFileList(page: Page): Promise<void> {
-  await expect(page.locator('[data-testid^="diff-folder-"]')).toHaveCount(0);
-  await expect(page.getByTestId("diff-file-0")).toContainText("use-mounted-tab-set.ts");
-  await expect(page.getByTestId("diff-file-0")).toContainText("src");
-}
-
 async function expectDiffCodeFontSize(page: Page, fontSize: number): Promise<void> {
  const canvas = page.getByTestId("git-diff-canvas");
  await expect
@@ -1491,6 +1352,7 @@ async function openWorkspaceChanges(page: Page, workspace: DirtyWorkspace): Prom
  await page.setViewportSize({ width: 1400, height: 900 });
  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
  await waitForWorkspaceTabsVisible(page);
+  await page.getByTestId("workspace-explorer-toggle").first().click();
  await openChangesInVisibleExplorer(page);
  await expectExpandedMountedTabDiff(page);
 }
@@ -1507,13 +1369,27 @@ async function openSelectionWorkspaceChanges(page: Page, workspace: DirtyWorkspa
  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
  await waitForWorkspaceTabsVisible(page);
  await openChangesPanel(page);
-  await expect(page.getByText("selection.ts")).toBeVisible({ timeout: 30_000 });
+  const diffPanel = page.getByTestId("working-diff-panel").filter({ visible: true });
+  await expect(diffPanel.getByTestId("diff-file-0-name")).toHaveText("selection.ts", {
+    timeout: 30_000,
+  });
  await expectExpandedMountedTabDiff(page);
 }

 async function openChangesInVisibleExplorer(page: Page): Promise<void> {
-  await openChangesPanel(page);
-  await expect(page.getByText("use-mounted-tab-set.ts")).toBeVisible({ timeout: 30_000 });
+  const explorer = page.getByTestId("workspace-explorer-sidebar");
+  await expect(explorer).toBeVisible({ timeout: 30_000 });
+  const changesTab = explorer.getByRole("button", { name: /Working tree diff/i }).first();
+  await changesTab.click();
+  const changedFile = explorer
+    .locator('[data-testid^="diff-tree-file-"][data-testid$="-toggle"]')
+    .filter({ visible: true })
+    .first();
+  await expect(changedFile).toBeVisible({ timeout: 30_000 });
+  await changedFile.click();
+  await expect(page.getByTestId("working-diff-panel").filter({ visible: true })).toBeVisible({
+    timeout: 30_000,
+  });
 }

 async function expectExpandedMountedTabDiff(page: Page): Promise<void> {
@@ -1,21 +1,12 @@
-import { expect, test, type Page } from "../support/fixtures";
+import { expect, test } from "../support/fixtures";
 import { gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";

-const APP_SETTINGS_KEY = "@paseo:app-settings";
 const CHANGES_SHORTCUT = `${process.platform === "darwin" ? "Meta" : "Control"}+Shift+G`;

-function mainPane(page: Page) {
-  return page.getByTestId("workspace-pane-main").filter({ visible: true });
-}
-
-function sidePanel(page: Page) {
-  return page.getByTestId("workspace-side-panel").filter({ visible: true });
-}
-
-test("Changes shortcut follows the default Side panel placement", async ({ page }) => {
-  const workspace = await seedWorkspace({ repoPrefix: "changes-shortcut-side-" });
+test("Changes shortcut reveals the Changes tree in Explorer", async ({ page }) => {
+  const workspace = await seedWorkspace({ repoPrefix: "changes-shortcut-explorer-" });

  try {
    await page.setViewportSize({ width: 1400, height: 900 });
@@ -24,34 +15,12 @@ test("Changes shortcut follows the default Side panel placement", async ({ page

    await page.keyboard.press(CHANGES_SHORTCUT);

-    await expect(sidePanel(page).getByTestId("workspace-tab-working_diff")).toBeVisible({
+    const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+    await expect(explorer.getByTestId("explorer-sidebar-tab-changes_tree")).toBeVisible({
      timeout: 30_000,
    });
-    await expect(mainPane(page).getByTestId("workspace-tab-working_diff")).toHaveCount(0);
-  } finally {
-    await workspace.cleanup();
-  }
-});
-
-test("Changes shortcut uses the focused pane when Side panel placement is off", async ({
-  page,
-}) => {
-  await page.addInitScript((settingsKey) => {
-    localStorage.setItem(settingsKey, JSON.stringify({ openSupportingTabsInSidePanel: false }));
-  }, APP_SETTINGS_KEY);
-  const workspace = await seedWorkspace({ repoPrefix: "changes-shortcut-pane-" });
-
-  try {
-    await page.setViewportSize({ width: 1400, height: 900 });
-    await gotoWorkspace(page, workspace.workspaceId);
-    await waitForWorkspaceTabsVisible(page);
-
-    await page.keyboard.press(CHANGES_SHORTCUT);
-
-    await expect(mainPane(page).getByTestId("workspace-tab-working_diff")).toBeVisible({
-      timeout: 30_000,
-    });
-    await expect(sidePanel(page)).toHaveCount(0);
+    await expect(explorer.getByTestId("changes-tree-panel")).toBeVisible();
+    await expect(page.getByTestId("workspace-tab-working_diff")).toHaveCount(0);
  } finally {
    await workspace.cleanup();
  }
@@ -3,7 +3,7 @@ import { writeFile } from "node:fs/promises";
 import path from "node:path";
 import type { Locator } from "@playwright/test";
 import { test, expect } from "../support/fixtures";
-import { openChangesPanel } from "../support/helpers/workspace-tabs";
+import { openChangesTreePanel } from "../support/helpers/workspace-tabs";

 const COMMIT_SUBJECT = "Show commit timestamps";

@@ -15,7 +15,7 @@ test("commit history explains when the workspace has no commits ahead of its bas
  execFileSync("git", ["checkout", "-b", "feature"], { cwd: workspace.repoPath, stdio: "ignore" });
  await workspace.navigateTo();

-  await openChangesPanel(page);
+  await openChangesTreePanel(page);
  const commitsSection = page.getByRole("button", { name: /Commits/i });
  await expect(commitsSection).toBeVisible({ timeout: 30_000 });
  await commitsSection.click();
@@ -35,7 +35,7 @@ test("commit history shows dates and shares diff layout preferences", async ({
  await page.setViewportSize({ width: 1400, height: 900 });
  await workspace.navigateTo();

-  await openChangesPanel(page);
+  await openChangesTreePanel(page);
  const commitsSection = page.getByRole("button", { name: /Commits/i });
  await expect(commitsSection).toBeVisible({ timeout: 30_000 });
  await commitsSection.click();
@@ -60,8 +60,8 @@ test("commit history shows dates and shares diff layout preferences", async ({
    throw new Error("Commit-diff toolbar geometry could not be measured");
  }
  expect(commitToolbarBox.height).toBe(36);
-  expect(layoutToggleBox.width).toBe(24);
-  expect(layoutToggleBox.height).toBe(24);
+  expect(layoutToggleBox.width).toBe(20);
+  expect(layoutToggleBox.height).toBe(20);
  expect(layoutToggleGlyphBox.width).toBe(14);
  expect(layoutToggleGlyphBox.height).toBe(14);
  await expect(layoutToggle).toHaveAccessibleName("Switch to side-by-side diff");
@@ -38,7 +38,10 @@ async function seedChangedAgent(repoPrefix: string) {
  }
 }

-test("composer diff stat toggles Changes in the preferred Side panel", async ({ page }) => {
+test("composer diff stat opens Changes in the configured side pane", async ({ page }) => {
+  await page.addInitScript((settingsKey) => {
+    localStorage.setItem(settingsKey, JSON.stringify({ openInSidePane: { changesLinks: true } }));
+  }, APP_SETTINGS_KEY);
  const workspace = await seedChangedAgent("composer-diff-stat-side-");

  try {
@@ -54,31 +57,24 @@ test("composer diff stat toggles Changes in the preferred Side panel", async ({
    await expect(pill).toContainText("-0");
    await pill.click();

-    const sidePanel = page.getByTestId("workspace-side-panel").filter({ visible: true });
-    await expect(sidePanel.getByTestId("workspace-tab-working_diff")).toBeVisible({
+    const sidePane = page
+      .locator('[data-testid^="workspace-pane-"]')
+      .filter({ visible: true })
+      .filter({ has: page.getByTestId("working-diff-panel") });
+    await expect(sidePane.getByTestId("workspace-tab-working_diff")).toBeVisible({
      timeout: 30_000,
    });
-    await expect(sidePanel.getByTestId("working-diff-panel")).toBeVisible({ timeout: 30_000 });
+    await expect(sidePane.getByTestId("working-diff-panel")).toBeVisible({ timeout: 30_000 });
+    await expect(visibleMainPane(page).getByTestId("working-diff-panel")).toHaveCount(0);

-    await test.step("switching from another Side panel view reveals Changes", async () => {
+    await test.step("Explorer navigation does not replace the side pane", async () => {
      await openFilesPanel(page);
-      await expect(sidePanel.getByTestId("file-explorer-tree-scroll")).toBeVisible();
+      await expect(page.getByTestId("workspace-explorer-sidebar")).toContainText("Files");

      await pill.click();
-      await expect(sidePanel.getByTestId("working-diff-panel")).toBeVisible();
-    });
-
-    await test.step("clicking visible Changes hides the panel without closing its tab", async () => {
-      await pill.click();
-      await expect(sidePanel).toHaveCount(0);
+      await expect(sidePane.getByTestId("working-diff-panel")).toBeVisible();
      await expect(page.getByTestId("workspace-tab-working_diff")).toHaveCount(1);
    });
-
-    await test.step("clicking again restores Changes", async () => {
-      await pill.click();
-      await expect(sidePanel.getByTestId("workspace-tab-working_diff")).toBeVisible();
-      await expect(sidePanel.getByTestId("working-diff-panel")).toBeVisible();
-    });
  } finally {
    await workspace.cleanup();
  }
@@ -96,19 +92,16 @@ test("composer diff stat opens the compact explorer instead of a Changes tab", a

    await page.getByTestId("composer-diff-stat-pill").click();

-    await expect(page.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
+    await expect(page.getByTestId("changes-header").filter({ visible: true }).first()).toBeVisible({
+      timeout: 30_000,
+    });
    await expect(page.getByTestId("workspace-tab-working_diff")).toHaveCount(0);
  } finally {
    await workspace.cleanup();
  }
 });

-test("composer diff stat opens Changes in the focused pane when Side panel routing is off", async ({
-  page,
-}) => {
-  await page.addInitScript((settingsKey) => {
-    localStorage.setItem(settingsKey, JSON.stringify({ openSupportingTabsInSidePanel: false }));
-  }, APP_SETTINGS_KEY);
+test("composer diff stat opens Changes in the focused pane by default", async ({ page }) => {
  const workspace = await seedChangedAgent("composer-diff-stat-tab-");

  try {
@@ -125,7 +118,9 @@ test("composer diff stat opens Changes in the focused pane when Side panel routi
      timeout: 30_000,
    });
    await expect(mainPane.getByTestId("working-diff-panel")).toBeVisible({ timeout: 30_000 });
-    await expect(page.getByTestId("workspace-side-panel")).toHaveCount(0);
+    await expect(
+      page.locator('[data-testid^="workspace-pane-"]').filter({ visible: true }),
+    ).toHaveCount(1);
  } finally {
    await workspace.cleanup();
  }
@@ -1,7 +1,8 @@
 import { expect, test } from "../support/fixtures";
+import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
 import { gotoWorkspace, pressDirectNewTabShortcut } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
-import { openChangesPanel, waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";

 test.describe("Direct terminal shortcut pane placement", () => {
  test("opens a terminal in the focused pane", async ({ page }) => {
@@ -11,21 +12,31 @@ test.describe("Direct terminal shortcut pane placement", () => {
      await gotoWorkspace(page, workspace.workspaceId);
      await waitForWorkspaceTabsVisible(page);

-      await openChangesPanel(page);
-      const focusedPane = page
-        .getByTestId("workspace-tabs-row")
-        .filter({ has: page.getByTestId("workspace-tab-working_diff") })
-        .first();
-      const primaryPane = page
-        .getByTestId("workspace-tabs-row")
-        .filter({ hasNot: page.getByTestId("workspace-tab-working_diff") })
-        .first();
+      await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+      const focusedPaneChild = page
+        .getByTestId("split-group-child")
+        .filter({ has: page.getByTestId("workspace-new-tab-panel") });
+      const originalPaneChild = page
+        .getByTestId("split-group-child")
+        .filter({ hasNot: page.getByTestId("workspace-new-tab-panel") });
+      await expect(focusedPaneChild).toBeVisible();
+      const focusedPaneId = await focusedPaneChild
+        .locator('[data-testid^="workspace-pane-"]')
+        .getAttribute("data-testid");
+      const originalPaneId = await originalPaneChild
+        .locator('[data-testid^="workspace-pane-"]')
+        .getAttribute("data-testid");
+      expect(focusedPaneId).not.toBeNull();
+      expect(originalPaneId).not.toBeNull();
+      const focusedPane = page.getByTestId(focusedPaneId!);
+      const originalPane = page.getByTestId(originalPaneId!);
+
      await pressDirectNewTabShortcut(page, "t");

      await expect(focusedPane.locator('[data-testid^="workspace-tab-terminal_"]')).toHaveCount(1, {
        timeout: 30_000,
      });
-      await expect(primaryPane.locator('[data-testid^="workspace-tab-terminal_"]')).toHaveCount(0);
+      await expect(originalPane.locator('[data-testid^="workspace-tab-terminal_"]')).toHaveCount(0);
    } finally {
      await workspace.cleanup();
    }
@@ -13,38 +13,25 @@ async function expectLauncherSelection(launcher: Locator, name: string): Promise
  await expect(launcher.getByRole("button", { name, exact: true })).toBeFocused();
 }

-async function openSidePanelWithKeyboard(page: Page): Promise<Locator> {
+async function openExplorerWithKeyboard(page: Page): Promise<Locator> {
  const modifier = process.platform === "darwin" ? "Meta" : "Control";
  await page.keyboard.press(`${modifier}+E`);
-  const launcher = page
-    .getByTestId("workspace-side-panel")
-    .filter({ visible: true })
-    .getByTestId("workspace-new-tab-panel");
-  await expect(launcher).toBeVisible({ timeout: 30_000 });
-  return launcher;
+  const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  await expect(explorer).toBeVisible({ timeout: 30_000 });
+  return explorer;
 }

 test.describe("New tab keyboard launcher", () => {
-  test("Cmd+E focuses the launcher and Enter opens the selected view", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "empty-pane-side-panel-keyboard-" });
+  test("Cmd+E reveals the repository Changes tree", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "explorer-keyboard-" });

    try {
      await gotoWorkspace(page, workspace.workspaceId);
      await waitForWorkspaceTabsVisible(page);

-      const launcher = await openSidePanelWithKeyboard(page);
-      await expectLauncherSelection(launcher, "Changes");
-
-      await page.keyboard.press("ArrowDown");
-      await expectLauncherSelection(launcher, "Files");
-      await page.keyboard.press("Enter");
-
-      await expect(
-        page
-          .getByTestId("workspace-side-panel")
-          .filter({ visible: true })
-          .getByTestId("workspace-tab-files"),
-      ).toBeVisible({ timeout: 30_000 });
+      const explorer = await openExplorerWithKeyboard(page);
+      await expect(explorer.getByTestId("explorer-sidebar-tab-changes_tree")).toBeVisible();
+      await expect(explorer.getByTestId("changes-tree-panel")).toBeVisible();
    } finally {
      await workspace.cleanup();
    }
@@ -65,14 +52,12 @@ test.describe("New tab keyboard launcher", () => {
      await page.keyboard.press("ArrowDown");
      await expectLauncherSelection(launcher, "Terminal");
      await page.keyboard.press("ArrowDown");
-      await expectLauncherSelection(launcher, "Changes");
-      await page.keyboard.press("ArrowDown");
-      await expectLauncherSelection(launcher, "Files");
+      await expectLauncherSelection(launcher, "Diff");
      await page.keyboard.press("Enter");

-      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toBeVisible({
-        timeout: 30_000,
-      });
+      await expect(
+        page.getByTestId("workspace-tab-working_diff").filter({ visible: true }),
+      ).toBeVisible({ timeout: 30_000 });
    } finally {
      await workspace.cleanup();
    }
@@ -8,7 +8,10 @@ import { expect, type Locator, type Page } from "@playwright/test";
 import { test } from "../support/fixtures";
 import { gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace } from "../support/helpers/seed-client";
-import { openChangesPanel, waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import {
+  openChangesTreePanel,
+  waitForWorkspaceTabsVisible,
+} from "../support/helpers/workspace-tabs";

 function visible(page: Page, testId: string): Locator {
  return page.getByTestId(testId).filter({ visible: true });
@@ -22,23 +25,18 @@ function draftTabChip(page: Page): Locator {
  return page.locator('[data-testid^="workspace-tab-draft_"]').filter({ visible: true });
 }

-/** The explorer pane is the only tab row carrying the Changes tab. */
+/** The Explorer has its own fixed tab rail, separate from workspace pane rows. */
 function explorerTabRow(page: Page): Locator {
-  return visible(page, "workspace-tabs-row").filter({
-    has: page.getByTestId("workspace-tab-working_diff"),
-  });
+  return visible(page, "explorer-sidebar-tab-rail");
 }

 function mainTabRow(page: Page): Locator {
-  return visible(page, "workspace-tabs-row").filter({
-    hasNot: page.getByTestId("workspace-tab-working_diff"),
-  });
+  return visible(page, "workspace-tabs-row");
 }

-async function focusExplorerPane(page: Page): Promise<void> {
-  await openChangesPanel(page);
-  const changesTab = visible(page, "workspace-tab-working_diff").first();
-  await expect(changesTab).toHaveAttribute("aria-selected", "true");
+async function selectExplorerChanges(page: Page): Promise<void> {
+  await openChangesTreePanel(page);
+  await expect(visible(page, "changes-tree-panel").first()).toBeVisible();
 }

 async function closeSeededDraftInMainPane(page: Page): Promise<void> {
@@ -115,8 +113,8 @@ test.describe("explorer pane tab placement", () => {
        await expect(draftTabChip(page).first()).toBeVisible({ timeout: 30_000 });
      });

-      await test.step("focus the explorer pane", async () => {
-        await focusExplorerPane(page);
+      await test.step("select Changes in Explorer", async () => {
+        await selectExplorerChanges(page);
      });

      await test.step("an agent appearing now opens in the main pane, not the explorer pane", async () => {
@@ -140,11 +138,8 @@ test.describe("explorer pane tab placement", () => {
        await expect(
          explorerTabRow(page).first().getByTestId(`workspace-tab-agent_${agentId}`),
        ).toHaveCount(0);
-        // The background open must not steal the explorer pane's focus.
-        await expect(visible(page, "workspace-tab-working_diff").first()).toHaveAttribute(
-          "aria-selected",
-          "true",
-        );
+        // The background open must not change the selected Explorer view.
+        await expect(visible(page, "changes-tree-panel").first()).toBeVisible();
      });

      await test.step("close the draft; the agent is the main pane's only tab", async () => {
@@ -170,8 +165,9 @@ test.describe("explorer pane tab placement", () => {
          body: await page.screenshot(),
          contentType: "image/png",
        });
-        // The split must have taken: agent pane + New main + explorer = 3 tab rows.
-        await expect(visible(page, "workspace-tabs-row")).toHaveCount(3, { timeout: 10_000 });
+        // The split must have taken: agent pane + New main. Explorer keeps its own rail.
+        await expect(visible(page, "workspace-tabs-row")).toHaveCount(2, { timeout: 10_000 });
+        await expect(explorerTabRow(page)).toHaveCount(1);
        await expect(page.getByTestId("workspace-new-tab-panel")).toBeVisible();
      });

@@ -0,0 +1,48 @@
+import { expect, test } from "../support/fixtures";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import {
+  ensureExplorerSidebar,
+  openFilesPanel,
+  waitForWorkspaceTabsVisible,
+} from "../support/helpers/workspace-tabs";
+
+function explorerSidebar(page: Parameters<typeof ensureExplorerSidebar>[0]) {
+  return page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+}
+
+test.describe("Explorer sidebar", () => {
+  test("starts with Files and Changes, switches views, and toggles without changing main", async ({
+    page,
+  }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "explorer-sidebar-defaults-" });
+
+    try {
+      await gotoWorkspace(page, workspace.workspaceId);
+      await waitForWorkspaceTabsVisible(page);
+      const mainTabsBefore = await page
+        .getByTestId("workspace-pane-main")
+        .locator('[data-testid^="workspace-tab-"]')
+        .count();
+
+      const explorer = await ensureExplorerSidebar(page);
+      await expect(explorer.getByTestId("explorer-sidebar-tab-files")).toBeVisible();
+      await expect(explorer.getByTestId("explorer-sidebar-tab-changes_tree")).toBeVisible();
+      await expect(explorer.getByTestId("workspace-new-tab-button")).toHaveCount(0);
+
+      await openFilesPanel(page);
+      await expect(explorer.getByTestId("file-explorer-tree-scroll")).toBeVisible();
+
+      await explorer.getByTestId("explorer-sidebar-tab-changes_tree").click();
+      await expect(explorer.getByTestId("changes-tree-panel")).toBeVisible();
+
+      await page.getByTestId("workspace-explorer-toggle").first().click();
+      await expect(explorerSidebar(page)).toHaveCount(0);
+      await expect(
+        page.getByTestId("workspace-pane-main").locator('[data-testid^="workspace-tab-"]'),
+      ).toHaveCount(mainTabsBefore);
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
@@ -19,14 +19,8 @@ function readPersistedPanelState(page: Page): Promise<string | null> {
  return page.evaluate(() => localStorage.getItem("panel-state"));
 }

-/** Only the docked sidebar ever rendered `explorer-header` on a wide layout. */
-function dockedSidebar(page: Page): Locator {
-  return visible(page, "explorer-header");
-}
-
-/** The desktop companion surface is a hideable side panel. */
-function sidePanel(page: Page): Locator {
-  return visible(page, "workspace-side-panel");
+function explorerSidebar(page: Page): Locator {
+  return visible(page, "workspace-explorer-sidebar");
 }

 /** Seed exactly what a pre-pane build wrote after the user opened the sidebar once. */
@@ -65,18 +59,18 @@ test.describe("explorer surface after upgrading from the docked sidebar", () =>
      await gotoWorkspace(page, workspace.workspaceId);
      await waitForWorkspaceTabsVisible(page);

-      await test.step("no docked sidebar, on load or after toggling", async () => {
-        await expect(dockedSidebar(page)).toHaveCount(0);
-
+      await test.step("the retired flag does not reveal Explorer", async () => {
+        await expect(explorerSidebar(page)).toHaveCount(0);
        const toggle = visible(page, "workspace-explorer-toggle").first();
        await toggle.click();
-        await expect(sidePanel(page)).toHaveCount(1, { timeout: 15_000 });
-        await expect(sidePanel(page).getByTestId("workspace-new-tab-panel")).toBeVisible();
-        await expect(dockedSidebar(page)).toHaveCount(0);
+        await expect(explorerSidebar(page)).toHaveCount(1, { timeout: 15_000 });
+        await expect(explorerSidebar(page).getByTestId("explorer-sidebar-tab-files")).toBeVisible();
+        await expect(
+          explorerSidebar(page).getByTestId("explorer-sidebar-tab-changes_tree"),
+        ).toBeVisible();

        await toggle.click();
-        await expect(sidePanel(page)).toHaveCount(0, { timeout: 15_000 });
-        await expect(dockedSidebar(page)).toHaveCount(0);
+        await expect(explorerSidebar(page)).toHaveCount(0, { timeout: 15_000 });
      });

      await test.step("the retired keys are migrated out of storage", async () => {
@@ -107,22 +101,22 @@ test.describe("explorer surface after upgrading from the docked sidebar", () =>

      await test.step("open the explorer so both sides are showing", async () => {
        await toggle.click();
-        await expect(sidePanel(page)).toHaveCount(1, { timeout: 15_000 });
-        await expect(sidePanel(page).getByTestId("workspace-new-tab-panel")).toBeVisible();
+        await expect(explorerSidebar(page)).toHaveCount(1, { timeout: 15_000 });
+        await expect(explorerSidebar(page).getByTestId("explorer-sidebar-tab-files")).toBeVisible();
        await expect(agentList).toHaveCount(1);
      });

      await test.step("the shortcut collapses both", async () => {
        await page.keyboard.press(`${modifier}+.`);
-        await expect(sidePanel(page)).toHaveCount(0, { timeout: 15_000 });
+        await expect(explorerSidebar(page)).toHaveCount(0, { timeout: 15_000 });
        await expect(agentList).toHaveCount(0);
      });

      await test.step("the shortcut restores both", async () => {
        await page.keyboard.press(`${modifier}+.`);
        await expect(agentList).toHaveCount(1, { timeout: 15_000 });
-        await expect(sidePanel(page)).toHaveCount(1, { timeout: 15_000 });
-        await expect(sidePanel(page).getByTestId("workspace-new-tab-panel")).toBeVisible();
+        await expect(explorerSidebar(page)).toHaveCount(1, { timeout: 15_000 });
+        await expect(explorerSidebar(page).getByTestId("explorer-sidebar-tab-files")).toBeVisible();
      });
    } finally {
      await workspace.cleanup();
@@ -9,6 +9,8 @@ import {
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

+const APP_SETTINGS_KEY = "@paseo:app-settings";
+
 const RED_PIXEL = Buffer.from(
  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9ZQmcAAAAASUVORK5CYII=",
  "base64",
@@ -218,6 +220,12 @@ test.describe("CodeMirror workspace file editing", () => {
  });

  test("clicking the editor focuses its pane beside an agent", async ({ page }) => {
+    await page.addInitScript((settingsKey) => {
+      localStorage.setItem(
+        settingsKey,
+        JSON.stringify({ openInSidePane: { explorerFiles: true } }),
+      );
+    }, APP_SETTINGS_KEY);
    const target = "target.ts:42";
    const session = await seedAgentWithFileLink({
      target,
@@ -1,142 +0,0 @@
-// The file panel's tree rail had no way to close: the changes panel's toolbar
-// carries a folder-tree toggle, the file toolbar carried nothing, and the rail
-// was permanent on desktop.
-import { expect } from "@playwright/test";
-import { test } from "../support/fixtures";
-import { openFileExplorer, openFileFromExplorer } from "../support/helpers/file-explorer";
-import { gotoWorkspace } from "../support/helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
-
-let workspace: SeededWorkspace;
-
-async function effectiveBackground(locator: import("@playwright/test").Locator): Promise<string> {
-  return locator.evaluate((element) => {
-    let current: Element | null = element;
-    while (current) {
-      const color = getComputedStyle(current).backgroundColor;
-      if (color !== "rgba(0, 0, 0, 0)" && color !== "transparent") return color;
-      current = current.parentElement;
-    }
-    return "transparent";
-  });
-}
-
-test.beforeAll(async () => {
-  workspace = await seedWorkspace({
-    repoPrefix: "file-tree-rail-toggle-",
-    repo: { files: [{ path: "docs/guide.md", content: "# Guide\n" }] },
-  });
-});
-
-test.afterAll(async () => {
-  await workspace?.cleanup();
-});
-
-test.describe("File panel tree rail", () => {
-  test("the Files panel starts with an empty content pane beside the tree", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-    await openFileExplorer(page);
-
-    const rail = page.getByTestId("files-tree-rail").filter({ visible: true });
-    await expect(rail).toBeVisible({ timeout: 30_000 });
-    const content = rail.getByTestId("files-tree-rail-content");
-    const tree = rail.getByTestId("files-tree-rail-tree");
-    await expect(content).toHaveText("Choose a file");
-    await expect(tree).toContainText("docs");
-    expect(await effectiveBackground(tree.getByTestId("file-explorer-tree-scroll"))).toBe(
-      await effectiveBackground(content),
-    );
-  });
-
-  test("the file toolbar toggle closes and reopens the tree", async ({ page }, testInfo) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-    await openFileExplorer(page);
-    await openFileFromExplorer(page, "docs");
-    await openFileFromExplorer(page, "guide.md");
-
-    const rail = page.getByTestId("file-tree-rail-tree").filter({ visible: true });
-    const toggle = page.getByTestId("file-toggle-tree").filter({ visible: true }).first();
-    const editorToolbar = page.getByTestId("file-panel-bar").filter({ visible: true });
-    const filesToolbar = page.getByTestId("files-pane-header").filter({ visible: true });
-    const refresh = page.getByRole("button", { name: "Refresh files" }).filter({ visible: true });
-    const hiddenFiles = page
-      .getByRole("button", { name: "Hide hidden files" })
-      .filter({ visible: true });
-    const shoot = async (name: string) => {
-      const path = testInfo.outputPath(`${name}.png`);
-      await page.screenshot({ path });
-      await testInfo.attach(name, { path, contentType: "image/png" });
-    };
-    await expect(rail).toBeVisible({ timeout: 30_000 });
-    await expect(toggle).toHaveAttribute("aria-selected", "true");
-    const [
-      editorToolbarBox,
-      filesToolbarBox,
-      treeToggleBox,
-      refreshBox,
-      treeGlyphBox,
-      refreshGlyphBox,
-    ] = await Promise.all([
-      editorToolbar.boundingBox(),
-      filesToolbar.boundingBox(),
-      toggle.boundingBox(),
-      refresh.boundingBox(),
-      toggle.locator("svg").boundingBox(),
-      refresh.locator("svg").boundingBox(),
-    ]);
-    if (
-      !editorToolbarBox ||
-      !filesToolbarBox ||
-      !treeToggleBox ||
-      !refreshBox ||
-      !treeGlyphBox ||
-      !refreshGlyphBox
-    ) {
-      throw new Error("Pane-content toolbar geometry could not be measured");
-    }
-    expect(editorToolbarBox.height).toBe(36);
-    expect(filesToolbarBox.height).toBe(36);
-    expect(editorToolbarBox.y + editorToolbarBox.height).toBe(
-      filesToolbarBox.y + filesToolbarBox.height,
-    );
-    expect(treeToggleBox.width).toBe(24);
-    expect(treeToggleBox.height).toBe(24);
-    expect(refreshBox.width).toBe(24);
-    expect(refreshBox.height).toBe(24);
-    expect(treeGlyphBox.width).toBe(14);
-    expect(treeGlyphBox.height).toBe(14);
-    expect(refreshGlyphBox.width).toBe(14);
-    expect(refreshGlyphBox.height).toBe(14);
-
-    const restBackground = await refresh.evaluate(
-      (element) => getComputedStyle(element).backgroundColor,
-    );
-    const treeToggleSelectedBackground = await toggle.evaluate(
-      (element) => getComputedStyle(element).backgroundColor,
-    );
-    await refresh.hover();
-    const refreshHoverBackground = await refresh.evaluate(
-      (element) => getComputedStyle(element).backgroundColor,
-    );
-    expect(refreshHoverBackground).not.toBe(restBackground);
-    expect(refreshHoverBackground).toBe(treeToggleSelectedBackground);
-    await hiddenFiles.click();
-    const hiddenFilesSelected = page
-      .getByRole("button", { name: "Show hidden files" })
-      .filter({ visible: true });
-    expect(
-      await hiddenFilesSelected.evaluate((element) => getComputedStyle(element).backgroundColor),
-    ).toBe(refreshHoverBackground);
-    await shoot("tree-open");
-
-    await toggle.click();
-    await expect(toggle).toHaveAttribute("aria-selected", "false");
-    await expect(rail).toHaveCount(0);
-    await shoot("tree-closed");
-
-    await toggle.click();
-    await expect(toggle).toHaveAttribute("aria-selected", "true");
-    await expect(rail).toBeVisible();
-    await shoot("tree-reopened");
-  });
-});
@@ -1,60 +0,0 @@
-import { test, expect } from "../support/fixtures";
-import { gotoWorkspace } from "../support/helpers/launcher";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import {
-  expectExplorerNodeRetained,
-  hideExplorerSplit,
-  measureExplorerSplit,
-  openExplorerSplit,
-  resizeExplorerSplit,
-  stampExplorerNode,
-} from "../support/helpers/split-pane";
-import {
-  createAgentTabFromMenu,
-  waitForWorkspaceTabsVisible,
-} from "../support/helpers/workspace-tabs";
-
-test.describe("Hidden split pane retention", () => {
-  test("releases all layout space without unmounting and restores its dragged width", async ({
-    page,
-  }, testInfo) => {
-    const workspace = await seedWorkspace({ repoPrefix: "hidden-split-pane-" });
-
-    try {
-      await gotoWorkspace(page, workspace.workspaceId);
-      await waitForWorkspaceTabsVisible(page);
-      await createAgentTabFromMenu(page);
-      await openExplorerSplit(page);
-
-      // Drag to a non-default width first: restoring the default would prove nothing.
-      await resizeExplorerSplit(page, 137);
-      await stampExplorerNode(page);
-      const open = await measureExplorerSplit(page);
-      expect(open.explorerWidth).toBeGreaterThan(250);
-      expect(open.separatorCount).toBe(1);
-
-      await hideExplorerSplit(page);
-      const hidden = await measureExplorerSplit(page);
-      expect(hidden.explorerWidth).toBe(0);
-      // The sibling must absorb the whole row, not just collapse the hidden pane.
-      expect(hidden.visibleWidth).toBeCloseTo(hidden.containerWidth, 5);
-      expect(hidden.occupiedWidth).toBeCloseTo(hidden.containerWidth, 5);
-      expect(hidden.separatorCount).toBe(0);
-      // Same DOM node, so a teardown-and-rebuild cannot pass as retention.
-      await expectExplorerNodeRetained(page);
-
-      await openExplorerSplit(page);
-      await expectExplorerNodeRetained(page);
-      const reopened = await measureExplorerSplit(page);
-      expect(reopened.explorerWidth).toBeCloseTo(open.explorerWidth, 5);
-      expect(reopened.separatorCount).toBe(1);
-
-      await testInfo.attach("split-pane-geometry", {
-        body: JSON.stringify({ open, hidden, reopened }, null, 2),
-        contentType: "application/json",
-      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-});
@@ -11,6 +11,7 @@ import {
  countTabsOfKind,
  waitForTabBar,
  pressNewTabShortcut,
+  pressDirectNewTabShortcut,
  getTabTestIds,
  waitForTabWithTitle,
  measureTileTransition,
@@ -177,13 +178,11 @@ test.describe("Tab creation", () => {
    const panel = page.getByTestId("workspace-new-tab-panel").filter({ visible: true });
    const agent = panel.getByRole("button", { name: /^Agent/ });
    const terminal = panel.getByRole("button", { name: /^Terminal/ });
-    const changes = panel.getByRole("button", { name: /Changes/ });
-    const files = panel.getByRole("button", { name: /Files/ });
+    const diff = panel.getByRole("button", { name: /Diff/ });
    const shortcutPrefix = process.platform === "darwin" ? /⇧⌘/ : /Ctrl.*Shift/;
    await expect(agent).toContainText(new RegExp(`${shortcutPrefix.source}.*A`));
    await expect(terminal).toContainText(new RegExp(`${shortcutPrefix.source}.*T`));
-    await expect(changes).toContainText(new RegExp(`${shortcutPrefix.source}.*G`));
-    await expect(files).toContainText(new RegExp(`${shortcutPrefix.source}.*E`));
+    await expect(diff).toContainText(new RegExp(`${shortcutPrefix.source}.*G`));
    await expect(agent).toBeFocused();

    await page.keyboard.press("ArrowDown");
@@ -191,6 +190,12 @@ test.describe("Tab creation", () => {
    await page.keyboard.press("ArrowUp");
    await expect(agent).toBeFocused();

+    await pressDirectNewTabShortcut(page, "e");
+    await expect(page.getByTestId("workspace-explorer-sidebar")).toBeVisible();
+    await expect(
+      page.getByTestId("file-explorer-tree-scroll").filter({ visible: true }),
+    ).toBeVisible();
+
    await page.locator("body").click({ position: { x: 1, y: 1 } });
    await panel.click({ position: { x: 20, y: 20 } });
    await expect(agent).toBeFocused();
@@ -102,11 +102,11 @@ test.describe("PR pane", () => {
    await expectPrPaneTitle(page, "Work in progress");
  });

-  test("renders check pills with correct success/failure/pending counts", async ({ page }) => {
+  test("renders check pills with correct passed/failed/pending counts", async ({ page }) => {
    await gotoWorkspace(page, workspaceByTitle.get("PR with mixed checks")!);
    await openPrPane(page);

-    await expectPrPaneCheckSummary(page, { success: 2, failure: 1, pending: 1 });
+    await expectPrPaneCheckSummary(page, { passed: 2, failed: 1, pending: 1 });
  });

  test("renders activity rows with correct count", async ({ page }) => {
@@ -120,7 +120,7 @@ test.describe("PR pane", () => {
    await gotoWorkspace(page, workspaceByTitle.get("PR with no checks")!);
    await openPrPane(page);

-    await expectPrPaneCheckSummary(page, { success: 0, failure: 0, pending: 0 });
+    await expectPrPaneCheckSummary(page, { passed: 0, failed: 0, pending: 0 });
    await expectPrPaneTitle(page, "PR with no checks");
  });
 });
@@ -1,50 +0,0 @@
-import { mkdir, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { expect, test } from "@playwright/test";
-import {
-  beginReplicaCacheObservation,
-  finishReplicaCacheObservation,
-  installReplicaCacheMeasurement,
-  measureReplicaCacheRestore,
-  type ReplicaCacheMeasurementReport,
-} from "../support/helpers/replica-cache-measurement";
-
-const RUN_MEASUREMENT = process.env.PASEO_REPLICA_CACHE_MEASUREMENT === "1";
-const TARGET_URL = process.env.PASEO_REPLICA_CACHE_MEASUREMENT_URL;
-const REPORT_PATH = process.env.PASEO_REPLICA_CACHE_MEASUREMENT_REPORT;
-const OBSERVATION_MS = Number(process.env.PASEO_REPLICA_CACHE_MEASUREMENT_MS ?? 60_000);
-const HYDRATED_SELECTOR =
-  process.env.PASEO_REPLICA_CACHE_HYDRATED_SELECTOR ??
-  '[data-testid="agent-chat-scroll"], [data-testid^="sidebar-workspace-row-"]';
-
-const measurementDescribe = RUN_MEASUREMENT ? test.describe : test.describe.skip;
-
-measurementDescribe("Replica cache live measurement", () => {
-  test("observes persistence and cached restore without mutating the daemon", async ({
-    page,
-  }, testInfo) => {
-    test.setTimeout(OBSERVATION_MS + 90_000);
-    expect(TARGET_URL, "PASEO_REPLICA_CACHE_MEASUREMENT_URL must be a full app URL").toBeTruthy();
-    expect(REPORT_PATH, "PASEO_REPLICA_CACHE_MEASUREMENT_REPORT must be set").toBeTruthy();
-
-    await installReplicaCacheMeasurement(page);
-    await page.goto(TARGET_URL!, { waitUntil: "domcontentloaded" });
-    await page.waitForLoadState("networkidle").catch(() => undefined);
-
-    const observation = await beginReplicaCacheObservation(page);
-    await page.waitForTimeout(OBSERVATION_MS);
-    const observed = await finishReplicaCacheObservation(page, observation, TARGET_URL!);
-    const restoreMs = await measureReplicaCacheRestore(page, TARGET_URL!, HYDRATED_SELECTOR);
-    const report: ReplicaCacheMeasurementReport = { ...observed, restoreMs };
-
-    await mkdir(path.dirname(REPORT_PATH!), { recursive: true });
-    await writeFile(REPORT_PATH!, `${JSON.stringify(report, null, 2)}\n`);
-    await testInfo.attach("replica-cache-measurement", {
-      body: JSON.stringify(report, null, 2),
-      contentType: "application/json",
-    });
-    console.log(`[measurement] Replica cache: ${JSON.stringify(report)}`);
-
-    expect(report.observationMs).toBeGreaterThanOrEqual(OBSERVATION_MS);
-  });
-});
@@ -14,7 +14,7 @@ import {

 const RUN_REPLICA_CACHE_PERF = process.env.PASEO_REPLICA_CACHE_PERF_E2E === "1";
 const MAX_STREAM_WRITES = 12;
-const MAX_SERIALIZED_CHARS = 45_000;
+const MAX_SERIALIZED_CHARS = 190_000;

 const test = base.extend<{ replicaCacheAgent: MockAgentWorkspace }>({
  replicaCacheAgent: async ({ page: _page }, provide) => {
@@ -1,238 +0,0 @@
-import { expect, type Locator, type Page, type TestInfo } from "@playwright/test";
-import { test } from "../support/fixtures";
-import { gotoWorkspace } from "../support/helpers/launcher";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import { ensureSidePanel, waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
-
-async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
-  const path = testInfo.outputPath(`${name}.png`);
-  await page.screenshot({ path });
-  await testInfo.attach(name, { path, contentType: "image/png" });
-}
-
-function sidePanel(page: Page): Locator {
-  return page.getByTestId("workspace-side-panel").filter({ visible: true });
-}
-
-function mainPane(page: Page): Locator {
-  return page.getByTestId("workspace-pane-main").filter({ visible: true });
-}
-
-function newTabPanel(scope: Locator): Locator {
-  return scope.getByTestId("workspace-new-tab-panel");
-}
-
-async function launcherButtonLabels(launcher: Locator): Promise<(string | null)[]> {
-  return launcher
-    .getByRole("button")
-    .evaluateAll((buttons) => buttons.map((button) => button.getAttribute("aria-label")));
-}
-
-function sidePanelToggle(page: Page): Locator {
-  return page.getByTestId("workspace-explorer-toggle").first();
-}
-
-/** Drags the pane's only tab into the left edge of its own pane, splitting it out. */
-async function splitTabOutOfMainPane(page: Page, chip: Locator): Promise<void> {
-  const paneBox = await mainPane(page).boundingBox();
-  const chipBox = await chip.boundingBox();
-  expect(paneBox).not.toBeNull();
-  expect(chipBox).not.toBeNull();
-  if (!paneBox || !chipBox) throw new Error("Unable to measure the main pane");
-
-  await page.mouse.move(chipBox.x + chipBox.width / 2, chipBox.y + chipBox.height / 2);
-  await page.mouse.down();
-  await page.mouse.move(chipBox.x + chipBox.width / 2 + 12, chipBox.y + chipBox.height / 2 + 4);
-  await page.mouse.move(paneBox.x + paneBox.width * 0.06, paneBox.y + paneBox.height * 0.6, {
-    steps: 20,
-  });
-  await page.mouse.up();
-}
-
-test.describe("Side panel", () => {
-  test("reveals empty, launches a view, and hides back out of the way", async ({
-    page,
-  }, testInfo) => {
-    const workspace = await seedWorkspace({ repoPrefix: "side-panel-reveal-" });
-
-    try {
-      await gotoWorkspace(page, workspace.workspaceId);
-      await waitForWorkspaceTabsVisible(page);
-      await expect(sidePanel(page)).toHaveCount(0);
-
-      await test.step("revealing the Side panel seeds nothing", async () => {
-        await sidePanelToggle(page).click();
-        await expect(sidePanel(page)).toBeVisible({ timeout: 30_000 });
-        const launcher = newTabPanel(sidePanel(page));
-        await expect(launcher).toBeVisible();
-        expect((await launcherButtonLabels(launcher)).slice(0, 4)).toEqual([
-          "Changes",
-          "Files",
-          "Terminal",
-          "Agent",
-        ]);
-        await expect(page.getByTestId("workspace-tab-working_diff")).toHaveCount(0);
-        await capture(page, testInfo, "01-side-panel-reveals-empty");
-      });
-
-      await test.step("Changes opens in the Side panel that offered it", async () => {
-        await newTabPanel(sidePanel(page)).getByRole("button", { name: "Changes" }).click();
-        await expect(sidePanel(page).getByTestId("workspace-tab-working_diff")).toBeVisible({
-          timeout: 30_000,
-        });
-        await expect(page.getByTestId("working-diff-panel").filter({ visible: true })).toBeVisible({
-          timeout: 30_000,
-        });
-        await capture(page, testInfo, "02-changes-opens-in-side-panel");
-      });
-
-      await test.step("closing its final tab hides the Side panel, and it reopens empty", async () => {
-        const changesTab = sidePanel(page).getByTestId("workspace-tab-working_diff");
-        await changesTab.hover();
-        await page
-          .locator('[data-testid^="workspace-working-diff-close-"]')
-          .filter({ visible: true })
-          .click();
-        await expect(sidePanel(page)).toHaveCount(0, { timeout: 15_000 });
-        await capture(page, testInfo, "03-side-panel-hidden-after-final-tab-close");
-
-        await sidePanelToggle(page).click();
-        await expect(sidePanel(page)).toBeVisible({ timeout: 15_000 });
-        await expect(newTabPanel(sidePanel(page))).toBeVisible();
-        await capture(page, testInfo, "04-side-panel-revealed-empty");
-      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("an emptied ordinary pane is removed rather than hidden", async ({ page }, testInfo) => {
-    const workspace = await seedWorkspace({ repoPrefix: "side-panel-close-main-" });
-
-    try {
-      await gotoWorkspace(page, workspace.workspaceId);
-      await waitForWorkspaceTabsVisible(page);
-      await ensureSidePanel(page);
-
-      // Dragging the pane's only tab into its own left edge splits that tab into a
-      // new pane and leaves the one it came from empty.
-      const draftTab = page
-        .locator('[data-testid^="workspace-tab-draft_"]')
-        .filter({ visible: true })
-        .first();
-      await expect(draftTab).toBeVisible({ timeout: 30_000 });
-      await splitTabOutOfMainPane(page, draftTab);
-      const draftPane = page
-        .locator('[data-testid^="workspace-pane-pane_"]')
-        .filter({ visible: true })
-        .first();
-      await expect(draftPane).toBeVisible({ timeout: 15_000 });
-
-      const emptyMain = newTabPanel(mainPane(page));
-      await expect(emptyMain).toBeVisible({ timeout: 15_000 });
-      await capture(page, testInfo, "06-empty-main-pane-launcher");
-
-      const newTabChip = mainPane(page)
-        .locator('[data-testid^="workspace-tab-tab_"]')
-        .filter({ hasText: "New tab" });
-      await newTabChip.hover();
-      await mainPane(page)
-        .locator('[data-testid^="workspace-new-tab-close-"]')
-        .filter({ visible: true })
-        .click();
-
-      // Gone for good, unlike the Side panel beside it, which is still only hidden away.
-      await expect(mainPane(page)).toHaveCount(0, { timeout: 30_000 });
-      await expect(sidePanel(page)).toBeVisible();
-      await expect(draftPane.getByTestId("workspace-new-tab-panel")).toHaveCount(0);
-      await capture(page, testInfo, "07-empty-main-pane-removed");
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("closing New cannot remove the last visible pane", async ({ page }, testInfo) => {
-    const workspace = await seedWorkspace({ repoPrefix: "side-panel-final-pane-" });
-
-    try {
-      await gotoWorkspace(page, workspace.workspaceId);
-      await waitForWorkspaceTabsVisible(page);
-
-      // Park a tab in the Side panel, then put the panel away. The workspace still
-      // holds that tab, so emptying Main does not look like an empty workspace and
-      // nothing reseeds a draft into it.
-      await ensureSidePanel(page);
-      await newTabPanel(sidePanel(page))
-        .getByRole("button", { name: "Files", exact: true })
-        .click();
-      await expect(sidePanel(page).getByTestId("workspace-tab-files")).toBeVisible({
-        timeout: 30_000,
-      });
-      await sidePanelToggle(page).click();
-      await expect(sidePanel(page)).toHaveCount(0, { timeout: 15_000 });
-
-      const draftTab = page
-        .locator('[data-testid^="workspace-tab-draft_"]')
-        .filter({ visible: true })
-        .first();
-      await draftTab.hover();
-      await page
-        .locator('[data-testid^="workspace-draft-close-"]')
-        .filter({ visible: true })
-        .first()
-        .click();
-
-      // Main now contains New and is the only pane the user can see. Closing its
-      // tab cannot remove the final visible pane.
-      const lastPane = newTabPanel(mainPane(page));
-      await expect(lastPane).toBeVisible({ timeout: 15_000 });
-      await expect(lastPane.getByRole("button", { name: "Files", exact: true })).toBeVisible();
-      const finalNewTab = mainPane(page)
-        .locator('[data-testid^="workspace-tab-tab_"]')
-        .filter({ hasText: "New tab" });
-      await finalNewTab.hover();
-      await mainPane(page)
-        .locator('[data-testid^="workspace-new-tab-close-"]')
-        .filter({ visible: true })
-        .click();
-      await expect(lastPane).toBeVisible();
-      await capture(page, testInfo, "08-final-visible-pane-has-no-close");
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("a pane's own menu creates an independent view when one is open elsewhere", async ({
-    page,
-  }, testInfo) => {
-    const workspace = await seedWorkspace({ repoPrefix: "side-panel-claim-" });
-
-    try {
-      await gotoWorkspace(page, workspace.workspaceId);
-      await waitForWorkspaceTabsVisible(page);
-      await ensureSidePanel(page);
-      await newTabPanel(sidePanel(page)).getByRole("button", { name: "Changes" }).click();
-      await expect(sidePanel(page).getByTestId("workspace-tab-working_diff")).toBeVisible({
-        timeout: 30_000,
-      });
-      await capture(page, testInfo, "08-changes-in-side-panel");
-
-      await mainPane(page).getByTestId("workspace-new-tab-button").click();
-      await page
-        .getByTestId("workspace-new-tab-menu-changes")
-        .filter({ visible: true })
-        .first()
-        .click();
-
-      await expect(mainPane(page).getByTestId("workspace-tab-working_diff")).toBeVisible({
-        timeout: 15_000,
-      });
-      await expect(sidePanel(page).getByTestId("workspace-tab-working_diff")).toHaveCount(1);
-      await expect(mainPane(page).getByTestId("workspace-tab-working_diff")).toHaveCount(1);
-      await expect(page.getByTestId("workspace-tab-working_diff")).toHaveCount(2);
-      await capture(page, testInfo, "09-independent-changes-in-both-panes");
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-});
@@ -29,10 +29,10 @@ test("sidebar and workspace pane borders highlight on hover", async ({ page, wit
  await expectBorderHighlight(page, "left-sidebar-resize-handle", sidebarHandle, "1px");

  await page.getByTestId("workspace-explorer-toggle").first().click();
-  const splitHandle = page.getByTestId("workspace-split-resize-handle");
+  const splitHandle = page.getByTestId("workspace-explorer-sidebar-resize-handle");
  await expectBorderHighlight(
    page,
-    "workspace-split-resize-handle",
+    "workspace-explorer-sidebar-resize-handle",
    splitHandle.getByRole("separator"),
    "3px",
  );
@@ -319,7 +319,7 @@ test.describe("Half-screen desktop layout", () => {
    await expect(closedIcon).toBeVisible();
    const closedBounds = await closedIcon.boundingBox();
    expect(closedBounds).not.toBeNull();
-    expect(closedBounds?.x).toBeCloseTo(12, 0);
+    expect(closedBounds?.x).toBeCloseTo(9, 0);
    expect(closedBounds?.y).toBe(openBounds?.y);
  });

@@ -342,16 +342,19 @@ test.describe("Half-screen desktop layout", () => {

      await openFilesPanel(page);
      const explorerToggle = page.getByTestId("workspace-explorer-toggle").first();
-      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toBeVisible();
-      await expect(explorerToggle).toHaveAccessibleName("Close side panel");
+      await expect(
+        page.getByTestId("explorer-sidebar-tab-files").filter({ visible: true }),
+      ).toBeVisible();
+      await expect(explorerToggle).toHaveAccessibleName("Close Explorer sidebar");
      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
-      await expect(page.getByTestId("workspace-tabs-row").filter({ visible: true })).toHaveCount(2);
+      await expect(page.getByTestId("explorer-sidebar-tab-rail")).toBeVisible();
+      await expect(page.getByTestId("workspace-tabs-row").filter({ visible: true })).toHaveCount(1);

      await explorerToggle.click();
-      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toHaveCount(
-        0,
-      );
-      await expect(explorerToggle).toHaveAccessibleName("Open side panel");
+      await expect(
+        page.getByTestId("explorer-sidebar-tab-files").filter({ visible: true }),
+      ).toHaveCount(0);
+      await expect(explorerToggle).toHaveAccessibleName("Open Explorer sidebar");
      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
    } finally {
      await workspace.cleanup();
@@ -1,6 +1,5 @@
 import { randomUUID } from "node:crypto";
-import { execSync, spawn, type ChildProcess } from "node:child_process";
-import { once } from "node:events";
+import type { ChildProcess } from "node:child_process";
 import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -23,6 +22,7 @@ import {
  submitNewWorkspaceEmpty,
 } from "../support/helpers/new-workspace";
 import { selectSidebarStatusGrouping } from "../support/helpers/sidebar";
+import { killProcessTree, spawnTsx } from "../support/helpers/spawn-node";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
 import { getVisibleWorkspaceAgentTabIds } from "../support/helpers/workspace-tabs";

@@ -195,9 +195,11 @@ async function getAvailablePort(): Promise<number> {
 async function waitForServer(port: number, child: ChildProcess): Promise<void> {
  const startedAt = Date.now();
  let lastConnectionError: unknown = null;
-  while (Date.now() - startedAt < 20_000) {
-    if (child.exitCode !== null) {
-      throw new Error(`Restart test daemon exited before listening (exit ${child.exitCode}).`);
+  while (Date.now() - startedAt < 90_000) {
+    if (child.exitCode !== null || child.signalCode !== null) {
+      throw new Error(
+        `Restart test daemon exited before listening (code ${String(child.exitCode)}, signal ${String(child.signalCode)}).`,
+      );
    }
    try {
      await new Promise<void>((resolve, reject) => {
@@ -226,21 +228,6 @@ async function waitForServer(port: number, child: ChildProcess): Promise<void> {
  );
 }

-async function stopProcess(child: ChildProcess): Promise<void> {
-  if (child.exitCode !== null || child.signalCode !== null) return;
-  child.kill("SIGTERM");
-  const timeout = setTimeout(() => {
-    if (child.exitCode === null && child.signalCode === null) {
-      child.kill("SIGKILL");
-    }
-  }, 5000);
-  try {
-    await once(child, "exit");
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-
 async function startRestartDaemon(input: {
  paseoHome: string;
  origin: string;
@@ -251,8 +238,7 @@ async function startRestartDaemon(input: {
  }

  const serverDir = path.resolve(__dirname, "../../../server");
-  const tsxBin = execSync("which tsx").toString().trim();
-  const child = spawn(tsxBin, ["scripts/supervisor-entrypoint.ts", "--dev"], {
+  const child = spawnTsx("scripts/supervisor-entrypoint.ts", ["--dev"], {
    cwd: serverDir,
    env: withDisabledE2ESpeechEnv({
      ...process.env,
@@ -276,7 +262,7 @@ async function startRestartDaemon(input: {
  try {
    await waitForServer(port, child);
  } catch (error) {
-    await stopProcess(child);
+    await killProcessTree(child);
    throw new Error(
      `${error instanceof Error ? error.message : String(error)}\nDaemon stderr:\n${stderr}`,
      { cause: error },
@@ -285,7 +271,7 @@ async function startRestartDaemon(input: {

  return {
    port,
-    close: () => stopProcess(child),
+    close: () => killProcessTree(child),
  };
 }

@@ -370,22 +356,6 @@ function parseWorkspaceIdFromPageUrl(page: Page, serverId: string): string | nul
  return decodeWorkspaceIdFromPathSegment(match[1]);
 }

-async function expectWorkspaceRowHasOnlyIndicator(
-  page: Page,
-  input: { serverId: string; workspaceId: string; indicator: string },
-) {
-  const row = page.getByTestId(`sidebar-workspace-row-${input.serverId}:${input.workspaceId}`);
-  await expect(row).toBeVisible({ timeout: 30_000 });
-  for (const indicator of ["attention", "done", "failed", "loading", "needs_input", "running"]) {
-    const locator = row.locator(`[data-testid="workspace-status-indicator-${indicator}"]`);
-    if (indicator === input.indicator) {
-      await expect(locator).toBeVisible({ timeout: 30_000 });
-    } else {
-      await expect(locator).toHaveCount(0);
-    }
-  }
-}
-
 async function expectWorkspaceRowDoesNotShowIndicator(
  page: Page,
  input: { serverId: string; workspaceId: string; indicator: string },
@@ -458,11 +428,6 @@ test.describe("Workspace model restart regressions", () => {

      await page.goto(buildHostWorkspaceRoute(serverId, seeded.workspaceA));
      await waitForSidebarHydration(page);
-      await expectWorkspaceRowHasOnlyIndicator(page, {
-        serverId,
-        workspaceId: seeded.workspaceA,
-        indicator: "running",
-      });
      await expectWorkspaceRowDoesNotShowIndicator(page, {
        serverId,
        workspaceId: seeded.workspaceB,
@@ -1,5 +1,5 @@
 import { spawn, type ChildProcess } from "node:child_process";
-import { once } from "node:events";
+import { killProcessTree } from "./helpers/spawn-node";
 import { existsSync } from "node:fs";
 import path from "node:path";
 import net from "node:net";
@@ -148,28 +148,11 @@ export async function warmMetro(port: number): Promise<void> {
  }
 }

-async function stopProcess(child: ChildProcess | null): Promise<void> {
-  if (!child || child.exitCode !== null || child.signalCode !== null) return;
-  child.kill("SIGTERM");
-  let timeout: ReturnType<typeof setTimeout> | undefined;
-  try {
-    await Promise.race([
-      once(child, "exit"),
-      new Promise<void>((resolve) => {
-        timeout = setTimeout(() => {
-          if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
-          resolve();
-        }, 5_000);
-      }),
-    ]);
-  } finally {
-    if (timeout) clearTimeout(timeout);
-  }
-}
-
 function startMetro(port: number, buffer: ReturnType<typeof createLineBuffer>): ChildProcess {
  const appDir = path.resolve(__dirname, "../..");
-  const child = spawn("npx", ["expo", "start", "--web", "--port", String(port)], {
+  const expoCli = require.resolve("expo/bin/cli");
+  // Spawns Node directly to bypass Windows .cmd shim execution restrictions without shell: true.
+  const child = spawn(process.execPath, [expoCli, "start", "--web", "--port", String(port)], {
    cwd: appDir,
    env: {
      ...process.env,
@@ -196,12 +179,6 @@ async function loadHarnessEnvironment(repoRoot: string): Promise<void> {
 }

 export default async function globalSetup() {
-  if (process.env.PASEO_REPLICA_CACHE_MEASUREMENT === "1") {
-    if (!process.env.PASEO_REPLICA_CACHE_MEASUREMENT_URL) {
-      throw new Error("PASEO_REPLICA_CACHE_MEASUREMENT_URL must be set for live measurement");
-    }
-    return;
-  }
  const repoRoot = path.resolve(__dirname, "../../../..");
  await loadHarnessEnvironment(repoRoot);

@@ -222,11 +199,11 @@ export default async function globalSetup() {
    console.log(`[e2e] Metro warmed on port ${metroPort}`);

    return async () => {
-      await stopProcess(metroProcess);
+      await killProcessTree(metroProcess);
      console.log("[e2e] Metro stopped");
    };
  } catch (error) {
-    await stopProcess(metroProcess);
+    await killProcessTree(metroProcess);
    throw error;
  }
 }
@@ -27,13 +27,6 @@ export interface DaemonHydrationGate {
  release(): void;
 }

-export interface RewindCompletionGate {
-  clearTimelineStreamCount(): void;
-  release(): void;
-  timelineStreamCount(): number;
-  waitForDelayedResponse(): Promise<void>;
-}
-
 export interface PromptJumpRequestTracker {
  requests(): Array<{ cursorSeq: number | null; limit: number | null; mergeWindow: boolean }>;
 }
@@ -262,62 +255,6 @@ export async function holdDaemonHydration(page: Page): Promise<DaemonHydrationGa
  };
 }

-export async function holdRewindCompletion(
-  page: Page,
-  agentId: string,
-): Promise<RewindCompletionGate> {
-  let released = false;
-  let timelineStreamCount = 0;
-  const delayedForwards: Array<() => void> = [];
-  let resolveDelayedResponse: (() => void) | null = null;
-  const delayedResponse = new Promise<void>((resolve) => {
-    resolveDelayedResponse = resolve;
-  });
-
-  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
-    const server = ws.connectToServer();
-    ws.onMessage((message) => server.send(message));
-    server.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      const payload = sessionMessage ? getPayload(sessionMessage) : null;
-      const streamEvent = payload?.event;
-      if (
-        sessionMessage?.type === "agent_stream" &&
-        payload?.agentId === agentId &&
-        streamEvent &&
-        typeof streamEvent === "object" &&
-        (streamEvent as { type?: unknown }).type === "timeline"
-      ) {
-        timelineStreamCount += 1;
-      }
-      if (
-        !released &&
-        sessionMessage?.type === "agent.rewind.response" &&
-        payload?.agentId === agentId
-      ) {
-        delayedForwards.push(() => ws.send(message));
-        resolveDelayedResponse?.();
-        return;
-      }
-      ws.send(message);
-    });
-  });
-
-  return {
-    clearTimelineStreamCount() {
-      timelineStreamCount = 0;
-    },
-    release() {
-      released = true;
-      for (const forward of delayedForwards.splice(0)) {
-        forward();
-      }
-    },
-    timelineStreamCount: () => timelineStreamCount,
-    waitForDelayedResponse: () => delayedResponse,
-  };
-}
-
 export async function delayCreatedAgentInitialTailResponse(
  page: Page,
 ): Promise<CreatedAgentTimelineGate> {
@@ -1,27 +1,27 @@
 import { expect, type Page } from "@playwright/test";
 import { escapeRegex } from "./regex";
-import { openChangesPanel as openWorkspaceChangesPanel } from "./workspace-tabs";
+import { openChangesTreePanel } from "./workspace-tabs";

 // The branch switcher lives in the Changes tab, not in the workspace header. It renders as a button whose
 // accessible name carries the current branch ("Current branch: <name>. Press to
 // switch branch."). Matching on the accessible name keeps these helpers tied to
 // what a screen reader user hears, and it proves the panel resolved a real
-// checkout directory from the opaque workspace id. Scoping to the changes header
-// keeps the matcher unambiguous even when the header is shared with diff actions.
+// checkout directory from the opaque workspace id. Scoping to the repository
+// header keeps the matcher aligned with the row that owns repository identity.
 function branchSwitcherTrigger(page: Page, branchName: string) {
  return page
-    .getByTestId("changes-header")
+    .getByTestId("changes-repository-header")
    .getByRole("button", { name: new RegExp(`Current branch: ${escapeRegex(branchName)}\\b`) })
    .filter({ visible: true })
    .first();
 }

-// Opens the fixed pane and lands on the Changes tab, where the switcher and diff live.
+// Opens the fixed Explorer Changes view, where the switcher lives.
 export async function openChangesPanel(page: Page): Promise<void> {
-  await openWorkspaceChangesPanel(page);
-  await expect(page.getByTestId("changes-header").filter({ visible: true }).first()).toBeVisible({
-    timeout: 30_000,
-  });
+  await openChangesTreePanel(page);
+  await expect(
+    page.getByTestId("changes-repository-header").filter({ visible: true }).first(),
+  ).toBeVisible({ timeout: 30_000 });
 }

 export async function expectWorkspaceBranch(page: Page, branchName: string): Promise<void> {
@@ -1,6 +1,6 @@
 import { fork, type ChildProcess } from "node:child_process";
-import { once } from "node:events";
 import path from "node:path";
+import { killProcessTree } from "./spawn-node";

 export interface OutdatedDaemon {
  endpoint: string;
@@ -55,14 +55,10 @@ export async function startOutdatedDaemon(options?: {
      endpoint: ready.endpoint,
      label: options?.desktopManaged === true ? "outdated Desktop host" : "outdated host",
      serverId: ready.serverId,
-      async close() {
-        if (child.exitCode !== null || child.signalCode !== null) return;
-        child.kill("SIGTERM");
-        await once(child, "exit");
-      },
+      close: () => killProcessTree(child),
    };
  } catch (error) {
-    child.kill("SIGTERM");
+    await killProcessTree(child);
    throw error;
  }
 }
@@ -1,4 +1,4 @@
-import { execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import { chmod, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -19,11 +19,19 @@ async function createFakeEditorBin(): Promise<string> {
  const binDir = await mkdtemp(path.join(tmpdir(), "paseo-e2e-editor-bin-"));
  let realGhPath = "";
  try {
-    realGhPath = execSync("which gh").toString().trim();
+    const locator = process.platform === "win32" ? "where.exe" : "which";
+    const candidates = execFileSync(locator, ["gh"], { encoding: "utf8" })
+      .split(/\r?\n/u)
+      .map((candidate) => candidate.trim())
+      .filter(Boolean);
+    realGhPath =
+      candidates.find(
+        (candidate) =>
+          process.platform !== "win32" || !/\.(?:cmd|bat)$/iu.test(path.extname(candidate)),
+      ) ?? "";
  } catch {
    // The local GitHub fixture remains usable without a system gh binary.
  }
-
  const fakeEditorSource = `#!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
@@ -41,6 +49,9 @@ if (recordPath) {
    const editorPath = path.join(binDir, editorCommand);
    await writeFile(editorPath, fakeEditorSource);
    await chmod(editorPath, 0o755);
+    if (process.platform === "win32") {
+      await writeFile(`${editorPath}.cmd`, `@node "%~dp0${editorCommand}" %*\r\n`);
+    }
  }

  const fakeGhPath = path.join(binDir, "gh");
@@ -106,6 +117,9 @@ process.exit(result.status ?? 1);
 `;
  await writeFile(fakeGhPath, fakeGhSource);
  await chmod(fakeGhPath, 0o755);
+  if (process.platform === "win32") {
+    await writeFile(`${fakeGhPath}.cmd`, '@node "%~dp0gh" %*\r\n');
+  }
  return binDir;
 }

@@ -1,16 +1,10 @@
-import { once } from "node:events";
-import {
-  spawn,
-  execFileSync,
-  execSync,
-  type ChildProcess,
-  type SpawnOptions,
-} from "node:child_process";
+import { spawn, execFileSync, type ChildProcess, type SpawnOptions } from "node:child_process";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import net from "node:net";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { withDisabledE2ESpeechEnv } from "./speech-env";
+import { killProcessTree, spawnTsx } from "./spawn-node";

 export interface IsolatedHostDaemon {
  serverId: string;
@@ -48,12 +42,14 @@ async function getAvailablePort(): Promise<number> {
 }

 async function waitForServer(port: number, child: ChildProcess): Promise<void> {
-  const deadline = Date.now() + 20_000;
+  const deadline = Date.now() + 90_000;
  let lastError: unknown = null;

  while (Date.now() < deadline) {
-    if (child.exitCode !== null) {
-      throw new Error(`Isolated host daemon exited before listening (exit ${child.exitCode})`);
+    if (child.exitCode !== null || child.signalCode !== null) {
+      throw new Error(
+        `Isolated host daemon exited before listening (code ${String(child.exitCode)}, signal ${String(child.signalCode)})`,
+      );
    }
    try {
      await new Promise<void>((resolve, reject) => {
@@ -81,19 +77,6 @@ async function waitForServer(port: number, child: ChildProcess): Promise<void> {
  );
 }

-async function stopProcess(child: ChildProcess): Promise<void> {
-  if (child.exitCode !== null || child.signalCode !== null) return;
-  child.kill("SIGTERM");
-  const timeout = setTimeout(() => {
-    if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
-  }, 5_000);
-  try {
-    await once(child, "exit");
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-
 export async function startIsolatedHostDaemon(
  serverId: string,
  options: IsolatedHostDaemonOptions = {},
@@ -114,11 +97,17 @@ export async function startIsolatedHostDaemon(
      path.join(publishedPackageRoot, "package.json"),
      `${JSON.stringify({ private: true })}\n`,
    );
-    const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
    try {
+      const npmCli = process.env.npm_execpath;
+      if (!npmCli || path.basename(npmCli).toLowerCase() !== "npm-cli.js") {
+        throw new Error(
+          "Published-version E2E requires npm_execpath from npm. Start it through `npm run test:e2e`.",
+        );
+      }
      execFileSync(
-        npmCommand,
+        process.execPath,
        [
+          npmCli,
          "install",
          "--no-audit",
          "--no-fund",
@@ -128,6 +117,9 @@ export async function startIsolatedHostDaemon(
        { cwd: publishedPackageRoot, stdio: "ignore" },
      );
    } catch (error) {
+      if (!options.preserveHome) {
+        await rm(paseoHome, { recursive: true, force: true });
+      }
      await rm(publishedPackageRoot, { recursive: true, force: true });
      throw error;
    }
@@ -155,7 +147,6 @@ export async function startIsolatedHostDaemon(
  const serverDir = publishedPackageRoot
    ? path.join(publishedPackageRoot, "node_modules", "@getpaseo", "server")
    : path.resolve(__dirname, "../../../../server");
-  const tsxBin = execSync("which tsx").toString().trim();
  const spawnDaemon = async (): Promise<ChildProcess> => {
    const spawnOptions: SpawnOptions = {
      cwd: serverDir,
@@ -175,7 +166,7 @@ export async function startIsolatedHostDaemon(
    };
    const child = publishedPackageRoot
      ? spawn(process.execPath, ["dist/scripts/supervisor-entrypoint.js"], spawnOptions)
-      : spawn(tsxBin, ["scripts/supervisor-entrypoint.ts", "--dev"], spawnOptions);
+      : spawnTsx("scripts/supervisor-entrypoint.ts", ["--dev"], spawnOptions);

    let stderr = "";
    child.stderr?.on("data", (chunk: Buffer) => {
@@ -187,7 +178,7 @@ export async function startIsolatedHostDaemon(
      await waitForServer(port, child);
      return child;
    } catch (error) {
-      await stopProcess(child);
+      await killProcessTree(child);
      throw new Error(
        `${error instanceof Error ? error.message : String(error)}\nDaemon stderr:\n${stderr}`,
        { cause: error },
@@ -216,13 +207,13 @@ export async function startIsolatedHostDaemon(
    getPid: () => child.pid,
    restart: async () => {
      if (closed) throw new Error(`Cannot restart closed isolated daemon ${serverId}`);
-      await stopProcess(child);
+      await killProcessTree(child);
      child = await spawnDaemon();
    },
    close: async () => {
      if (closed) return;
      closed = true;
-      await stopProcess(child);
+      await killProcessTree(child);
      if (!options.preserveHome) {
        await rm(paseoHome, { recursive: true, force: true });
      }
@@ -1,8 +1,8 @@
 import { spawn, type ChildProcess } from "node:child_process";
-import { once } from "node:events";
 import { existsSync } from "node:fs";
 import net from "node:net";
 import path from "node:path";
+import { killProcessTree } from "./spawn-node";

 export interface LocalElixirRelay {
  endpoint: string;
@@ -27,19 +27,6 @@ async function availablePort(): Promise<number> {
  });
 }

-async function stopProcess(child: ChildProcess): Promise<void> {
-  if (child.exitCode !== null || child.signalCode !== null) return;
-  child.kill("SIGTERM");
-  const force = setTimeout(() => {
-    if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
-  }, 5_000);
-  try {
-    await once(child, "exit");
-  } finally {
-    clearTimeout(force);
-  }
-}
-
 async function waitUntilReady(
  port: number,
  child: ChildProcess,
@@ -48,9 +35,9 @@ async function waitUntilReady(
  const deadline = Date.now() + 60_000;
  let lastError: unknown;
  while (Date.now() < deadline) {
-    if (child.exitCode !== null) {
+    if (child.exitCode !== null || child.signalCode !== null) {
      throw new Error(
-        `Elixir relay exited before becoming ready (exit ${child.exitCode}).\n${recentOutput()}`,
+        `Elixir relay exited before becoming ready (code ${String(child.exitCode)}, signal ${String(child.signalCode)}).\n${recentOutput()}`,
      );
    }
    try {
@@ -70,6 +57,12 @@ async function waitUntilReady(
 }

 export async function startLocalElixirRelay(): Promise<LocalElixirRelay> {
+  if (process.platform === "win32") {
+    throw new Error(
+      "The local Elixir relay requires asdf, which is not available on Windows; the relay-deployment Playwright project is POSIX-only.",
+    );
+  }
+
  const relayRoot =
    process.env.PASEO_RELAY_CHECKOUT ?? path.resolve(__dirname, "../../../../../..", "paseo-relay");
  if (!existsSync(path.join(relayRoot, "mix.exs"))) {
@@ -107,14 +100,14 @@ export async function startLocalElixirRelay(): Promise<LocalElixirRelay> {
    try {
      await waitUntilReady(port, child, () => output.join("\n"));
    } catch (error) {
-      await stopProcess(child);
+      await killProcessTree(child);
      throw error;
    }
  };

  const stop = async () => {
    if (!child) return;
-    await stopProcess(child);
+    await killProcessTree(child);
    child = null;
  };

@@ -1,5 +1,4 @@
 import { expect, type Page } from "@playwright/test";
-import type { CheckPresentationCounts } from "@/git/check-presentation";
 import { getStateLabel } from "@/git/pull-request-panel/data";
 import { openPullRequestPanel } from "./workspace-tabs";

@@ -30,10 +29,10 @@ async function assertCheckPill(page: Page, testId: string, count: number): Promi

 export async function expectPrPaneCheckSummary(
  page: Page,
-  counts: Pick<CheckPresentationCounts, "success" | "failure" | "pending">,
+  counts: { passed: number; failed: number; pending: number },
 ): Promise<void> {
-  await assertCheckPill(page, "pr-pane-check-success", counts.success);
-  await assertCheckPill(page, "pr-pane-check-failure", counts.failure);
+  await assertCheckPill(page, "pr-pane-check-passed", counts.passed);
+  await assertCheckPill(page, "pr-pane-check-failed", counts.failed);
  await assertCheckPill(page, "pr-pane-check-pending", counts.pending);
 }

@@ -1,312 +0,0 @@
-import type { CDPSession, Page } from "@playwright/test";
-
-const REPLICA_CACHE_DATABASE = "paseo-replica-row-store";
-const REPLICA_CACHE_ROWS_STORE = "rows";
-const PERSIST_FRAME_NAMES = [
-  "captureSessions",
-  "captureHost",
-  "queueReplicaChanges",
-  "apply",
-  "safeParse",
-  "stringify",
-  "setItem",
-  "measuredPut",
-] as const;
-const PERSIST_STACK_ANCHORS = new Set([
-  "captureSessions",
-  "captureHost",
-  "queueReplicaChanges",
-  "persist",
-  "flushPending",
-  "measuredPut",
-]);
-
-export interface ReplicaCacheMeasurementReport {
-  targetUrl: string;
-  observationMs: number;
-  persistCpuMs: number;
-  persistCpuFrames: Record<string, number>;
-  flushes: number;
-  bytesWritten: {
-    total: number;
-    perFlush: number[];
-  };
-  redundantWrites: number;
-  storageDurationMs: number;
-  longTasks: {
-    count: number;
-    totalDurationMs: number;
-    maximumDurationMs: number;
-    durationsMs: number[];
-  };
-  restoreMs: number | null;
-}
-
-interface BrowserMeasurementState {
-  flushes: Array<{ bytes: number; durationMs: number }>;
-  longTasks: number[];
-  redundantWrites: number;
-}
-
-interface ProfileNode {
-  id: number;
-  callFrame: { functionName: string; url: string };
-  parent?: number;
-}
-
-interface SamplingProfile {
-  nodes: ProfileNode[];
-  samples?: number[];
-  timeDeltas?: number[];
-}
-
-declare global {
-  interface Window {
-    __replicaCacheMeasurement?: BrowserMeasurementState;
-    __replicaCacheRestoreReadStartedAt?: number;
-  }
-}
-
-export async function installReplicaCacheMeasurement(page: Page): Promise<void> {
-  await page.addInitScript(
-    ({ databaseName, storeName }) => {
-      const encoder = new TextEncoder();
-      const transactionWrites = new WeakMap<
-        IDBTransaction,
-        Array<
-          | { type: "put"; key: string; value: string; bytes: number; startedAt: number }
-          | { type: "delete"; key: string; bytes: 0; startedAt: number }
-        >
-      >();
-      const lastValues = new Map<string, string>();
-
-      const resolveStorageKey = (
-        store: IDBObjectStore,
-        value: unknown,
-        explicitKey: IDBValidKey | undefined,
-      ): unknown => {
-        if (explicitKey !== undefined) return explicitKey;
-        if (value === null || typeof value !== "object") return null;
-        if (Array.isArray(store.keyPath)) {
-          return store.keyPath.map((part) => Reflect.get(value, part));
-        }
-        return typeof store.keyPath === "string" ? Reflect.get(value, store.keyPath) : null;
-      };
-
-      window.__replicaCacheMeasurement = {
-        flushes: [],
-        longTasks: [],
-        redundantWrites: 0,
-      };
-
-      const observeTransaction = (transaction: IDBTransaction) => {
-        let writes = transactionWrites.get(transaction);
-        if (writes) return writes;
-        writes = [];
-        transactionWrites.set(transaction, writes);
-        transaction.addEventListener("complete", () => {
-          const state = window.__replicaCacheMeasurement;
-          if (!state || writes!.length === 0) return;
-          let bytes = 0;
-          let startedAt = Number.POSITIVE_INFINITY;
-          for (const write of writes!) {
-            bytes += write.bytes;
-            startedAt = Math.min(startedAt, write.startedAt);
-            if (write.type === "put") {
-              if (lastValues.get(write.key) === write.value) state.redundantWrites += 1;
-              lastValues.set(write.key, write.value);
-            } else {
-              lastValues.delete(write.key);
-            }
-          }
-          state.flushes.push({ bytes, durationMs: performance.now() - startedAt });
-        });
-        return writes;
-      };
-
-      const originalPut = IDBObjectStore.prototype.put;
-      IDBObjectStore.prototype.put = function measuredPut(value: unknown, key?: IDBValidKey) {
-        const request =
-          key === undefined ? originalPut.call(this, value) : originalPut.call(this, value, key);
-        if (this.transaction.db.name !== databaseName || this.name !== storeName) return request;
-        const rowPayload =
-          value && typeof value === "object" ? Reflect.get(value, "payload") : undefined;
-        let serialized = JSON.stringify(value);
-        if (typeof value === "string") serialized = value;
-        if (typeof rowPayload === "string") serialized = rowPayload;
-        const storageKey = JSON.stringify(resolveStorageKey(this, value, key));
-        observeTransaction(this.transaction).push({
-          type: "put",
-          key: `${this.name}:${storageKey}`,
-          value: serialized,
-          bytes: encoder.encode(serialized).byteLength,
-          startedAt: performance.now(),
-        });
-        return request;
-      };
-      const originalDelete = IDBObjectStore.prototype.delete;
-      IDBObjectStore.prototype.delete = function measuredDelete(query: IDBValidKey | IDBKeyRange) {
-        const request = originalDelete.call(this, query);
-        if (this.transaction.db.name !== databaseName || this.name !== storeName) return request;
-        observeTransaction(this.transaction).push({
-          type: "delete",
-          key: `${this.name}:${JSON.stringify(query)}`,
-          bytes: 0,
-          startedAt: performance.now(),
-        });
-        return request;
-      };
-
-      const markRestoreRead = (store: IDBObjectStore) => {
-        if (
-          store.transaction.db.name === databaseName &&
-          store.name === storeName &&
-          store.transaction.mode === "readonly" &&
-          window.__replicaCacheRestoreReadStartedAt === undefined
-        ) {
-          window.__replicaCacheRestoreReadStartedAt = performance.now();
-        }
-      };
-      const originalGet = IDBObjectStore.prototype.get;
-      IDBObjectStore.prototype.get = function measuredGet(query: IDBValidKey | IDBKeyRange) {
-        markRestoreRead(this);
-        return originalGet.call(this, query);
-      };
-      const originalGetAll = IDBObjectStore.prototype.getAll;
-      IDBObjectStore.prototype.getAll = function measuredGetAll(
-        query?: IDBValidKey | IDBKeyRange | null,
-        count?: number,
-      ) {
-        markRestoreRead(this);
-        return originalGetAll.call(this, query, count);
-      };
-      const originalOpenCursor = IDBObjectStore.prototype.openCursor;
-      IDBObjectStore.prototype.openCursor = function measuredOpenCursor(
-        query?: IDBValidKey | IDBKeyRange | null,
-        direction?: IDBCursorDirection,
-      ) {
-        markRestoreRead(this);
-        return originalOpenCursor.call(this, query, direction);
-      };
-
-      if (typeof PerformanceObserver !== "undefined") {
-        const observer = new PerformanceObserver((entries) => {
-          const state = window.__replicaCacheMeasurement;
-          if (!state) return;
-          for (const entry of entries.getEntries()) state.longTasks.push(entry.duration);
-        });
-        try {
-          observer.observe({ type: "longtask", buffered: true });
-        } catch {
-          // Chromium exposes Long Tasks; leave an empty list on runtimes that do not.
-        }
-      }
-    },
-    { databaseName: REPLICA_CACHE_DATABASE, storeName: REPLICA_CACHE_ROWS_STORE },
-  );
-}
-
-export async function beginReplicaCacheObservation(
-  page: Page,
-): Promise<{ cdp: CDPSession; startedAt: number }> {
-  await page.evaluate(() => {
-    const state = window.__replicaCacheMeasurement;
-    if (!state) throw new Error("Replica cache measurement is not installed");
-    state.flushes = [];
-    state.longTasks = [];
-    state.redundantWrites = 0;
-  });
-  const cdp = await page.context().newCDPSession(page);
-  await cdp.send("Profiler.enable");
-  await cdp.send("Profiler.setSamplingInterval", { interval: 100 });
-  await cdp.send("Profiler.start");
-  return { cdp, startedAt: Date.now() };
-}
-
-export async function finishReplicaCacheObservation(
-  page: Page,
-  observation: { cdp: CDPSession; startedAt: number },
-  targetUrl: string,
-): Promise<Omit<ReplicaCacheMeasurementReport, "restoreMs">> {
-  const result = (await observation.cdp.send("Profiler.stop")) as { profile: SamplingProfile };
-  await observation.cdp.detach();
-  const browser = await page.evaluate(() => {
-    const state = window.__replicaCacheMeasurement;
-    if (!state) throw new Error("Replica cache measurement is not installed");
-    return state;
-  });
-  const cpu = summarizePersistCpu(result.profile);
-  const bytesPerFlush = browser.flushes.map((flush) => flush.bytes);
-  const longTaskDurations = browser.longTasks;
-  return {
-    targetUrl,
-    observationMs: Date.now() - observation.startedAt,
-    persistCpuMs: cpu.totalMs,
-    persistCpuFrames: cpu.byFrame,
-    flushes: browser.flushes.length,
-    bytesWritten: {
-      total: bytesPerFlush.reduce((sum, bytes) => sum + bytes, 0),
-      perFlush: bytesPerFlush,
-    },
-    redundantWrites: browser.redundantWrites,
-    storageDurationMs: browser.flushes.reduce((sum, flush) => sum + flush.durationMs, 0),
-    longTasks: {
-      count: longTaskDurations.length,
-      totalDurationMs: longTaskDurations.reduce((sum, duration) => sum + duration, 0),
-      maximumDurationMs: Math.max(0, ...longTaskDurations),
-      durationsMs: longTaskDurations,
-    },
-  };
-}
-
-export async function measureReplicaCacheRestore(
-  page: Page,
-  targetUrl: string,
-  hydratedSelector: string,
-): Promise<number | null> {
-  await page.routeWebSocket(/\/ws(?:\?|$)/, async (socket) => {
-    await socket.close({ code: 1000, reason: "Hold reconnect until cached replica paints" });
-  });
-  await page.goto(targetUrl, { waitUntil: "domcontentloaded" });
-  const restoredAt = await page.waitForFunction(
-    (selector) => {
-      const startedAt = window.__replicaCacheRestoreReadStartedAt;
-      if (startedAt === undefined) return null;
-      const element = document.querySelector(selector);
-      if (!element || !(element instanceof HTMLElement) || element.offsetParent === null)
-        return null;
-      return performance.now();
-    },
-    hydratedSelector,
-    { timeout: 30_000 },
-  );
-  const restoredAtMs = await restoredAt.jsonValue();
-  const startedAtMs = await page.evaluate(() => window.__replicaCacheRestoreReadStartedAt ?? null);
-  return typeof restoredAtMs === "number" && startedAtMs !== null
-    ? restoredAtMs - startedAtMs
-    : null;
-}
-
-function summarizePersistCpu(profile: SamplingProfile): {
-  totalMs: number;
-  byFrame: Record<string, number>;
-} {
-  const nodes = new Map(profile.nodes.map((node) => [node.id, node]));
-  const byFrame: Record<string, number> = {};
-  let totalMicroseconds = 0;
-  for (const [index, sampleId] of (profile.samples ?? []).entries()) {
-    const delta = profile.timeDeltas?.[index] ?? 0;
-    const stackFunctions = new Set<string>();
-    let node = nodes.get(sampleId);
-    while (node) {
-      stackFunctions.add(node.callFrame.functionName);
-      node = node.parent === undefined ? undefined : nodes.get(node.parent);
-    }
-    if (![...stackFunctions].some((name) => PERSIST_STACK_ANCHORS.has(name))) continue;
-    const matched = PERSIST_FRAME_NAMES.filter((name) => stackFunctions.has(name));
-    if (matched.length === 0) continue;
-    totalMicroseconds += delta;
-    for (const pattern of matched) byFrame[pattern] = (byFrame[pattern] ?? 0) + delta / 1_000;
-  }
-  return { totalMs: totalMicroseconds / 1_000, byFrame };
-}
@@ -1,49 +1,26 @@
 import type { Page } from "@playwright/test";

-const DATABASE_NAME = "paseo-replica-row-store";
-const STORE_NAME = "rows";
-const SINGLETON_ID = "singleton";
-
-type ReplicaRowKind = "agent" | "workspace" | "project" | "timeline" | "checkpoint";
-
-interface ReplicaRowRecord {
-  serverId: string;
-  kind: ReplicaRowKind;
-  id: string;
-  payload: string;
-}
-
-interface ReplicaCacheHostRecord {
-  serverId: string;
-  agents: Array<Record<string, unknown>>;
-  workspaces: Array<Record<string, unknown>>;
-  projects: Array<Record<string, unknown>>;
-  timeline?: {
-    agentId?: string;
-    items?: Array<Record<string, unknown>>;
-    range?: {
-      endSeq?: number;
-      epoch?: string;
-      startSeq?: number;
-    } | null;
-  } | null;
-  directorySync?: unknown;
-}
+const DATABASE_NAME = "paseo-replica-cache";
+const STORE_NAME = "key-value";
+const STORAGE_KEY = "@paseo:replica-cache";

 export interface ReplicaCacheRecord {
  version?: number;
-  hosts?: ReplicaCacheHostRecord[];
+  hosts?: Array<{
+    timeline?: {
+      agentId?: string;
+      items?: Array<Record<string, unknown>>;
+      range?: {
+        endSeq?: number;
+        epoch?: string;
+        startSeq?: number;
+      } | null;
+    } | null;
+  }>;
 }

 interface ReplicaCacheWriteObserverState {
-  lastValues: Record<string, string>;
-  redundantWrites: number;
-  serializedChars: number;
-  storageDurationMs: number;
-  writes: number;
-}
-
-interface ReplicaCacheWriteObserverReport {
+  lastValue: string | null;
  redundantWrites: number;
  serializedChars: number;
  storageDurationMs: number;
@@ -56,10 +33,11 @@ declare global {
  }
 }

-async function readRows(input: {
+async function readStoredValue(input: {
  databaseName: string;
  storeName: string;
-}): Promise<ReplicaRowRecord[]> {
+  storageKey: string;
+}): Promise<string | null> {
  const database = await new Promise<IDBDatabase>((resolve, reject) => {
    const request = indexedDB.open(input.databaseName, 1);
    request.addEventListener("success", () => resolve(request.result));
@@ -69,103 +47,26 @@ async function readRows(input: {
    const request = database
      .transaction(input.storeName, "readonly")
      .objectStore(input.storeName)
-      .getAll();
-    request.addEventListener("success", () => resolve(request.result));
+      .get(input.storageKey);
+    request.addEventListener("success", () =>
+      resolve(typeof request.result === "string" ? request.result : null),
+    );
    request.addEventListener("error", () => reject(request.error));
  });
 }

-function assembleCache(rows: ReplicaRowRecord[]): ReplicaCacheRecord {
-  const hosts = new Map<string, ReplicaCacheHostRecord>();
-  for (const row of rows) {
-    const host = hosts.get(row.serverId) ?? {
-      serverId: row.serverId,
-      agents: [],
-      workspaces: [],
-      projects: [],
-      timeline: null,
-    };
-    const payload = JSON.parse(row.payload) as Record<string, unknown>;
-    switch (row.kind) {
-      case "agent":
-        host.agents.push(payload);
-        break;
-      case "workspace":
-        host.workspaces.push(payload);
-        break;
-      case "project":
-        host.projects.push(payload);
-        break;
-      case "timeline":
-        host.timeline = payload;
-        break;
-      case "checkpoint":
-        host.directorySync = payload;
-        break;
-    }
-    hosts.set(row.serverId, host);
-  }
-  return { version: 6, hosts: [...hosts.values()] };
-}
-
 export async function readReplicaCache(page: Page): Promise<ReplicaCacheRecord | null> {
-  const rows = await page.evaluate(readRows, {
+  const raw = await page.evaluate(readStoredValue, {
    databaseName: DATABASE_NAME,
    storeName: STORE_NAME,
+    storageKey: STORAGE_KEY,
  });
-  return rows.length > 0 ? assembleCache(rows) : null;
+  return raw ? (JSON.parse(raw) as ReplicaCacheRecord) : null;
 }

 export async function writeReplicaCache(page: Page, value: ReplicaCacheRecord): Promise<void> {
-  const rows: ReplicaRowRecord[] = [];
-  for (const host of value.hosts ?? []) {
-    for (const agent of host.agents) {
-      const snapshot = agent.snapshot;
-      if (!snapshot || typeof snapshot !== "object") continue;
-      const id = Reflect.get(snapshot, "id");
-      if (typeof id === "string") {
-        rows.push({ serverId: host.serverId, kind: "agent", id, payload: JSON.stringify(agent) });
-      }
-    }
-    for (const workspace of host.workspaces) {
-      if (typeof workspace.id === "string") {
-        rows.push({
-          serverId: host.serverId,
-          kind: "workspace",
-          id: workspace.id,
-          payload: JSON.stringify(workspace),
-        });
-      }
-    }
-    for (const project of host.projects) {
-      if (typeof project.projectId === "string") {
-        rows.push({
-          serverId: host.serverId,
-          kind: "project",
-          id: project.projectId,
-          payload: JSON.stringify(project),
-        });
-      }
-    }
-    if (host.timeline) {
-      rows.push({
-        serverId: host.serverId,
-        kind: "timeline",
-        id: SINGLETON_ID,
-        payload: JSON.stringify(host.timeline),
-      });
-    }
-    if (host.directorySync !== undefined) {
-      rows.push({
-        serverId: host.serverId,
-        kind: "checkpoint",
-        id: SINGLETON_ID,
-        payload: JSON.stringify(host.directorySync),
-      });
-    }
-  }
  await page.evaluate(
-    async ({ databaseName, storeName, nextRows }) => {
+    async ({ databaseName, storeName, storageKey, raw }) => {
      const database = await new Promise<IDBDatabase>((resolve, reject) => {
        const request = indexedDB.open(databaseName, 1);
        request.addEventListener("success", () => resolve(request.result));
@@ -173,23 +74,26 @@ export async function writeReplicaCache(page: Page, value: ReplicaCacheRecord):
      });
      await new Promise<void>((resolve, reject) => {
        const transaction = database.transaction(storeName, "readwrite");
-        const store = transaction.objectStore(storeName);
-        store.clear();
-        for (const row of nextRows) store.put(row);
+        transaction.objectStore(storeName).put(raw, storageKey);
        transaction.addEventListener("complete", () => resolve());
        transaction.addEventListener("error", () => reject(transaction.error));
        transaction.addEventListener("abort", () => reject(transaction.error));
      });
    },
-    { databaseName: DATABASE_NAME, storeName: STORE_NAME, nextRows: rows },
+    {
+      databaseName: DATABASE_NAME,
+      storeName: STORE_NAME,
+      storageKey: STORAGE_KEY,
+      raw: JSON.stringify(value),
+    },
  );
 }

 export async function observeReplicaCacheStorageWrites(page: Page): Promise<void> {
  await page.addInitScript(
-    ({ databaseName, storeName }) => {
+    ({ databaseName, storeName, storageKey }) => {
      window.__replicaCacheWriteObserver = {
-        lastValues: {},
+        lastValue: null,
        redundantWrites: 0,
        serializedChars: 0,
        storageDurationMs: 0,
@@ -202,71 +106,51 @@ export async function observeReplicaCacheStorageWrites(page: Page): Promise<void
        if (
          this.transaction.db.name !== databaseName ||
          this.name !== storeName ||
-          !value ||
-          typeof value !== "object"
+          key !== storageKey ||
+          typeof value !== "string"
        ) {
          return request;
        }
-        const serverId = Reflect.get(value, "serverId");
-        const kind = Reflect.get(value, "kind");
-        const id = Reflect.get(value, "id");
-        const payload = Reflect.get(value, "payload");
-        if (
-          typeof serverId !== "string" ||
-          typeof kind !== "string" ||
-          typeof id !== "string" ||
-          typeof payload !== "string"
-        ) {
-          return request;
-        }
-        const rowKey = `${serverId}:${kind}:${id}`;
        const startedAt = performance.now();
        request.addEventListener("success", () => {
          const state = window.__replicaCacheWriteObserver;
          if (!state) return;
-          if (state.lastValues[rowKey] === payload) state.redundantWrites += 1;
-          state.lastValues[rowKey] = payload;
+          if (state.lastValue === value) state.redundantWrites += 1;
+          state.lastValue = value;
          state.writes += 1;
-          state.serializedChars += payload.length;
+          state.serializedChars += value.length;
          state.storageDurationMs += performance.now() - startedAt;
        });
        return request;
      };
    },
-    { databaseName: DATABASE_NAME, storeName: STORE_NAME },
+    { databaseName: DATABASE_NAME, storeName: STORE_NAME, storageKey: STORAGE_KEY },
  );
 }

 export async function resetReplicaCacheStorageWriteObserver(page: Page): Promise<void> {
-  const rows = await page.evaluate(readRows, {
+  const lastValue = await page.evaluate(readStoredValue, {
    databaseName: DATABASE_NAME,
    storeName: STORE_NAME,
+    storageKey: STORAGE_KEY,
  });
-  const lastValues = Object.fromEntries(
-    rows.map((row) => [`${row.serverId}:${row.kind}:${row.id}`, row.payload]),
-  );
-  await page.evaluate((values) => {
+  await page.evaluate((value) => {
    window.__replicaCacheWriteObserver = {
-      lastValues: values,
+      lastValue: value,
      redundantWrites: 0,
      serializedChars: 0,
      storageDurationMs: 0,
      writes: 0,
    };
-  }, lastValues);
+  }, lastValue);
 }

 export async function readReplicaCacheStorageWriteObserver(
  page: Page,
-): Promise<ReplicaCacheWriteObserverReport> {
+): Promise<ReplicaCacheWriteObserverState> {
  return page.evaluate(() => {
    const state = window.__replicaCacheWriteObserver;
    if (!state) throw new Error("Replica cache write observer is not installed");
-    return {
-      redundantWrites: state.redundantWrites,
-      serializedChars: state.serializedChars,
-      storageDurationMs: state.storageDurationMs,
-      writes: state.writes,
-    };
+    return state;
  });
 }
@@ -0,0 +1,84 @@
+import { execFile, spawn, type ChildProcess, type SpawnOptions } from "node:child_process";
+import { once } from "node:events";
+
+/**
+ * Runs a repo-local TypeScript entrypoint through Node's own tsx loader instead
+ * of the `node_modules/.bin/tsx` shim.
+ *
+ * The shim is a platform trap, not a convenience: on Windows it is `tsx.cmd`,
+ * and Node refuses to spawn `.cmd`/`.bat` without `shell: true` (EINVAL, from
+ * the CVE-2024-27980 mitigation). Opting into `shell: true` to get around that
+ * trades one bug for three — argv is concatenated unescaped (DEP0190), a path
+ * containing spaces splits, and the kill signal lands on `cmd.exe` while the
+ * real child keeps the port. Spawning `process.execPath` has none of those
+ * properties and is byte-identical on POSIX, so there is no platform branch.
+ */
+export function spawnTsx(entrypoint: string, args: string[], options: SpawnOptions): ChildProcess {
+  if (entrypoint.startsWith("-")) {
+    throw new Error(`TypeScript entrypoint must be a path, received ${entrypoint}`);
+  }
+  return spawn(process.execPath, ["--import", "tsx", "--", entrypoint, ...args], options);
+}
+
+/**
+ * Terminates a child and everything it forked, then waits for the exit.
+ *
+ * `child.kill()` on Windows maps to `TerminateProcess` against the direct child
+ * only. Metro and the daemon supervisor both fork workers, so the signal leaves
+ * grandchildren holding the listening port and the next run fails to bind.
+ * `taskkill /T` walks the tree; POSIX keeps the SIGTERM-then-SIGKILL ladder.
+ */
+export async function killProcessTree(child: ChildProcess | null): Promise<void> {
+  if (!child || hasExited(child)) return;
+  const exited = once(child, "exit").then(() => undefined);
+
+  if (process.platform === "win32") {
+    const pid = child.pid;
+    if (pid === undefined) {
+      throw new Error("Cannot terminate a Windows process tree without a PID");
+    }
+
+    // Register the exit listener before taskkill to avoid missing a fast exit.
+    // Bound taskkill itself so a stuck system utility cannot hang teardown.
+    const completed = Promise.withResolvers<Error | null>();
+    execFile("taskkill", ["/pid", String(pid), "/T", "/F"], { timeout: 5_000 }, (error) =>
+      completed.resolve(error),
+    );
+    const taskkillError = await completed.promise;
+    if (taskkillError && !hasExited(child)) {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+        // The child can exit between the state check and the direct kill.
+      }
+      await waitForExitOrTimeout(exited, 5_000);
+      throw new Error(`Failed to terminate process tree for PID ${pid}`, { cause: taskkillError });
+    }
+    if (!hasExited(child) && !(await waitForExitOrTimeout(exited, 5_000))) {
+      throw new Error(`Process tree for PID ${pid} did not exit after taskkill`);
+    }
+    return;
+  }
+
+  child.kill("SIGTERM");
+  if (await waitForExitOrTimeout(exited, 5_000)) return;
+
+  child.kill("SIGKILL");
+  if (!(await waitForExitOrTimeout(exited, 5_000))) {
+    throw new Error(`Process ${String(child.pid)} did not exit after SIGKILL`);
+  }
+}
+
+function hasExited(child: ChildProcess): boolean {
+  return child.exitCode !== null || child.signalCode !== null;
+}
+
+async function waitForExitOrTimeout(exited: Promise<void>, timeoutMs: number): Promise<boolean> {
+  const timedOut = Promise.withResolvers<boolean>();
+  const timeout = setTimeout(() => timedOut.resolve(false), timeoutMs);
+  try {
+    return await Promise.race([exited.then(() => true), timedOut.promise]);
+  } finally {
+    clearTimeout(timeout);
+  }
+}
@@ -1,84 +0,0 @@
-import { expect, type Locator, type Page } from "@playwright/test";
-
-export interface SplitPaneGeometry {
-  containerWidth: number;
-  explorerWidth: number;
-  visibleWidth: number;
-  separatorCount: number;
-  occupiedWidth: number;
-}
-
-function splitSeparator(page: Page): Locator {
-  return page.getByRole("separator", { name: "" });
-}
-
-export async function openExplorerSplit(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Open side panel" }).click();
-  await expect(splitSeparator(page)).toHaveCount(1, { timeout: 30_000 });
-}
-
-export async function hideExplorerSplit(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Close side panel" }).click();
-  await expect(splitSeparator(page)).toHaveCount(0, { timeout: 30_000 });
-}
-
-export async function resizeExplorerSplit(page: Page, deltaX: number): Promise<void> {
-  const separator = splitSeparator(page);
-  await expect(separator).toHaveCount(1);
-  const box = await separator.boundingBox();
-  expect(box).not.toBeNull();
-  if (!box) throw new Error("Split separator has no bounding box");
-  await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
-  await page.mouse.down();
-  await page.mouse.move(box.x + box.width / 2 + deltaX, box.y + box.height / 2, { steps: 10 });
-  await page.mouse.up();
-}
-
-export async function stampExplorerNode(page: Page): Promise<void> {
-  await page
-    .getByTestId("split-group-child")
-    .last()
-    .evaluate((node) => {
-      Reflect.set(window, "__splitPaneExplorerNode", node);
-      node.setAttribute("data-split-pane-identity", "retained");
-    });
-}
-
-export async function expectExplorerNodeRetained(page: Page): Promise<void> {
-  const stampedNode = page.locator('[data-split-pane-identity="retained"]');
-  await expect(stampedNode).toHaveCount(1);
-  expect(
-    await stampedNode.evaluate((node) => Reflect.get(window, "__splitPaneExplorerNode") === node),
-  ).toBe(true);
-}
-
-export async function measureExplorerSplit(page: Page): Promise<SplitPaneGeometry> {
-  const explorerChild = page.locator('[data-split-pane-identity="retained"]');
-  await expect(explorerChild).toHaveCount(1);
-
-  return explorerChild.evaluate((explorerNode) => {
-    const visibleNode = Array.from(explorerNode.parentElement?.children ?? [])
-      .filter(
-        (candidate) =>
-          candidate !== explorerNode &&
-          (candidate as HTMLElement).dataset.testid === "split-group-child",
-      )
-      .sort(
-        (left, right) => right.getBoundingClientRect().width - left.getBoundingClientRect().width,
-      )[0];
-    if (!(visibleNode instanceof HTMLElement)) throw new Error("Visible split child not found");
-    const visible = visibleNode.getBoundingClientRect();
-    const explorer = explorerNode.getBoundingClientRect();
-    const container = explorerNode.parentElement?.getBoundingClientRect();
-    if (!container) throw new Error("Split child has no container");
-    const separatorCount =
-      explorerNode.parentElement?.querySelectorAll('[role="separator"]').length ?? 0;
-    return {
-      containerWidth: container.width,
-      explorerWidth: explorer.width,
-      visibleWidth: visible.width,
-      separatorCount,
-      occupiedWidth: explorer.width + visible.width,
-    };
-  });
-}
@@ -1,31 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { summarizeStreamSmoothness } from "./stream-smoothness";
-
-describe("summarizeStreamSmoothness", () => {
-  it("reports canonical handover snaps separately from paced growth", () => {
-    const report = summarizeStreamSmoothness(
-      [
-        { timestampMs: 0, growthChars: 0, firstPaintChars: 0 },
-        { timestampMs: 10, growthChars: 4, firstPaintChars: 0 },
-        { timestampMs: 20, growthChars: 100, firstPaintChars: 30 },
-        { timestampMs: 30, growthChars: 4, firstPaintChars: 0 },
-        { timestampMs: 40, growthChars: 0, firstPaintChars: 0 },
-      ],
-      40,
-    );
-
-    expect(report).toMatchObject({
-      frames: 3,
-      growthFrames: 2,
-      charsPainted: 8,
-      maxCharsInOneFrame: 4,
-      firstPaintFrames: 1,
-      firstPaintChars: 30,
-      handoverGrowthFrames: 1,
-      handoverGrowthChars: 100,
-      maxHandoverGrowthCharsInOneFrame: 100,
-      updateGapP95Ms: 10,
-    });
-  });
-});
@@ -1,215 +0,0 @@
-import type { Page } from "@playwright/test";
-
-/**
- * Frame-level sampling of the streaming assistant message, and the two numbers
- * that describe how it reads:
- *
- * - `charsPerFrameCv` — coefficient of variation of characters painted per frame.
- *   This is the smoothness metric. Painting deltas as they land tracks the
- *   arrival lumps, so it is high; pacing the reveal flattens it.
- * - `updateGapP95Ms` — how long the text can sit unchanged mid-stream. This is
- *   the stall metric, and it is what stops smoothness being bought with lag.
- *
- * Both are needed. A stream that never updates is perfectly smooth.
- */
-
-export interface StreamFrameSample {
-  timestampMs: number;
-  growthChars: number;
-  firstPaintChars: number;
-}
-
-export interface StreamSmoothnessReport {
-  sampleWindowMs: number;
-  frames: number;
-  growthFrames: number;
-  charsPainted: number;
-  meanCharsPerFrame: number;
-  maxCharsInOneFrame: number;
-  charsPerFrameCv: number;
-  firstPaintFrames: number;
-  firstPaintChars: number;
-  maxFirstPaintCharsInOneFrame: number;
-  handoverGrowthFrames: number;
-  handoverGrowthChars: number;
-  maxHandoverGrowthCharsInOneFrame: number;
-  updateGapP50Ms: number;
-  updateGapP95Ms: number;
-  updateGapMaxMs: number;
-}
-
-/**
- * Record text growth on every mounted assistant message once per frame.
- *
- * Message occurrence identity separates paced growth from first paint. Completed markdown
- * blocks move into canonical timeline rows while a turn streams, remounting text
- * that was already visible. Counting the new node's full length as growth would
- * report that handover as a large reveal even though no text appeared on screen.
- * First paints stay in the report as a separate diagnostic.
- *
- * Runs entirely in the page so the sampling clock is the same clock the reveal
- * runs on. Waits for the text to start moving first, so a slow model's
- * time-to-first-token is not counted as a stall.
- */
-export async function sampleStreamFrames(
-  page: Page,
-  options: { sampleWindowMs: number; startTimeoutMs?: number },
-): Promise<StreamFrameSample[]> {
-  const startTimeoutMs = options.startTimeoutMs ?? 60_000;
-  return await page.evaluate(
-    async ({ sampleWindowMs, startTimeoutMs: waitMs }) => {
-      const readLength = () => {
-        let total = 0;
-        for (const node of document.querySelectorAll('[data-testid="assistant-message"]')) {
-          total += node.textContent?.length ?? 0;
-        }
-        return total;
-      };
-
-      const waitStart = performance.now();
-      const base = readLength();
-      await new Promise<void>((resolve) => {
-        const poll = () => {
-          if (readLength() > base + 20 || performance.now() - waitStart > waitMs) {
-            resolve();
-            return;
-          }
-          requestAnimationFrame(poll);
-        };
-        requestAnimationFrame(poll);
-      });
-
-      let previousLengths = new Map<string, number>();
-      for (const node of document.querySelectorAll('[data-testid="assistant-message"]')) {
-        const key = node.getAttribute("data-reveal-key");
-        const length = Number(node.getAttribute("data-reveal-length"));
-        if (key !== null && Number.isFinite(length)) {
-          previousLengths.set(key, length);
-        }
-      }
-
-      const samples: Array<{
-        timestampMs: number;
-        growthChars: number;
-        firstPaintChars: number;
-      }> = [];
-      await new Promise<void>((resolve) => {
-        const start = performance.now();
-        const tick = (now: number) => {
-          const currentLengths = new Map<string, number>();
-          let growthChars = 0;
-          let firstPaintChars = 0;
-          for (const node of document.querySelectorAll('[data-testid="assistant-message"]')) {
-            const key = node.getAttribute("data-reveal-key");
-            const currentLength = Number(node.getAttribute("data-reveal-length"));
-            if (key === null || !Number.isFinite(currentLength)) {
-              continue;
-            }
-            const previousLength = previousLengths.get(key);
-            if (previousLength === undefined || currentLength < previousLength) {
-              firstPaintChars += currentLength;
-            } else {
-              const nodeGrowth = currentLength - previousLength;
-              growthChars += nodeGrowth;
-            }
-            currentLengths.set(key, currentLength);
-          }
-          samples.push({
-            timestampMs: now,
-            growthChars,
-            firstPaintChars,
-          });
-          previousLengths = currentLengths;
-          if (now - start >= sampleWindowMs) {
-            resolve();
-            return;
-          }
-          requestAnimationFrame(tick);
-        };
-        requestAnimationFrame(tick);
-      });
-      return samples;
-    },
-    { sampleWindowMs: options.sampleWindowMs, startTimeoutMs },
-  );
-}
-
-export function computePercentile(samples: readonly number[], percentile: number): number {
-  if (samples.length === 0) {
-    return 0;
-  }
-  const sorted = [...samples].sort((a, b) => a - b);
-  return sorted[Math.max(0, Math.ceil((percentile / 100) * sorted.length) - 1)];
-}
-
-function round2(value: number): number {
-  return Math.round(value * 100) / 100;
-}
-
-/**
- * Reduce frame samples to the report. Frames outside the streaming window are
- * dropped: leading idle is time-to-first-token, and trailing idle means the turn
- * ended mid-sample. First-paint frames are structural handovers. Existing blocks
- * may also snap complete on those frames, so their growth is reported separately
- * from the paced-growth CV.
- */
-export function summarizeStreamSmoothness(
-  samples: readonly StreamFrameSample[],
-  sampleWindowMs: number,
-): StreamSmoothnessReport {
-  const deltas: number[] = [];
-  const gapsMs: number[] = [];
-  let lastUpdateAtMs: number | null = null;
-  let firstGrowth = -1;
-  let lastGrowth = -1;
-  const handoverGrowths: number[] = [];
-
-  for (let index = 0; index < samples.length; index += 1) {
-    const sample = samples[index];
-    const isHandover = sample.firstPaintChars > 0;
-    const growth = isHandover ? 0 : sample.growthChars;
-    if (isHandover && sample.growthChars > 0) {
-      handoverGrowths.push(sample.growthChars);
-      lastUpdateAtMs = sample.timestampMs;
-    }
-    deltas.push(growth);
-    if (growth > 0) {
-      if (firstGrowth === -1) {
-        firstGrowth = deltas.length - 1;
-      }
-      lastGrowth = deltas.length - 1;
-      if (lastUpdateAtMs !== null) {
-        gapsMs.push(samples[index].timestampMs - lastUpdateAtMs);
-      }
-      lastUpdateAtMs = samples[index].timestampMs;
-    }
-  }
-
-  const active = firstGrowth === -1 ? [] : deltas.slice(firstGrowth, lastGrowth + 1);
-  const charsPainted = active.reduce((sum, delta) => sum + delta, 0);
-  const mean = active.length > 0 ? charsPainted / active.length : 0;
-  const variance =
-    active.length > 0
-      ? active.reduce((sum, delta) => sum + (delta - mean) ** 2, 0) / active.length
-      : 0;
-  const firstPaints = samples.map((sample) => sample.firstPaintChars).filter((chars) => chars > 0);
-
-  return {
-    sampleWindowMs,
-    frames: active.length,
-    growthFrames: active.filter((delta) => delta > 0).length,
-    charsPainted,
-    meanCharsPerFrame: round2(mean),
-    maxCharsInOneFrame: active.length > 0 ? Math.max(...active) : 0,
-    charsPerFrameCv: mean === 0 ? Number.POSITIVE_INFINITY : round2(Math.sqrt(variance) / mean),
-    firstPaintFrames: firstPaints.length,
-    firstPaintChars: firstPaints.reduce((sum, chars) => sum + chars, 0),
-    maxFirstPaintCharsInOneFrame: firstPaints.length > 0 ? Math.max(...firstPaints) : 0,
-    handoverGrowthFrames: handoverGrowths.length,
-    handoverGrowthChars: handoverGrowths.reduce((sum, chars) => sum + chars, 0),
-    maxHandoverGrowthCharsInOneFrame: handoverGrowths.length > 0 ? Math.max(...handoverGrowths) : 0,
-    updateGapP50Ms: round2(computePercentile(gapsMs, 50)),
-    updateGapP95Ms: round2(computePercentile(gapsMs, 95)),
-    updateGapMaxMs: gapsMs.length > 0 ? round2(Math.max(...gapsMs)) : 0,
-  };
-}
@@ -42,8 +42,8 @@ export async function expectFailedSetupTabSeededInMainPane(
  await expect(page.getByTestId(tabId).filter({ visible: true }).first()).toBeVisible({
    timeout: 30_000,
  });
-  const panel = await ensureSidePanel(page);
-  await expect(panel.getByTestId(tabId)).toHaveCount(0);
+  const explorer = await ensureExplorerSidebar(page);
+  await expect(explorer.getByTestId(tabId)).toHaveCount(0);
 }

 export async function closeSetupTab(page: Page, workspaceId: string): Promise<void> {
@@ -57,8 +57,8 @@ function visibleTestId(page: Page, testId: string) {
  return page.getByTestId(testId).filter({ visible: true });
 }

-function sidePanel(page: Page) {
-  return visibleTestId(page, "workspace-side-panel").first();
+function explorerSidebar(page: Page) {
+  return visibleTestId(page, "workspace-explorer-sidebar").first();
 }

 async function selectWorkspaceTab(tab: Locator): Promise<void> {
@@ -70,53 +70,54 @@ async function selectWorkspaceTab(tab: Locator): Promise<void> {
  await expect(tab).toHaveAttribute("aria-selected", "true");
 }

-/** Reveal the Side panel. It opens empty; the caller decides what goes in it. */
-export async function ensureSidePanel(page: Page): Promise<Locator> {
+/** Reveal the Explorer sidebar without changing its selected view. */
+export async function ensureExplorerSidebar(page: Page): Promise<Locator> {
  const toggle = page.getByTestId("workspace-explorer-toggle").first();
  await expect(toggle).toBeVisible({ timeout: 30_000 });
-  const panel = sidePanel(page);
-  if ((await panel.count()) === 0) {
+  const explorer = explorerSidebar(page);
+  if ((await explorer.count()) === 0) {
    await toggle.click();
  }
-  await expect(panel).toBeVisible({ timeout: 30_000 });
-  return panel;
+  await expect(explorer).toBeVisible({ timeout: 30_000 });
+  return explorer;
 }

-/**
- * Reveals the Side panel and brings one of its views up in it. Goes through the
- * pane's own `+` menu, which is there whether the pane is empty or already loaded.
- */
-async function openSidePanelView(
+/** Reveals the Explorer sidebar and selects one of its fixed navigation views. */
+async function openExplorerView(
  page: Page,
-  view: { tabTestId: string; launchItemId: string; contentTestId: string; timeout?: number },
+  view: { tabTestId: string; contentTestId: string; timeout?: number },
 ): Promise<void> {
-  const panel = await ensureSidePanel(page);
-  const tab = panel.getByTestId(view.tabTestId);
-  if ((await tab.count()) === 0) {
-    await panel.getByTestId("workspace-new-tab-button").click();
-    await page
-      .getByTestId(`workspace-new-tab-menu-${view.launchItemId}`)
-      .filter({ visible: true })
-      .click();
-  }
-  await selectWorkspaceTab(tab);
+  const explorer = await ensureExplorerSidebar(page);
+  const tab = explorer.getByTestId(view.tabTestId);
+  await tab.click();
  await expect(visibleTestId(page, view.contentTestId).first()).toBeVisible({
    timeout: view.timeout ?? 30_000,
  });
 }

+export async function openChangesTreePanel(page: Page): Promise<void> {
+  await openExplorerView(page, {
+    tabTestId: "explorer-sidebar-tab-changes_tree",
+    contentTestId: "changes-tree-panel",
+  });
+}
+
 export async function openChangesPanel(page: Page): Promise<void> {
-  await openSidePanelView(page, {
-    tabTestId: "workspace-tab-working_diff",
-    launchItemId: "changes",
-    contentTestId: "working-diff-panel",
+  await openChangesTreePanel(page);
+  const changedFile = page
+    .locator('[data-testid^="diff-tree-file-"][data-testid$="-toggle"]')
+    .filter({ visible: true })
+    .first();
+  await expect(changedFile).toBeVisible({ timeout: 30_000 });
+  await changedFile.click();
+  await expect(visibleTestId(page, "working-diff-panel").first()).toBeVisible({
+    timeout: 30_000,
  });
 }

 export async function openFilesPanel(page: Page): Promise<void> {
-  await openSidePanelView(page, {
-    tabTestId: "workspace-tab-files",
-    launchItemId: "files",
+  await openExplorerView(page, {
+    tabTestId: "explorer-sidebar-tab-files",
    contentTestId: "file-explorer-tree-scroll",
  });
 }
@@ -128,12 +129,10 @@ export async function openPullRequestPanel(page: Page): Promise<void> {
    await expect(visibleTestId(page, "pr-pane").first()).toBeVisible({ timeout: 15_000 });
    return;
  }
-  await openSidePanelView(page, {
-    tabTestId: "workspace-tab-pull_request",
-    launchItemId: "pull-request",
-    contentTestId: "pr-pane",
-    timeout: 15_000,
-  });
+  const trigger = visibleTestId(page, "workspace-new-tab-button").first();
+  await trigger.click();
+  await visibleTestId(page, "workspace-new-tab-menu-pull-request").first().click();
+  await expect(visibleTestId(page, "pr-pane").first()).toBeVisible({ timeout: 15_000 });
 }

 export async function waitForWorkspaceTabsVisible(page: Page): Promise<void> {
@@ -1,11 +1,5 @@
 const versionPattern = /^(\d+)\.(\d+)\.(\d+)(?:-beta\.(\d+))?$/;
 const stableIosBuildSlot = 999;
-const FDROID_ABI_VERSION_CODE_SUFFIXES = {
-  "armeabi-v7a": 1,
-  "arm64-v8a": 2,
-  x86: 3,
-  x86_64: 4,
-};

 function getNativeReleaseVersion(version) {
  const match = versionPattern.exec(version);
@@ -27,11 +21,7 @@ function getNativeReleaseVersion(version) {
  }

  const versionCode = major * 1_000_000 + minor * 1_000 + patch;
-  if (
-    !Number.isSafeInteger(versionCode) ||
-    versionCode <= 0 ||
-    versionCode * 10 + 9 > 2_100_000_000
-  ) {
+  if (!Number.isSafeInteger(versionCode) || versionCode <= 0 || versionCode > 2_100_000_000) {
    throw new Error(`Derived Android versionCode is out of range: ${versionCode}`);
  }

@@ -48,16 +38,4 @@ function getNativeReleaseVersion(version) {
  };
 }

-function getFdroidVersionCodes(version) {
-  const { androidVersionCode } = getNativeReleaseVersion(version);
-  return Object.entries(FDROID_ABI_VERSION_CODE_SUFFIXES).map(([abi, suffix]) => ({
-    abi,
-    versionCode: androidVersionCode * 10 + suffix,
-  }));
-}
-
-module.exports = {
-  FDROID_ABI_VERSION_CODE_SUFFIXES,
-  getFdroidVersionCodes,
-  getNativeReleaseVersion,
-};
+module.exports = { getNativeReleaseVersion };
@@ -1,10 +1,6 @@
 import { describe, expect, it } from "vitest";

-const {
-  FDROID_ABI_VERSION_CODE_SUFFIXES,
-  getFdroidVersionCodes,
-  getNativeReleaseVersion,
-} = require("./native-release-version");
+const { getNativeReleaseVersion } = require("./native-release-version");

 describe("native release version", () => {
  it("reserves the final iOS build slot for a stable release", () => {
@@ -28,19 +24,4 @@ describe("native release version", () => {
      "iOS beta number must be between 1 and 998",
    );
  });
-
-  it("derives one F-Droid version code per published ABI", () => {
-    expect(FDROID_ABI_VERSION_CODE_SUFFIXES).toEqual({
-      "armeabi-v7a": 1,
-      "arm64-v8a": 2,
-      x86: 3,
-      x86_64: 4,
-    });
-    expect(getFdroidVersionCodes("0.5.0")).toEqual([
-      { abi: "armeabi-v7a", versionCode: 50001 },
-      { abi: "arm64-v8a", versionCode: 50002 },
-      { abi: "x86", versionCode: 50003 },
-      { abi: "x86_64", versionCode: 50004 },
-    ]);
-  });
 });
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.5.1",
+  "version": "0.6.0",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -23,7 +23,6 @@
    "test:browser": "vitest run --project browser",
    "test:e2e": "playwright test --project=browser",
    "test:e2e:diff-performance": "cross-env PASEO_DIFF_PERF_E2E=1 playwright test --project=browser e2e/browser/diff-performance.spec.ts",
-    "test:e2e:stream-smoothness": "cross-env PASEO_AGENT_STREAM_PERF_E2E=1 playwright test --project=browser e2e/browser/agent-stream-smoothness.spec.ts",
    "test:e2e:real": "cross-env E2E_FORK_PASEO_HOME_FROM=../../.dev/paseo-home playwright test --project=real-provider",
    "test:e2e:relay-deployment": "npm --prefix ../.. run build:server && npm --prefix ../.. run build:daemon-web-ui && cross-env E2E_FORK_PASEO_HOME_FROM=../../.dev/paseo-home playwright test --project=relay-deployment e2e/browser/relay-deployment-reconnect.real.spec.ts",
    "test:e2e:ui": "playwright test --ui",
@@ -31,6 +30,7 @@
    "build:web": "npm --prefix ../.. run build:app-deps && expo export --platform web",
    "profile:composer-typing": "node ./scripts/profile-composer-typing.mjs",
    "profile:explorer-toggle": "node ./scripts/profile-explorer-toggle.mjs",
+    "profile:side-pane": "playwright test --config playwright.profile.config.ts side-pane-performance.spec.ts",
    "profile:workspace-switching": "node ./scripts/profile-workspace-switching.mjs",
    "profile:workspace-tabs": "node ./scripts/profile-workspace-tabs.mjs",
    "deploy:web": "npm run build:web && wrangler pages deploy dist --project-name paseo-app --branch main",
@@ -96,7 +96,6 @@
    "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",
@@ -138,7 +137,6 @@
    "@testing-library/dom": "^10.4.1",
    "@testing-library/react": "^16.3.2",
    "@types/markdown-it": "^14.1.2",
-    "@types/node": "~22.19.0",
    "@types/qrcode": "^1.5.6",
    "@types/react": "~19.2.0",
    "@types/turndown": "^5.0.6",
@@ -152,7 +150,6 @@
    "eslint": "^9.25.0",
    "eslint-config-expo": "~10.0.0",
    "expo-gradle-jvmargs": "^1.1.2",
-    "fake-indexeddb": "^6.2.5",
    "jsdom": "^20.0.3",
    "material-icon-theme": "^5.32.0",
    "playwright": "^1.56.1",
@@ -0,0 +1,388 @@
+import { execFileSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { expect, type Locator, type Page } from "@playwright/test";
+
+const APP_SETTINGS_KEY = "@paseo:app-settings";
+
+export interface ProfileTarget {
+  serverId: string;
+  workspaceId: string;
+}
+
+export interface RenderSummary {
+  id: string;
+  renders: number;
+  mounts: number;
+  updates: number;
+  actualDurationMs: number;
+  maximumActualDurationMs: number;
+}
+
+export interface InteractionMeasurement {
+  name: string;
+  latencyMs: number;
+  commits: number;
+  domMutations: number;
+  addedElements: number;
+  removedElements: number;
+  addedTestIds: string[];
+  removedTestIds: string[];
+  trackedNodes: Array<{
+    selector: string;
+    existedBefore: boolean;
+    connected: boolean;
+    sameNode: boolean;
+  }>;
+  renders: RenderSummary[];
+  reasons: Record<string, Record<string, number>>;
+  heapAfterGcBytes?: number;
+}
+
+interface BrowserMeasurementState {
+  startedAt: number;
+  selectors: string[];
+  originals: Array<Element | null>;
+  observer?: MutationObserver;
+  domMutations: number;
+  addedElements: number;
+  removedElements: number;
+  addedTestIds: Set<string>;
+  removedTestIds: Set<string>;
+}
+
+declare global {
+  interface Window {
+    __PASEO_SIDE_PANE_MEASUREMENT__?: BrowserMeasurementState;
+  }
+}
+
+function parseCliJson<T>(output: string): T {
+  const arrayStart = output.indexOf("[\n");
+  const objectStart = output.indexOf("{\n");
+  const start = arrayStart >= 0 ? arrayStart : objectStart;
+  if (start < 0) throw new Error(`Could not find JSON in CLI output: ${output}`);
+  return JSON.parse(output.slice(start)) as T;
+}
+
+export function resolveProfileTarget(): ProfileTarget {
+  const repoRoot = resolve(process.cwd(), "../..");
+  const serverId = (
+    process.env.PASEO_PROFILE_SERVER_ID ??
+    readFileSync(resolve(repoRoot, ".dev/paseo-home/server-id"), "utf8")
+  ).trim();
+  const requestedName = process.env.PASEO_PROFILE_WORKSPACE_NAME?.trim() || "Paseo";
+  const requestedWorkspaceId = process.env.PASEO_PROFILE_WORKSPACE_ID?.trim();
+  if (requestedWorkspaceId) return { serverId, workspaceId: requestedWorkspaceId };
+
+  const output = execFileSync("npm", ["run", "cli", "--", "workspace", "ls", "--json"], {
+    cwd: repoRoot,
+    encoding: "utf8",
+    env: { ...process.env, FORCE_COLOR: "0" },
+  });
+  const workspaces =
+    parseCliJson<Array<{ workspaceId: string; name: string; cwd: string }>>(output);
+  const workspace = workspaces.find(
+    (candidate) => candidate.name === requestedName && candidate.cwd === repoRoot,
+  );
+  if (!workspace) {
+    throw new Error(`No Paseo workspace named ${requestedName} points at ${repoRoot}`);
+  }
+  return { serverId, workspaceId: workspace.workspaceId };
+}
+
+export async function openProfileWorkspace(page: Page, target: ProfileTarget): Promise<void> {
+  await page.addInitScript(() => {
+    const preserveRenderProfile = (original: History["pushState"]) =>
+      function preserveProfileParam(
+        this: History,
+        state: unknown,
+        unused: string,
+        url?: string | URL | null,
+      ) {
+        if (url == null) return Reflect.apply(original, this, [state, unused, url]);
+        const nextUrl = new URL(String(url), location.href);
+        nextUrl.searchParams.set("renderProfile", "1");
+        return Reflect.apply(original, this, [
+          state,
+          unused,
+          `${nextUrl.pathname}${nextUrl.search}${nextUrl.hash}`,
+        ]);
+      };
+    history.pushState = preserveRenderProfile(history.pushState);
+    history.replaceState = preserveRenderProfile(history.replaceState);
+  });
+  await page.goto("/?renderProfile=1", { waitUntil: "domcontentloaded" });
+  const workspaceRow = page.getByTestId(
+    `sidebar-workspace-row-${target.serverId}:${target.workspaceId}`,
+  );
+  await expect(workspaceRow).toBeVisible({ timeout: 60_000 });
+  await workspaceRow.click();
+  await expect(
+    page.getByTestId("workspace-tabs-row").filter({ visible: true }).first(),
+  ).toBeVisible({
+    timeout: 60_000,
+  });
+  await expect(page.getByTestId("workspace-explorer-toggle").first()).toBeVisible();
+  await expect(page).toHaveURL(new RegExp(`/workspace/${target.workspaceId}\\?renderProfile=1$`));
+}
+
+export async function enableChangesOpenInSidePane(page: Page): Promise<void> {
+  await page.evaluate((settingsKey) => {
+    const persisted = JSON.parse(localStorage.getItem(settingsKey) ?? "{}") as Record<
+      string,
+      unknown
+    >;
+    const currentPreferences =
+      typeof persisted.openInSidePane === "object" && persisted.openInSidePane !== null
+        ? (persisted.openInSidePane as Record<string, unknown>)
+        : {};
+    localStorage.setItem(
+      settingsKey,
+      JSON.stringify({
+        ...persisted,
+        openInSidePane: { ...currentPreferences, explorerChanges: true },
+      }),
+    );
+  }, APP_SETTINGS_KEY);
+  await page.reload({ waitUntil: "domcontentloaded" });
+  await expect(
+    page.getByTestId("workspace-tabs-row").filter({ visible: true }).first(),
+  ).toBeVisible({
+    timeout: 60_000,
+  });
+}
+
+export async function openChangesExplorer(page: Page): Promise<void> {
+  const explorer = page.getByTestId("workspace-explorer-sidebar");
+  if ((await explorer.count()) === 0) {
+    await page.keyboard.press("Meta+e");
+  }
+  await expect(explorer).toBeVisible({ timeout: 30_000 });
+  const changesTab = explorer.getByRole("button", { name: /Working tree diff/i }).first();
+  await expect(changesTab).toBeVisible();
+  if ((await changesTab.getAttribute("aria-selected")) !== "true") {
+    await changesTab.click();
+  }
+  await expect(page.getByTestId("changes-tree-panel")).toBeVisible({ timeout: 30_000 });
+  await expect(changedFileRows(page).nth(1)).toBeVisible({ timeout: 30_000 });
+}
+
+export function changedFileRows(page: Page): Locator {
+  return page
+    .locator('[data-testid^="diff-tree-file-"][data-testid$="-toggle"]')
+    .filter({ visible: true });
+}
+
+export async function selectChangedFile(page: Page, index: number): Promise<void> {
+  const row = changedFileRows(page).nth(index);
+  await expect(row).toBeVisible();
+  await row.click();
+  await expect(row).toHaveAttribute("aria-selected", "true");
+}
+
+export async function expectWorkingDiffVisible(page: Page): Promise<void> {
+  await expect(page.getByTestId("working-diff-panel").filter({ visible: true })).toBeVisible({
+    timeout: 60_000,
+  });
+  await expect(page.getByTestId("git-diff-canvas").filter({ visible: true })).toBeVisible({
+    timeout: 60_000,
+  });
+}
+
+export async function closeWorkingDiffPane(page: Page): Promise<void> {
+  const tab = page.getByTestId("workspace-tab-working_diff").filter({ visible: true }).first();
+  await expect(tab).toBeVisible();
+  await tab.hover();
+  await page
+    .locator('[data-testid^="workspace-working-diff-close-"]')
+    .filter({ visible: true })
+    .first()
+    .click();
+  await expect(page.getByTestId("working-diff-panel").filter({ visible: true })).toHaveCount(0);
+}
+
+export async function measureHeapAfterGc(page: Page): Promise<number> {
+  await page.requestGC();
+  return page.evaluate(() => {
+    const memory = performance as Performance & {
+      memory?: { usedJSHeapSize: number };
+    };
+    return memory.memory?.usedJSHeapSize ?? 0;
+  });
+}
+
+async function waitForReactIdle(page: Page, quietMs = 250): Promise<void> {
+  let previousCount = -1;
+  let unchangedSince = Date.now();
+  const deadline = Date.now() + 15_000;
+  while (Date.now() < deadline) {
+    const count = await page.evaluate(() => globalThis.__PASEO_RENDER_PROFILE__?.length ?? 0);
+    if (count !== previousCount) {
+      previousCount = count;
+      unchangedSince = Date.now();
+    } else if (Date.now() - unchangedSince >= quietMs) {
+      return;
+    }
+    await page.waitForTimeout(25);
+  }
+  throw new Error("React profiler did not become idle");
+}
+
+function summarizeRenders(
+  samples: Array<{
+    id: string;
+    phase: "mount" | "update" | "nested-update";
+    actualDuration: number;
+  }>,
+): RenderSummary[] {
+  const summaries = new Map<string, RenderSummary>();
+  for (const sample of samples) {
+    const summary = summaries.get(sample.id) ?? {
+      id: sample.id,
+      renders: 0,
+      mounts: 0,
+      updates: 0,
+      actualDurationMs: 0,
+      maximumActualDurationMs: 0,
+    };
+    summary.renders += 1;
+    summary.mounts += sample.phase === "mount" ? 1 : 0;
+    summary.updates += sample.phase === "mount" ? 0 : 1;
+    summary.actualDurationMs += sample.actualDuration;
+    summary.maximumActualDurationMs = Math.max(
+      summary.maximumActualDurationMs,
+      sample.actualDuration,
+    );
+    summaries.set(sample.id, summary);
+  }
+  for (const summary of summaries.values()) {
+    summary.actualDurationMs = Math.round(summary.actualDurationMs * 100) / 100;
+    summary.maximumActualDurationMs = Math.round(summary.maximumActualDurationMs * 100) / 100;
+  }
+  return [...summaries.values()].sort(
+    (left, right) => right.actualDurationMs - left.actualDurationMs,
+  );
+}
+
+async function beginMeasurement(page: Page, selectors: string[]): Promise<void> {
+  await waitForReactIdle(page);
+  await page.evaluate((trackedSelectors) => {
+    globalThis.__PASEO_RESET_RENDER_PROFILE__?.();
+    const collectTestIds = (node: Node, output: Set<string>) => {
+      if (!(node instanceof Element)) return;
+      const ownTestId = node.getAttribute("data-testid");
+      if (ownTestId) output.add(ownTestId);
+      for (const element of node.querySelectorAll("[data-testid]")) {
+        const testId = element.getAttribute("data-testid");
+        if (testId) output.add(testId);
+      }
+    };
+    const state: BrowserMeasurementState = {
+      startedAt: performance.now(),
+      selectors: trackedSelectors,
+      originals: trackedSelectors.map((selector) => document.querySelector(selector)),
+      domMutations: 0,
+      addedElements: 0,
+      removedElements: 0,
+      addedTestIds: new Set(),
+      removedTestIds: new Set(),
+    };
+    state.observer = new MutationObserver((records) => {
+      state.domMutations += records.length;
+      for (const record of records) {
+        for (const node of record.addedNodes) {
+          state.addedElements +=
+            node instanceof Element ? 1 + node.querySelectorAll("*").length : 0;
+          collectTestIds(node, state.addedTestIds);
+        }
+        for (const node of record.removedNodes) {
+          state.removedElements +=
+            node instanceof Element ? 1 + node.querySelectorAll("*").length : 0;
+          collectTestIds(node, state.removedTestIds);
+        }
+      }
+    });
+    state.observer.observe(document.body, { childList: true, subtree: true });
+    window.__PASEO_SIDE_PANE_MEASUREMENT__ = state;
+  }, selectors);
+}
+
+async function finishMeasurement(page: Page, name: string): Promise<InteractionMeasurement> {
+  await page.evaluate(
+    () =>
+      new Promise<void>((resolveFrame) => {
+        requestAnimationFrame(() => requestAnimationFrame(() => resolveFrame()));
+      }),
+  );
+  await waitForReactIdle(page);
+  const raw = await page.evaluate((measurementName) => {
+    const state = window.__PASEO_SIDE_PANE_MEASUREMENT__;
+    if (!state) throw new Error("Side-pane performance measurement was not started");
+    state.observer?.disconnect();
+    const samples = globalThis.__PASEO_RENDER_PROFILE__ ?? [];
+    return {
+      name: measurementName,
+      latencyMs: Math.round((performance.now() - state.startedAt) * 100) / 100,
+      commits: new Set(samples.map((sample) => sample.commitTime)).size,
+      domMutations: state.domMutations,
+      addedElements: state.addedElements,
+      removedElements: state.removedElements,
+      addedTestIds: [...state.addedTestIds].sort(),
+      removedTestIds: [...state.removedTestIds].sort(),
+      trackedNodes: state.selectors.map((selector, index) => {
+        const original = state.originals[index] ?? null;
+        const current = document.querySelector(selector);
+        return {
+          selector,
+          existedBefore: original !== null,
+          connected: original?.isConnected ?? false,
+          sameNode: original !== null && original === current,
+        };
+      }),
+      samples,
+      reasons: globalThis.__PASEO_RENDER_PROFILE_REASONS__ ?? {},
+    };
+  }, name);
+  return {
+    ...raw,
+    renders: summarizeRenders(raw.samples),
+  };
+}
+
+export async function measureInteraction(
+  page: Page,
+  input: {
+    name: string;
+    trackedSelectors: string[];
+    interact: () => Promise<void>;
+    expectComplete: () => Promise<void>;
+  },
+): Promise<InteractionMeasurement> {
+  await beginMeasurement(page, input.trackedSelectors);
+  await input.interact();
+  await input.expectComplete();
+  return finishMeasurement(page, input.name);
+}
+
+export function expectTrackedNodePreserved(
+  measurement: InteractionMeasurement,
+  selector: string,
+): void {
+  const tracked = measurement.trackedNodes.find((candidate) => candidate.selector === selector);
+  expect.soft(tracked).toEqual({
+    selector,
+    existedBefore: true,
+    connected: true,
+    sameNode: true,
+  });
+}
+
+export function expectProfilerDidNotMount(
+  measurement: InteractionMeasurement,
+  idPrefix: string,
+): void {
+  const summaries = measurement.renders.filter((summary) => summary.id.startsWith(idPrefix));
+  expect.soft(summaries.length).toBeGreaterThan(0);
+  expect.soft(summaries.every((summary) => summary.mounts === 0)).toBe(true);
+}
@@ -0,0 +1,119 @@
+import { test, expect } from "@playwright/test";
+import {
+  changedFileRows,
+  closeWorkingDiffPane,
+  enableChangesOpenInSidePane,
+  expectProfilerDidNotMount,
+  expectTrackedNodePreserved,
+  expectWorkingDiffVisible,
+  measureInteraction,
+  measureHeapAfterGc,
+  openChangesExplorer,
+  openProfileWorkspace,
+  resolveProfileTarget,
+  selectChangedFile,
+  type InteractionMeasurement,
+} from "./helpers/side-pane-performance";
+
+const MAIN_PANE = '[data-testid="workspace-pane-main"]';
+const WORKING_DIFF = '[data-testid="working-diff-panel"]';
+const DIFF_CANVAS = '[data-testid="git-diff-canvas-root"]';
+const DIFF_TAB = '[data-testid="workspace-tab-working_diff"]';
+
+test("side-pane diff transitions preserve mounted work and report their real React cost", async ({
+  page,
+}, testInfo) => {
+  test.setTimeout(180_000);
+  const target = resolveProfileTarget();
+  const reports: InteractionMeasurement[] = [];
+
+  await test.step("open the real main workspace with Changes routed beside it", async () => {
+    await openProfileWorkspace(page, target);
+    await enableChangesOpenInSidePane(page);
+    await openChangesExplorer(page);
+    expect(await changedFileRows(page).count()).toBeGreaterThanOrEqual(2);
+  });
+
+  await test.step("creating the side pane keeps the main pane mounted", async () => {
+    const report = await measureInteraction(page, {
+      name: "create-side-pane",
+      trackedSelectors: [MAIN_PANE],
+      interact: () => selectChangedFile(page, 0),
+      expectComplete: () => expectWorkingDiffVisible(page),
+    });
+    reports.push(report);
+    await testInfo.attach(report.name, {
+      body: JSON.stringify(report, null, 2),
+      contentType: "application/json",
+    });
+    expectTrackedNodePreserved(report, MAIN_PANE);
+  });
+
+  await test.step("changing the selected diff file updates the existing diff in place", async () => {
+    const report = await measureInteraction(page, {
+      name: "change-diff-focus",
+      trackedSelectors: [MAIN_PANE, WORKING_DIFF, DIFF_CANVAS, DIFF_TAB],
+      interact: () => selectChangedFile(page, 1),
+      expectComplete: () => expectWorkingDiffVisible(page),
+    });
+    reports.push(report);
+    await testInfo.attach(report.name, {
+      body: JSON.stringify(report, null, 2),
+      contentType: "application/json",
+    });
+    expectTrackedNodePreserved(report, MAIN_PANE);
+    expectTrackedNodePreserved(report, WORKING_DIFF);
+    expectTrackedNodePreserved(report, DIFF_CANVAS);
+    expectTrackedNodePreserved(report, DIFF_TAB);
+    expectProfilerDidNotMount(report, "WorkingDiffPanel:");
+  });
+
+  await test.step("repeated cold reopenings measure retained workspace work", async () => {
+    for (let index = 0; index < 5; index += 1) {
+      await closeWorkingDiffPane(page);
+      const report = await measureInteraction(page, {
+        name: `reopen-side-pane-${index + 1}`,
+        trackedSelectors: [MAIN_PANE],
+        interact: () => selectChangedFile(page, index % 2),
+        expectComplete: () => expectWorkingDiffVisible(page),
+      });
+      report.heapAfterGcBytes = await measureHeapAfterGc(page);
+      reports.push(report);
+      await testInfo.attach(report.name, {
+        body: JSON.stringify(report, null, 2),
+        contentType: "application/json",
+      });
+      expectTrackedNodePreserved(report, MAIN_PANE);
+      expect(
+        report.renders.some(
+          (summary) => summary.id.startsWith("WorkingDiffPanel:") && summary.mounts > 0,
+        ),
+      ).toBe(true);
+    }
+  });
+
+  const artifact = {
+    appUrl: testInfo.project.use.baseURL,
+    target,
+    reports,
+  };
+  await testInfo.attach("side-pane-performance", {
+    body: JSON.stringify(artifact, null, 2),
+    contentType: "application/json",
+  });
+  console.log(
+    `[perf] Side pane: ${JSON.stringify(
+      reports.map((report) => ({
+        name: report.name,
+        latencyMs: report.latencyMs,
+        commits: report.commits,
+        domMutations: report.domMutations,
+        addedElements: report.addedElements,
+        removedElements: report.removedElements,
+        heapAfterGcBytes: report.heapAfterGcBytes,
+        trackedNodes: report.trackedNodes,
+        renders: report.renders.slice(0, 8),
+      })),
+    )}`,
+  );
+});
@@ -0,0 +1,18 @@
+import { defineConfig, devices } from "@playwright/test";
+
+export default defineConfig({
+  testDir: "./perf",
+  timeout: 120_000,
+  expect: { timeout: 30_000 },
+  fullyParallel: false,
+  workers: 1,
+  retries: 0,
+  reporter: [["list"]],
+  use: {
+    ...devices["Desktop Chrome"],
+    baseURL: process.env.PASEO_PROFILE_APP_URL ?? "http://127.0.0.1:8081",
+    viewport: { width: 1440, height: 900 },
+    trace: "retain-on-failure",
+    screenshot: "only-on-failure",
+  },
+});
@@ -1,7 +1,6 @@
 const fs = require("node:fs/promises");
 const path = require("node:path");
 const { withAppBuildGradle, withDangerousMod, withSettingsGradle } = require("expo/config-plugins");
-const { FDROID_ABI_VERSION_CODE_SUFFIXES } = require("../native-release-version");

 const EXCLUDED_ANDROID_MODULES = [
  "expo-camera",
@@ -12,15 +11,12 @@ const EXCLUDED_ANDROID_MODULES = [
  "expo-dev-menu-interface",
 ];

-// Generated from the shared suffix table so the Groovy literal can never drift
-// from the version codes the F-Droid changelog filenames are derived from.
-const FDROID_ABI_VERSION_CODE_ENTRIES = Object.entries(FDROID_ABI_VERSION_CODE_SUFFIXES)
-  .map(([abi, suffix]) => `    "${abi}": ${suffix},`)
-  .join("\n");
-
 const FDROID_ABI_VERSION_CODE_BLOCK = `// Paseo F-Droid single-ABI version codes
 def paseoAbiVersionCodes = [
-${FDROID_ABI_VERSION_CODE_ENTRIES}
+    "armeabi-v7a": 1,
+    "arm64-v8a": 2,
+    "x86": 3,
+    "x86_64": 4,
 ]
 def paseoArchitectures = (findProperty("reactNativeArchitectures") ?: "")
    .toString()
@@ -10,7 +10,7 @@ export interface BottomAnchorRouteRequest {
 }

 export interface BottomAnchorLocalRequest {
-  reason: "jump-to-bottom" | "message-sent" | "rewind";
+  reason: "jump-to-bottom" | "message-sent";
  agentId: string;
 }

@@ -1,277 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  advanceTextReveal,
-  beginTextReveal,
-  clampToSafeRevealBoundary,
-  completeTextReveal,
-  computeRevealStep,
-  nextTextRevealFrame,
-  isTextRevealSettled,
-  retargetTextReveal,
-  TEXT_REVEAL_FRAME_INTERVAL_MS,
-  TEXT_REVEAL_HORIZON_MS,
-  visibleRevealedText,
-} from "./text-reveal";
-
-describe("computeRevealStep", () => {
-  it("reveals nothing when there is no backlog", () => {
-    expect(computeRevealStep({ backlog: 0, elapsedMs: 16 })).toBe(0);
-    expect(computeRevealStep({ backlog: -5, elapsedMs: 16 })).toBe(0);
-  });
-
-  it("drains the backlog over the horizon", () => {
-    const step = computeRevealStep({ backlog: 300, elapsedMs: TEXT_REVEAL_HORIZON_MS / 2 });
-    expect(step).toBe(150);
-  });
-
-  it("reveals the whole backlog once a frame covers the horizon", () => {
-    expect(computeRevealStep({ backlog: 42, elapsedMs: TEXT_REVEAL_HORIZON_MS })).toBe(42);
-    expect(computeRevealStep({ backlog: 42, elapsedMs: TEXT_REVEAL_HORIZON_MS * 10 })).toBe(42);
-  });
-
-  it("scales the rate with the backlog so a faster model reveals faster", () => {
-    const slow = computeRevealStep({ backlog: 20, elapsedMs: 16 });
-    const fast = computeRevealStep({ backlog: 200, elapsedMs: 16 });
-    expect(fast).toBeGreaterThan(slow);
-  });
-
-  it("always advances at least one character so the tail finishes", () => {
-    expect(computeRevealStep({ backlog: 1, elapsedMs: 1 })).toBe(1);
-    expect(computeRevealStep({ backlog: 2, elapsedMs: 0.01 })).toBe(1);
-  });
-
-  it("never overshoots the backlog", () => {
-    for (const backlog of [1, 3, 7, 50]) {
-      expect(computeRevealStep({ backlog, elapsedMs: 120 })).toBeLessThanOrEqual(backlog);
-    }
-  });
-
-  it("reveals nothing when no time has passed", () => {
-    expect(computeRevealStep({ backlog: 100, elapsedMs: 0 })).toBe(0);
-    expect(computeRevealStep({ backlog: 100, elapsedMs: -16 })).toBe(0);
-  });
-
-  it("converges within a bounded number of frames at 60Hz", () => {
-    let remaining = 500;
-    let frames = 0;
-    while (remaining > 0) {
-      remaining -= computeRevealStep({ backlog: remaining, elapsedMs: 16 });
-      frames += 1;
-      expect(frames).toBeLessThan(120);
-    }
-    expect(remaining).toBe(0);
-  });
-
-  it("keeps per-frame steps smooth for a bursty arrival pattern", () => {
-    // A lumpy arrival sequence: the daemon's coalescing window carries wildly
-    // different character counts depending on model throughput.
-    const arrivals = [4, 180, 6, 240, 2, 90, 300, 8];
-    const steps: number[] = [];
-    let backlog = 0;
-
-    for (const arrival of arrivals) {
-      backlog += arrival;
-      // ~60ms of frames between coalesced flushes.
-      for (let frame = 0; frame < 4; frame += 1) {
-        const step = computeRevealStep({ backlog, elapsedMs: 16 });
-        backlog -= step;
-        steps.push(step);
-      }
-    }
-
-    // Painting arrivals directly would swing from 2 to 300 characters in one
-    // paint. Pacing keeps the largest single paint far below the largest arrival.
-    expect(Math.max(...steps)).toBeLessThan(Math.max(...arrivals) / 2);
-    expect(Math.min(...steps)).toBeGreaterThan(0);
-  });
-});
-
-describe("clampToSafeRevealBoundary", () => {
-  it("leaves boundaries in plain text alone", () => {
-    expect(clampToSafeRevealBoundary("hello world", 5)).toBe(5);
-  });
-
-  it("clamps the ends", () => {
-    expect(clampToSafeRevealBoundary("hello", -3)).toBe(0);
-    expect(clampToSafeRevealBoundary("hello", 99)).toBe(5);
-  });
-
-  it("never splits a surrogate pair", () => {
-    // "a😀b" — the emoji occupies indices 1 and 2.
-    const text = "a😀b";
-    expect(clampToSafeRevealBoundary(text, 2)).toBe(1);
-    expect(clampToSafeRevealBoundary(text, 3)).toBe(3);
-  });
-
-  it("does not strand a combining mark", () => {
-    // "e" + combining acute; cutting at 1 would show a bare "e" then reflow.
-    const text = `éx`;
-    expect(clampToSafeRevealBoundary(text, 1)).toBe(0);
-    expect(clampToSafeRevealBoundary(text, 2)).toBe(2);
-  });
-
-  it("does not split an emoji ZWJ sequence", () => {
-    // Family emoji: person ZWJ person ZWJ child.
-    const family = "\u{1F468}‍\u{1F469}‍\u{1F467}";
-    const text = `${family}!`;
-    for (let index = 1; index < family.length; index += 1) {
-      expect(clampToSafeRevealBoundary(text, index)).toBe(0);
-    }
-    expect(clampToSafeRevealBoundary(text, family.length)).toBe(family.length);
-  });
-
-  it("does not split a skin tone modifier from its base", () => {
-    const text = "\u{1F44D}\u{1F3FD} nice";
-    expect(clampToSafeRevealBoundary(text, 2)).toBe(0);
-    expect(clampToSafeRevealBoundary(text, 4)).toBe(4);
-  });
-
-  it("does not strand a variation selector", () => {
-    const text = "❤️ done";
-    expect(clampToSafeRevealBoundary(text, 1)).toBe(0);
-    expect(clampToSafeRevealBoundary(text, 2)).toBe(2);
-  });
-
-  it("does not split extended grapheme clusters", () => {
-    for (const { text, boundaries } of [
-      { text: "a🇺🇸b", boundaries: [0, 1, 5, 6] },
-      { text: "a가b", boundaries: [0, 1, 3, 4] },
-      { text: "aकःb", boundaries: [0, 1, 3, 4] },
-    ]) {
-      for (let index = 1; index < text.length; index += 1) {
-        const expected = boundaries.toReversed().find((boundary) => boundary <= index);
-        expect(clampToSafeRevealBoundary(text, index)).toBe(expected);
-      }
-    }
-  });
-});
-
-describe("nextTextRevealFrame", () => {
-  it("caps a high-refresh frame clock at 60Hz", () => {
-    expect(nextTextRevealFrame(null, 0)).toEqual({
-      elapsedMs: TEXT_REVEAL_FRAME_INTERVAL_MS,
-      frameAtMs: 0,
-    });
-    expect(nextTextRevealFrame(0, 8)).toBeNull();
-    expect(nextTextRevealFrame(0, 17)).toEqual({
-      elapsedMs: 17,
-      frameAtMs: expect.closeTo(TEXT_REVEAL_FRAME_INTERVAL_MS, 5),
-    });
-  });
-});
-
-describe("text reveal state", () => {
-  it("reveals the first text it sees in full", () => {
-    const state = beginTextReveal("already here");
-    expect(visibleRevealedText(state)).toBe("already here");
-    expect(isTextRevealSettled(state)).toBe(true);
-  });
-
-  it("paces growth instead of painting it whole", () => {
-    let state = beginTextReveal("a");
-    state = retargetTextReveal(state, `a${"b".repeat(300)}`);
-    expect(visibleRevealedText(state)).toBe("a");
-
-    state = advanceTextReveal(state, 16);
-    const shown = visibleRevealedText(state);
-    expect(shown.length).toBeGreaterThan(1);
-    expect(shown.length).toBeLessThan(301);
-  });
-
-  it("catches up to the full text across frames", () => {
-    const full = `a${"b".repeat(200)}`;
-    let state = retargetTextReveal(beginTextReveal("a"), full);
-    for (let frame = 0; frame < 60 && !isTextRevealSettled(state); frame += 1) {
-      state = advanceTextReveal(state, 16);
-    }
-    expect(isTextRevealSettled(state)).toBe(true);
-    expect(visibleRevealedText(state)).toBe(full);
-  });
-
-  it("releases everything when the turn completes", () => {
-    const full = `a${"b".repeat(500)}`;
-    let state = advanceTextReveal(retargetTextReveal(beginTextReveal("a"), full), 16);
-    expect(visibleRevealedText(state)).not.toBe(full);
-
-    state = completeTextReveal(state);
-    expect(visibleRevealedText(state)).toBe(full);
-  });
-
-  it("only ever paints a prefix of the real text", () => {
-    const full = "the quick brown fox jumps over the lazy dog";
-    let state = retargetTextReveal(beginTextReveal("the "), full);
-    for (let frame = 0; frame < 20; frame += 1) {
-      expect(full.startsWith(visibleRevealedText(state))).toBe(true);
-      state = advanceTextReveal(state, 16);
-    }
-  });
-
-  it("clamps when the slot switches to a shorter message", () => {
-    const state = retargetTextReveal(beginTextReveal("a long streaming message"), "short");
-    expect(visibleRevealedText(state)).toBe("short");
-  });
-
-  it("never paints a lone surrogate while streaming emoji", () => {
-    const full = `progress ${"\u{1F680}".repeat(40)} done`;
-    let state = retargetTextReveal(beginTextReveal("progress "), full);
-    for (let frame = 0; frame < 200 && !isTextRevealSettled(state); frame += 1) {
-      const shown = visibleRevealedText(state);
-      // A stranded surrogate would make the painted prefix un-decodable.
-      expect(shown).toBe(Array.from(shown).join(""));
-      expect(full.startsWith(shown)).toBe(true);
-      state = advanceTextReveal(state, 16);
-    }
-    expect(visibleRevealedText(completeTextReveal(state))).toBe(full);
-  });
-
-  it("a long cluster cannot stall the reveal", () => {
-    // The rendered boundary backs up over this cluster, but the counter does not,
-    // so the reveal still finishes.
-    const full = `x${"́".repeat(40)}y`;
-    let state = retargetTextReveal(beginTextReveal("x"), full);
-    for (let frame = 0; frame < 200 && !isTextRevealSettled(state); frame += 1) {
-      state = advanceTextReveal(state, 16);
-    }
-    expect(isTextRevealSettled(state)).toBe(true);
-    expect(visibleRevealedText(state)).toBe(full);
-  });
-});
-
-describe("trailing fragments from arrival boundaries", () => {
-  it("holds back half a flag while more text is coming", () => {
-    // The daemon's coalescing window can end a delta mid-cluster, so a caught-up
-    // reveal can be handed a single regional indicator.
-    const halfFlag = "flags: \u{1F1EC}";
-    const state = beginTextReveal(halfFlag);
-    expect(visibleRevealedText(state, { streaming: true })).toBe("flags: ");
-    // Once the turn ends nothing more is coming, so paint what there is.
-    expect(visibleRevealedText(state, { streaming: false })).toBe(halfFlag);
-  });
-
-  it("paints the flag once its second half arrives", () => {
-    const whole = "flags: \u{1F1EC}\u{1F1E7}";
-    expect(visibleRevealedText(beginTextReveal(whole), { streaming: true })).toBe(whole);
-  });
-
-  it("keeps an even run of regional indicators intact", () => {
-    const twoFlags = "\u{1F1EC}\u{1F1E7}\u{1F1EB}\u{1F1F7}";
-    expect(visibleRevealedText(beginTextReveal(twoFlags), { streaming: true })).toBe(twoFlags);
-  });
-
-  it("holds back a dangling joiner", () => {
-    expect(
-      visibleRevealedText(beginTextReveal("family: \u{1F468}\u200D"), { streaming: true }),
-    ).toBe("family: \u{1F468}");
-  });
-
-  it("holds back a dangling high surrogate", () => {
-    const loneHigh = `broken: ${String.fromCharCode(0xd83d)}`;
-    expect(visibleRevealedText(beginTextReveal(loneHigh), { streaming: true })).toBe("broken: ");
-  });
-
-  it("leaves ordinary trailing text alone", () => {
-    const prose = "just some prose";
-    expect(visibleRevealedText(beginTextReveal(prose), { streaming: true })).toBe(prose);
-  });
-});
@@ -1,240 +0,0 @@
-/**
- * Paced reveal for streaming assistant text.
- *
- * Deltas arrive lumpy: the daemon coalesces one message per 60ms window, carrying
- * however many characters the model happened to produce in that window. Painting
- * each delta as it lands makes the size of those lumps visible, which is what
- * reads as jagged. So arrival changes the *target* and the reveal rate is derived
- * from the backlog instead — a burst makes the text catch up faster, it doesn't
- * make it jump.
- *
- * The store keeps the full text. Only the rendered slice is paced, so copy,
- * selection, the chat outline, and scroll geometry all stay consistent with what
- * is on screen.
- *
- * Everything here is pure. The only thing the React hook adds is a frame clock,
- * which keeps the policy testable without a renderer.
- */
-
-// Backlog is drained over this horizon. Shorter feels more like the raw arrival
-// pattern; longer adds lag the user can notice at the end of a turn.
-export const TEXT_REVEAL_HORIZON_MS = 150;
-
-/** Reveal at most once per 60Hz frame, even on high-refresh displays. */
-export const TEXT_REVEAL_FRAME_INTERVAL_MS = 1000 / 60;
-
-// A frame's elapsed time is clamped to this before it is used, so a long stall
-// (backgrounded tab, blocked main thread) doesn't produce a wild step from one
-// enormous delta.
-const MAX_ELAPSED_MS = 250;
-
-/**
- * Characters to reveal on this frame. Proportional to the backlog, so the reveal
- * accelerates when the model runs ahead and settles when it doesn't, with a
- * one-character floor so the tail always finishes.
- */
-export function computeRevealStep(input: {
-  backlog: number;
-  elapsedMs: number;
-  horizonMs?: number;
-}): number {
-  const { backlog } = input;
-  if (backlog <= 0) {
-    return 0;
-  }
-
-  const horizonMs = input.horizonMs ?? TEXT_REVEAL_HORIZON_MS;
-  if (horizonMs <= 0) {
-    return backlog;
-  }
-
-  const elapsedMs = Math.min(Math.max(input.elapsedMs, 0), MAX_ELAPSED_MS);
-  if (elapsedMs <= 0) {
-    return 0;
-  }
-  if (elapsedMs >= horizonMs) {
-    return backlog;
-  }
-
-  const step = Math.ceil((backlog * elapsedMs) / horizonMs);
-  return Math.min(backlog, Math.max(1, step));
-}
-
-const ZERO_WIDTH_JOINER = 0x200d;
-
-const graphemeSegmenter =
-  typeof Intl.Segmenter === "function"
-    ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
-    : null;
-
-/**
- * Pacing needs a conformant grapheme segmenter. Older runtimes paint each
- * arrival whole instead of risking a transient broken glyph.
- */
-export function isTextRevealPacingSupported(): boolean {
-  return graphemeSegmenter !== null;
-}
-
-/**
- * Pull a cut index back to somewhere it is safe to slice.
- *
- * A raw `slice` at an arbitrary index can split a grapheme cluster, which makes
- * one visible glyph briefly render as separate parts while the text is streaming.
- *
- * This only moves the *rendered* boundary. The reveal counter stays monotonic, so
- * a long cluster can never stall the reveal — the next frame steps past it.
- */
-export function clampToSafeRevealBoundary(text: string, index: number): number {
-  if (index <= 0) {
-    return 0;
-  }
-  if (index >= text.length) {
-    return text.length;
-  }
-
-  const segment = graphemeSegmenter?.segment(text).containing(index);
-  return segment?.index ?? 0;
-}
-
-export interface TextRevealFrame {
-  elapsedMs: number;
-  frameAtMs: number;
-}
-
-/**
- * Keep reveal commits at 60Hz while carrying timing remainder forward so a
- * high-refresh display does not make the reveal render at hardware frame rate.
- */
-export function nextTextRevealFrame(
-  previousFrameAtMs: number | null,
-  timestampMs: number,
-): TextRevealFrame | null {
-  const elapsedMs =
-    previousFrameAtMs === null ? TEXT_REVEAL_FRAME_INTERVAL_MS : timestampMs - previousFrameAtMs;
-  if (elapsedMs < TEXT_REVEAL_FRAME_INTERVAL_MS) {
-    return null;
-  }
-  return {
-    elapsedMs,
-    frameAtMs: timestampMs - (elapsedMs % TEXT_REVEAL_FRAME_INTERVAL_MS),
-  };
-}
-
-export interface TextRevealState {
-  /** The full text as the store knows it. */
-  readonly target: string;
-  /** How much of it has been released. Monotonic within a message. */
-  readonly revealed: number;
-}
-
-/**
- * First sight of a text is revealed whole. Only growth is paced, which is what
- * makes history hydration, timeline replay, a virtualized row remounting on
- * scroll, and an already-finished message all render complete on first paint
- * without a special case for each.
- */
-export function beginTextReveal(text: string): TextRevealState {
-  return { target: text, revealed: text.length };
-}
-
-/** Point the reveal at newly arrived text without changing how much is shown. */
-export function retargetTextReveal(state: TextRevealState, text: string): TextRevealState {
-  if (state.target === text) {
-    return state;
-  }
-  // A shorter string means this slot is showing a different message than the one
-  // the reveal position belongs to.
-  return { target: text, revealed: Math.min(state.revealed, text.length) };
-}
-
-/** Release one frame's worth of characters. */
-export function advanceTextReveal(
-  state: TextRevealState,
-  elapsedMs: number,
-  horizonMs?: number,
-): TextRevealState {
-  const step = computeRevealStep({
-    backlog: state.target.length - state.revealed,
-    elapsedMs,
-    ...(horizonMs !== undefined ? { horizonMs } : {}),
-  });
-  if (step <= 0) {
-    return state;
-  }
-  return { target: state.target, revealed: Math.min(state.target.length, state.revealed + step) };
-}
-
-/** Release everything, for when the turn ends and nothing may be held back. */
-export function completeTextReveal(state: TextRevealState): TextRevealState {
-  if (state.revealed >= state.target.length) {
-    return state;
-  }
-  return { target: state.target, revealed: state.target.length };
-}
-
-export function isTextRevealSettled(state: TextRevealState): boolean {
-  return state.revealed >= state.target.length;
-}
-
-/**
- * Hold back a trailing fragment that cannot stand on its own.
- *
- * The reveal boundary is not the only place a cluster gets cut. The daemon's
- * coalescing window ends a delta wherever the window closes, so a caught-up
- * reveal can be handed half a flag and paint it — measured on a mixed-script
- * stream as frames ending in a single regional indicator. Only fragments that
- * are certainly waiting on more input are withheld: a dangling high surrogate, a
- * trailing joiner, or an odd regional indicator.
- */
-function trimIncompleteTrailingCluster(text: string): string {
-  if (text.length === 0) {
-    return text;
-  }
-
-  const lastUnit = text.charCodeAt(text.length - 1);
-  if (lastUnit >= 0xd800 && lastUnit <= 0xdbff) {
-    return text.slice(0, -1);
-  }
-  if (lastUnit === ZERO_WIDTH_JOINER) {
-    return text.slice(0, -1);
-  }
-
-  const trailingRegionalIndicators = countTrailingRegionalIndicators(text);
-  if (trailingRegionalIndicators % 2 === 1) {
-    return text.slice(0, -2);
-  }
-
-  return text;
-}
-
-/** Number of regional indicators at the end of `text`. A flag is a pair. */
-function countTrailingRegionalIndicators(text: string): number {
-  let count = 0;
-  let cursor = text.length;
-  while (cursor >= 2) {
-    const codePoint = text.codePointAt(cursor - 2);
-    if (codePoint === undefined || codePoint < 0x1f1e6 || codePoint > 0x1f1ff) {
-      break;
-    }
-    count += 1;
-    cursor -= 2;
-  }
-  return count;
-}
-
-/**
- * What should actually be painted this frame.
- *
- * `streaming` says whether more text is still expected. While it is, a trailing
- * fragment waits for the rest of its cluster; once the turn ends everything
- * received is painted, because nothing more is coming.
- */
-export function visibleRevealedText(
-  state: TextRevealState,
-  options?: { streaming?: boolean },
-): string {
-  if (state.revealed >= state.target.length) {
-    return options?.streaming ? trimIncompleteTrailingCluster(state.target) : state.target;
-  }
-  return state.target.slice(0, clampToSafeRevealBoundary(state.target, state.revealed));
-}
@@ -27,7 +27,7 @@ import { useMutation } from "@tanstack/react-query";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { Check, ChevronDown, X } from "lucide-react-native";
 import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
-import { openSidePanelView } from "@/workspace-tabs/side-panel";
+import { openExplorerSidebarView } from "@/workspace-tabs/explorer-sidebar";
 import {
  AssistantMessage,
  SpeakMessage,
@@ -51,7 +51,6 @@ import type {
 } from "@getpaseo/protocol/agent-types";
 import type { AgentScreenAgent } from "@/hooks/use-agent-screen-state-machine";
 import { useSessionStore } from "@/stores/session-store";
-import { useRevealedText } from "@/hooks/use-revealed-text";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 import { useLoadOlderAgentHistory } from "@/hooks/use-load-older-agent-history";
 import { useSettings } from "@/hooks/use-settings";
@@ -458,7 +457,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
          setCurrentPath: false,
        });

-        openSidePanelView({
+        openExplorerSidebarView({
          isCompact: isMobile,
          workspaceKey: buildWorkspaceTabPersistenceKey({
            serverId: resolvedServerId,
@@ -475,7 +474,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    );

    const handleToolCallOpenFile = useStableEvent((filePath: string) => {
-      handleInlinePathPress({ raw: filePath, path: filePath }, "side");
+      handleInlinePathPress({ raw: filePath, path: filePath }, "preferred");
    });

    const handleForkAssistantTurn: AssistantTurnForkHandler = useStableEvent(
@@ -718,13 +717,15 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    const renderThoughtItem = useCallback(
      (layoutItem: StreamLayoutItem, item: Extract<StreamItem, { kind: "thought" }>) => {
        return (
-          <ThoughtSlot
+          <ToolCallSlot
            itemId={item.id}
            onInlineDetailsExpandedChangeByItemId={setInlineDetailsExpanded}
-            text={item.text}
-            status={item.status}
+            toolName="thinking"
+            args={item.text}
+            status={item.status === "ready" ? "completed" : "executing"}
            isLastInSequence={layoutItem.isLastInToolSequence}
            defaultExpanded={autoExpandReasoning}
+            forceInline={autoExpandReasoning}
          />
        );
      },
@@ -1229,39 +1230,6 @@ interface ToolCallSlotProps extends Omit<
  onInlineDetailsExpandedChangeByItemId: (itemId: string, expanded: boolean) => void;
 }

-interface ThoughtSlotProps {
-  itemId: string;
-  onInlineDetailsExpandedChangeByItemId: (itemId: string, expanded: boolean) => void;
-  text: string;
-  status: Extract<StreamItem, { kind: "thought" }>["status"];
-  isLastInSequence: boolean;
-  defaultExpanded: boolean;
-}
-
-// Reasoning text is paced the same way assistant text is; see @/hooks/use-revealed-text.
-function ThoughtSlot({
-  itemId,
-  onInlineDetailsExpandedChangeByItemId,
-  text,
-  status,
-  isLastInSequence,
-  defaultExpanded,
-}: ThoughtSlotProps) {
-  const revealedText = useRevealedText(text, status === "ready" ? "complete" : "streaming");
-  return (
-    <ToolCallSlot
-      itemId={itemId}
-      onInlineDetailsExpandedChangeByItemId={onInlineDetailsExpandedChangeByItemId}
-      toolName="thinking"
-      args={revealedText}
-      status={status === "ready" ? "completed" : "executing"}
-      isLastInSequence={isLastInSequence}
-      defaultExpanded={defaultExpanded}
-      forceInline={defaultExpanded}
-    />
-  );
-}
-
 function ToolCallSlot({
  itemId,
  onInlineDetailsExpandedChangeByItemId,
@@ -36,6 +36,7 @@ import { KeyboardShortcutsDialog } from "@/components/keyboard-shortcuts-dialog"
 import { AppDiagnosticHost } from "@/components/app-diagnostic-host";
 import { LeftSidebar } from "@/components/left-sidebar";
 import { WindowSidebarMenuToggle } from "@/components/headers/menu-header";
+import { DesktopWindowControls } from "@/components/desktop/window-controls";
 import { SidebarModelProvider } from "@/components/sidebar/sidebar-model";
 import { WorkspacePinShortcutHandler } from "@/components/workspace-pin-shortcut-handler";
 import { CompactExplorerSidebarHost } from "@/components/compact-explorer-sidebar-host";
@@ -76,7 +77,7 @@ import { AgentNavigationListener } from "@/desktop/agent-navigation";
 import { LegacyAgentSkillsMigration } from "@/agent-skills/legacy-migration";
 import { legacyFavoriteProfileMigration } from "@/agent-profiles/migration";
 import { listenToDesktopEvent } from "@/desktop/electron/events";
-import { updateDesktopWindowControls } from "@/desktop/electron/window";
+import { updateDesktopWindowChrome } from "@/desktop/electron/window";
 import { getDesktopHost } from "@/desktop/host";
 import { loadDesktopSettings } from "@/desktop/settings/desktop-settings";
 import { RosettaCalloutSource } from "@/desktop/updates/rosetta-callout-source";
@@ -86,6 +87,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 "@/hooks/use-keyboard-shift-style";
 import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
@@ -473,6 +475,10 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  }, [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;
@@ -545,8 +551,11 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
          {sidebarChrome}
        </WindowChromeRegion>
      ) : null}
-      {isCompactLayout ? (
-        <CompactExplorerSidebarHost enabled={chromeEnabled}>
+      {usesCompactExplorerHost ? (
+        <CompactExplorerSidebarHost
+          enabled={chromeEnabled}
+          presentation={explorerSidebarPresentation === "dock" ? "dock" : "overlay"}
+        >
          <WindowChromeRegion corners={chromeEnabled ? "both" : appChromeLayout.contentCorners}>
            <View style={flexStyle}>{children}</View>
          </WindowChromeRegion>
@@ -574,6 +583,7 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
          </WindowChromeSafeArea>
        </WindowChromeRegion>
      ) : null}
+      <DesktopWindowControls />
      <FloatingPanelPortalHost />
      {isCompactLayout ? sidebarChrome : null}
      <DownloadToast />
@@ -665,18 +675,16 @@ function DesktopWindowControlsSync() {
  const { isLoading } = useAppSettings();
  const { theme } = useUnistyles();
  const surface0 = theme.colors.surface0;
-  const foreground = theme.colors.foreground;

  useEffect(() => {
    if (isLoading || isNative) return;
-    void updateDesktopWindowControls({
+    void updateDesktopWindowChrome({
      backgroundColor: surface0,
-      foregroundColor: foreground,
-      trafficLightOffsetY: -5,
+      trafficLightOffsetY: -4,
    }).catch((error) => {
      console.warn("[DesktopWindow] Failed to update window controls overlay", error);
    });
-  }, [isLoading, surface0, foreground]);
+  }, [isLoading, surface0]);

  return null;
 }
@@ -176,7 +176,7 @@ describe("useFileLink", () => {
            lineStart: undefined,
            lineEnd: undefined,
          },
-          disposition: "side",
+          disposition: "preferred",
        },
      ]);
    });
@@ -117,7 +117,7 @@ export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult
  });

  const onPress = useStableEvent(() => {
-    open(stableSource, "side");
+    open(stableSource, "preferred");
  });

  const target = useMemo(() => {
@@ -110,9 +110,7 @@ export type UserComposerAttachment =
  | PluginResourceComposerAttachment
  | { kind: "forge_issue"; item: ForgeSearchItem }
  | { kind: "forge_change_request"; item: ForgeSearchItem }
-  // COMPAT(githubAttachmentKinds): legacy persisted attachment kinds retained
-  // when forge-neutral kinds shipped in v0.2.0-beta.1. Remove after 2027-01-17
-  // once supported floors are >= v0.2.0 and old drafts no longer need them.
+  // COMPAT(githubAttachmentKinds): added in v0.1.106, remove after 2026-12-28 once daemon floor >= v0.1.106
  | { kind: "github_issue"; item: ForgeSearchItem }
  | {
      kind: "github_pr";
@@ -61,9 +61,8 @@ function source(gitActions: GitActions): {
        moveTabUp: "Move tab up",
        moveTabDown: "Move tab down",
        closePane: "Close pane",
-        togglePaneMaximization: "Toggle pane maximization",
        toggleFocusMode: "Toggle focus mode",
-        toggleSidePanel: "Toggle side panel",
+        toggleExplorerSidebar: "Toggle side panel",
      },
      icons: {},
      shortcuts: {},
@@ -40,9 +40,8 @@ export interface WorkspaceCommandCenterLabels {
  moveTabUp: string;
  moveTabDown: string;
  closePane: string;
-  togglePaneMaximization: string;
  toggleFocusMode: string;
-  toggleSidePanel: string;
+  toggleExplorerSidebar: string;
 }

 export interface WorkspaceCommandCenterIcons {
@@ -62,9 +61,8 @@ export interface WorkspaceCommandCenterIcons {
  copy?: CommandCenterIcon;
  focusPane?: CommandCenterIcon;
  moveTab?: CommandCenterIcon;
-  maximize?: CommandCenterIcon;
  focusMode?: CommandCenterIcon;
-  sidePanel?: CommandCenterIcon;
+  explorerSidebar?: CommandCenterIcon;
  git?(action: GitAction): CommandCenterIcon | undefined;
 }

@@ -78,9 +76,8 @@ export interface WorkspaceCommandCenterShortcuts {
  nextTab?: ShortcutKey[][];
  closeCurrentTab?: ShortcutKey[][];
  closePane?: ShortcutKey[][];
-  togglePaneMaximization?: ShortcutKey[][];
  toggleFocusMode?: ShortcutKey[][];
-  toggleSidePanel?: ShortcutKey[][];
+  toggleExplorerSidebar?: ShortcutKey[][];
 }

 export interface WorkspaceCommandCenterSource {
@@ -198,7 +195,9 @@ function buildPanelContributions(
      }),
    );
    if (!source.capabilities.canSplitPanes) continue;
-    for (const [placementIndex, placement] of (["side-panel", "focused-pane"] as const).entries()) {
+    if (panel.target !== "pull-request") continue;
+    const placements = ["side-pane", "focused-pane"] as const;
+    for (const [placementIndex, placement] of placements.entries()) {
      contributions.push(
        buildQueryAction(source, {
          id: `tab:open:${panel.target}:${placement}`,
@@ -447,15 +446,6 @@ function buildPaneContributions(source: WorkspaceCommandCenterSource): CommandCe
      shortcutKeys: source.shortcuts.closePane,
      action: { id: "workspace.pane.close", scope: "workspace" },
    },
-    {
-      id: "pane:maximize-toggle",
-      rank: 61,
-      title: source.labels.togglePaneMaximization,
-      keywords: ["pane", "maximize", "restore", "toggle"],
-      icon: source.icons.maximize,
-      shortcutKeys: source.shortcuts.togglePaneMaximization,
-      action: { id: "workspace.explorer.maximize.toggle", scope: "workspace" },
-    },
    {
      id: "pane:focus-mode-toggle",
      rank: 62,
@@ -522,12 +512,12 @@ export function buildWorkspaceCommandCenterContributions(
    ...buildActiveTabContributions(source),
    ...(source.capabilities.canSplitPanes ? buildPaneContributions(source) : []),
    buildQueryAction(source, {
-      id: "side-panel:toggle",
+      id: "explorer-sidebar:toggle",
      rank: 70,
-      title: source.labels.toggleSidePanel,
-      keywords: ["side", "panel", "toggle", "show", "hide"],
-      icon: source.icons.sidePanel,
-      shortcutKeys: source.shortcuts.toggleSidePanel,
+      title: source.labels.toggleExplorerSidebar,
+      keywords: ["explorer", "sidebar", "toggle", "show", "hide"],
+      icon: source.icons.explorerSidebar,
+      shortcutKeys: source.shortcuts.toggleExplorerSidebar,
      action: { id: "sidebar.toggle.right", scope: "workspace" },
    }),
  ];
@@ -131,6 +131,7 @@ export function useWorkspaceFileSearch(input: { enabled: boolean; query: string
      openWorkspaceFileFromExplorer({
        filePath: path,
        persistenceKey: buildWorkspaceTabPersistenceKey({ serverId, workspaceId }),
+        closeExplorerAfterOpen: true,
        showMobileAgent: usePanelStore.getState().showMobileAgent,
        openWorkspaceTabInFocusedPane: (workspaceKey, target, placement) =>
          useWorkspaceLayoutStore.getState().openTab({
@@ -11,7 +11,6 @@ import {
  GitCompareArrows,
  GitPullRequest,
  Globe,
-  Maximize2,
  Move,
  PanelRight,
  Pencil,
@@ -64,14 +63,13 @@ const WORKSPACE_COMMAND_CENTER_ICONS = {
  copy: getCommandCenterIcon(Copy),
  focusPane: getCommandCenterIcon(Focus),
  moveTab: getCommandCenterIcon(Move),
-  maximize: getCommandCenterIcon(Maximize2),
  focusMode: getCommandCenterIcon(ArrowDownToLine),
-  sidePanel: getCommandCenterIcon(PanelRight),
+  explorerSidebar: getCommandCenterIcon(PanelRight),
 };

 const OPEN_PANEL_LABEL_KEYS = {
  supporting: "shell.commandCenter.open",
-  "side-panel": "shell.commandCenter.openInSidePanel",
+  "side-pane": "shell.commandCenter.openInSidePane",
  "focused-pane": "shell.commandCenter.openInFocusedPane",
 } as const;

@@ -152,9 +150,8 @@ export function useWorkspaceCommandCenterActions(): void {
          moveTabUp: t("settings.shortcuts.help.moveTabUp"),
          moveTabDown: t("settings.shortcuts.help.moveTabDown"),
          closePane: t("settings.shortcuts.help.closePane"),
-          togglePaneMaximization: t("settings.shortcuts.help.toggleExplorerPaneMaximization"),
          toggleFocusMode: t("settings.shortcuts.help.toggleFocusMode"),
-          toggleSidePanel: t("workspace.tabs.sidePanel.toggle"),
+          toggleExplorerSidebar: t("workspace.tabs.explorerSidebar.toggle"),
        },
        icons: {
          ...WORKSPACE_COMMAND_CENTER_ICONS,
@@ -31,9 +31,7 @@ export function resolveWorkspaceCommandCenterShortcuts({
      resolveShortcutKeysForAction("workspace-tab-close-current", overrides, platform) ?? undefined,
    closePane:
      resolveShortcutKeysForAction("workspace-pane-close", overrides, platform) ?? undefined,
-    togglePaneMaximization:
-      resolveShortcutKeysForAction("workspace-explorer-maximize", overrides, platform) ?? undefined,
-    toggleSidePanel:
+    toggleExplorerSidebar:
      resolveShortcutKeysForAction("toggle-right-sidebar", overrides, platform) ?? undefined,
  };
 }
@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useRef } from "react";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import { Text, View } from "react-native";
 import { useQueryClient } from "@tanstack/react-query";
-import { ChevronDown, GitBranch } from "lucide-react-native";
+import { GitBranch } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import type { Theme } from "@/styles/theme";
@@ -10,6 +10,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useToast } from "@/contexts/toast-context";
 import { useBranchSwitcher } from "@/hooks/use-branch-switcher";
+import { ToolbarLabelSelectTrigger } from "@/components/ui/toolbar-label-trigger";

 interface BranchSwitcherProps {
  currentBranchName: string | null;
@@ -23,9 +24,7 @@ interface BranchSwitcherProps {
 const foregroundMutedIconColorMapping = (theme: Theme) => ({
  color: theme.colors.foregroundMuted,
 });
-
 const ThemedGitBranch = withUnistyles(GitBranch);
-const ThemedChevronDown = withUnistyles(ChevronDown);

 export function BranchSwitcher({
  currentBranchName,
@@ -56,14 +55,6 @@ export function BranchSwitcher({

  const handleOpen = useCallback(() => setIsOpen(true), [setIsOpen]);

-  const triggerStyle = useCallback(
-    ({ hovered = false, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.trigger,
-      (Boolean(hovered) || pressed) && styles.triggerHovered,
-    ],
-    [],
-  );
-
  const branchLeadingSlot = useMemo(
    () => <ThemedGitBranch size={14} uniProps={foregroundMutedIconColorMapping} />,
    [],
@@ -90,21 +81,16 @@ export function BranchSwitcher({
    <View ref={anchorRef} collapsable={false} style={styles.anchor}>
      <Tooltip delayDuration={300} enabledOnDesktop enabledOnMobile={false}>
        <TooltipTrigger asChild>
-          <Pressable
+          <ToolbarLabelSelectTrigger
            testID={testID}
+            label={currentBranchName}
+            open={isOpen}
            onPress={handleOpen}
-            style={triggerStyle}
            accessibilityRole="button"
            accessibilityLabel={t("branchSwitcher.currentBranch", {
              branchName: currentBranchName,
            })}
-          >
-            <ThemedGitBranch size={12} uniProps={foregroundMutedIconColorMapping} />
-            <Text style={styles.branchLabel} numberOfLines={1}>
-              {currentBranchName}
-            </Text>
-            <ThemedChevronDown size={12} uniProps={foregroundMutedIconColorMapping} />
-          </Pressable>
+          />
        </TooltipTrigger>
        <TooltipContent side="bottom">
          <Text style={styles.tooltipText}>{t("branchSwitcher.triggerTooltip")}</Text>
@@ -136,25 +122,6 @@ const styles = StyleSheet.create((theme) => ({
    flexShrink: 1,
    minWidth: 0,
  },
-  trigger: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    minWidth: 0,
-    paddingVertical: theme.spacing[1],
-    paddingHorizontal: theme.spacing[1],
-    borderRadius: theme.borderRadius.md,
-    flexShrink: 1,
-  },
-  triggerHovered: {
-    backgroundColor: theme.colors.surface1,
-  },
-  branchLabel: {
-    fontSize: theme.fontSize.sm,
-    color: theme.colors.foregroundMuted,
-    fontWeight: theme.fontWeight.normal,
-    flexShrink: 1,
-  },
  tooltipText: {
    color: theme.colors.popoverForeground,
    fontSize: theme.fontSize.sm,
@@ -1,9 +1,12 @@
-import { type ReactNode, useCallback, useEffect, useMemo, useRef } from "react";
-import { View } from "react-native";
+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 } from "@/components/compact-explorer-sidebar";
+import {
+  CompactExplorerSidebar,
+  NativeExplorerSidebarDock,
+} from "@/components/compact-explorer-sidebar";
 import { useOpenFileExplorerGesture } from "@/mobile-panels/gestures";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { selectIsCompactFileExplorerOpen, usePanelStore } from "@/stores/panel-store";
@@ -12,6 +15,7 @@ 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,
@@ -94,10 +98,16 @@ function useActiveCompactExplorerSidebarModel(
 interface CompactExplorerSidebarHostProps {
  children: ReactNode;
  enabled: boolean;
+  presentation: "overlay" | "dock";
 }

-export function CompactExplorerSidebarHost({ children, enabled }: CompactExplorerSidebarHostProps) {
+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);
@@ -127,14 +137,54 @@ export function CompactExplorerSidebarHost({ children, enabled }: CompactExplore
      openWorkspaceFileFromExplorer({
        filePath,
        persistenceKey: model.persistenceKey,
+        closeExplorerAfterOpen: presentation === "overlay",
        showMobileAgent,
        openWorkspaceTabInFocusedPane,
        focusWorkspaceTab,
      });
    },
-    [focusWorkspaceTab, model, openWorkspaceTabInFocusedPane, showMobileAgent],
+    [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;
+
+  if (presentation === "dock") {
+    return (
+      <View style={styles.row} onLayout={handleContainerLayout}>
+        <View style={styles.fill}>{children}</View>
+        {explorer}
+      </View>
+    );
+  }
+
  return (
    <>
      <CompactExplorerOpenGestureSurface
@@ -143,15 +193,7 @@ export function CompactExplorerSidebarHost({ children, enabled }: CompactExplore
      >
        {children}
      </CompactExplorerOpenGestureSurface>
-      {enabled && model ? (
-        <CompactExplorerSidebar
-          serverId={model.serverId}
-          workspaceId={model.workspaceId}
-          workspaceRoot={model.workspaceRoot}
-          isGit={model.isGit}
-          onOpenFile={handleOpenFile}
-        />
-      ) : null}
+      {explorer}
    </>
  );
 }
@@ -160,4 +202,8 @@ const styles = {
  fill: {
    flex: 1,
  },
+  row: {
+    flex: 1,
+    flexDirection: "row",
+  },
 } as const;
@@ -1,5 +1,8 @@
-import { useCallback, useMemo, useState } from "react";
+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 } from "react-native-unistyles";
 import { X } from "lucide-react-native";
@@ -29,6 +32,13 @@ 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 { resolveExplorerSidebarWidth } from "@/components/explorer-sidebar-layout";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";

 function logExplorerSidebar(_event: string, _details: Record<string, unknown>): void {}

@@ -139,6 +149,118 @@ export function CompactExplorerSidebar({
  );
 }

+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;
@@ -230,7 +352,7 @@ function ExplorerSidebarContent({
            <ExplorerTabButton
              tab="changes"
              active={resolvedTab === "changes"}
-              label={t("workspace.tabs.sidePanel.changes")}
+              label={t("workspace.tabs.explorerSidebar.changes")}
              onTabPress={onTabPress}
              testID="explorer-tab-changes"
            />
@@ -238,7 +360,7 @@ function ExplorerSidebarContent({
          <ExplorerTabButton
            tab="files"
            active={resolvedTab === "files"}
-            label={t("workspace.tabs.sidePanel.files")}
+            label={t("workspace.tabs.explorerSidebar.files")}
            onTabPress={onTabPress}
            testID="explorer-tab-files"
          />
@@ -268,7 +390,7 @@ function ExplorerSidebarContent({
            nativeID="explorer-close"
            accessible
            accessibilityRole="button"
-            accessibilityLabel={t("workspace.tabs.sidePanel.close")}
+            accessibilityLabel={t("workspace.tabs.explorerSidebar.close")}
            hitSlop={8}
          >
            {({ hovered, pressed }) => (
@@ -335,7 +457,6 @@ function ChangedFilesPane({
  );
  return (
    <ChangesSurface
-      host="explorer"
      serverId={serverId}
      workspaceId={workspaceId}
      cwd={workspaceRoot}
@@ -370,6 +491,18 @@ function FilesPane({
 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,
@@ -17,15 +17,20 @@ import { isNative } from "@/constants/platform";
 * On macOS, Electron handles edge resize natively.
 */

+export const titlebarDragSurfaceStyle: React.CSSProperties = {
+  cursor: "default",
+  // @ts-expect-error — WebkitAppRegion is not in CSSProperties
+  WebkitAppRegion: "drag",
+};
+
 const DRAG_OVERLAY_STYLE: React.CSSProperties = {
+  ...titlebarDragSurfaceStyle,
  top: 0,
  left: 0,
  display: "block",
  position: "absolute",
  width: "100%",
  height: "100%",
-  // @ts-expect-error — WebkitAppRegion is not in CSSProperties
-  WebkitAppRegion: "drag",
 };

 const TOP_RESIZER_STYLE: React.CSSProperties = {
@@ -0,0 +1,208 @@
+import { useCallback, useMemo } from "react";
+import { Pressable, View } from "react-native";
+import Svg, { Line, Rect } from "react-native-svg";
+import { useTranslation } from "react-i18next";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import {
+  closeDesktopWindow,
+  minimizeDesktopWindow,
+  toggleDesktopMaximize,
+} from "@/desktop/electron/window";
+import {
+  getDesktopWindowControlsPresentation,
+  type DesktopWindowControlsPresentation,
+} from "@/desktop/window-chrome-presentation";
+import { useCustomDesktopWindowControls } from "@/utils/desktop-window";
+import type { Theme } from "@/styles/theme";
+
+type WindowControlKind = "minimize" | "maximize" | "restore" | "close";
+
+function WindowControlGlyph({
+  kind,
+  color,
+  size,
+  strokeWidth,
+}: {
+  kind: WindowControlKind;
+  color: string;
+  size: number;
+  strokeWidth: number;
+}) {
+  if (kind === "minimize") {
+    return (
+      <Svg width={size} height={size} viewBox="0 0 16 16" style={styles.glyph}>
+        <Line x1={3} y1={8} x2={13} y2={8} stroke={color} strokeWidth={strokeWidth} />
+      </Svg>
+    );
+  }
+  if (kind === "restore") {
+    return (
+      <Svg width={size} height={size} viewBox="0 0 16 16" style={styles.glyph}>
+        <Rect
+          x={5.5}
+          y={3.5}
+          width={7}
+          height={7}
+          fill="none"
+          stroke={color}
+          strokeWidth={strokeWidth}
+        />
+        <Line x1={3.5} y1={5.5} x2={3.5} y2={12.5} stroke={color} strokeWidth={strokeWidth} />
+        <Line x1={3} y1={12.5} x2={10.5} y2={12.5} stroke={color} strokeWidth={strokeWidth} />
+      </Svg>
+    );
+  }
+  if (kind === "close") {
+    return (
+      <Svg width={size} height={size} viewBox="0 0 16 16" style={styles.glyph}>
+        <Line x1={4} y1={4} x2={12} y2={12} stroke={color} strokeWidth={strokeWidth} />
+        <Line x1={12} y1={4} x2={4} y2={12} stroke={color} strokeWidth={strokeWidth} />
+      </Svg>
+    );
+  }
+  return (
+    <Svg width={size} height={size} viewBox="0 0 16 16" style={styles.glyph}>
+      <Rect
+        x={3.5}
+        y={3.5}
+        width={9}
+        height={9}
+        fill="none"
+        stroke={color}
+        strokeWidth={strokeWidth}
+      />
+    </Svg>
+  );
+}
+
+const ThemedWindowControlGlyph = withUnistyles(WindowControlGlyph);
+const mutedGlyphMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const whiteGlyphMapping = () => ({ color: "#ffffff" });
+
+function WindowControl({
+  kind,
+  label,
+  onPress,
+  presentation,
+}: {
+  kind: WindowControlKind;
+  label: string;
+  onPress: () => void;
+  presentation: DesktopWindowControlsPresentation;
+}) {
+  const glyph = useCallback(
+    ({ hovered, pressed }: { hovered?: boolean; pressed: boolean }) => {
+      const highlighted = hovered || pressed;
+      const closeHighlighted = kind === "close" && highlighted;
+      return (
+        <View
+          style={[
+            styles.controlSurface,
+            presentation.hoverShape === "circle"
+              ? styles.circularControlSurface
+              : styles.fullControlSurface,
+            highlighted ? styles.controlHovered : null,
+            closeHighlighted ? styles.closeHovered : null,
+          ]}
+        >
+          <ThemedWindowControlGlyph
+            kind={kind}
+            size={presentation.glyphSize}
+            strokeWidth={presentation.glyphStrokeWidth}
+            uniProps={closeHighlighted ? whiteGlyphMapping : mutedGlyphMapping}
+          />
+        </View>
+      );
+    },
+    [kind, presentation],
+  );
+  const controlStyle = useMemo(
+    () => [styles.control, { width: presentation.controlWidth }],
+    [presentation.controlWidth],
+  );
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityLabel={label}
+      onPress={onPress}
+      style={controlStyle}
+    >
+      {glyph}
+    </Pressable>
+  );
+}
+
+export function DesktopWindowControls() {
+  const { t } = useTranslation();
+  const { visible, mode, isMaximized } = useCustomDesktopWindowControls();
+  const minimize = useCallback(() => void minimizeDesktopWindow(), []);
+  const toggleMaximize = useCallback(() => void toggleDesktopMaximize(), []);
+  const close = useCallback(() => void closeDesktopWindow(), []);
+  if (!visible || !mode) return null;
+  const presentation = getDesktopWindowControlsPresentation(mode);
+
+  return (
+    <View
+      style={[styles.controls, { height: presentation.controlHeight }]}
+      testID="desktop-window-controls"
+    >
+      <WindowControl
+        kind="minimize"
+        label={t("desktop.windowControls.minimize")}
+        onPress={minimize}
+        presentation={presentation}
+      />
+      <WindowControl
+        kind={isMaximized ? "restore" : "maximize"}
+        label={t(
+          isMaximized ? "desktop.windowControls.restore" : "desktop.windowControls.maximize",
+        )}
+        onPress={toggleMaximize}
+        presentation={presentation}
+      />
+      <WindowControl
+        kind="close"
+        label={t("desktop.windowControls.close")}
+        onPress={close}
+        presentation={presentation}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  controls: {
+    position: "absolute",
+    top: 0,
+    right: 0,
+    zIndex: 3000,
+    flexDirection: "row",
+  },
+  control: {
+    height: "100%",
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  controlSurface: {
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  fullControlSurface: {
+    width: "100%",
+    height: "100%",
+  },
+  circularControlSurface: {
+    width: 24,
+    height: 24,
+    borderRadius: 12,
+  },
+  glyph: {
+    flexShrink: 0,
+  },
+  controlHovered: {
+    backgroundColor: theme.colors.interactionHighlight,
+  },
+  closeHovered: {
+    backgroundColor: "rgba(232, 17, 35, 0.9)",
+  },
+}));
@@ -0,0 +1,22 @@
+import { describe, expect, it } from "vitest";
+import {
+  resolveExplorerSidebarDockSizes,
+  resolveExplorerSidebarWidth,
+} from "@/components/explorer-sidebar-layout";
+
+describe("Explorer sidebar layout", () => {
+  it("keeps the sidebar width fixed when the workspace body changes size", () => {
+    const narrow = resolveExplorerSidebarDockSizes({ requestedWidth: 320, containerWidth: 1200 });
+    const wide = resolveExplorerSidebarDockSizes({ requestedWidth: 320, containerWidth: 1520 });
+
+    expect(narrow[1] * 1200).toBeCloseTo(320);
+    expect(wide[1] * 1520).toBeCloseTo(320);
+  });
+
+  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(800);
+    expect(resolveExplorerSidebarWidth({ requestedWidth: 600, containerWidth: 750 })).toBe(350);
+  });
+});
@@ -0,0 +1,27 @@
+const DEFAULT_EXPLORER_SIDEBAR_WIDTH = 320;
+const MIN_EXPLORER_SIDEBAR_WIDTH = 240;
+const MIN_WORKSPACE_BODY_WIDTH = 400;
+
+export function resolveExplorerSidebarWidth(input: {
+  requestedWidth?: number;
+  containerWidth: number;
+}): number {
+  const requestedWidth = input.requestedWidth ?? DEFAULT_EXPLORER_SIDEBAR_WIDTH;
+  const maximumVisibleWidth =
+    input.containerWidth > 0
+      ? Math.max(MIN_EXPLORER_SIDEBAR_WIDTH, input.containerWidth - MIN_WORKSPACE_BODY_WIDTH)
+      : requestedWidth;
+  return Math.max(MIN_EXPLORER_SIDEBAR_WIDTH, Math.min(maximumVisibleWidth, requestedWidth));
+}
+
+export function resolveExplorerSidebarDockSizes(input: {
+  requestedWidth?: number;
+  containerWidth: number;
+}): number[] {
+  if (input.containerWidth <= 0) {
+    return [1, 0];
+  }
+  const width = resolveExplorerSidebarWidth(input);
+  const ratio = width / input.containerWidth;
+  return [1 - ratio, ratio];
+}
@@ -1,6 +1,7 @@
-import { Fragment, useMemo, type ReactElement, type ReactNode } from "react";
+import { Fragment, useMemo, type ReactElement } from "react";
 import { withUnistyles } from "react-native-unistyles";
 import {
+  ArrowRightToLine,
  Copy,
  CopyPlus,
  Download,
@@ -25,8 +26,11 @@ import {

 const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 const destructiveColorMapping = (theme: Theme) => ({ color: theme.colors.destructive });
+type FileActionGroup = "create" | "open" | "reference" | "manage" | "destructive";
+
 interface FileAction {
  key: string;
+  group: FileActionGroup;
  label: string;
  icon: LucideIcon;
  onSelect: () => void;
@@ -35,10 +39,19 @@ interface FileAction {
  testID?: string;
 }

+function optionalFileAction(
+  available: boolean,
+  onSelect: (() => void) | undefined,
+  action: Omit<FileAction, "onSelect">,
+): FileAction | null {
+  return available && onSelect ? { ...action, onSelect } : null;
+}
+
 interface FileActionsContextMenuContentProps {
  fileKind: "file" | "directory";
  fileExists?: boolean;
  onOpenFile?: () => void;
+  onOpenToSide?: () => void;
  onCopyPath?: () => void;
  onCopyRelativePath?: () => void;
  onReveal?: () => void;
@@ -52,8 +65,6 @@ interface FileActionsContextMenuContentProps {
  onDuplicate?: () => void;
  onRevert?: () => void;
  onDelete?: () => void;
-  /** Optional metadata block rendered above the actions (e.g. size/modified). */
-  header?: ReactNode;
  testIDPrefix?: string;
 }

@@ -65,6 +76,7 @@ export function FileActionsContextMenuContent({
  fileKind,
  fileExists = true,
  onOpenFile,
+  onOpenToSide,
  onCopyPath,
  onCopyRelativePath,
  onReveal,
@@ -78,7 +90,6 @@ export function FileActionsContextMenuContent({
  onDuplicate,
  onRevert,
  onDelete,
-  header,
  testIDPrefix,
 }: FileActionsContextMenuContentProps): ReactElement | null {
  const { t } = useTranslation();
@@ -88,6 +99,7 @@ export function FileActionsContextMenuContent({
      onNewFile
        ? {
            key: "new-file",
+            group: "create",
            label: t("workspace.fileActions.newFile"),
            icon: FilePlus,
            onSelect: onNewFile,
@@ -96,6 +108,7 @@ export function FileActionsContextMenuContent({
      onNewFolder
        ? {
            key: "new-folder",
+            group: "create",
            label: t("workspace.fileActions.newFolder"),
            icon: FolderPlus,
            onSelect: onNewFolder,
@@ -104,6 +117,7 @@ export function FileActionsContextMenuContent({
      onCollapseFolder
        ? {
            key: "collapse-folder",
+            group: "open",
            label: t("workspace.fileActions.collapseFolder"),
            icon: FolderMinus,
            onSelect: onCollapseFolder,
@@ -112,30 +126,22 @@ export function FileActionsContextMenuContent({
      availableFile && onOpenFile
        ? {
            key: "open-file",
+            group: "open",
            label: t("workspace.fileActions.openFile"),
            icon: FileText,
            onSelect: onOpenFile,
          }
        : null,
-      onRename
-        ? {
-            key: "rename",
-            label: t("workspace.fileActions.rename"),
-            icon: Pencil,
-            onSelect: onRename,
-          }
-        : null,
-      onDuplicate
-        ? {
-            key: "duplicate",
-            label: t("workspace.fileActions.duplicate"),
-            icon: CopyPlus,
-            onSelect: onDuplicate,
-          }
-        : null,
+      optionalFileAction(availableFile, onOpenToSide, {
+        key: "open-to-side",
+        group: "open",
+        label: t("workspace.fileActions.openToSide"),
+        icon: ArrowRightToLine,
+      }),
      onCopyPath
        ? {
            key: "copy-path",
+            group: "reference",
            label: t("workspace.fileActions.copyPath"),
            icon: Copy,
            onSelect: onCopyPath,
@@ -144,6 +150,7 @@ export function FileActionsContextMenuContent({
      onCopyRelativePath
        ? {
            key: "copy-relative-path",
+            group: "reference",
            label: t("workspace.fileActions.copyRelativePath"),
            icon: Copy,
            onSelect: onCopyRelativePath,
@@ -152,6 +159,7 @@ export function FileActionsContextMenuContent({
      onReveal && revealTargetName
        ? {
            key: "reveal",
+            group: "reference",
            label: t("workspace.fileActions.revealIn", { target: revealTargetName }),
            icon: FolderOpen,
            onSelect: onReveal,
@@ -160,6 +168,7 @@ export function FileActionsContextMenuContent({
      availableFile && onDownload
        ? {
            key: "download",
+            group: "reference",
            label: t("workspace.fileActions.download"),
            icon: Download,
            onSelect: onDownload,
@@ -168,14 +177,34 @@ export function FileActionsContextMenuContent({
      availableFile && onAddToChat
        ? {
            key: "add-to-chat",
+            group: "reference",
            label: t("workspace.fileActions.addToChat"),
            icon: MessageSquarePlus,
            onSelect: onAddToChat,
          }
        : null,
+      onRename
+        ? {
+            key: "rename",
+            group: "manage",
+            label: t("workspace.fileActions.rename"),
+            icon: Pencil,
+            onSelect: onRename,
+          }
+        : null,
+      onDuplicate
+        ? {
+            key: "duplicate",
+            group: "manage",
+            label: t("workspace.fileActions.duplicate"),
+            icon: CopyPlus,
+            onSelect: onDuplicate,
+          }
+        : null,
      onRevert
        ? {
            key: "revert",
+            group: "destructive",
            label: t("workspace.fileActions.revert"),
            icon: Undo2,
            onSelect: onRevert,
@@ -185,6 +214,7 @@ export function FileActionsContextMenuContent({
      onDelete
        ? {
            key: "delete",
+            group: "destructive",
            label: t("workspace.fileActions.delete"),
            icon: Trash2,
            onSelect: onDelete,
@@ -195,9 +225,7 @@ export function FileActionsContextMenuContent({
    const availableActions = specs.filter((action): action is FileAction => action !== null);
    return availableActions.map((action, index) =>
      Object.assign(action, {
-        separatorBefore: Boolean(
-          action.destructive && index > 0 && !availableActions[index - 1].destructive,
-        ),
+        separatorBefore: index > 0 && action.group !== availableActions[index - 1]?.group,
        testID: testIDPrefix ? `${testIDPrefix}-${action.key}` : undefined,
      }),
    );
@@ -214,6 +242,7 @@ export function FileActionsContextMenuContent({
    onNewFile,
    onNewFolder,
    onOpenFile,
+    onOpenToSide,
    onRename,
    onReveal,
    onRevert,
@@ -231,12 +260,6 @@ export function FileActionsContextMenuContent({
      width={220}
      testID={testIDPrefix ? `${testIDPrefix}-context-menu` : undefined}
    >
-      {header ? (
-        <>
-          {header}
-          <ContextMenuSeparator />
-        </>
-      ) : null}
      {actions.map((action) => (
        <Fragment key={action.key}>
          {action.separatorBefore ? <ContextMenuSeparator /> : null}
@@ -41,7 +41,9 @@ import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
  PaneContentToolbar,
  paneContentToolbarIconSize,
-  paneContentToolbarIconButtonStyle,
+  paneContentToolbarTrailingPadding,
+  ToolbarButton,
+  ToolbarControls,
 } from "@/components/ui/pane-content-toolbar";
 import {
  useOverlayFlatListScrollbar,
@@ -61,7 +63,6 @@ import { useIsLocalDaemon } from "@/hooks/use-is-local-daemon";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 import { buildWorkspaceExplorerStateKey } from "@/hooks/use-file-explorer-actions";
 import { usePanelStore, type ExpandedPathsUpdate, type SortOption } from "@/stores/panel-store";
-import { formatTimeAgo } from "@/utils/time";
 import { buildAbsoluteExplorerPath } from "@/utils/explorer-paths";
 import { isHiddenExplorerPath } from "@/file-explorer/visibility";
 import {
@@ -100,16 +101,6 @@ function DirectoryChevronIcon({ loading, expanded }: { loading: boolean; expande
  return <TreeChevron expanded={expanded} />;
 }

-function formatFileSize({ size }: { size: number }): string {
-  if (size < 1024) {
-    return `${size} B`;
-  }
-  if (size < 1024 * 1024) {
-    return `${(size / 1024).toFixed(1)} KB`;
-  }
-  return `${(size / (1024 * 1024)).toFixed(1)} MB`;
-}
-
 interface TreeRowItemProps {
  serverId: string;
  workspaceId?: string | null;
@@ -126,6 +117,7 @@ interface TreeRowItemProps {
  revealTargetName?: string;
  onDownloadEntry: (entry: ExplorerEntry) => void;
  onAddToChat?: (path: string) => void;
+  onOpenFileToSide?: (path: string) => void;
  onNewEntry?: (parentPath: string, kind: "file" | "directory") => void;
  onCollapseDirectory?: (path: string) => void;
  onRenameEntry?: (entry: ExplorerEntry) => void;
@@ -141,13 +133,6 @@ function sortTriggerStyle({
  return [styles.sortTrigger, (Boolean(hovered) || pressed) && styles.sortTriggerHovered];
 }

-function iconButtonStyle(
-  isCompact: boolean,
-  { hovered, pressed }: PressableStateCallbackType & { hovered?: boolean },
-) {
-  return paneContentToolbarIconButtonStyle({ hovered, pressed }, false, isCompact);
-}
-
 type ExplorerListRow =
  | { type: "entry"; row: ExplorerTreeRow }
  | { type: "draft"; parentPath: string; kind: "file" | "directory"; depth: number }
@@ -256,6 +241,7 @@ function TreeRowItem({
  revealTargetName,
  onDownloadEntry,
  onAddToChat,
+  onOpenFileToSide,
  onNewEntry,
  onCollapseDirectory,
  onRenameEntry,
@@ -263,7 +249,6 @@ function TreeRowItem({
  onDeleteEntry,
  testID,
 }: TreeRowItemProps) {
-  const { t } = useTranslation();
  const [isHovered, setIsHovered] = useState(false);
  const showNameHover = useCallback(() => setIsHovered(true), []);
  const hideNameHover = useCallback(() => setIsHovered(false), []);
@@ -317,6 +302,10 @@ function TreeRowItem({
    onAddToChat?.(entry.path);
  }, [onAddToChat, entry.path]);

+  const handleOpenToSide = useCallback(() => {
+    onOpenFileToSide?.(entry.path);
+  }, [entry.path, onOpenFileToSide]);
+
  const handleNewFile = useCallback(() => {
    onNewEntry?.(entry.path, "file");
  }, [onNewEntry, entry.path]);
@@ -341,30 +330,6 @@ function TreeRowItem({
    onDeleteEntry?.(entry);
  }, [onDeleteEntry, entry]);

-  const metaHeader = useMemo(
-    () => (
-      <View style={styles.contextMetaBlock}>
-        <View style={styles.contextMetaRow}>
-          <Text style={styles.contextMetaLabel} numberOfLines={1}>
-            {t("workspace.fileExplorer.context.size")}
-          </Text>
-          <Text style={styles.contextMetaValue} numberOfLines={1} ellipsizeMode="tail">
-            {formatFileSize({ size: entry.size })}
-          </Text>
-        </View>
-        <View style={styles.contextMetaRow}>
-          <Text style={styles.contextMetaLabel} numberOfLines={1}>
-            {t("workspace.fileExplorer.context.modified")}
-          </Text>
-          <Text style={styles.contextMetaValue} numberOfLines={1} ellipsizeMode="tail">
-            {formatTimeAgo(new Date(entry.modifiedAt))}
-          </Text>
-        </View>
-      </View>
-    ),
-    [entry.modifiedAt, entry.size, t],
-  );
-
  return (
    <ContextMenu>
      <ContextMenuTrigger
@@ -407,13 +372,13 @@ function TreeRowItem({
        revealTargetName={revealTargetName}
        onDownload={handleDownload}
        onAddToChat={onAddToChat ? handleAddToChat : undefined}
+        onOpenToSide={!isDirectory && onOpenFileToSide ? handleOpenToSide : undefined}
        onNewFile={onNewEntry ? handleNewFile : undefined}
        onNewFolder={onNewEntry ? handleNewFolder : undefined}
        onCollapseFolder={isDirectory && isExpanded ? handleCollapseDirectory : undefined}
        onRename={onRenameEntry ? handleRename : undefined}
        onDuplicate={onDuplicateEntry ? handleDuplicate : undefined}
        onDelete={onDeleteEntry ? handleDelete : undefined}
-        header={metaHeader}
        testIDPrefix={testID}
      />
    </ContextMenu>
@@ -425,6 +390,7 @@ interface FileExplorerPaneProps {
  workspaceId?: string | null;
  workspaceRoot: string;
  onOpenFile?: (filePath: string) => void;
+  onOpenFileToSide?: (filePath: string) => void;
  onAddToChat?: (path: string) => void;
 }

@@ -433,6 +399,7 @@ export function FileExplorerPane({
  workspaceId,
  workspaceRoot,
  onOpenFile,
+  onOpenFileToSide,
  onAddToChat,
 }: FileExplorerPaneProps) {
  const { t } = useTranslation();
@@ -996,6 +963,7 @@ export function FileExplorerPane({
          revealTargetName={fileManagerTarget?.label}
          onDownloadEntry={handleDownloadEntry}
          onAddToChat={onAddToChat}
+          onOpenFileToSide={onOpenFileToSide}
          onNewEntry={fsEntryOpsEnabled ? handleNewEntry : undefined}
          onCollapseDirectory={handleCollapseDirectory}
          onRenameEntry={fsEntryOpsEnabled ? handleRenameEntry : undefined}
@@ -1026,6 +994,7 @@ export function FileExplorerPane({
      fileManagerTarget,
      selectedEntryPath,
      onAddToChat,
+      onOpenFileToSide,
      serverId,
      workspaceId,
    ],
@@ -1049,11 +1018,6 @@ export function FileExplorerPane({
    });
  }, [requestDirectoryListing]);

-  const toolbarIconButtonStyle = useCallback(
-    (state: PressableStateCallbackType) => iconButtonStyle(isCompact, state),
-    [isCompact],
-  );
-
  if (!hasWorkspaceScope) {
    return (
      <View style={styles.centerState}>
@@ -1087,7 +1051,6 @@ export function FileExplorerPane({
        handleBackFromError={handleBackFromError}
        handleRetry={handleRetry}
        sortTriggerStyle={sortTriggerStyle}
-        iconButtonStyle={toolbarIconButtonStyle}
      />
    </View>
  );
@@ -1162,7 +1125,6 @@ interface FileExplorerPaneContentProps {
  handleBackFromError: () => void;
  handleRetry: () => void;
  sortTriggerStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
-  iconButtonStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
 }

 function FileExplorerPaneContent(props: FileExplorerPaneContentProps) {
@@ -1186,7 +1148,6 @@ function FileExplorerPaneContent(props: FileExplorerPaneContentProps) {
    handleBackFromError,
    handleRetry,
    sortTriggerStyle: sortTriggerStyleProp,
-    iconButtonStyle: iconButtonStyleProp,
  } = props;

  const showHiddenFiles = usePanelStore((state) => state.explorerShowHiddenFiles);
@@ -1204,17 +1165,6 @@ function FileExplorerPaneContent(props: FileExplorerPaneContentProps) {
  const emptyLabel = showHiddenFiles
    ? t("workspace.fileExplorer.empty.noFiles")
    : t("workspace.fileExplorer.empty.noVisibleFiles");
-  const hiddenFilesToggleStyle = useCallback(
-    (state: PressableStateCallbackType) => [
-      iconButtonStyleProp(state),
-      !showHiddenFiles && styles.iconButtonActive,
-    ],
-    [showHiddenFiles, iconButtonStyleProp],
-  );
-  const hiddenFilesToggleAccessibilityState = useMemo(
-    () => ({ selected: !showHiddenFiles }),
-    [showHiddenFiles],
-  );

  if (error) {
    return (
@@ -1245,7 +1195,10 @@ function FileExplorerPaneContent(props: FileExplorerPaneContentProps) {

  return (
    <View style={[styles.treePane, styles.treePaneFill]}>
-      <PaneContentToolbar style={styles.paneHeader} testID="files-pane-header">
+      <PaneContentToolbar
+        style={[styles.paneHeader, { paddingRight: paneContentToolbarTrailingPadding(isCompact) }]}
+        testID="files-pane-header"
+      >
        <Pressable
          onPress={handleSortCycle}
          style={sortTriggerStyleProp}
@@ -1256,86 +1209,82 @@ function FileExplorerPaneContent(props: FileExplorerPaneContentProps) {
          </Text>
          <ChevronDown size={12} color={theme.colors.foregroundMuted} />
        </Pressable>
-        <View style={styles.headerActions}>
+        <ToolbarControls style={styles.headerActions}>
          {onNewEntryAtRoot ? (
            <>
-              <Pressable
-                onPress={handleNewFileAtRoot}
+              <ToolbarButton
+                label={t("workspace.fileActions.newFile")}
+                compact={isCompact}
                hitSlop={8}
-                style={iconButtonStyleProp}
-                accessibilityRole="button"
-                accessibilityLabel={t("workspace.fileActions.newFile")}
                testID="files-new-file"
+                onPress={handleNewFileAtRoot}
              >
                <FilePlus
                  size={paneContentToolbarIconSize(isCompact)}
-                  color={theme.colors.foregroundMuted}
+                  color={theme.colors.foregroundExtraMuted}
                />
-              </Pressable>
-              <Pressable
-                onPress={handleNewFolderAtRoot}
+              </ToolbarButton>
+              <ToolbarButton
+                label={t("workspace.fileActions.newFolder")}
+                compact={isCompact}
                hitSlop={8}
-                style={iconButtonStyleProp}
-                accessibilityRole="button"
-                accessibilityLabel={t("workspace.fileActions.newFolder")}
                testID="files-new-folder"
+                onPress={handleNewFolderAtRoot}
              >
                <FolderPlus
                  size={paneContentToolbarIconSize(isCompact)}
-                  color={theme.colors.foregroundMuted}
+                  color={theme.colors.foregroundExtraMuted}
                />
-              </Pressable>
+              </ToolbarButton>
            </>
          ) : null}
-          <Pressable
-            onPress={handleToggleHiddenFiles}
+          <ToolbarButton
+            label={hiddenFilesToggleAccessibilityLabel}
+            selected={!showHiddenFiles}
+            compact={isCompact}
            hitSlop={8}
-            style={hiddenFilesToggleStyle}
-            accessibilityRole="button"
-            accessibilityLabel={hiddenFilesToggleAccessibilityLabel}
-            accessibilityState={hiddenFilesToggleAccessibilityState}
            testID="files-hidden-toggle"
+            onPress={handleToggleHiddenFiles}
          >
            {showHiddenFiles ? (
              <Eye
                size={paneContentToolbarIconSize(isCompact)}
-                color={theme.colors.foregroundMuted}
+                color={theme.colors.foregroundExtraMuted}
              />
            ) : (
              <EyeOff
                size={paneContentToolbarIconSize(isCompact)}
-                color={theme.colors.foregroundMuted}
+                color={theme.colors.foregroundExtraMuted}
              />
            )}
-          </Pressable>
-          <Pressable
-            onPress={handleRefresh}
-            disabled={isRefreshFetching}
-            hitSlop={8}
-            style={iconButtonStyleProp}
-            accessibilityRole="button"
-            accessibilityLabel={
+          </ToolbarButton>
+          <ToolbarButton
+            label={
              isRefreshFetching
                ? t("workspace.fileExplorer.actions.refreshing")
                : t("workspace.fileExplorer.actions.refresh")
            }
+            compact={isCompact}
+            disabled={isRefreshFetching}
+            hitSlop={8}
            testID="files-refresh"
+            onPress={handleRefresh}
          >
            <View style={styles.refreshIcon}>
              {isRefreshFetching ? (
                <LoadingSpinner
                  size={paneContentToolbarIconSize(isCompact)}
-                  color={theme.colors.foregroundMuted}
+                  color={theme.colors.foregroundExtraMuted}
                />
              ) : (
                <RotateCw
                  size={paneContentToolbarIconSize(isCompact)}
-                  color={theme.colors.foregroundMuted}
+                  color={theme.colors.foregroundExtraMuted}
                />
              )}
            </View>
-          </Pressable>
-        </View>
+          </ToolbarButton>
+        </ToolbarControls>
      </PaneContentToolbar>
      <ContextMenu>
        <RootCreationContextTarget enabled={Boolean(onNewEntryAtRoot)}>
@@ -1479,6 +1428,7 @@ function TreeRowDispatcher({
  revealTargetName,
  onDownloadEntry,
  onAddToChat,
+  onOpenFileToSide,
  onNewEntry,
  onCollapseDirectory,
  onRenameEntry,
@@ -1500,6 +1450,7 @@ function TreeRowDispatcher({
  revealTargetName?: string;
  onDownloadEntry: (entry: ExplorerEntry) => void;
  onAddToChat?: (path: string) => void;
+  onOpenFileToSide?: (path: string) => void;
  onNewEntry?: (parentPath: string, kind: "file" | "directory") => void;
  onCollapseDirectory?: (path: string) => void;
  onRenameEntry?: (entry: ExplorerEntry) => void;
@@ -1530,6 +1481,7 @@ function TreeRowDispatcher({
      revealTargetName={revealTargetName}
      onDownloadEntry={onDownloadEntry}
      onAddToChat={onAddToChat}
+      onOpenFileToSide={onOpenFileToSide}
      onNewEntry={onNewEntry}
      onCollapseDirectory={onCollapseDirectory}
      onRenameEntry={onRenameEntry}
@@ -1698,7 +1650,7 @@ const styles = StyleSheet.create((theme) => ({
    flexDirection: "row",
    alignItems: "center",
    justifyContent: "space-between",
-    paddingRight: theme.spacing[3],
+    backgroundColor: theme.colors.surfaceSidebar,
  },
  sortTrigger: {
    flexDirection: "row",
@@ -1711,7 +1663,7 @@ const styles = StyleSheet.create((theme) => ({
    borderRadius: theme.borderRadius.base,
  },
  sortTriggerHovered: {
-    backgroundColor: theme.colors.surface2,
+    backgroundColor: theme.colors.surfaceSidebarHover,
  },
  sortTriggerText: {
    fontSize: theme.fontSize.sm,
@@ -1720,7 +1672,6 @@ const styles = StyleSheet.create((theme) => ({
  headerActions: {
    flexDirection: "row",
    alignItems: "center",
-    gap: theme.spacing[1],
  },
  treeList: {
    flex: 1,
@@ -1807,38 +1758,12 @@ const styles = StyleSheet.create((theme) => ({
  draftPlaceholder: {
    color: theme.colors.foregroundExtraMuted,
  },
-  contextMetaBlock: {
-    paddingVertical: theme.spacing[1],
-  },
-  contextMetaRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    minHeight: 32,
-    paddingHorizontal: theme.spacing[3],
-  },
-  contextMetaLabel: {
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundMuted,
-    flexShrink: 0,
-  },
-  contextMetaValue: {
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foreground,
-    fontWeight: theme.fontWeight.medium,
-    flex: 1,
-    minWidth: 0,
-    textAlign: "right",
-  },
  previewHeaderText: {
    flex: 1,
    color: theme.colors.foreground,
    fontSize: theme.fontSize.base,
    fontWeight: theme.fontWeight.normal,
  },
-  iconButtonActive: {
-    backgroundColor: theme.colors.surface2,
-  },
  refreshIcon: {
    width: 16,
    height: 16,
@@ -5,6 +5,10 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
 import { Shortcut } from "@/components/ui/shortcut";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { isWeb } from "@/constants/platform";
+import {
+  iconButtonChromeFrameStyle,
+  iconButtonChromeStyle,
+} from "@/components/ui/icon-button-chrome";

 interface HeaderToggleButtonState {
  hovered: boolean;
@@ -42,7 +46,17 @@ export function HeaderToggleButton({
      ? ({ "aria-expanded": expandedState } as Record<string, boolean>)
      : null;

-  const combinedStyle = useMemo(() => [headerIconSlotStyle.slot, style], [style]);
+  const combinedStyle = useMemo(
+    () =>
+      ({ hovered, pressed }: { hovered?: boolean; pressed: boolean }) =>
+        iconButtonChromeStyle({
+          size: "large",
+          state: { hovered: Boolean(hovered), pressed },
+          disabled: Boolean(disabled),
+          style,
+        }),
+    [disabled, style],
+  );

  return (
    <Tooltip delayDuration={tooltipDelayDuration} enabledOnDesktop enabledOnMobile={false}>
@@ -68,16 +82,6 @@ export function HeaderToggleButton({
  );
 }

-export const headerIconSlotStyle = StyleSheet.create((theme) => ({
-  slot: {
-    padding: {
-      xs: theme.spacing[3],
-      md: theme.spacing[2],
-    },
-    borderRadius: theme.borderRadius.lg,
-  },
-}));
-
 const styles = StyleSheet.create((theme) => ({
  tooltipRow: {
    flexDirection: "row",
@@ -90,3 +94,7 @@ const styles = StyleSheet.create((theme) => ({
  },
  shortcut: {},
 }));
+
+export const headerIconSlotStyle = {
+  slot: iconButtonChromeFrameStyle("large"),
+};
@@ -10,6 +10,7 @@ import { selectIsAgentListOpen, usePanelStore } from "@/stores/panel-store";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import { useHasWindowChromeObstruction, useOwnsWindowChromeCorner } from "@/utils/desktop-window";
+import { iconButtonChromeGlyphSize } from "@/components/ui/icon-button-chrome";

 interface MenuHeaderProps {
  title?: string;
@@ -26,7 +27,7 @@ interface SidebarMenuToggleProps {

 const MOBILE_MENU_LINE_WIDTH = 16;
 const MOBILE_MENU_LINE_SHORT_WIDTH = 8;
-const MOBILE_MENU_LINE_HEIGHT = 2;
+const MOBILE_MENU_LINE_HEIGHT = 1.5;

 function MobileMenuIcon({ color }: { color: string }) {
  const lineStyle = useMemo(() => [styles.mobileMenuLine, { backgroundColor: color }], [color]);
@@ -84,19 +85,21 @@ function SidebarMenuToggleButton({
      accessibilityLabel={isOpen ? t("shell.menu.close") : t("shell.menu.open")}
      accessibilityState={accessibilityState}
    >
-      {({ hovered, pressed }) => {
-        let color = extraMutedIdleIcon
-          ? theme.colors.foregroundExtraMuted
-          : theme.colors.foregroundMuted;
-        if (hovered || pressed) {
-          color = theme.colors.foreground;
-        }
-        return isMobile ? (
-          <MobileMenuIcon color={color} />
-        ) : (
-          <PanelLeft size={theme.iconSize.md} color={color} />
-        );
-      }}
+      {isMobile ? (
+        <MobileMenuIcon
+          color={
+            extraMutedIdleIcon ? theme.colors.foregroundExtraMuted : theme.colors.foregroundMuted
+          }
+        />
+      ) : (
+        <PanelLeft
+          size={iconButtonChromeGlyphSize("large")}
+          strokeWidth={1.5}
+          color={
+            extraMutedIdleIcon ? theme.colors.foregroundExtraMuted : theme.colors.foregroundMuted
+          }
+        />
+      )}
    </HeaderToggleButton>
  );
 }
@@ -1,16 +0,0 @@
-import Svg, { Circle, Path } from "react-native-svg";
-import type { SvgPathIconProps } from "./svg-path-icon";
-
-// Forge-neutral rendering of GitLab's manual-status gear, aligned with the
-// proportions of the other pipeline status icons.
-const MANUAL_STATUS_GEAR_PATH =
-  "M10.5 7.63V6.37l-.787-.13c-.044-.175-.132-.349-.263-.61l.481-.652-.918-.913-.657.478a2.346 2.346 0 0 0-.612-.26L7.656 3.5H6.388l-.132.783c-.219.043-.394.13-.612.26l-.657-.478-.918.913.437.652c-.131.218-.175.392-.262.61l-.744.086v1.261l.787.13c.044.218.132.392.263.61l-.438.651.92.913.655-.434c.175.086.394.173.613.26l.131.783h1.313l.131-.783c.219-.043.394-.13.613-.26l.656.478.918-.913-.48-.652c.13-.218.218-.435.262-.61l.656-.13zM7 8.283a1.285 1.285 0 0 1-1.313-1.305c0-.739.57-1.304 1.313-1.304.744 0 1.313.565 1.313 1.304 0 .74-.57 1.305-1.313 1.305z";
-
-export function ManualStatusIcon({ size = 16, color = "currentColor" }: SvgPathIconProps) {
-  return (
-    <Svg width={size} height={size} viewBox="-0.5 -0.5 15 15">
-      <Circle cx={7} cy={7} r={6.25} fill="none" stroke={color} strokeWidth={1.25} />
-      <Path d={MANUAL_STATUS_GEAR_PATH} fill={color} />
-    </Svg>
-  );
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	6da9fa43fa	chore(release): cut 0.6.0	2026-08-25 15:58:11 +02:00
Mohamed Boudra	cd8c868b32	docs: add 0.6.0 changelog	2026-08-25 15:50:49 +02:00
Mohamed Boudra	6f6466d4cb	Wait for authoritative provider readiness before prompting (#3821 ) * fix(server): trust provider connection lifecycle events Readiness now waits for the upstream connection event, and later connection events directly trigger the existing gap repair. This removes the parallel synthetic reconnection contract while preserving transport ownership and prompt gating. * test(server): model OpenCode global event envelopes	2026-08-25 15:28:06 +02:00
Mohamed Boudra	6147991519	test(app): follow filtered launcher order	2026-08-25 14:58:35 +02:00
Mohamed Boudra	bbe3f17327	test(app): follow Explorer subagent placement	2026-08-25 13:50:54 +02:00
Mohamed Boudra	c914bcb44b	feat(app): make Explorer a first-class pane host (#3826 )	2026-08-25 13:25:57 +02:00
Mohamed Boudra	54299a2e6c	fix(server): let event-stream startup recover once (#3814 ) The readiness wait expired at the same boundary as the producer watchdog, so a reconnect already initiated by the event consumer could never benefit the pending turn. Keep dispatch gated, allow that retry to land, and preserve the actual SDK failure details for logs and user-visible reports.	2026-08-24 19:31:11 +02:00
Aditya Borakati ABorakati Mohamed Boudra	f4b5f32862	test(e2e): boot the Playwright harness on Windows (#3804 ) * test(e2e): boot the Playwright harness on Windows The harness could not start on Windows. Metro was launched with spawn("npx", ...) and the isolated daemon resolved its runner with execSync("which tsx") — npx is a .cmd shim that Node's bare spawn cannot launch, and `which` does not exist there. Route both through process.execPath instead of the node_modules/.bin shims. Node refuses to spawn .cmd or .bat without shell: true, and shell: true is the wrong escape hatch: it concatenates argv unescaped (DEP0190), splits paths containing spaces, and sends kill signals to cmd.exe rather than the real child. Spawning Node directly has none of those properties and is identical on POSIX, so no platform branch is needed. The same reasoning fixes the published-server npm install, which passed "npm.cmd" to execFileSync and had been failing with EINVAL on Windows since Node's CVE-2024-27980 mitigation landed. Teardown now kills the process tree. A Windows signal reaches only the direct child, so Metro's and the supervisor's forked workers kept the listening port and the next run failed to bind. The daemon startup deadline goes from 20s to 90s. A cold tsx start was measured at 25s on Windows and exceeded 60s under load; the loop still fails immediately on a crashed child, so the ceiling only costs time that a genuinely slow start needs. The fake editor and gh binaries the harness puts on PATH gain .cmd wrappers, because Windows resolves PATH entries by PATHEXT and cannot execute an extension-less shebang file. The wrappers point at the same payload file so the recorded command name stays "cursor", "code", or "gh" on every platform. The asdf-backed local Elixir relay stays POSIX-only and now says so before spawning. * test(ci): follow shared e2e daemon launcher --------- Co-authored-by: ABorakati <ABorakati@users.noreply.github.com> Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>	2026-08-24 18:20:19 +02:00
paseo-ai[bot]	7db654aa0a	fix: update lockfile signatures and Nix hash [skip ci]	2026-08-24 12:40:34 +00:00
Mohamed Boudra	4092c29265	chore(release): cut 0.5.2	2026-08-24 14:30:57 +02:00
Mohamed Boudra	5cedc210a8	docs: add 0.5.2 changelog	2026-08-24 14:27:37 +02:00
Mohamed Boudra	4724d1d9b7	fix(settings): preserve valid legacy font fallback	2026-08-24 14:27:22 +02:00
Mohamed Boudra	8fdca94ead	Fix settings resets across app revisions (#3787 ) * fix(settings): preserve settings from newer builds Strict blob validation treated a single newer setting as corruption and then rewrote defaults. Read settings field by field and retain unrecognized data when materializing or migrating known preferences. * refactor(settings): unify discarded-value warnings Emit settings warnings where each stored value is parsed so validation cannot drift from diagnostics. * refactor(settings): validate persisted settings declaratively Use one loose Zod schema with field defaults so mixed-version settings remain loadable without parallel validation paths. * fix(settings): preserve explicit services preferences Keep compatibility fallbacks from overriding explicit settings and prevent read metadata from reaching migration writes. * refactor(settings): derive migration persistence types Let the schema prove normalized settings coverage and carry its persisted shape through migrations.	2026-08-24 12:10:13 +02:00
Mohamed Boudra	88f410567d	Revert "fix(server): honor Claude bypass permission mode (#3732 )" This reverts commit `f998ee1691`.	2026-08-24 11:05:19 +02:00
wongangandMohamed Boudra	f998ee1691	fix(server): honor Claude bypass permission mode (#3732 ) Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>	2026-08-24 10:49:12 +02:00
Julien Eid	7a47ec0ee9	Fix crash on Android tablet workspace (#3760 ) Fixes #3750	2026-08-24 09:21:25 +02:00
paseo-ai[bot]	4f796181bf	fix: update lockfile signatures and Nix hash [skip ci]	2026-08-23 17:46:14 +00:00
Mohamed Boudra	f517493591	chore(release): cut 0.5.1	2026-08-23 19:37:03 +02:00
Mohamed Boudra	fb74f766c8	docs(changelog): prepare 0.5.1 stable release	2026-08-23 19:32:35 +02:00
Mohamed Boudra	e268d1a894	fix(app): stabilize native composer resizing JavaScript height state competed with native intrinsic layout across draft and agent ownership transitions. Let native inputs own sizing and scrolling while preserving DOM measurement on web.	2026-08-23 18:55:38 +02:00
paseo-ai[bot]	b5f5832214	fix: update lockfile signatures and Nix hash [skip ci]	2026-08-23 13:51:42 +00:00
Mohamed Boudra	b8a31034ca	chore(release): cut 0.5.0	2026-08-23 15:42:11 +02:00
Mohamed Boudra	68275f1e0f	docs(changelog): prepare 0.5.0 stable release	2026-08-23 15:38:25 +02:00
Mohamed Boudra	3979371901	fix(server): recover already-settled interrupts (#3742 ) * fix(server): recover already-settled interrupts Provider state can drift from Paseo’s tracked run. Treat an authoritative already-idle interrupt as settled and retire the captured run token so retrying can start new work without weakening ambiguous-cancellation protection. * fix(codex): fence interruption during turn startup Reserve foreground-start ownership before asynchronous provider setup. An interrupt can now cancel preflight before turn/start or wait for an issued start to become interruptible, preventing acknowledged cancellation from leaving unmanaged work.	2026-08-23 14:59:36 +02:00
Dan Berindei	71e375c2bc	fix(server): stop quota fetcher from writing provider credentials (#3442 )	2026-08-23 14:24:18 +02:00
Mohamed Boudra	35cde075ae	fix(app): restore composer height lifecycle (#3740 ) Native Fabric can omit the initial content-size callback and retain stale size after deletion. Keep the common composer surface free of platform branches while native and web adapters own their measurement mechanisms.	2026-08-23 13:57:17 +02:00
Mohamed Boudra	2124115c8e	Open the tab chooser beside the pointer (#3735 ) * feat(app): open the tab chooser beside the pointer Keep keyboard-created and empty-pane New tabs as persistent launcher surfaces, while giving pointer users an anchored chooser at the pane-local plus button. Both presentations resolve the same launch catalogue so future ordering and customization cannot drift. * test(app): follow the anchored tab chooser The browser helpers still searched inside the pane for persistent-launcher controls after clicking the portalled menu trigger. Exercise the menu through its own roles and stable catalogue IDs.	2026-08-23 13:08:30 +02:00
Mohamed Boudra	4094eeb566	fix(app): preserve timeline retry backoff (#3736 ) Equivalent visibility publications were acting as implicit retry commands, so unrelated tab and layout changes could restart failed timeline work. Keep visibility identity stable and reserve immediate retries for explicit user action.	2026-08-23 13:04:14 +02:00
Mohamed Boudra	8d92e1cc17	fix(pairing): warn that pairing links grant daemon access (#3734 ) A pairing offer remains valid across daemon restarts, so remove the incorrect rotation guidance and warn users where the durable credential is displayed.	2026-08-23 12:32:21 +02:00
Omer Cohen Claude Opus 5 Mohamed Boudra	5123b23f41	fix(app): stop a string SVG transform from crashing the app (#3711 ) * fix(app): stop a string SVG transform from crashing the app A root <Svg> is a real React Native view, so react-native-svg rewrites a string `transform` into RN style syntax in `extractTransformSvgView`, using a PEG parser whose grammar only accepts SVG transform functions. Upstream lets that parser's SyntaxError escape, so any string it does not understand takes the whole app down during render: SyntaxError: Expected transform functions but "n" found. "found": "n", "location": { "start": { "offset": 0 } } `none` reproduces that message character for character; so does any other CSS value (`rotate(-90deg)`, `translate(10px, 0)`). Every sibling extractor in that file already catches the same error and degrades, so the asymmetry is the bug: a string that is merely ignored on a <Path> crashes on an <Svg>. We feed that path untrusted input. The daemon scans a project for favicon.svg / icon.svg / logo.svg (packages/server/src/utils/project-icon.ts) and ships it to the client, where ProjectIconImage hands it to SvgCss. Running the library's own XML parser over `<svg style="transform:none">` yields exactly `transform: "none"` on the root, which is why the crash starts once a host connects and the project icons render, with no terminal involved. Note this is not reachable from an RN-style array transform: the extractor returns arrays untouched and only parses strings, so `style={{ transform: [{ rotate: "-90deg" }] }}` (the context window meter and the checks ring) was never a factor. Patch the three builds a consumer can resolve - Metro takes the package's `react-native` field (src/.ts), Node and Vitest take main/module - and register react-native-svg with the postinstall patch runner so the patch actually applies. The new test pins all three. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EDwfsMWoSFfPm2cFXe5noQ test(app): cover parsed root SVG transforms Exercise the dependency patch with root props produced by the library's XML and CSS parsers, including embedded style rules that can arrive through project icons. Keep dependency-patch documentation focused on the reusable install and resolution constraints. --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>	2026-08-23 11:05:25 +02:00
Yuri Gui Agent Op Mohamed Boudra	c3594b2079	fix(app): keep pinned project actions reachable (#3722 ) * fix(app): keep pinned project actions reachable Preserve an empty project shell after its final workspace is hoisted into the pinned section so project-scoped workspace creation remains available. Co-authored-by: Agent Op <agentop718@gmail.com> * test(app): verify pinned project workspace context --------- Co-authored-by: Agent Op <agentop718@gmail.com> Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>	2026-08-23 10:44:23 +02:00
Mohamed Boudra	dc9fb9aa1b	fix(app): make compact git actions menu-only Keep compact toolbars narrow and require users to choose potentially consequential Git and workspace actions from the menu.	2026-08-23 09:39:42 +02:00
paseo-ai[bot]	7c430777bf	fix: update lockfile signatures and Nix hash [skip ci]	2026-08-22 21:45:00 +00:00
Mohamed Boudra	acad9f6881	chore(release): cut 0.5.0-beta.5	2026-08-22 23:35:40 +02:00
Mohamed Boudra	fc214b20f1	test(app): align new tab launcher expectations	2026-08-22 23:32:05 +02:00
Mohamed Boudra	c998b24c5f	docs: add 0.5.0-beta.5 changelog	2026-08-22 23:25:10 +02:00
Mohamed Boudra	28df3f259a	fix(app): align terminal profiles header	2026-08-22 22:34:05 +02:00
Mohamed Boudra	cc2012be7c	fix(app): prioritize side panel launcher actions Lead with supporting workspace tools when the launcher is in the Side panel, while ordinary panes continue to lead with agent creation.	2026-08-22 22:24:35 +02:00
Mohamed Boudra	b139046a3e	fix(app): show the New agent shortcut The command center resolved New agent through the New tab binding, so it advertised Cmd+T despite creating an agent. Resolve the target-agent binding instead and cover the mapping.	2026-08-22 22:17:13 +02:00
Mohamed Boudra	482bbb2910	fix(app): order new tab launcher actions by workflow	2026-08-22 22:16:48 +02:00
Mohamed Boudra	4a5a8d469c	fix(app): keep compact model options scrollable The compact model sheet had no sheet-aware scroll owner when profiles filled its viewport, leaving the controls below them unreachable. Keep the root provider view inside Gorhom's scroll container so native sheet gestures work on both platforms.	2026-08-22 22:06:27 +02:00
Mohamed Boudra	c60fa098ac	Give every pane a browser-style New tab (#3715 ) * feat(app): replace empty panes with New tabs Give every retained pane an independently identified New tab, replace it in place when a destination is chosen, and preserve split close and move invariants. Keep existing workspace startup and compact explorer routing explicit, with focused unit and browser regression coverage. * test(app): count content tabs in subagent integration * fix(app): preserve workspace shortcut ownership	2026-08-22 21:30:15 +02:00
Mohamed Boudra	33cf6cf337	perf(app): defer replica persistence until user inactivity Whole-replica capture and serialization blocked the JS thread during navigation and streaming. Defer that work until the user has been inactive while allowing long-running streams to persist without becoming the idle signal.	2026-08-22 20:57:13 +02:00
Mohamed Boudra	65fbe38dd3	Restore compact and stable chat timelines (#3716 ) Restore compact message and footer spacing, reserve independent composer-pill clearance for transcript content and floating controls, and keep visible web tool-call expansion from shifting the reading position.	2026-08-22 20:50:20 +02:00
Mohamed Boudra	a69dca2907	Expand workspace panel actions and keyboard navigation (#3685 ) * fix(app): keep file navigation in place Retargeting a File tab allocated a new tab identity, causing the tab track to unmount and remount during navigation. Preserve the identity for File-to-File changes while retaining new instances for cross-kind replacements. * feat(app): expand workspace panel actions Keep the Command Center aligned with workspace tab and pane primitives. Add explicit panel placement, focused open behavior, keyboard navigation for empty panes, and a Changes pill that toggles the visible Side panel without closing its tab.	2026-08-22 14:15:23 +02:00
Mohamed Boudra	3029b5991a	Surface workspace changes from agent panes (#3682 ) * feat(app): refine workspace pane actions Prioritize Changes when available, keep Files useful before a selection, and reserve desktop diff clicks for selection so comments require the explicit affordance. Move the Changes shortcut to Shift+G to avoid consuming a likely copy variant. * feat(app): improve access to workspace changes	2026-08-22 12:20:21 +02:00
Mohamed Boudra	b1455fb4b3	docs(hub): document zero-friction onboarding (#3657 ) Lead with the browser-to-CLI onboarding journey, document the generated starter bundle, and align guided setup with available Hub connections and daemon-reported runtime defaults.	2026-08-22 12:15:58 +02:00
Mohamed Boudra	b4e0ff7685	fix(app): restore native composer auto-growth (#3681 ) Native multiline inputs were always scrollable, which kept iOS content-size measurement pinned to one line. Keep native sizing intrinsic below the cap and enable internal scrolling only after the composer reaches it.	2026-08-22 11:36:22 +02:00
Mohamed Boudra	4c6b79dc44	feat(app): refine agent profile creation (#3680 ) Keep profiles as the richer primitive while restoring the familiar star cue and clearer guidance for agent selection. Account for borders in shared field geometry so controls preserve their declared heights across form consumers.	2026-08-22 11:16:28 +02:00
Mohamed Boudra	a687c42f33	Keep released agent SDK versions reproducible (#3678 ) Pin the validated provider and protocol SDK dependency pair so fresh installs cannot silently float after a Paseo release. Refresh the Nix npm dependency hash for the resulting lockfile.	2026-08-22 11:10:20 +02:00
Mohamed Boudra	7beff9cb0b	fix(hub): make guided setup choices actionable (#3677 ) Show a concise login success state, scope starter choices to available Hub connections, wait for daemon capabilities, and avoid partial starter bundles when setup cannot proceed.	2026-08-22 10:37:19 +02:00
Mohamed Boudra	c763b80824	fix(files): keep large source previews responsive (#3665 ) Large read-only files bypassed the editor's virtualization and eagerly mounted every highlighted token, which could stall the renderer for seconds and consume gigabytes of memory. Route source previews through bounded platform renderers and reject reads above their display budgets before accumulation.	2026-08-22 10:13:31 +02:00
Mohamed Boudra	8905ad4160	fix(relay): validate handshake keys (#3669 )	2026-08-22 02:32:13 +02:00
BrianAguilarWascoandMohamed Boudra	60a5344cc6	fix(server): stop short start gates from undercutting provider startup budgets (#3621 ) * fix(server): stop short start gates from undercutting provider startup budgets Agent creation still failed on contended cold starts after #3578, because two shorter gates on the same path fire before the event-stream readiness budget can apply. A traced creation reached session.create twelve seconds in, past the 10s session.create gate, and the agent was then killed by a bare "timeout" at fifteen seconds from AGENT_RUN_START_TIMEOUT_MS while the SSE connect was still running. A run-start bound of 15s wraps a path that is deliberately allowed 30s, so the outer gate always wins and the inner budget is unreachable. Give session.create the shared OPENCODE_SERVER_STARTUP_TIMEOUT_MS budget, since creating the first session for a directory is part of OpenCode coming up, and derive its error message from the constant instead of hardcoding "10s". Raise AGENT_RUN_START_TIMEOUT_MS to 60s with a comment recording that it must stay above the slowest provider startup budget; it stays a literal because that module is provider-agnostic. Related to #3571. * test(server): drive the run start budget through a real AgentManager The run start boundary tests replaced AgentManager.waitForAgentRunStart with a bare timer, so they never exercised the production run-state transition or the agent_state subscription the real wait depends on. That path could regress while the tests stayed green. Build the scenario on a real AgentManager with a provider session that holds its turn start open for a configurable span, so pendingRun.started, the lifecycle change to "running", and the agent_state notification are what the wait actually observes. Budgets stay independent literals and the settled-before/after assertions are unchanged. * fix(server): describe agent run start timeouts --------- Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>	2026-08-22 02:06:16 +02:00
Mohamed Boudra	8f0c35e924	feat(hub): guide starter setup (#3651 ) * feat(hub): guide setup with provider IDs * fix(hub): preserve login setup state * feat(hub): select starter agent runtime Use the connected daemon's provider snapshot so generated Hub bundles only contain complete provider, model, and mode combinations. * fix(hub): stage starter runtime choices Keep providers with valid modes selectable when the daemon has no default mode, so users explicitly choose the complete runtime. * fix(hub): scope runtime choices to workspace Provider capabilities can vary by repository, so request the snapshot for the bundle directory that guided setup will deploy.	2026-08-21 23:11:55 +02:00
				`@@ -1 +0,0 @@`
				`../../../../../../packages/website/public/phone-1.png`
				`@@ -1 +0,0 @@`
				`Monitor and control your local AI coding agents from anywhere`
				`@@ -1 +0,0 @@`
				`ローカルのAIコーディングエージェントをどこからでも操作`
				`@@ -1 +0,0 @@`
				`随时随地监控和控制本地的 AI 编程 agents`