perf(app): row-grained replica cache persistence (#3755 )

* 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. * 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> * fix(relay): validate handshake keys (#3669) * 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. * 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. * 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. * 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. * 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. * 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. * 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 * 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. * 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. * 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. * 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 * 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. * fix(app): order new tab launcher actions by workflow * 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. * 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. * fix(app): align terminal profiles header * docs: add 0.5.0-beta.5 changelog * test(app): align new tab launcher expectations * chore(release): cut 0.5.0-beta.5 * fix: update lockfile signatures and Nix hash [skip ci] * 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. * 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> * 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> * 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. * 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. * 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. * 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. * fix(server): stop quota fetcher from writing provider credentials (#3442) * 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. * docs(changelog): prepare 0.5.0 stable release * chore(release): cut 0.5.0 * fix: update lockfile signatures and Nix hash [skip ci] * 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. * docs(changelog): prepare 0.5.1 stable release * chore(release): cut 0.5.1 * fix: update lockfile signatures and Nix hash [skip ci] * perf(app): move replica cache validation to restore Add an observational live measurement harness for the row-store migration baseline. Trust already-shaped cache values on persist while retaining full schema validation at the restore boundary. * feat(app): add replica cache row store Ship the platform storage engines behind a dark interface so the cache migration can wire them separately. Both engines share a contract, including atomic writes and destructive schema-version resets. * feat(app): switch replica cache to row storage Persist only changed replica entities so steady-state writes scale with the update rather than the complete cached world. Restore remains an all-or-nothing validated boundary, with whole-host byte-budget eviction. * fix(app): harden replica row persistence Serialize pending batches at write execution time so retries cannot overwrite newer rows or resurrect removed hosts. Reject oversized hosts before storage writes and preserve unchanged directory identities so routine reconciliation stays row-grained. --------- Co-authored-by: BrianAguilarWasco <146237330+BrianAguilarWasco@users.noreply.github.com> Co-authored-by: paseo-ai[bot] <266920839+paseo-ai[bot]@users.noreply.github.com> Co-authored-by: Yuri Gui <yugui923@users.noreply.github.com> Co-authored-by: Agent Op <agentop718@gmail.com> Co-authored-by: Omer Cohen <639682+omercnet@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Dan Berindei <dan.berindei@gmail.com>
Fastlane metadata format for F-Droid releases (#2501 )
2026-10-14 13:22:37 +00:00 · 2026-08-24 20:45:49 +02:00 · 2026-08-22 12:43:20 +02:00 · 2026-08-22 12:42:54 +02:00 · 2026-08-22 12:38:49 +02:00 · 2026-08-21 19:09:56 +02:00
1266 changed files with 97363 additions and 22116 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
+        run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/sync-fdroid-changelogs.test.mjs

  format:
    name: format
@@ -18,6 +18,7 @@ on:
      - "packages/client/**"
      - "packages/expo-two-way-audio/**"
      - "packages/highlight/**"
+      - "packages/plugin/**"
      - "packages/protocol/**"
      - "packages/relay/**"
      - "packages/server/**"
@@ -10,6 +10,7 @@ on:
      - "package.json"
      - "package-lock.json"
      - "packages/highlight/**"
+      - "packages/plugin/**"
      - "packages/server/**"
      - "packages/relay/**"
      - "packages/cli/**"
@@ -12,6 +12,7 @@ on:
      - "packages/app/**"
      - "packages/expo-two-way-audio/**"
      - "packages/highlight/**"
+      - "packages/plugin/**"
      - "packages/protocol/**"
      - "packages/client/**"
      - "packages/server/**"
@@ -94,6 +94,11 @@
          "error",
          {
            "paths": [
+              {
+                "name": "react-native",
+                "importNames": ["TextInput"],
+                "message": "Use EditingTextInput from @/components/ui/text-input. Raw TextInput bypasses editing-surface authority and IME safety."
+              },
              {
                "name": "@tanstack/react-query",
                "importNames": ["useQuery", "useInfiniteQuery", "useQueries"],
@@ -120,6 +125,11 @@
          "error",
          {
            "paths": [
+              {
+                "name": "react-native",
+                "importNames": ["TextInput"],
+                "message": "Use EditingTextInput from @/components/ui/text-input. Raw TextInput bypasses editing-surface authority and IME safety."
+              },
              {
                "name": "react-native-unistyles",
                "importNames": ["useUnistyles"],
@@ -167,6 +177,11 @@
          "error",
          {
            "paths": [
+              {
+                "name": "react-native",
+                "importNames": ["TextInput"],
+                "message": "Use EditingTextInput from @/components/ui/text-input. Raw TextInput bypasses editing-surface authority and IME safety."
+              },
              {
                "name": "react-native-unistyles",
                "importNames": ["useUnistyles"],
@@ -192,11 +207,11 @@
        "packages/app/src/desktop/browser/pane/index.tsx",
        "packages/app/src/desktop/browser/pane/index.web.tsx",
        "packages/app/src/components/command-center.tsx",
+        "packages/app/src/components/compact-explorer-sidebar.tsx",
        "packages/app/src/components/context-window-meter.tsx",
        "packages/app/src/components/dictation-controls.tsx",
        "packages/app/src/components/download-toast.tsx",
        "packages/app/src/components/draggable-list.native.tsx",
-        "packages/app/src/components/explorer-sidebar.tsx",
        "packages/app/src/components/headers/back-header.tsx",
        "packages/app/src/components/headers/menu-header.tsx",
        "packages/app/src/components/headers/screen-header.tsx",
@@ -254,6 +269,11 @@
          "error",
          {
            "paths": [
+              {
+                "name": "react-native",
+                "importNames": ["TextInput"],
+                "message": "Use EditingTextInput from @/components/ui/text-input. Raw TextInput bypasses editing-surface authority and IME safety."
+              },
              {
                "name": "@tanstack/react-query",
                "importNames": ["useQuery", "useInfiniteQuery", "useQueries"],
@@ -274,6 +294,26 @@
        "packages/app/src/desktop/components/pair-device-section.tsx",
        "packages/app/src/screens/new-workspace-screen.tsx"
      ],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "react-native",
+                "importNames": ["TextInput"],
+                "message": "Use EditingTextInput from @/components/ui/text-input. Raw TextInput bypasses editing-surface authority and IME safety."
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": [
+        "packages/app/src/components/ui/text-input/**/*.{ts,tsx}",
+        "packages/app/src/agent-stream/scroll-keyboard-dismiss/use-scroll-keyboard-dismiss.ts"
+      ],
      "rules": {
        "no-restricted-imports": "off"
      }
@@ -1,5 +1,82 @@
 # Changelog

+## 0.5.1 - 2026-08-23
+
+### Fixed
+
+- Fixed multiline composers stopping resizing after workspace and agent transitions on iOS and Android ([#3740](https://github.com/getpaseo/paseo/pull/3740))
+
+## 0.5.0 - 2026-08-23
+
+### Added
+
+- Added experimental trusted local plugins ([#3222](https://github.com/getpaseo/paseo/pull/3222), [#3446](https://github.com/getpaseo/paseo/pull/3446), [#3465](https://github.com/getpaseo/paseo/pull/3465))
+- Added plugin-contributed application themes to Settings → Appearance ([#3602](https://github.com/getpaseo/paseo/pull/3602) by [@ragokan](https://github.com/ragokan))
+- Added a user-directed Side panel with independent tabs ([#3287](https://github.com/getpaseo/paseo/pull/3287), [#3605](https://github.com/getpaseo/paseo/pull/3605))
+- Added browser-style New tabs with an anchored pane-local chooser ([#3715](https://github.com/getpaseo/paseo/pull/3715), [#3735](https://github.com/getpaseo/paseo/pull/3735))
+- Added active-turn steering for Claude, Codex, and OpenCode ([#3394](https://github.com/getpaseo/paseo/pull/3394), [#3580](https://github.com/getpaseo/paseo/pull/3580) by [@mcowger](https://github.com/mcowger))
+- Added workspace labels for sidebar organization and filtering ([#3510](https://github.com/getpaseo/paseo/pull/3510) by [@cleiter](https://github.com/cleiter))
+- Added live workspace change counts above active agent composers ([#3682](https://github.com/getpaseo/paseo/pull/3682))
+- Added workspace panel, tab, and pane actions to the Command Center ([#3685](https://github.com/getpaseo/paseo/pull/3685))
+- Added `paseo project` to create, list, rename, and delete projects from the terminal ([#3460](https://github.com/getpaseo/paseo/pull/3460))
+- Added `paseo reload` to apply runtime-safe `config.json` changes without restarting the daemon ([#3365](https://github.com/getpaseo/paseo/pull/3365))
+- Added Paseo skill management to Host → Agents, including remote hosts ([#3451](https://github.com/getpaseo/paseo/pull/3451))
+- Added project filtering to the sidebar display menu ([#3563](https://github.com/getpaseo/paseo/pull/3563) by [@cleiter](https://github.com/cleiter))
+- Added optional branch and project names on workspace rows ([#3445](https://github.com/getpaseo/paseo/pull/3445))
+- Added drag-and-drop reordering for pinned workspaces ([#3341](https://github.com/getpaseo/paseo/pull/3341))
+- Added one-click agent profile creation from the model chooser ([#3533](https://github.com/getpaseo/paseo/pull/3533))
+- Added Android Studio to Open in editor ([#3531](https://github.com/getpaseo/paseo/pull/3531), [#3614](https://github.com/getpaseo/paseo/pull/3614) by [@caikovsky](https://github.com/caikovsky))
+- Added MiniMax Code to the one-click ACP provider catalog ([#3457](https://github.com/getpaseo/paseo/pull/3457) by [@hetaoBackend](https://github.com/hetaoBackend))
+- Added Nix syntax highlighting ([#3110](https://github.com/getpaseo/paseo/pull/3110) by [@Strainy](https://github.com/Strainy))
+- Added Svelte syntax highlighting ([#3487](https://github.com/getpaseo/paseo/pull/3487), [#3534](https://github.com/getpaseo/paseo/pull/3534) by [@fiorelorenzo](https://github.com/fiorelorenzo))
+- Added guided Hub setup that connects a daemon and deploys a compatible starter workflow ([#3651](https://github.com/getpaseo/paseo/pull/3651), [#3657](https://github.com/getpaseo/paseo/pull/3657), [#3677](https://github.com/getpaseo/paseo/pull/3677))
+
+### Improved
+
+- Restored cached projects, workspaces, agents, and timelines immediately while hosts reconnect ([#3259](https://github.com/getpaseo/paseo/pull/3259), [#3329](https://github.com/getpaseo/paseo/pull/3329))
+- Reduced workspace-switch stalls on desktop and Android with long chats ([#3447](https://github.com/getpaseo/paseo/pull/3447), [#3610](https://github.com/getpaseo/paseo/pull/3610))
+- Kept composer typing within the frame budget on web and desktop ([#3450](https://github.com/getpaseo/paseo/pull/3450))
+- Kept large diffs responsive while expanding, scrolling, and commenting ([#3422](https://github.com/getpaseo/paseo/pull/3422))
+- Kept large read-only source previews responsive with bounded rendering ([#3665](https://github.com/getpaseo/paseo/pull/3665))
+- Removed complete-transcript disk rewrites from long-running agent timelines ([#3647](https://github.com/getpaseo/paseo/pull/3647))
+- Added outcome summaries and failure-first grouping to pull request checks ([#3483](https://github.com/getpaseo/paseo/pull/3483))
+- Moved subagent and task trackers into pills above the composer ([#3482](https://github.com/getpaseo/paseo/pull/3482))
+- Simplified mobile agent configuration into one options sheet ([#3424](https://github.com/getpaseo/paseo/pull/3424))
+- Opened summarized tool-call groups in live sheets on compact layouts ([#3619](https://github.com/getpaseo/paseo/pull/3619))
+- Added separate Content text sizing for chat, the composer, Markdown, and review prose ([#3637](https://github.com/getpaseo/paseo/pull/3637))
+- Updated Pi usage and context meters during active turns ([#3532](https://github.com/getpaseo/paseo/pull/3532))
+- Changed Archive finished to archive every finished subagent in the track ([#3368](https://github.com/getpaseo/paseo/pull/3368))
+- Changed automatic Setup tabs to appear only after workspace setup fails ([#3634](https://github.com/getpaseo/paseo/pull/3634))
+- Changed Default send in Settings to a dropdown menu ([#3644](https://github.com/getpaseo/paseo/pull/3644))
+- Added password-equivalent warnings to pairing links in the desktop app and CLI ([#3734](https://github.com/getpaseo/paseo/pull/3734))
+- Corrected Russian UI translations and terminology ([#3586](https://github.com/getpaseo/paseo/pull/3586) by [@timz](https://github.com/timz))
+
+### Fixed
+
+- Fixed CJK IME composition being cancelled in text fields and mobile terminals ([#2811](https://github.com/getpaseo/paseo/pull/2811), [#3343](https://github.com/getpaseo/paseo/pull/3343), [#3391](https://github.com/getpaseo/paseo/pull/3391), [#3462](https://github.com/getpaseo/paseo/pull/3462), [#3517](https://github.com/getpaseo/paseo/pull/3517) by [@northsea4](https://github.com/northsea4), [@jimersylee](https://github.com/jimersylee), [@ZacharyZcR](https://github.com/ZacharyZcR), [@chulmin-dev](https://github.com/chulmin-dev))
+- Fixed OpenCode turns failing when their event stream dropped ([#3395](https://github.com/getpaseo/paseo/pull/3395))
+- Fixed OpenCode agents timing out during slow or plugin-heavy startup ([#3578](https://github.com/getpaseo/paseo/pull/3578), [#3621](https://github.com/getpaseo/paseo/pull/3621) by [@BrianAguilarWasco](https://github.com/BrianAguilarWasco))
+- Fixed an unrelated merged pull request archiving a workspace ([#3425](https://github.com/getpaseo/paseo/pull/3425))
+- Fixed Annotate element and Screenshot element doing nothing on loaded desktop browser pages ([#3187](https://github.com/getpaseo/paseo/pull/3187) by [@dgk-dev](https://github.com/dgk-dev))
+- Fixed repeated copy and fork footers after heartbeat runs ([#3484](https://github.com/getpaseo/paseo/pull/3484))
+- Fixed Cursor plan usage on hosts signed in only through `cursor-agent` ([#3486](https://github.com/getpaseo/paseo/pull/3486) by [@Lite-G](https://github.com/Lite-G))
+- Fixed mobile composers retaining sent text after submission ([#3564](https://github.com/getpaseo/paseo/pull/3564))
+- Fixed multiline composers retaining stale heights across workspace and draft lifecycles ([#3681](https://github.com/getpaseo/paseo/pull/3681), [#3740](https://github.com/getpaseo/paseo/pull/3740))
+- Fixed pull request checkout when the target repository is configured as `upstream` ([#2997](https://github.com/getpaseo/paseo/pull/2997) by [@mcowger](https://github.com/mcowger))
+- Fixed composer steers remaining unread while Claude or Codex waited on a permission ([#3585](https://github.com/getpaseo/paseo/pull/3585) by [@cleiter](https://github.com/cleiter))
+- Fixed Changes opening an empty comparison after checkout state changes ([#3636](https://github.com/getpaseo/paseo/pull/3636))
+- Fixed Pi chats ending in an error state during a successful automatic retry ([#3639](https://github.com/getpaseo/paseo/pull/3639))
+- Fixed Claude usage appearing unavailable when macOS Keychain contains multiple credential items ([#3597](https://github.com/getpaseo/paseo/pull/3597) by [@t-benoit](https://github.com/t-benoit))
+- Fixed provider usage checks overwriting Claude or Codex credential files ([#3442](https://github.com/getpaseo/paseo/pull/3442) by [@danberindei](https://github.com/danberindei))
+- Fixed active Codex agents failing to open when their native thread was archived outside Paseo ([#3334](https://github.com/getpaseo/paseo/pull/3334))
+- Fixed agents remaining impossible to stop after the provider had already settled their turn ([#3742](https://github.com/getpaseo/paseo/pull/3742))
+- Fixed worktree creation rejecting Git-valid branch names containing uppercase letters, underscores, or dots ([#3591](https://github.com/getpaseo/paseo/pull/3591))
+- Fixed project icons showing stale images in New Workspace ([#3600](https://github.com/getpaseo/paseo/pull/3600))
+- Fixed malformed SVG project icons crashing the iOS app ([#3711](https://github.com/getpaseo/paseo/pull/3711) by [@omercnet](https://github.com/omercnet))
+- Fixed pinning a project's only workspace hiding its New workspace action ([#3722](https://github.com/getpaseo/paseo/pull/3722) by [@yugui923](https://github.com/yugui923))
+- Fixed workspace layout changes bypassing timeline retry backoff ([#3736](https://github.com/getpaseo/paseo/pull/3736))
+- Fixed fresh installs resolving provider SDK versions that were not validated with the release ([#3678](https://github.com/getpaseo/paseo/pull/3678))
+
 ## 0.4.0 - 2026-08-13

 ### Breaking
@@ -21,44 +21,47 @@ 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/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/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                               |
+| 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                               |

 ### Writing docs

@@ -23,6 +23,7 @@ RUN set -eux; \
    npm pack --workspace=@getpaseo/relay --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/protocol --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/client --pack-destination /tmp/paseo-packs; \
+    npm pack --workspace=@getpaseo/plugin --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/server --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/cli --pack-destination /tmp/paseo-packs

@@ -35,7 +35,16 @@ be in flight.

 ### Cancellation

-Cancellation changes lifecycle state only after the provider acknowledges the interrupt or emits a terminal turn event. If the interrupt is rejected or times out, the agent remains `running` with its active foreground turn intact. Follow-up actions such as replacement, reload, rewind, and Stop must report that failure instead of accepting work they cannot perform. Synthesizing a local cancellation without provider acknowledgment creates a split-brain session: Paseo accepts a new prompt while the provider still owns the previous foreground turn.
+Provider interruption is idempotent at the `AgentSession` boundary. It resolves when the prior
+foreground turn can no longer run, including when the provider reports that it is already idle. It
+rejects only when the provider may still own the turn. Provider adapters translate native errors
+into that contract; lifecycle callers do not interpret provider-specific errors.
+
+After an acknowledged interrupt, the manager settles the captured run even when no terminal event
+arrives or the run was still waiting for its provider turn id. The captured run token prevents an
+older cancellation from settling a newer turn. If interruption is rejected or times out, the agent
+keeps its active foreground turn and replacement, reload, rewind, and Stop report the failure.
+Accepting new work after an ambiguous interruption would create a split-brain session.

 ## Relationships

@@ -103,7 +112,9 @@ recoverable from History. Opening one pins its tab and renders the archived-agen
 timeline catch-up may load provider history with a runtime-only `history` resume purpose, which must
 leave both Paseo's `archivedAt` and the provider's native archive state unchanged. **Unarchive** remains
 the only transition back to an interactive runtime: it runs the provider's native unarchive hook
-(including Codex `thread/unarchive`) before the normal agent resume and timeline hydration flow.
+(including Codex `thread/unarchive`) before the normal agent resume and timeline hydration flow. A
+provider session can be archived outside Paseo while its Paseo agent remains active. Interactive
+resume repairs that drift through the provider's native unarchive hook; history resume does not.

 Provider session connection owns every process it spawns until the session is registered with
 `AgentManager`. If initialization, persisted-session resume, or initial history hydration fails,
@@ -135,7 +146,9 @@ Running provider-native subagents contribute `running` to the workspace owned by

 ## The subagents track

-The collapsible track above the composer in an agent's pane (`packages/app/src/subagents/track.tsx`) combines two kinds of children:
+The track is a pill at the foot of an agent's pane (`packages/app/src/subagents/track.tsx`): a count you can read at a glance, and a panel behind it — a popover on wide screens, a sheet on compact ones — holding the rows. It floats over the transcript rather than sitting in a band above the composer, so the timeline scrolls underneath it; `packages/app/src/panels/agent-tracks.tsx` owns that placement, and the pill frame is shared with the task list in `packages/app/src/composer/tracks.tsx`.
+
+The rows combine two kinds of children:

 - **Paseo subagents** are full managed agents. Their membership rule (`packages/app/src/subagents/select.ts`) is:

@@ -158,6 +171,7 @@ Claude Code announces subagent lifecycle on the SDK stream (`task_started` / `ta
 - **Not every announced task belongs in the track.** Task subagents announce as `local_agent` and workflows as `local_workflow`; a backgrounded shell announces as `local_bash` with the same `tool_use_id` shape, and ambient housekeeping sets `skip_transcript`. The Claude provider normalizes a workflow to a generic provider-subagent descriptor titled `Workflow`, using Claude's summary as its description and timeline opener. Shared storage, protocol, and UI do not distinguish it from another provider subagent.
 - **A task that was never declared gets no descriptor, by any route.** Filtered tasks still emit `task_notification`s carrying a `tool_use_id`, and still emit frames carrying `parent_tool_use_id`. Attributing either produces a descriptor with no identity and a defaulted `running` status — a nameless row that never finishes. Status, presentation updates, and sidechain frames all route through the declaration table.
 - **Task ids are session-scoped, not turn-scoped.** Cancelling a turn must not clear the routing table: a backgrounded child settles after the interrupt and needs its descriptor to still exist. Cancellation instead terminalizes the declared children that were running in the foreground, and a later `task_notification` is free to correct that guess. Backgrounded children are identified by `task_updated.patch.is_backgrounded`.
+- **A resumed task can be announced again with a new `tool_use_id`.** The first Task tool id remains the canonical descriptor and later ids are routing aliases for the same session-scoped task. The resumed prompt is added to that child timeline.
 - **Effort is only reachable through hooks.** It appears nowhere on the message stream at any depth, and the level Paseo requests is not necessarily the level that runs — a model that does not support it is silently downgraded. A hook firing inside a subagent reports the active post-downgrade level next to its `agent_id`, which is the same id `task_started` calls `task_id`.
 - **Backgrounded subagents emit no frames carrying `parent_tool_use_id` at all.** Everything keyed off that field sees nothing for one; they are visible only because the task protocol announces them.
 - **On replay, `<session>/subagents/` holds every descendant, not just this session's children.** `agent-<id>.meta.json` carries `spawnDepth`: `1` is a direct child, `2+` was spawned by another subagent and its `toolUseId` names a Task call made inside its parent's session, which nothing in this transcript can resolve. Replaying those adds rows the live stream never showed, each with no Task card and no recoverable outcome, so they render as running forever. One recorded session showed 10 subagents live and would have replayed 22.
@@ -165,7 +179,7 @@ Claude Code announces subagent lifecycle on the SDK stream (`task_started` / `ta

 Archived Paseo subagents disappear from the track, by design. To remove one from the track without closing its tab, use the **archive button** on the row — it opens a confirm dialog and archives the subagent on confirm. Provider-owned rows have no individual Paseo lifecycle controls.

-The track header's **Archive finished** action hides finished provider-owned rows in the current app session. Their native sessions and timelines are untouched, and managed Paseo subagents are not archived by this bulk action. If a hidden provider child starts running again, the app brings it back to the track.
+The **Archive finished** row at the foot of the panel covers every finished row. It archives idle or errored managed Paseo subagents one at a time, and hides completed, failed, or canceled provider-owned rows in the current app session. Native sessions and timelines are untouched. Running and initializing children remain in the track. If a hidden provider child starts running again, the app brings it back to the track.

 To keep the agent alive but remove it from the parent's track, use **detach**. The daemon clears the relationship lifecycle labels, emits the normal agent update, and every client reclassifies the agent from subagent to root/sibling from that updated snapshot.

@@ -185,7 +199,7 @@ We considered universal decoupling (no tab close ever archives, archive is alway

 ### Subagent accumulation under long-lived parents

-A parent that spawns many subagents will see the track grow. Managed Paseo subagents can be archived individually. Finished provider-owned rows can be hidden together with **Archive finished**; this is app-local presentation state and resets when the app restarts.
+A parent that spawns many subagents will see the panel's list grow; the pill only counts them. Managed Paseo subagents can be archived individually or with **Archive finished**. That action hides finished provider-owned rows locally; this presentation state resets when the app restarts.

 ### Cross-client tab dismissal

@@ -0,0 +1,52 @@
+# 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,7 +15,9 @@ EAS profiles: `development`, `production`, and `production-apk` in `packages/app

 ## Version codes

-`packages/app/app.config.js` derives Android `versionCode` from the package version with:
+`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:

 ```text
 major * 1_000_000 + minor * 1_000 + patch
@@ -82,11 +84,11 @@ Or from `packages/app`:

 ```bash
 # Debug
-npx cross-env APP_VARIANT=development expo prebuild --platform android --non-interactive
+npx cross-env APP_VARIANT=development expo prebuild --platform android --clean --non-interactive
 npx cross-env APP_VARIANT=development expo run:android --variant=debug

 # Release
-npx cross-env APP_VARIANT=production expo prebuild --platform android --non-interactive
+npx cross-env APP_VARIANT=production expo prebuild --platform android --clean --non-interactive
 npx cross-env APP_VARIANT=production expo run:android --variant=release

 # Clear generated Android project
@@ -145,6 +147,37 @@ 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.
@@ -64,18 +64,21 @@ not retain non-Git directories.

 **Key modules:**

-| Module                          | Responsibility                                                                |
-| ------------------------------- | ----------------------------------------------------------------------------- |
-| `server/bootstrap.ts`           | Daemon initialization: HTTP server, WS server, agent manager, storage, relay  |
-| `server/websocket-server.ts`    | WebSocket connection management, hello handshake, binary frame routing        |
-| `server/session.ts`             | Per-client session state, timeline subscriptions, terminal operations         |
-| `server/agent/agent-manager.ts` | Agent lifecycle state machine, timeline tracking, subscriber management       |
-| `server/agent/agent-storage.ts` | File-backed JSON persistence at `$PASEO_HOME/agents/`                         |
-| `server/agent/tools/`           | Transport-neutral catalog for workspaces, agents, permissions, and automation |
-| `server/agent/mcp-server.ts`    | Thin MCP adapter that registers the Paseo tool catalog with the MCP SDK       |
-| `server/agent/providers/`       | Provider adapters (see "Agent providers" below)                               |
-| `server/relay-transport.ts`     | Outbound relay connection with E2E encryption                                 |
-| `server/schedule/`              | Cron-based scheduled agents                                                   |
+| Module                          | Responsibility                                                                 |
+| ------------------------------- | ------------------------------------------------------------------------------ |
+| `server/bootstrap.ts`           | Daemon initialization: HTTP server, WS server, agent manager, storage, relay   |
+| `server/websocket-server.ts`    | WebSocket connection management, hello handshake, binary frame routing         |
+| `server/session.ts`             | Per-client session state, timeline subscriptions, terminal operations          |
+| `server/directory-sync/`        | Daemon-global latest-state sequences for projects, workspaces, and agents      |
+| `server/workspace-labels/`      | Host-local label catalog, assignment mutations, and explicit subscriptions     |
+| `server/agent/agent-manager.ts` | Agent lifecycle state machine, timeline tracking, subscriber management        |
+| `server/agent/agent-storage.ts` | File-backed JSON persistence at `$PASEO_HOME/agents/`                          |
+| `server/agent/tools/`           | Transport-neutral catalog for workspaces, agents, permissions, and automation  |
+| `server/agent/mcp-server.ts`    | Thin MCP adapter that registers the Paseo tool catalog with the MCP SDK        |
+| `server/agent/providers/`       | Provider adapters (see "Agent providers" below)                                |
+| `server/orchestration-skills/`  | Bundled catalog, host selection, convergence, and skill-directory transactions |
+| `server/relay-transport.ts`     | Outbound relay connection with E2E encryption                                  |
+| `server/schedule/`              | Cron-based scheduled agents                                                    |

 ### `packages/protocol` — Wire schemas and shared protocol types

@@ -91,25 +94,46 @@ facade. App and CLI may import the low-level driver from
 `@getpaseo/client/internal/daemon-client` during migration, while new SDK-shaped
 code imports from `@getpaseo/client`.

+`PaseoApi` is the capability-only boundary over workspaces, agents, providers, and config.
+`PaseoClient` adds connection lifecycle. App plugin surfaces borrow an API over their selected
+host's client; plugin subprocesses use the same facade over a host-owned IPC transport.
+
 ### `packages/app` — Mobile + web client (Expo)

 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 a non-authoritative per-host display replica in AsyncStorage: only the last focused agent, its workspace, and a short timeline tail. It restores before navigation becomes ready, leaves remote hydration flags false, and is atomically replaced by the normal snapshot-plus-delta synchronization path.
+- `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/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
 - Composer UI and submit/draft behavior live in `packages/app/src/composer/`; screens and panels should integrate it from there instead of dropping composer internals into `components/`, `hooks/`, or `screens/workspace/`
 - Timeline reducers in `timeline/session-stream-reducers.ts` handle compaction, gap detection, sequence-based deduplication
 - Timeline sync correctness is documented in [docs/timeline-sync.md](timeline-sync.md): live streams are for immediacy, `fetch_agent_timeline_request` is authoritative, and catch-up is paged but complete.
 - Voice features: dictation (STT) and voice agent (realtime)

-The replica cache exists only to paint stale data immediately while the host connects. It does not
-own mutations, infer deletions, or replace daemon reconciliation. 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.
-Its serialized payload has a 1 MiB byte budget and evicts whole host snapshots in least-recently-
-written order; a single oversized host is omitted rather than partially restored.
+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
+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.
+
+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
+event log. A missing, expired, or previous-generation cursor receives a full snapshot. Projects are
+independent records; a project with no workspaces does not need a workspace placeholder.
+
+Workspace label definitions use a separate, explicitly subscribed sequence. The list request both
+fetches and grants live updates for that session. A current cursor receives an empty correlated
+catch-up response when nothing changed; idle sessions and unsubscribed sessions receive no label
+traffic. Workspace assignments stay on the workspace directory sequence.

 ### `packages/cli` — Command-line client

@@ -121,6 +145,7 @@ Commander.js CLI with Docker-style commands. Common agent operations are also ex
 - `paseo script ls/start/stop`
 - `paseo schedule create/ls/inspect/update/pause/resume/run-once/logs/delete`
 - `paseo heartbeat create/update/delete`
+- `paseo project create/ls/rename/delete`
 - `paseo workspace create/ls/rename/archive`
 - `paseo permit allow/deny/ls`
 - `paseo provider ls/models`
@@ -158,6 +183,10 @@ Electron wrapper for macOS, Linux, and Windows.
 - Native file access for workspace integration
 - Same WebSocket client as mobile app

+The desktop does not manage agent skills. It retains one compatibility reader for the old
+`skill-selection.json`, imports that preference into its managed local daemon, then deletes the old
+file after the daemon confirms persistence.
+
 **Multi-window (hybrid land-on model).** `createWindow()` in `main.ts` is reusable: `⌘⇧N`/File→New Window, relaunching the app (`second-instance`), and the sidebar "Open in new window" action each open a fresh `BrowserWindow`. Every window shows the full sidebar — there is no per-window project ownership or filtering. "Land on a project" is delivered by a per-`webContents` `PendingOpenProjectStore`: each window pulls its own pending project path on mount (`paseo:get-pending-open-project`) and runs the normal open-project flow, identical to a CLI `paseo <path>` launch.

 > **Window-state v1 limitation:** only the _first_ window of a session restores and persists saved geometry (size/position/maximized). Windows opened via ⌘⇧N / second-instance / "Open in new window" open at the default size, OS-cascaded, and do not persist — this avoids every window stacking on the same restored bounds and fighting over the single window-state store. Lifting this needs per-window state keys.
@@ -301,7 +330,7 @@ initializing → idle ⇄ running
  client-side dedup; the default fetch page is 200 items.
 - Timeline row `timestamp` values are canonical daemon-owned timestamps. Providers may supply original replay timestamps, but clients must not guess timestamp trust or hide time UI based on local clock heuristics.
 - Events stream to connected clients in real time; correctness is backed by authoritative timeline fetches and paged-to-completion catch-up.
- Agent state persists to `$PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json` (timeline rows live alongside the record). That storage path is derived from `cwd`, not from workspace id.
+- Agent state persists to `$PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json`. Timeline rows are runtime memory; provider history is the durable transcript authority and resumed agents rebuild from it. That storage path is derived from `cwd`, not from workspace id.

 ## Right-sidebar boundary: directory-backed vs workspace-owned

@@ -376,7 +405,7 @@ Providers that can accept native tool definitions should set `supportsNativePase

 ```
 $PASEO_HOME/
-├── agents/{cwd-with-dashes}/{agent-id}.json   # Agent record + persisted timeline rows
+├── agents/{cwd-with-dashes}/{agent-id}.json   # Agent record
 ├── projects/projects.json                      # Project registry
 ├── projects/workspaces.json                    # Workspace registry
 ├── projects/icons/                             # Custom project icon images
@@ -57,6 +57,8 @@ $PASEO_HOME/
 ├── projects/
 │   ├── projects.json                    # Project registry
 │   ├── workspaces.json                  # Workspace registry
+│   ├── workspace-labels.json            # Shared host-local label catalog
+│   ├── workspace-labels.transaction.json # Recoverable catalog/assignment compound commit
 │   └── icons/                           # Host-local custom project icon images
 ├── runtime/
 │   └── managed-processes/
@@ -175,6 +177,17 @@ Terminal activity contributes to the workspace status bucket **per `workspaceId`

 Single file, validated with `PersistedConfigSchema`.

+`agents.skills.selection` is the daemon host's orchestration-skill preference. Missing means
+`{ mode: "all" }`. Installed state is not persisted; the daemon derives it from its three managed
+skill directories and keeps config plus filesystem convergence behind one serialized owner.
+
+`paseo reload` reads and validates this file once inside the daemon. That snapshot drives resolution,
+classification, application, and reload bookkeeping. `DaemonConfigStore` owns applying runtime-safe
+fields and their removal/default semantics; session handlers and the CLI only relay the structured
+result. Normal config patches persist only the requested fields, so launch overrides and resolved
+defaults never leak into the file. Startup-only fields remain compared with the daemon's launch
+snapshot so a mixed edit can apply its live subset and still name the paths that require restart.
+
 ```
 {
  version: 1,
@@ -211,6 +224,9 @@ Single file, validated with `PersistedConfigSchema`.
    local: { modelsDir: string }
  },
  agents: {
+    skills?: {
+      selection?: { mode: "all" } | { mode: "custom", skills: string[] }
+    },
    // ProviderOverrideSchema; legacy entries with `command: { mode, ... }` are migrated to the
    // current shape on load via `migrateProviderSettings`. Custom provider IDs must declare
    // `extends` (one of the built-ins or `"acp"`) and `label`. See `provider-launch-config.ts`.
@@ -219,6 +235,8 @@ Single file, validated with `PersistedConfigSchema`.
      providers: [{ provider, model?, thinkingOptionId? }]
    }
  },
+  pluginsEnabled: boolean,
+  plugins: Record<pluginId, { source: "directory", path: string, enabled?: boolean }>,
  features: {
    dictation: { enabled, stt: { provider, model, language, confidenceThreshold } },
    voiceMode: { enabled, llm, stt: { provider, model, language }, turnDetection, tts: { provider, model, voice, speakerId, speed } }
@@ -278,9 +296,9 @@ Environment variables override `config.json`:
 | `PASEO_GIT_MAX_PROCESS_CONCURRENCY`  | `maxProcessConcurrency`  |
 | `PASEO_GIT_CONCURRENCY`              | Legacy concurrency alias |

-`PASEO_GIT_MAX_PROCESS_CONCURRENCY` wins when it and the legacy alias are both set. Restart the
-daemon after changing the file or environment. Run `paseo daemon restart` for a standalone daemon.
-For a desktop-managed daemon, fully quit and reopen Paseo Desktop.
+`PASEO_GIT_MAX_PROCESS_CONCURRENCY` wins when it and the legacy alias are both set. Run `paseo reload`
+after changing `config.json`. Environment changes require a daemon restart; the launch environment
+remains authoritative during reload.

 `agents.metadataGeneration.providers` controls the preferred structured-generation fallback order for daemon-side metadata tasks such as commit messages, PR text, branch names, and generated agent titles. Entries are tried first in the configured order, then Paseo falls through to dynamically discovered defaults and finally the current selection when available.

@@ -429,10 +447,35 @@ Array of workspace records. A workspace is a specific working directory within a
 | `updatedAt`                    | `string` (ISO 8601)                             |                                                                                                                                                                                               |
 | `archivedAt`                   | `string \| null` (ISO 8601)                     | Soft-delete; required nullable                                                                                                                                                                |
 | `autoArchivedChangeRequestUrl` | `string \| null`                                | Change request whose merged state triggered auto-archive. Restore replaces it with the current merged change request, when present, so repeated snapshots cannot archive the workspace again. |
+| `labels`                       | `string[]?`                                     | Normalized display names assigned from this host's shared label catalog. Missing means unlabelled.                                                                                            |
 | `pinnedAt`                     | `string \| null` (ISO 8601)                     | Pinned-to-top-of-sidebar timestamp; null means "not pinned"                                                                                                                                   |

 > **Opaque-ID invariant:** `workspaceId` is opaque identity, never a filesystem path. Filesystem and git operations take `cwd`/`workspaceDirectory` only — never the id. A compatibility-only first-materialization bootstrap still groups pre-registry agent records by path and Git remote so existing installs retain their legacy records. That grouping never runs against a live registry, and its keys are not runtime project or workspace identity.

+### Workspace label catalog
+
+**Path:** `$PASEO_HOME/projects/workspace-labels.json`
+
+The catalog is shared by every workspace on one host. A definition contains a display name and one
+of the ten identity colour names (`WORKSPACE_LABEL_COLORS` in
+`packages/protocol/src/workspace-labels.ts`); trimmed, collapsed, case-insensitive name identity is
+unique within that file. Definitions have no portable ID or principal owner and remain after their
+last assignment. Editing a label takes a new name, a new colour, or both in one commit, so the two
+fields cannot land half-applied. Workspaces store label names, so a rename and a delete rewrite
+workspace assignments through one serialized compound commit while a recolour is catalog-only; a
+rename onto a name the host already has is refused rather than merged. A prepared
+`workspace-labels.transaction.json` contains both before and after images. The daemon writes the
+catalog and workspace files, then atomically changes the transaction to committed; that phase
+change is the durable commit point. Recovery rolls prepared transactions back before either
+directory is served. A committed marker proves both data files were already written, so recovery
+only loads the current catalog and retries marker cleanup; it never reapplies stale workspace
+after-images over later registry mutations. A request rejected before the commit point therefore
+cannot take effect after restart. If the live daemon cannot determine or restore the durable state,
+the workspace registry freezes every write and later label mutations fail with
+`workspace_label_storage_uncertain` until daemon restart performs recovery. Reads remain available,
+but may reflect the last acknowledged cache until restart. Workspace directory and catalog updates
+publish only after the commit point; publication failure does not roll durable state back.
+
 `projectId` is still a real FK: workspace records should have a matching project record. Read-only
 history surfaces tolerate transient orphaned workspaces by omitting those rows so one bad FK cannot
 blank the whole History screen, but mutation paths should repair or remove the orphaned state rather
@@ -28,11 +28,13 @@ Before adding a new component, read `components/ui/`. The primitive usually exis

 ## 3. Hierarchy

-Hierarchy is conveyed through weight and color, not size. Most labels, titles, and hints across the app are `fontSize.base` or `fontSize.xs`. The distinction between a row's primary line and its secondary line is `foreground` versus `foregroundMuted`.
+Hierarchy is conveyed through weight and color, not size. Most interface text is `fontSize.base`; compact metadata and hints use `fontSize.sm`. The distinction between a row's primary line and its secondary line is `foreground` versus `foregroundMuted`.
+
+The authored interface ramp uses a 14px base. New native installs default to 15px; web and desktop default to 14px. The Appearance **Interface size** setting is the rendered `fontSize.base` value and scales the rest of the UI ramp proportionally. Primary readable content has its own `fontSize.content`, which defaults to 15px on every platform. It owns message bodies, composer input, Markdown, and PR prose. Controls, navigation, metadata, tool chrome, code, diffs, editors, and terminals stay on their interface or code tokens. **Code size** remains independent.

 Weight has three tiers, applied by role:

- **Screen titles** — the title at the top of a screen — use `<ScreenTitle>` (`packages/app/src/components/headers/screen-title.tsx`), which renders `fontSize.base` at weight `400` on compact and `300` on desktop. Top-of-screen titles are lighter on desktop, not heavier. The workspace screen header follows the same rule (`packages/app/src/screens/workspace/workspace-screen.tsx`).
+- **Screen titles** — the title in app chrome — use `<ScreenTitle>` (`packages/app/src/components/headers/screen-title.tsx`), which renders `fontSize.base` at weight `400` on compact and `300` on desktop. The New workspace hero is the only larger product title; it uses `fontSize["2xl"]` (`packages/app/src/screens/new-workspace-screen.tsx`).
 - **Structural labels** use `fontWeight.medium`. This applies to section labels above a stack of rows (`packages/app/src/components/agent-list.tsx:519-523`, `packages/app/src/components/keyboard-shortcuts-dialog.tsx:63-67`), form field labels above an input inside a modal (`packages/app/src/components/add-host-modal.tsx:19-23`, `packages/app/src/components/pair-link-modal.tsx:24-28`), the title at the top of a modal/sheet/dialog (`packages/app/src/components/adaptive-modal-sheet.tsx:90-94`, `packages/app/src/components/ui/combobox.tsx:1607-1611`, `packages/app/src/components/welcome-screen.tsx:48-53`), action button labels in tight components such as the sidebar callout actions (`packages/app/src/components/sidebar-callout.tsx:218-221`), and inline data emphasis on dense metadata rows (`packages/app/src/components/git-diff-pane.tsx:2322-2327`, `packages/app/src/components/file-explorer-pane.tsx:1115-1122`).
 - **Content** uses `fontWeight.normal`. This applies to settings rows (`packages/app/src/styles/settings.ts`), sidebar primary list-item titles (`packages/app/src/components/sidebar-workspace-list.tsx:2680-2686`, `packages/app/src/components/agent-list.tsx:572-578`), `<Button>` text (`packages/app/src/components/ui/button.tsx:80-84`), `<StatusBadge>` text (`packages/app/src/components/ui/status-badge.tsx:56-60`), and `<SidebarCallout>` titles (`packages/app/src/components/sidebar-callout.tsx:175-180`).

@@ -64,7 +66,7 @@ The button is `<Button>` (`packages/app/src/components/ui/button.tsx`). It has f

 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.

-Sizes are a shared contract across control kinds, defined once in `control-geometry.ts`: `xs` = 28px tall with `fontSize.xs` labels, `sm` = 32px with `fontSize.sm`, `md`/`lg` = 44px with `fontSize.sm`. `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) takes the same `xs`/`sm`/`md` sizes — a segmented control next to a `<Button>` of the same size always matches in height, label size, and horizontal padding. Thin chrome such as the file toolbar uses `xs`; settings rows use `sm`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
+Sizes are a shared contract across control kinds, defined once in `control-geometry.ts`: `xs` = 28px tall with `fontSize.sm` labels, `sm` = 32px with `fontSize.base`, `md`/`lg` = 44px with `fontSize.base`. `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) takes the same `xs`/`sm`/`md` sizes — a segmented control next to a `<Button>` of the same size always matches in height, label size, and corner radius. Its segments run one padding step tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. Thin chrome such as the file toolbar uses `xs`; settings rows use `sm`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.

 A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.

@@ -225,13 +227,13 @@ There is exactly one token per status signal — `statusSuccess`, `statusDanger`

 Status **dots** are the one exception, and they are a family of their own — `statusDotSuccess`, `statusDotDanger`, `statusDotWarning`, `statusDotRunning`, read only by `getStatusDotColor` (`packages/app/src/utils/status-dot-color.ts`). Same hues and the same generation rule, but their own band: 90% of gamut chroma against the status family's 55–60%. A dot is a few points of solid color with no shape to read and no label attached, and the running one pulses, so at the status band's chroma the dots read dimmer than the metadata beside them — backwards, since the dot is the row's state. Lightness is set by hue separation rather than by distance from the surface: at 6pt four dark hues on a light surface all read as one dark blob no matter how much contrast they have. So the light band runs as bright as the contrast floor allows at L=0.62, the last step where all four clear 3:1 against the sidebar's `surface2`; the dark band sits at L=0.72, where danger turns pink above. All four move together; regenerate the set, never one hue.

-Status pills are the status token as foreground on a 10%-alpha tint of the same token (`${token}1a`), with a 20% border (`${token}33`). The `<StatusBadge>` primitive (`packages/app/src/components/ui/status-badge.tsx`) is canonical; a pill never reaches into `palette`.
+Status pills use the status token for text on the shared `surface3` and `border` shell. The neutral shell keeps the signal legible without manufacturing translucent colors outside the theme. The `<StatusBadge>` primitive (`packages/app/src/components/ui/status-badge.tsx`) is canonical; a pill never reaches into `palette`.

 Status dots — the small filled circles next to a host or agent name — are `borderRadius.full` filled with the status token. Which token a given agent state maps to is owned by `getStatusDotColor` (`packages/app/src/utils/status-dot-color.ts`); a row, a group header, and a project icon all call it rather than restating the mapping. They sit in the trailing slot of a sidebar row or as a leading marker on a status pill.

 Identity badges — the project icon, the sidebar host badge, and the PR-panel participant avatar — do not use the theme palette. They draw from the fixed ten-color identity table in `packages/app/src/styles/identity-colors.ts`, whose hexes are held to one contrast band so a color identifies rather than ranks. Project icons and PR avatars use it as a fill with a white letter — that is `identityColor`, one theme-independent hex per identity. Host badges use it as a _foreground_ on both the glyph and the label, which is a different contrast problem that the fill table cannot solve: no single hex clears 4.5:1 against both a near-white and a dark sidebar. Foregrounds therefore come from `identityForeground(name, colorScheme)`, one set per scheme, hue unchanged. That set is generated on the **status family's** lightness and chroma fraction, because a meta row puts a host badge beside a CI check and a diff stat, and two families at different lightness make the brighter one shout. Change the status band and this one changes with it. A host with no color assigned falls back to `foregroundMuted`. The table is theme-independent by design; do not fork it per theme, and do not add hexes to it without recomputing the band.

-The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `packages/app/src/components/agent-list.tsx:607-632`, and `packages/app/src/components/sidebar-workspace-list.tsx:2889-2894` are drift to be removed. New code uses `<StatusBadge>`.
+New status pills use `<StatusBadge>`. Identity, shortcut, and interactive link badges remain separate because color does not encode status there.

 ---

@@ -242,7 +244,7 @@ The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `
 - Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
 - A "Settings" CTA on a detail page. Detail pages are settings; settings is reached from the sidebar, the host entry, or a row's kebab menu.
 - The word "checkout" in UI strings or identifiers. The term is "workspace".
- New color tokens or hardcoded hex outside the palette. Status pill rgba backgrounds and the identity color table are the documented exceptions (§13), not a license.
+- New color tokens or hardcoded hex outside the palette. The identity color table is the documented exception (§13), not a license.
 - Placeholder text dimmed beyond `foregroundMuted`. No extra opacity, no italics, no ghost-text.
 - `onPointerEnter` and `onPointerLeave`. They do not fire on native iOS. Hover uses Pressable's `onHoverIn`/`onHoverOut` gated with `isHovered || isCompact || isNative`.
 - Raw DOM APIs without an `isWeb` guard.
@@ -217,6 +217,67 @@ PASEO_PROFILE_IDLE_WAIT_MS=3000             # idle baseline before switching
 PASEO_PROFILE_DUMP_COMMITS=1                # include per-commit profiler samples
 ```

+For warm workspace switching, point the benchmark at an app backed by seeded
+daemon state:
+
+```bash
+PASEO_PROFILE_APP_URL=http://localhost:19010 \
+  npm run profile:workspace-switching --workspace=@getpaseo/app
+```
+
+The benchmark first warms `Cmd+1` through `Cmd+7`, then records a rapid seven-workspace
+burst. It separately warms the three-entry workspace deck LRU and records `Cmd+1` through
+`Cmd+3` without waits between keys. Both scenarios report keydown-to-activation latency and
+React commits on the same browser clock. Set `PASEO_PROFILE_WORKSPACE_DIGITS`,
+`PASEO_PROFILE_WORKSPACE_LRU_SIZE`, or `PASEO_PROFILE_WARM_QUIET_MS` to change the shape. Set
+`PASEO_PROFILE_DUMP_COMMITS=1` to include the nested component breakdown for every commit.
+Set `PASEO_PROFILE_RETAINED_REPEATS=5` to repeat the retained-LRU burst for a less noisy sample.
+Set `PASEO_PROFILE_CPU_PATH=/tmp/workspace-switch.cpuprofile` to run a separate retained-LRU
+capture after the latency scenarios and write a raw CDP CPU profile without contaminating their
+timings.
+Set `PASEO_PROFILE_TRACE_PATH=/tmp/workspace-switch.trace.json` to run another separate retained-LRU
+capture and write a Chromium Performance trace with User Timing marks and screenshots. Open the
+trace in the Chrome DevTools Performance panel. Set `PASEO_PROFILE_TRACE_INVALIDATIONS=1` only for a
+focused invalidation capture; React Native's generated stacks make that mode highly intrusive.
+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:
+
+```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,
+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
+`PASEO_PROFILE_CPU_PATH=/tmp/explorer-toggle.cpuprofile` for separate Chromium captures. Override
+the app URL, daemon port, workspace, or server with the corresponding `PASEO_PROFILE_*` variables.
+
+For sustained composer typing, run the paired composer-versus-textarea benchmark against a seeded
+daemon:
+
+```bash
+PASEO_PROFILE_APP_URL=http://localhost:19010 \
+  npm run profile:composer-typing --workspace=@getpaseo/app
+```
+
+The benchmark opens the first workspace, preserves its existing draft, and dispatches 300 printable
+keys at a fixed 16 ms cadence without waiting for each key to paint. It measures renderer
+`keydown` to the next paint opportunity, verifies that every character survived, alternates the
+composer and plain-textarea control across three runs, then restores the original draft. The report
+includes percentiles, frame coalescing, input processing, React work, long tasks, slow samples, and
+Playwright dispatch lateness. Set `PASEO_PROFILE_TYPING_KEYS`, `PASEO_PROFILE_TYPING_CADENCE_MS`,
+`PASEO_PROFILE_TYPING_REPEATS`, or `PASEO_PROFILE_WORKSPACE_DIGIT` to change the scenario. Optional
+`PASEO_PROFILE_CPU_PATH` and `PASEO_PROFILE_TRACE_PATH` captures run separately after the latency
+measurements so profiling overhead does not contaminate them.
+
+Set `PASEO_PROFILE_TYPING_SCENARIO=height-growth` to alternate `Shift+Enter` and printable input.
+That report includes input and composer height changes plus React work grouped into composer,
+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.
+
 ### Desktop macOS compositor watchdog

 macOS display sleep can leave Chromium's GPU-process display link — the vsync
@@ -266,8 +327,8 @@ the daemon-global Git process limits in `$PASEO_HOME/config.json`:
 }
 ```

-Restart the daemon with `paseo daemon restart`. If Paseo Desktop manages the daemon, fully quit and
-reopen the desktop app. Lower values reduce machine pressure but make Git-backed workspace state and
+Reload the daemon with `paseo reload`. Environment-variable overrides still require a restart because
+the launch environment remains authoritative. Lower values reduce machine pressure but make Git-backed workspace state and
 Git RPCs wait longer. See [Git process limits](data-model.md#git-process-limits) for defaults,
 semantics, and environment-variable overrides.

@@ -441,6 +502,16 @@ For tighter loops, you can rebuild a single workspace:
 - Changed `packages/server/src/*`, `packages/cli/src/*`, `packages/relay/src/*`, or `packages/highlight/src/*`: `npm run build:server`.
 - Changed app build dependencies: `npm run build:app-deps`.

+## Dependency patches
+
+`patches/*.patch` are applied by `scripts/postinstall-patches.mjs` on every install. A patch only
+runs when its package is actually present, so add the package to that script's `patchedPackages`
+list when you introduce a new patch — otherwise the file sits in `patches/` and never applies.
+Regenerate a patch with `npx patch-package <package>` after editing `node_modules/<package>`, and
+patch every build the consumers use: Metro resolves the `react-native` field of a package
+(`src/*.ts` for `react-native-svg`), while Node and Vitest resolve `main`/`module`
+(`lib/commonjs`, `lib/module`). Patching only `lib/` leaves the app bundle unfixed.
+
 ## ACP provider catalog versions

 The in-app ACP provider catalog pins package-runner entries (`npx`, `npm exec`,
@@ -462,7 +533,7 @@ install.

 Use `npm run cli` to run the in-repo CLI from source (`npx tsx packages/cli/src/index.ts`). The script wraps the CLI with `scripts/dev-home.sh`, so it automatically uses this checkout's `.dev/paseo-home` and dev daemon endpoint unless you pass an explicit override. The globally installed `paseo` binary on macOS is a symlink into the installed Paseo desktop app, not this checkout — use it to drive the desktop's built-in daemon, but use `npm run cli` when you want to talk to the CLI you are editing.

-Canonical automation uses `paseo workspace create/ls/rename/archive`, `paseo heartbeat create/update/delete`, and the full `paseo schedule` group. MCP heartbeat automation is intentionally smaller: create and delete only. Detach remains an explicit user lifecycle action rather than an agent tool. `paseo run --new-workspace local|worktree` composes workspace creation with agent creation. The old `paseo worktree` and `paseo run --worktree` forms are hidden compatibility aliases.
+Canonical automation uses `paseo project create/ls/rename/delete`, `paseo workspace create/ls/rename/archive`, `paseo heartbeat create/update/delete`, and the full `paseo schedule` group. MCP heartbeat automation is intentionally smaller: create and delete only. Detach remains an explicit user lifecycle action rather than an agent tool. `paseo run --new-workspace local|worktree` composes workspace creation with agent creation. The old `paseo worktree` and `paseo run --worktree` forms are hidden compatibility aliases.

 ```bash
 npm run cli -- ls -a -g              # List all agents globally
@@ -17,7 +17,9 @@ Each layout owns only the routes directly inside its directory.
  `h/[serverId]/index`.
 - `packages/app/src/app/h/[serverId]/_layout.tsx` owns the host leaves with
  relative screen names: `index`, `workspace/[workspaceId]/index`,
-  `agent/[agentId]`, `sessions`, `open-project`, and `settings`.
+  `agent/[agentId]`, `sessions`, `open-project`, `settings`,
+  `plugin/[pluginId]/[surfaceId]`, and
+  `plugin/[pluginId]/[contributionKind]/[contributionId]`.

 Expo Router warns with `[Layout children]: No route named ...` when a layout
 registers grandchildren. Treat that warning as a route-tree bug. On native, that
@@ -26,8 +26,9 @@ 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`,
-     optional `facts` (schema, merge-capability, native-check fallbacks). No
+   - `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
     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
@@ -57,8 +58,20 @@ 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.
@@ -112,7 +125,7 @@ rendering stack:
 `acme.ts` exports a `ClientForgeLogicModule`:

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

 `acme.view.tsx` exports a `ClientForgeViewModule`:
@@ -181,10 +194,27 @@ 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.
@@ -61,6 +61,12 @@ complete`), keyed off the opened snapshot's serverId. Waiting for data is a
  states) is owned by `components/ui/control-geometry.ts` — controls never
  declare their own, and screens never nudge global component styles to align
  a row.
+- Every text field consumes `EditingTextInput`, directly or through a UI
+  wrapper. The editing surface owns in-progress text; React observes committed
+  edits through `onChangeText`, and programmatic mutations use the input's
+  `replaceText` command. Its props omit `value` and `defaultValue`, web IME
+  candidates stay unpublished until composition commits, and lint rejects raw
+  React Native `TextInput` imports outside the primitive.
 - The form declares one size for all fields: `sm` on desktop, `md` compact
  (`useIsCompactFormFactor`).
 - Availability hierarchy: a field whose capability doesn't apply is **hidden**
@@ -19,6 +19,7 @@ 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.
 - **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`.
@@ -42,7 +43,8 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Composer toolbar** — The bottom control row inside the composer input. Contains agent controls, attachment button, voice controls, and stop/send controls. Code: `leftContent`, `beforeVoiceContent`, and `rightContent` slots in `MessageInput` (`packages/app/src/composer/input/input.tsx`). Forbidden: "Status bar".
 - **Agent controls** — Provider, model, mode, thinking, and provider-feature controls for an agent or draft agent. Code: `AgentControls` / `DraftAgentControls` (`packages/app/src/composer/agent-controls/index.tsx`). Forbidden: "Agent status bar".
 - **Composer footer** — Optional area rendered below the composer input but still inside the keyboard-shifted composer layout. Code: `Composer.footer` (`packages/app/src/composer/index.tsx`).
- **Composer track** — A contextual lane above the composer input. Specific tracks use the `<thing> track` form: **Queue track**, **Subagents track**. Code: queue track inside `Composer` (`packages/app/src/composer/index.tsx`), `SubagentsTrack` (`packages/app/src/subagents/track.tsx`).
+- **Composer track** — A contextual lane at the foot of a pane, by the composer input. Specific tracks use the `<thing> track` form: **Queue track**, **Subagents track**, **Tasks track**. The subagents and tasks tracks are pills floating over the transcript, each opening a panel with its rows; the queue track is a lane inside the composer itself. Code: queue track inside `Composer` (`packages/app/src/composer/index.tsx`), pill and panel frame in `packages/app/src/composer/tracks.tsx`, `SubagentsTrack` (`packages/app/src/subagents/track.tsx`), `AgentTaskList` (`packages/app/src/composer/task-list/index.tsx`).
+- **Steer** — A follow-up admitted into an agent's already-running turn instead of interrupting it. Interrupting the turn discards steers the provider has not read yet; there is no take-back short of that, and no provider offers one. The stop button and Escape both interrupt. A steer the provider never read keeps its transcript row, matching Codex. Sending while the agent waits on a permission denies that request first, so the message reaches the same turn instead of stalling behind it. UI: "Send and steer". Code: `steerActiveTurn` (`packages/server/src/server/agent/agent-sdk-types.ts`). Don't confuse with **Queue track**, which holds messages client-side until the turn ends and never enters the running turn. Forbidden: "Delivery", "Queued prompt".
 - **Subagent** — User-facing term for an agent session related to a parent agent session. Use **subagents** in UI copy and docs. Internal daemon/provider plumbing may say "child agent" or `child_session`, especially for provider-managed imports; do not surface "child agent" as a product term.
 - **Attachment tray** — The selected-attachments row inside the composer input, above the text input. Code: `renderAttachmentTray` (`packages/app/src/composer/index.tsx`). Forbidden: "Attachment bar".
 - **Fork** — Starting a NEW agent session seeded with a copy of another session's curated chat history. The history rides along as a `chat_history` composer attachment on a draft; the fork does **not** resume or branch the provider-side session, and the source session keeps running untouched. Two targets, one surface, one RPC (`agent.fork_context`, gated on the `agentForkContext` host feature). UI: the fork menu lives in the assistant turn footer and offers "Fork in a new tab" / "Fork in a new workspace". On a **completed** turn it sits beside the copy button and pins a boundary to that turn, so the fork stops where the turn ended. On the **in-flight** turn it sits beside the progress loader and elapsed timer, and omits the boundary entirely — `selectForkContextRows` projects the whole timeline when no boundary is given, so the fork captures everything **up to now**, including the response still streaming. That omission is what makes mid-run forking work; pinning a boundary there would silently drop the live response. Forbidden on provider-subagent (read-only) panes. Code: `useForkAgent` (`packages/app/src/hooks/use-fork-agent.ts`), `selectForkContextRows` (`packages/server/src/server/agent/activity-curator.ts`). Don't confuse with: git fork (unrelated; Paseo has no such concept), **Worktree** (filesystem isolation, not history copying).
@@ -26,6 +26,15 @@ when you have actually looked at it on a phone.
 `ContextMenu` is the exception: it defaults to `compactMode="sheet"` and enables native long press.
 Disable mobile triggering explicitly on draggable rows, where long press belongs to drag instead.

+## When the items differ per form factor
+
+A menu whose contents depend on what else is on screen gets one component per surface, not one
+component with `isMobile` branches inside it. The workspace header menu is the example
+(`packages/app/src/screens/workspace/workspace-header-menu.tsx`): compact has no tab strip, so it
+carries new-tab actions, while wide leaves those to the strip's `+` menu and lists workspace
+actions only. Items both surfaces share live in one component that each menu renders, from the same
+callbacks, so the two can't drift.
+
 ## Selecting an item on iOS

 An item that closes the menu runs its action after a fixed grace period on iOS, not immediately:
@@ -37,6 +46,12 @@ and it loses. Selections used to be dropped entirely for exactly that reason.
 The consequence for callers: an `onSelect` on iOS runs a beat after the press. Don't add a second
 delay on top of it, and don't read state that the same press mutated.

+This is why a row inside a menu surface goes through `selectItem` rather than calling its handler
+from its own `Pressable`. `MenuItem` is not the only row shape on the engine — `ComposerTrackRow`
+is another, with its own icons and hover-revealed actions — but both hand the press to the engine
+and take `closeOnSelect` to say whether choosing them ends the surface. A row that owns its press
+outright leaves the surface open behind whatever it opened, and skips the iOS wait.
+
 ## Pages

 A submenu is a page, declared as data on the surface and reached by a `MenuSubTrigger` whose `id`
@@ -62,6 +77,25 @@ Opening a submenu truncates the path to the depth of the trigger that opened it.
 sliding the pointer across a row of triggers would stack up every flyout it passed instead of
 swapping between them.

+## A page that takes input
+
+A menu page can hold a small form — `MenuTextField` is the field for it, drawn as a row's own
+fill so its text lands on the same rail as the labels above it. Two things have to be true for
+that page, and both are set on the page definition rather than discovered later:
+
+- **`hoverIntent: false`.** A branch you skim is opened and closed by the pointer; a form is not.
+  Without this the page opens on a pointer that was only passing through, and dismisses itself —
+  draft and all — the moment your hands move to the keyboard and the mouse drifts off the flyout.
+  While such a page is open, the whole surface stops closing on hover, because the parent flyout
+  leads back to the same dismissal.
+- **The compact presentation has to be a sheet.** `MenuTextField` resolves to
+  `BottomSheetTextInput` on compact native, which reads the sheet's context and has none in a
+  popover.
+
+The sheet keeps `keyboardBehavior="interactive"`. `extend` grows a sheet to its largest snap
+point, and with `enableDynamicSizing` that point is the content's own height — a short page does
+not grow, and the keyboard comes up over the field you are typing into.
+
 ## Hover intent

 A flyout **overlaps its parent by 5pt** rather than sitting beside it. With a gap there is a strip
@@ -86,6 +120,9 @@ opens on press.
 | `selected` | This is the chosen value   | A check, and nothing else |
 | `active`   | This row's submenu is open | The fill, and no check    |

+`selected` also announces itself as `aria-checked`, so a multi-select page is audible as the list
+of on/off things it is.
+
 A selected row does **not** get a background. A check and a fill are two separate claims about the
 same state, and showing both makes a chosen row compete with the row the pointer is actually on.
 `showSelectedCheck` moves the check to a reserved leading column when a group needs to stay
@@ -0,0 +1,221 @@
+# Local plugins
+
+Local plugins contribute daemon RPCs, native app surfaces, workspace panels, Command Center items,
+app themes, and composer attachment sources from one `index.ts`. Paseo executes the server contribution in a
+subprocess and evaluates the client contribution in the app runtime. Plugin code is trusted code;
+this first slice does not sandbox it.
+
+## Install a directory source
+
+Create a typecheckable plugin project, install its development dependencies, then install it into
+the daemon. `init` only writes the project files; it does not run the package manager.
+
+```bash
+paseo plugin init /absolute/path/to/my-plugin
+cd /absolute/path/to/my-plugin
+npm install
+npm run typecheck
+paseo plugin install /absolute/path/to/my-plugin
+paseo plugin install /absolute/path/to/my-plugin --id another-runtime-id
+paseo plugin ls
+```
+
+The daemon stores directory sources under the root `plugins` object:
+
+```json
+{
+  "pluginsEnabled": true,
+  "plugins": {
+    "my-plugin": {
+      "source": "directory",
+      "path": "/absolute/path/to/my-plugin",
+      "enabled": true
+    }
+  }
+}
+```
+
+The plugin system is disabled unless `pluginsEnabled` is `true`. Changing that root field is
+runtime-safe: run `paseo reload` after editing `config.json`. Enabling starts every configured,
+enabled plugin; disabling tears them all down without restarting the daemon. Plugin source entries
+remain lifecycle-owned and do not reload from manual config edits.
+
+The directory contains an identity-only manifest, one entry point, and local typechecking support:
+
+```text
+my-plugin/
+  paseo-plugin.json
+  index.ts
+  main.client.tsx
+  paseo-plugin.d.ts
+  package.json
+  tsconfig.json
+```
+
+Paseo compiles TypeScript and TSX when loading the plugin, so these packages are development dependencies only.
+The generated declaration file supplies `@getpaseo/plugin` and `@getpaseo/plugin/server` types until the
+SDK is distributed as a public package. Regenerate new plugins with the matching Paseo CLI when the
+SDK contract changes.
+
+```json
+{
+  "id": "my-plugin"
+}
+```
+
+The config key is the runtime plugin ID. The manifest ID is the default selected during install;
+`--id` overrides it. Existing configuration is not renamed when the manifest changes, and the
+runtime does not compare the two IDs. The same directory can be installed under several config
+keys.
+
+Never enable plugins on a user's behalf without explicit permission. Before asking, check the
+target daemon's current `pluginsEnabled` value. State that plugins are trusted, unsandboxed code:
+backend code can access the daemon machine, while client contributions run inside the Paseo app.
+
+Source changes are explicit. Run `paseo plugin reload <id>` to stop and fully tear down the old
+plugin before compiling and starting from disk. A failed reload stays failed; Paseo does not restore
+the old code. Use `enable`, `disable`, and `remove` to manage one plugin. Remove deletes only its
+configuration, never its source directory. The global `pluginsEnabled` switch remains available.
+
+Server contributions can write to stdout and stderr with normal Node logging. Paseo adds `[paseo]`
+entries for loading, ready, stopping, and stopped transitions. Compilation and load failures are
+recorded as stderr entries before a subprocess exists. Inspect the recent in-memory
+tail from the host plugin settings or with `paseo plugin logs <id>`. Reload, disable, and process
+failure retain the tail; removing the plugin clears it. Daemon restarts do not retain the tail, but
+structured copies remain in `$PASEO_HOME/daemon.log`. Plugin output can contain secrets, so do not
+log credentials or tokens.
+
+## Contribute behavior and UI
+
+Default export one contribution function from `index.ts`. Keep it to contribution wiring. Runtime
+code lives behind filename boundaries:
+
+| Suffix         | Owns                                                                 |
+| -------------- | -------------------------------------------------------------------- |
+| `*.client.tsx` | React, React Native, hooks, styles, surfaces, panels, and callbacks. |
+| `*.server.ts`  | Node APIs, filesystem and process access, credentials, and handlers. |
+| `*.shared.ts`  | Zod RPC contracts and plain values used by both runtimes.            |
+
+Shared files import contracts from `@getpaseo/plugin/server`. Client files import hooks from
+`@getpaseo/plugin`. Plugin UI runs on desktop and mobile across multiple themes: color every
+`Text` from `theme.colors.foreground` or `theme.colors.foregroundMuted`, and size layout from
+`layout.compact`. See `public-docs/plugins/reference.md`.
+
+| Module                    | Use it for                                               |
+| ------------------------- | -------------------------------------------------------- |
+| `@getpaseo/plugin`        | hooks and UI types                                       |
+| `@getpaseo/plugin/server` | `defineRpc`, `defineAttachmentSource`, and handler types |
+
+The compiler removes client registrations and imports from the server entry point, and server
+registrations and imports from the client entry point. Importing a `*.server` module from a client
+module, or a `*.client` module from a server module, fails compilation. Top-level React Native calls
+such as `StyleSheet.create` belong in `*.client.tsx`; placing them in `index.ts` executes them in the
+server bundle.
+
+```ts
+import type { PluginContext } from "@getpaseo/plugin";
+import { Greeting } from "./greeting.client";
+import { createGreeting } from "./greeting.server";
+import { greetRpc } from "./greeting.shared";
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(greetRpc, createGreeting);
+  plugin.addSurface("main", Greeting);
+  plugin.addSidebarItem({ id: "main", title: "Greeting", icon: "MessageCircle", surface: "main" });
+  return () => {};
+}
+```
+
+The contribution function must return cleanup. Server cleanup may be async; Paseo waits for it when
+the plugin is reloaded, disabled, removed, disconnected, or shut down. Cleanup is for resources
+created by plugin code. Paseo removes registered contributions, unmounts surfaces, clears query
+state, rejects pending RPCs, closes the plugin's daemon session, and stops the subprocess. Cleanup
+errors are logged and do not interrupt host teardown.
+
+Paseo owns the route, screen header, Lucide icon validation, close action, theme DTO, layout facts,
+and render error boundary. The contributed component owns the complete body below the header.
+
+RPC contracts validate inputs and outputs in both the app and plugin subprocess. `useRpc` returns a
+typed async function. Use the host-provided `@tanstack/react-query` for request state and caching;
+Paseo gives each plugin installation its own query client.
+
+`usePaseo()` and the handler's `{ paseo }` context expose the same `PaseoApi`: workspaces, agents,
+providers, and daemon config. They do not expose connection lifecycle. A surface borrows the
+selected host's existing connection; switching the screen's host changes both `usePaseo()` and
+`useRpc()` to that host. An offline selected host fails there and never falls through to another
+installation. A server handler owns an IPC-backed daemon session for the life of its subprocess.
+Use plugin RPC for plugin-specific backend behavior that is not a normal Paseo operation.
+
+Each subprocess gets an exclusively owned `plugin:<id>` session. That identity is reserved from
+normal clients, never resumes another session, and is cleaned immediately on exit without reconnect
+grace. During daemon startup, plugin sessions may connect while application WebSockets remain
+paused; the daemon accepts clients only after configured plugins have settled and the initial
+catalog is complete.
+
+When the same plugin contribution exists on multiple hosts, Paseo shows it once in the sidebar and
+adds a host picker to the screen header. The selected host supplies the bundle, RPC transport, and
+query cache. Plugin code cannot address another host.
+
+Workspace panels and Command Center items remain client contributions. The daemon transports their
+compiled bundle without interpreting placement or callbacks. Panel props contain workspace and agent
+IDs. Required-selector hooks read normalized client state synchronously and use shallow equality, so a
+panel does not subscribe to fields it does not render. Command callbacks materialize their snapshots
+only when invoked. Contribution discovery and panel opening never fetch active context through plugin
+RPC. Snapshot DTOs are deeply readonly and frozen at runtime so plugin code cannot mutate normalized
+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.
+
+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
+plugin's registered global surfaces and workspace panels; plugins do not receive Expo Router or
+workspace-layout store access.
+
+## Contribute composer attachments
+
+Register a declarative attachment source backed by a plugin RPC. Paseo owns the attachment menu,
+search picker, drafts, selected pill, and submission. The plugin returns complete text snapshots;
+credentials and vendor API calls stay in the daemon handler.
+
+```ts
+import type { PluginContext } from "@getpaseo/plugin";
+import { search } from "./issues.server";
+import { issues, searchIssues } from "./issues.shared";
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(searchIssues, search);
+  plugin.addAttachmentSource(issues);
+  return () => {};
+}
+```
+
+Attachment sources stay scoped to the composer's host. Unlike sidebar contributions, equal sources
+on several hosts are not coalesced. The selected snapshot submits as a text attachment with neutral
+external-resource presentation, so it remains readable if the plugin is removed or an older peer
+drops the optional presentation fields.
+
+## Contribute a theme
+
+`addTheme` takes a small light or dark palette and a display name. Paseo expands it through the
+same semantic builders as the built-in themes, so plugins do not depend on the complete app token
+contract. Unistyles needs every theme name at `StyleSheet.configure` time, so
+`packages/app/src/styles/theme.ts` reserves one light and one dark plugin slot. The appearance
+provider rewrites the matching slot when the selection changes. See [unistyles.md](unistyles.md)
+for the runtime-patching rules the appearance settings share.
+
+`addTheme` is a client registration, so the compiler strips it from the backend bundle. A daemon
+that predates it does not, and the plugin fails to start there. Daemons advertise
+`features.pluginThemes` in `server_info`; the plugin theme catalog is the one place the app reads it, and
+a host without it contributes no themes.
+
+The selection persists as `theme: "plugin"` plus a `pluginThemeId` of `<pluginId>/theme/<themeId>`,
+so equal themes on several hosts coalesce the way sidebar contributions do. Two hosts can answer
+that id with different palettes, so picking a theme records its host through
+`rememberPluginContributionHost` and resolution prefers it; a peer connecting or dropping then does
+not repaint the app. Without a preference the sorted registry snapshot decides, so the result is
+stable rather than arrival-ordered. The app resolves that id
+against the installed catalog on every change; an id nothing contributes falls back to the default
+preference instead of painting the reserved slot's placeholder colors.
+
+See `plugin-examples/local-plugin` for a native surface, `plugin-examples/linear` for a complete
+attachment-source example, and `plugin-examples/catppuccin` for a theme.
@@ -81,6 +81,12 @@ OpenCode owns user message IDs. Do not pass Paseo-generated IDs to OpenCode prom

 `AgentManager` owns the one canonical timeline row for a foreground prompt carrying a Paseo `clientMessageId`. It records that row when `startTurn` accepts, with the wire `messageId` set to the same value. Provider adapters still emit their native user-message echo with the same `clientMessageId` when available; the manager records its provider identity on the internal row without changing or redispatching the wire item. If an adapter emits the echo before `startTurn` resolves, the manager records the provider identity with the row at acceptance. Provider adapters continue to own externally initiated user rows that have no Paseo client identity. Do not perform global transcript text dedupe.

+Active-turn steering is an optional `AgentSession.steerActiveTurn` operation. The manager owns admission against its exact foreground turn, canonical user-message creation, echo reconciliation, and falls back to the normal interrupt-and-replace path only when the adapter reports `unavailable`. An adapter error leaves the steer's fate ambiguous and must surface without an interrupt or retry. Codex calls `turn/steer` with the native expected turn and Paseo client user-message ID. Claude pushes an admitted steer into the exact active SDK query input; isolated control commands remain unavailable. OpenCode calls `session/prompt_async` with an OpenCode-generated message ID; the server queues the prompt while busy and the next LLM call in the same Paseo turn includes it. A missing session reports `unavailable` and uses the normal interrupt fallback.
+
+A steering adapter also owes its interrupt: stopping a turn must discard the steers the provider has not read yet, or one of them resumes the turn the user just stopped. Codex clears pending input when it aborts a turn; Claude does not, so its adapter cancels the SDK messages it queued before calling `query.interrupt()`.
+
+`SteerActiveTurnOptions.clearPendingPermissions` makes permission release part of the provider contract. A provider that accepts such a steer queues it first, denies permissions blocking its delivery, and stops once the steer is read. Steers without the flag leave permissions open. A denied plan remains in the timeline because the pending card was the only other copy of its text.
+
 Rewind accepts the canonical wire `messageId` and resolves it to the provider identity before calling the adapter. A submitted prompt cannot be rewound until its provider echo supplies that identity.

 Submitted user-message wire items carry the same Paseo ID in `messageId` and `clientMessageId`. Provider adapters attach `clientMessageId` only to the echo for that foreground submission; provider history and externally initiated user rows do not have a Paseo client ID.
@@ -139,6 +145,12 @@ Keep the protocol shape provider-agnostic. Do not add provider-specific renderer

 Kimi Code usage follows the CLI-managed credential file at `KIMI_CODE_HOME` or `~/.kimi-code/credentials/kimi-code.json`; do not probe the legacy `~/.kimi` path as the primary source for current Kimi Code installs.

+Cursor usage reads the desktop `state.vscdb` token first, then `cursor-agent`'s `~/.config/cursor/auth.json`. Headless hosts only have the CLI file.
+
+### Usage fetchers are read-only on credentials
+
+A fetcher reads the provider's credential file and never writes it. On a 401 or 403 it returns `unavailable` and leaves refresh to the provider's own CLI: redeeming a refresh token in the fetcher invalidates the CLI's copy (refresh tokens are single-use), and rewriting the file through the fetcher's Zod schema drops any field the schema does not model, corrupting the file for the CLI.
+
 ---

 ## ACP Provider Checklist
@@ -424,6 +436,7 @@ interface AgentSession {
  readonly features?: AgentFeature[];
  run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult>;
  startTurn(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<{ turnId: string }>;
+  steerActiveTurn?(prompt: AgentPromptInput, options: SteerActiveTurnOptions): Promise<SteerResult>;
  subscribe(callback: (event: AgentStreamEvent) => void): () => void;
  streamHistory(): AsyncGenerator<AgentStreamEvent>;
  getRuntimeInfo(): Promise<AgentRuntimeInfo>;
@@ -120,7 +120,7 @@ republish the packages:

 ```bash
 PASEO_VERSION=$(node -p "require('./package.json').version")
-for package in highlight relay protocol client server cli; do
+for package in highlight relay protocol client plugin server cli; do
  npm dist-tag add "@getpaseo/$package@$PASEO_VERSION" beta
 done
 ```
@@ -436,6 +436,7 @@ 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
@@ -0,0 +1,98 @@
+# 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.
@@ -24,7 +24,9 @@ Terminal frames share the daemon main event loop with all agent traffic. The `ev
 - **Coalesced output carries the LAST chunk's revision.** Snapshot replay dedup (`replayTerminalOutputAfterSnapshot`) skips buffered output with `revision <= replayRevision`; a merged batch with a lower revision would be wrongly skipped (lost output).
 - **The input-mode tracker runs once per process boundary, not per hop.** The worker owns the authoritative tracker; the daemon caches the replay preamble from `getTerminalState` responses and `snapshotReady` messages. Do not reintroduce a per-chunk `feed()` on the daemon main loop.
 - **Snapshot catch-up is backpressure-gated.** A stream falls back to a full snapshot only when `outputBytesSinceSnapshot > MAX_TERMINAL_OUTPUT_FRAME_BYTES` (256KB) **and** the client transport reports `bufferedAmount > MAX_CLIENT_BUFFERED_BYTES` (4MB). A client that keeps draining streams continuously, no matter how much output is produced. Before this gate existed, every 256KB of build output dropped a frame and forced a full JSON cell-grid snapshot (~200k objects across IPC) — the historical source of spiky lag and GC hitches.
+- **Plugin daemon sessions report IPC queue bytes.** Their virtual socket increments `bufferedAmount` before `process.send` and decrements it only in the send callback. Text and binary frames share that ordered queue, so the normal snapshot catch-up and physical high-water gates remain valid for server-side plugin SDK traffic.
 - **Client output writes are not serialized per frame.** The emulator runtime drains contiguous plain writes straight into xterm (which buffers internally). Only barrier ops (`clear`, `snapshot`, `suppressInput` writes) wait — behind a zero-length sentinel write — so resets can't interleave with in-flight output.
+- **Retained terminal tabs in the focused workspace keep their streams.** Hidden mounted terminals continue applying output, so switching tabs does not resubscribe or request a fresh snapshot. The retained-panel LRU bounds the number of live streams; terminals in an unfocused workspace detach.
 - **Terminal size has one daemon-owned claimant.** Focus and direct interaction send a `claim`; later geometry changes from that connection send `update`. A claim transfers ownership even when the dimensions are unchanged, while an update from any other connection is ignored. This lets an owning pane follow splits and keyboard insets without allowing an idle phone or browser to steal the PTY size.

 ## Measuring
@@ -41,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.
+- 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.
 - 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.
@@ -124,6 +124,16 @@ PASEO_DESKTOP_SMOKE_ARTIFACT_DIR=/tmp/paseo-desktop-smoke \
 npm run build:desktop -- --publish never --linux --x64 --dir
 ```

+### Undeclared peer dependencies break app.asar
+
+electron-builder packs `node_modules` by walking declared production `dependencies`. A package that imports something it only lists as a `peerDependency` resolves fine in this hoisted workspace, passes every test, and then throws `ERR_MODULE_NOT_FOUND` inside `app.asar` — killing the desktop daemon at startup. That shipped twice from `@replit/codemirror-lang-*` grammars, which are interactive editor extensions published as if they were bare parsers.
+
+The packaged smoke catches it but only runs when a PR touches the `desktop` filter in `.github/ci-paths.yml`. Both offenders landed under `packages/highlight/**`, which maps to `sdk`.
+
+`packages/highlight/src/__tests__/dependency-closure.test.ts` replicates the packer's traversal statically and runs with the normal unit tests. It is scoped to `@getpaseo/highlight` on purpose: that tree is small and pure, so the check is exact. Running the same walk over `@getpaseo/server` produces dozens of false positives from optional dependencies loaded behind `try`/`catch`.
+
+Prefer a `@lezer/*` grammar. When a language only ships inside an editor extension, vendor the grammar into `packages/highlight/src/<lang>/` — see `svelte/`, `nix/`, and `csharp/`.
+
 ### Desktop browser regression

 The desktop browser E2E launches an isolated real daemon, Metro, and Electron app. It forces workspace LRU eviction to reparent the original tab and replace its guest `WebContents`, then makes one MCP call each for tab listing, snapshot, and click against that original browser id. A final MCP wait proves the real target page received the click.
@@ -5,6 +5,9 @@ Agent chat delivery has two paths:
 1. **Live stream** — `agent_stream` WebSocket messages for immediacy. These may be delta-shaped lifecycle updates.
 2. **Authoritative history** — `fetch_agent_timeline_request` for correctness. This always returns full projected timeline items, never lifecycle deltas.

+The daemon keeps canonical rows only for its runtime. Provider history is the durable transcript
+authority and repopulates those rows when an agent resumes.
+
 The invariants are:

 > A continuously subscribed client applies every committed row in order. Opening or resuming an
@@ -12,7 +15,7 @@ The invariants are:
 > through backward pagination.

 Tool output is bounded before it enters either delivery path. Canonical shell tool output is sliced
-to 64 KiB, and the same bounded item is used for durable timeline rows and live stream events.
+to 64 KiB, and the same bounded item is used for runtime timeline rows and live stream events.
 Provider history hydration applies the same rule so reopening an agent cannot restore an oversized
 tool payload.

@@ -42,6 +45,16 @@ Initialization timeouts guard lack of catch-up progress, not the full multi-page
 Opening or resuming an agent fetches one bounded latest tail page. Older history remains
 user-driven by scrolling upward.

+A failed catch-up or subscription reconcile retries on its own, doubling from 1s to a 30s ceiling.
+A fixed 1s retry turned a persistent daemon-side refusal — a Codex thread that already has an active
+writer, say — into a request and a log line every second on an idle app. The delay resets on success,
+reconnect, delivery-mode change, and visibility change, so recovery is still immediate once the
+condition clears. Republishing the same visibility set is a no-op and never bypasses backoff.
+
+Background retries are silent. The retry the user presses in the sync-error callout is a fallible
+user action and owns its pending state: `retrying` is a status the sync model publishes, not a React
+boolean, so the button reports in-flight and the callout returns to `error` when the attempt fails.
+
 Reaching the history-start threshold loads one older page and preserves the visible content anchor.
 Cursor progress does not trigger another page. The user must leave and return to the threshold unless
 the anchored page still leaves the viewport at history start, as with short or compacted content; in
@@ -85,16 +98,22 @@ recomposition while the runtime still owns the same directory snapshot and timel
 Removing the host from the registry is the destructive boundary: it stops the runtime and clears the
 session and host-scoped setup state together.

-The durable replica cache is a display cache, not a synchronization checkpoint. Its timeline record
-contains only the focused `agentId` and a truncated item tail. It never persists a cursor, epoch,
-older-history availability, authority status, or sync generation because those facts would describe
-the complete source dataset rather than the truncated display dataset.
+The durable replica cache persists synchronization authority only when it can store the complete
+current canonical window losslessly. The stored range describes those exact items: `startSeq` drives
+older pagination and `endSeq` drives forward catch-up. Restore paints the items immediately, requests
+`after endSeq`, and requests `before startSeq` when the user loads older history.

-Restoring that cache produces a painted timeline: the items may render immediately, but the first
-daemon timeline request is still `tail`. A successful tail response atomically establishes canonical
-items, range, and older-history availability. Live rows received between cache paint and that tail
-response stay in the separate live head, do not advance a cursor or trigger gap recovery, and are
-reconciled with the authoritative tail and subsequent catch-up.
+The first resume request is bounded. If it reports more newer history, fetch one latest bounded tail
+instead of replaying every missed page. Live gap recovery still pages forward until current.
+
+If the canonical window exceeds the cache item limit, contains a discontiguous retained range, has a
+live head, or includes presentation data the cache cannot encode losslessly, persistence drops the
+range and keeps a display-only tail. Restore then uses the ordinary bounded `tail` bootstrap. Never
+slice items while retaining the pre-slice range; that falsely certifies discarded source rows.
+
+Live rows received between cache paint and catch-up stay in the separate live head and reconcile with
+the authoritative range through the existing forward-page path. The cache does not persist sync
+generation or unreconciled local submissions.

 Every daemon-derived live item carries its timeline epoch and sequence position. Bootstrap
 replacement keeps only positioned rows newer than the page it installs, while unresolved local
@@ -167,6 +186,11 @@ foreground control ownership remains a separate daemon concern. Cancellation req
 with that record rather than in a React component, so an old request cannot clear a newer one. Submissions
 remain a separate pre-turn registry and retire on canonical acknowledgement.

+Canonical turns and visible responses are different boundaries. System-injected prompts are absent from
+the Paseo timeline, so one visible response can span several canonical turns without a user message
+between them. Layout and copy group that response together; lifecycle, timing, tool sequences, and exact
+fork positions retain the canonical `turnId` boundaries.
+
 The compatibility boundary for older daemons is snapshot normalization: running/idle status becomes an
 anonymous active turn or idle state once, and downstream code consumes the same activity shape. The app
 does not combine anonymous lifecycle events, timestamps, timeline rows, and resume coverage to infer a
@@ -335,15 +335,16 @@ If we ever need to avoid the transition entirely, store at least the theme prefe

 ## Runtime Theme Patching For User Preferences

-Appearance settings (UI/mono font family, font sizes, syntax-highlight theme) are applied by patching every registered theme at runtime with `UnistylesRuntime.updateTheme(name, updater)` — not by threading preference reads through components. `applyAppearance` in `packages/app/src/screens/settings/appearance/apply-appearance.ts` runs from a `ProvidersWrapper` effect on settings load/change and loops all six theme keys, returning `{ ...theme, fontFamily, fontSize, lineHeight, colors.syntax }`.
+Appearance settings (theme, UI/mono font family, font sizes, syntax-highlight theme) are owned by `packages/app/src/appearance`. Its provider subscribes once and synchronizes Unistyles when settings or plugin contributions change. `applyAppearance` patches every key in `REGISTERED_THEMES`, returning `{ ...theme, fontFamily, fontSize, lineHeight, colors.syntax }`.

 This works without `useUnistyles()` because every consumer already reads these tokens through `StyleSheet.create((theme) => …)` (or the `withUnistyles`/`uniProps` path for the markdown renderer), so patching the theme repaints tracked views through the native ShadowRegistry with no React re-render.

 Gotchas:

 - **Patch all themes, not just the active one.** The active theme can change and adaptive mode can flip light/dark; patching every key keeps the active key current and makes ordering vs `setTheme`/`setAdaptiveThemes` irrelevant. The effect depends on the settings values (not on `theme`), so it cannot loop.
+- **The reserved plugin keys are the exception to that ordering.** A plugin-contributed theme is rebuilt from its palette, which discards the appearance patch, so the appearance provider writes the matching light or dark slot before applying font and syntax preferences. See [plugins.md](plugins.md).
 - **Narrow the discriminated union before spreading.** `updateTheme`'s updater returns the theme union; spreading the union widens `colorScheme` to `"light" | "dark"`, which is assignable to neither concrete member. Branch on `t.colorScheme` so each branch spreads a single narrowed theme type (no `as`).
- **`lineHeight.diff` is the code/diff line-height axis** — it is coupled to the code-font-size control (≈ `codeFontSize * 1.5`). Do NOT use it for prose. Markdown body line-height scales with the UI ramp (`Math.round(theme.fontSize.base * 1.4)`); routing prose through `lineHeight.diff` clips text at small code sizes.
+- **`lineHeight.diff` is the code/diff line-height axis** — it is coupled to the code-font-size control (≈ `codeFontSize * 1.5`). Do NOT use it for prose. Markdown body line-height scales with content size (`Math.round(theme.fontSize.content * 1.4)`); routing prose through `lineHeight.diff` clips text at small code sizes.
 - **High-churn draft values** (live-while-typing in the appearance preview) bypass the theme: apply them as inline styles marked with `inlineUnistylesStyle` so per-keystroke values don't grow the `#unistyles-web` CSS registry.
 - **The app shell uses one `AppearanceStyleBoundary`.** Runtime-patched numeric theme values are baked into Unistyles web classes rather than CSS variables, while parsed/memoized content also does not naturally re-run when appearance tokens change. The boundary sits below stable runtime providers in `app/_layout.tsx` and remounts the visual shell once. `applyAppearance` patches the active theme before inactive registry entries so its subscribers receive the committed values in the same update. Do not add local appearance keys or nested boundaries.
 - **Dynamic font tokens stay widened.** `fontFamily`, `fontSize`, and `lineHeight` on `commonTheme` are annotated `string`/`number` (not narrowed by `as const`) so the updater's return assigns; the platform default stacks live in `DEFAULT_UI_FONT_STACK` / `DEFAULT_MONO_FONT_STACK`.
@@ -0,0 +1,37 @@
+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
@@ -0,0 +1 @@
+../../../../../../packages/website/public/phone-1.png
@@ -0,0 +1 @@
+../../../../../../packages/website/public/phone-2.png
@@ -0,0 +1 @@
+../../../../../../packages/website/public/phone-3.png
@@ -0,0 +1 @@
+Monitor and control your local AI coding agents from anywhere
@@ -0,0 +1 @@
+Paseo
@@ -0,0 +1,37 @@
+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
@@ -0,0 +1 @@
+ローカルのAIコーディングエージェントをどこからでも操作
@@ -0,0 +1,37 @@
+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
@@ -0,0 +1 @@
+随时随地监控和控制本地的 AI 编程 agents
@@ -178,11 +178,6 @@ buildNpmPackage {
        exit 1
      fi

-      # Skills directory referenced at runtime by some agents
-      if [ -d skills ]; then
-        cp -a skills $out/share/paseo-desktop/
-      fi
-
      # Hicolor icon for desktop environments
      install -Dm644 packages/desktop/assets/icon.png \
        $out/share/icons/hicolor/512x512/apps/paseo-desktop.png
@@ -1 +1 @@
-sha256-zO0mNouwY+thgefl2zB/Lk8pIZGh0QowC8klXll2qOc=
+sha256-13Q44pEU+V2M/wnitVAlBarYxAqWkGkXrE+w5qUCf7o=
@@ -1,17 +1,18 @@
 {
  "name": "paseo",
-  "version": "0.4.0",
+  "version": "0.5.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
        "packages/expo-two-way-audio",
        "packages/highlight",
+        "packages/plugin",
        "packages/protocol",
        "packages/client",
        "packages/server",
@@ -2548,19 +2549,6 @@
        "node": ">=16"
      }
    },
-    "node_modules/@codemirror/autocomplete": {
-      "version": "6.20.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.3.tgz",
-      "integrity": "sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.17.0",
-        "@lezer/common": "^1.0.0"
-      }
-    },
    "node_modules/@codemirror/commands": {
      "version": "6.10.4",
      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.4.tgz",
@@ -6259,6 +6247,10 @@
      "resolved": "packages/highlight",
      "link": true
    },
+    "node_modules/@getpaseo/plugin": {
+      "resolved": "packages/plugin",
+      "link": true
+    },
    "node_modules/@getpaseo/protocol": {
      "resolved": "packages/protocol",
      "link": true
@@ -7762,6 +7754,16 @@
      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
      "license": "MIT"
    },
+    "node_modules/@mattermost/react-native-paste-input": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@mattermost/react-native-paste-input/-/react-native-paste-input-2.0.1.tgz",
+      "integrity": "sha512-Q9zjXvjwxVQ1M8ylxr9Y+wUpG7xb1wW4u+I34oPvF3etTyBrGtVyA4Bt7Xphgc29eW6wQFUxTIbzZc3E6W2MQg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": ">=0.76.0"
+      }
+    },
    "node_modules/@mermaid-js/parser": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.0.tgz",
@@ -11125,21 +11127,6 @@
        "nanoid": "^3.3.11"
      }
    },
-    "node_modules/@replit/codemirror-lang-csharp": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@replit/codemirror-lang-csharp/-/codemirror-lang-csharp-6.2.0.tgz",
-      "integrity": "sha512-6utbaWkoymhoAXj051mkRp+VIJlpwUgCX9Toevz3YatiZsz512fw3OVCedXQx+WcR0wb6zVHjChnuxqfCLtFVQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0"
-      }
-    },
    "node_modules/@replit/codemirror-vim": {
      "version": "6.3.0",
      "resolved": "https://registry.npmjs.org/@replit/codemirror-vim/-/codemirror-vim-6.3.0.tgz",
@@ -11660,6 +11647,32 @@
      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
      "license": "MIT"
    },
+    "node_modules/@shopify/react-native-skia": {
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/@shopify/react-native-skia/-/react-native-skia-2.2.12.tgz",
+      "integrity": "sha512-P5wZSMPTp00hM0do+awNFtb5aPh5hSpodMGwy7NaxK90AV+SmUu7wZe6NGevzQIwgFa89Epn6xK3j4jKWdQi+A==",
+      "license": "MIT",
+      "dependencies": {
+        "canvaskit-wasm": "0.40.0",
+        "react-reconciler": "0.31.0"
+      },
+      "bin": {
+        "setup-skia-web": "scripts/setup-canvaskit.js"
+      },
+      "peerDependencies": {
+        "react": ">=19.0",
+        "react-native": ">=0.78",
+        "react-native-reanimated": ">=3.19.1"
+      },
+      "peerDependenciesMeta": {
+        "react-native": {
+          "optional": true
+        },
+        "react-native-reanimated": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/@sideway/address": {
      "version": "4.1.5",
      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -14115,6 +14128,12 @@
        "url": "https://opencollective.com/vitest"
      }
    },
+    "node_modules/@webgpu/types": {
+      "version": "0.1.21",
+      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.21.tgz",
+      "integrity": "sha512-pUrWq3V5PiSGFLeLxoGqReTZmiiXwY3jRkIG5sLLKjyqNxrwm/04b4nw7LSmGWJcKk59XOM/YRTUwOzo4MMlow==",
+      "license": "BSD-3-Clause"
+    },
    "node_modules/@xmldom/xmldom": {
      "version": "0.7.13",
      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
@@ -15051,6 +15070,12 @@
        "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",
@@ -16043,6 +16068,15 @@
      ],
      "license": "CC-BY-4.0"
    },
+    "node_modules/canvaskit-wasm": {
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/canvaskit-wasm/-/canvaskit-wasm-0.40.0.tgz",
+      "integrity": "sha512-Od2o+ZmoEw9PBdN/yCGvzfu0WVqlufBPEWNG452wY7E9aT8RBE+ChpZF526doOlg7zumO4iCS+RAeht4P0Gbpw==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@webgpu/types": "0.1.21"
+      }
+    },
    "node_modules/cardinal": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz",
@@ -21308,6 +21342,20 @@
        "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",
@@ -21753,6 +21801,16 @@
      "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",
@@ -30894,6 +30952,27 @@
        "async-limiter": "~1.0.0"
      }
    },
+    "node_modules/react-reconciler": {
+      "version": "0.31.0",
+      "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.31.0.tgz",
+      "integrity": "sha512-7Ob7Z+URmesIsIVRjnLoDGwBEG/tVitidU0nMsqX/eeJaLY89RISO/10ERe0MqmzuKUUB1rmY+h1itMbUHg9BQ==",
+      "license": "MIT",
+      "dependencies": {
+        "scheduler": "^0.25.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "react": "^19.0.0"
+      }
+    },
+    "node_modules/react-reconciler/node_modules/scheduler": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",
+      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==",
+      "license": "MIT"
+    },
    "node_modules/react-refresh": {
      "version": "0.17.0",
      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
@@ -36091,7 +36170,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -36105,14 +36184,18 @@
        "@getpaseo/client": "*",
        "@getpaseo/expo-two-way-audio": "*",
        "@getpaseo/highlight": "*",
+        "@getpaseo/plugin": "*",
        "@getpaseo/protocol": "*",
        "@gorhom/bottom-sheet": "^5.2.14",
        "@gorhom/portal": "^1.0.14",
+        "@marijn/find-cluster-break": "^1.0.2",
+        "@mattermost/react-native-paste-input": "2.0.1",
        "@react-native-async-storage/async-storage": "2.2.0",
        "@react-native-masked-view/masked-view": "^0.3.2",
        "@react-native/normalize-colors": "^0.81.5",
        "@react-navigation/native": "^7.1.8",
        "@replit/codemirror-vim": "6.3.0",
+        "@shopify/react-native-skia": "2.2.12",
        "@tanstack/react-query": "^5.90.11",
        "@tanstack/react-virtual": "^3.13.21",
        "@xterm/addon-clipboard": "^0.3.0-beta.213",
@@ -36147,6 +36230,7 @@
        "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",
@@ -36188,6 +36272,7 @@
        "@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",
@@ -36201,6 +36286,7 @@
        "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",
@@ -36738,6 +36824,16 @@
        "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",
@@ -37139,12 +37235,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.4.0",
-        "@getpaseo/protocol": "0.4.0",
-        "@getpaseo/server": "0.4.0",
+        "@getpaseo/client": "0.5.1",
+        "@getpaseo/protocol": "0.5.1",
+        "@getpaseo/server": "0.5.1",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -37391,10 +37487,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
-        "@getpaseo/protocol": "0.4.0",
-        "@getpaseo/relay": "0.4.0",
+        "@getpaseo/protocol": "0.5.1",
+        "@getpaseo/relay": "0.5.1",
        "zod": "^4.4.3"
      },
      "devDependencies": {
@@ -37405,7 +37501,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -37648,7 +37744,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -38544,7 +38640,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -38557,13 +38653,13 @@
        "@lezer/java": "^1.1.3",
        "@lezer/javascript": "^1.5.4",
        "@lezer/json": "^1.0.3",
+        "@lezer/lr": "^1.4.8",
        "@lezer/markdown": "^1.6.2",
        "@lezer/php": "^1.0.5",
        "@lezer/python": "^1.1.18",
        "@lezer/rust": "^1.0.2",
        "@lezer/xml": "^1.0.6",
        "@lezer/yaml": "^1.0.4",
-        "@replit/codemirror-lang-csharp": "^6.2.0",
        "lezer-elixir": "^1.1.2"
      },
      "devDependencies": {
@@ -38571,9 +38667,30 @@
        "vitest": "^4.1.6"
      }
    },
+    "packages/plugin": {
+      "name": "@getpaseo/plugin",
+      "version": "0.5.1",
+      "dependencies": {
+        "use-sync-external-store": "^1.6.0"
+      },
+      "devDependencies": {
+        "@getpaseo/client": "0.5.1",
+        "@types/node": "^20.9.0",
+        "@types/react": "~19.2.0",
+        "react": "19.1.0",
+        "typescript": "^5.9.3",
+        "vitest": "^4.1.6",
+        "zod": "^4.4.3"
+      },
+      "peerDependencies": {
+        "@getpaseo/client": "0.5.1",
+        "react": "19.1.0",
+        "zod": "^4.4.3"
+      }
+    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
        "zod": "^4.4.3"
      },
@@ -38586,7 +38703,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -38804,23 +38921,26 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
-        "@anthropic-ai/claude-agent-sdk": "^0.3.220",
+        "@anthropic-ai/claude-agent-sdk": "0.3.220",
        "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.4.0",
-        "@getpaseo/highlight": "0.4.0",
-        "@getpaseo/protocol": "0.4.0",
-        "@getpaseo/relay": "0.4.0",
+        "@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",
        "@isaacs/ttlcache": "^2.1.4",
-        "@modelcontextprotocol/sdk": "^1.20.1",
+        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
        "@xterm/headless": "^6.0.0",
        "ai": "5.0.78",
        "ajv": "^8.20.0",
        "bcryptjs": "^3.0.3",
        "dotenv": "^17.2.3",
+        "esbuild": "^0.25.12",
        "express": "^4.18.2",
        "fast-deep-equal": "^3.1.3",
        "lru-cache": "^11.5.1",
@@ -38984,6 +39104,468 @@
        "win32"
      ]
    },
+    "packages/server/node_modules/@babel/helper-string-parser": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/server/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/server/node_modules/@babel/parser": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz",
+      "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.8"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "packages/server/node_modules/@babel/types": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/server/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/android-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/android-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/android-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
+      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/win32-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
    "packages/server/node_modules/@isaacs/ttlcache": {
      "version": "2.1.4",
      "resolved": "https://registry.npmjs.org/@isaacs/ttlcache/-/ttlcache-2.1.4.tgz",
@@ -39138,6 +39720,47 @@
        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
      }
    },
+    "packages/server/node_modules/esbuild": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
+      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.12",
+        "@esbuild/android-arm": "0.25.12",
+        "@esbuild/android-arm64": "0.25.12",
+        "@esbuild/android-x64": "0.25.12",
+        "@esbuild/darwin-arm64": "0.25.12",
+        "@esbuild/darwin-x64": "0.25.12",
+        "@esbuild/freebsd-arm64": "0.25.12",
+        "@esbuild/freebsd-x64": "0.25.12",
+        "@esbuild/linux-arm": "0.25.12",
+        "@esbuild/linux-arm64": "0.25.12",
+        "@esbuild/linux-ia32": "0.25.12",
+        "@esbuild/linux-loong64": "0.25.12",
+        "@esbuild/linux-mips64el": "0.25.12",
+        "@esbuild/linux-ppc64": "0.25.12",
+        "@esbuild/linux-riscv64": "0.25.12",
+        "@esbuild/linux-s390x": "0.25.12",
+        "@esbuild/linux-x64": "0.25.12",
+        "@esbuild/netbsd-arm64": "0.25.12",
+        "@esbuild/netbsd-x64": "0.25.12",
+        "@esbuild/openbsd-arm64": "0.25.12",
+        "@esbuild/openbsd-x64": "0.25.12",
+        "@esbuild/openharmony-arm64": "0.25.12",
+        "@esbuild/sunos-x64": "0.25.12",
+        "@esbuild/win32-arm64": "0.25.12",
+        "@esbuild/win32-ia32": "0.25.12",
+        "@esbuild/win32-x64": "0.25.12"
+      }
+    },
    "packages/server/node_modules/isexe": {
      "version": "3.1.5",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
@@ -39360,7 +39983,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.4.0",
+      "version": "0.5.1",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.4.0",
+  "version": "0.5.1",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -23,6 +23,7 @@
  "workspaces": [
    "packages/expo-two-way-audio",
    "packages/highlight",
+    "packages/plugin",
    "packages/protocol",
    "packages/client",
    "packages/server",
@@ -46,19 +47,21 @@
    "build": "npm run build --workspaces --if-present",
    "build:highlight": "npm run build --workspace=@getpaseo/highlight",
    "build:highlight:clean": "npm run build:clean --workspace=@getpaseo/highlight",
+    "build:plugin": "npm run build --workspace=@getpaseo/plugin",
+    "build:plugin:clean": "npm run build:clean --workspace=@getpaseo/plugin",
    "build:relay": "npm run build --workspace=@getpaseo/relay",
    "build:relay:clean": "npm run build:clean --workspace=@getpaseo/relay",
    "build:protocol": "npm run build --workspace=@getpaseo/protocol",
    "build:protocol:clean": "npm run build:clean --workspace=@getpaseo/protocol",
    "build:client": "npm run build --workspace=@getpaseo/client",
    "build:client:clean": "npm run build:protocol:clean && npm run build:clean --workspace=@getpaseo/client",
-    "build:server-deps": "concurrently --kill-others-on-fail --names highlight,relay,client --prefix-colors yellow,blue,cyan \"npm run build:highlight\" \"npm run build:relay\" \"npm run build:client\"",
-    "build:server-deps:clean": "npm run build:highlight:clean && npm run build:relay:clean && npm run build:client:clean",
+    "build:server-deps": "npm run build:client && concurrently --kill-others-on-fail --names highlight,plugin,relay --prefix-colors yellow,green,blue \"npm run build:highlight\" \"npm run build:plugin\" \"npm run build:relay\"",
+    "build:server-deps:clean": "npm run build:client:clean && npm run build:highlight:clean && npm run build:plugin:clean && npm run build:relay:clean",
    "build:server": "npm run build:server-deps && npm run build --workspace=@getpaseo/server && npm run build --workspace=@getpaseo/cli",
    "build:server:clean": "npm run build:server-deps:clean && npm run build:clean --workspace=@getpaseo/server && npm run build:clean --workspace=@getpaseo/cli",
    "build:daemon-web-ui": "node scripts/build-daemon-web-ui.mjs",
-    "build:app-deps": "npm run build:highlight && npm run build:client && npm run build --workspace=@getpaseo/expo-two-way-audio",
-    "build:app-deps:clean": "npm run build:highlight:clean && npm run build:client:clean && npm run build --workspace=@getpaseo/expo-two-way-audio",
+    "build:app-deps": "npm run build:highlight && npm run build:client && npm run build:plugin && npm run build --workspace=@getpaseo/expo-two-way-audio",
+    "build:app-deps:clean": "npm run build:highlight:clean && npm run build:client:clean && npm run build:plugin:clean && npm run build --workspace=@getpaseo/expo-two-way-audio",
    "watch:protocol": "npm run watch --workspace=@getpaseo/protocol",
    "watch:client": "tsc -p packages/client/tsconfig.json --watch --preserveWatchOutput",
    "typecheck": "npm run typecheck --workspaces --if-present",
@@ -81,6 +84,8 @@
    "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",
@@ -88,7 +93,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 release:prepare && git add -A",
+    "version": "npm run version:sync-internal && npm run fdroid:changelogs && 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",
@@ -99,11 +104,11 @@
    "version:all:beta:major": "node scripts/set-release-version.mjs --mode beta-major",
    "version:all:beta:next": "node scripts/set-release-version.mjs --mode beta-next",
    "version:all:promote": "node scripts/set-release-version.mjs --mode promote",
-    "release:check": "npm run release:prepare && npm run typecheck --workspace=@getpaseo/highlight && npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run build:client:clean && npm run typecheck --workspace=@getpaseo/client && npm run build:server:clean && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli && npm pack --dry-run --workspace=@getpaseo/highlight && npm pack --dry-run --workspace=@getpaseo/relay && npm pack --dry-run --workspace=@getpaseo/protocol && npm pack --dry-run --workspace=@getpaseo/client && npm pack --dry-run --workspace=@getpaseo/server && npm pack --dry-run --workspace=@getpaseo/cli",
-    "release:publish:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public && npm publish --dry-run --workspace=@getpaseo/relay --access public && npm publish --dry-run --workspace=@getpaseo/protocol --access public && npm publish --dry-run --workspace=@getpaseo/client --access public && npm publish --dry-run --workspace=@getpaseo/server --access public && npm publish --dry-run --workspace=@getpaseo/cli --access public",
-    "release:publish:beta:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/relay --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/protocol --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/client --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/server --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/cli --access public --tag beta",
-    "release:publish": "npm publish --workspace=@getpaseo/highlight --access public && npm publish --workspace=@getpaseo/relay --access public && npm publish --workspace=@getpaseo/protocol --access public && npm publish --workspace=@getpaseo/client --access public && npm publish --workspace=@getpaseo/server --access public && npm publish --workspace=@getpaseo/cli --access public",
-    "release:publish:beta": "npm publish --workspace=@getpaseo/highlight --access public --tag beta && npm publish --workspace=@getpaseo/relay --access public --tag beta && npm publish --workspace=@getpaseo/protocol --access public --tag beta && npm publish --workspace=@getpaseo/client --access public --tag beta && npm publish --workspace=@getpaseo/server --access public --tag beta && npm publish --workspace=@getpaseo/cli --access public --tag beta",
+    "release:check": "npm run release:prepare && npm run typecheck --workspace=@getpaseo/highlight && npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run build:client:clean && npm run typecheck --workspace=@getpaseo/client && npm run typecheck --workspace=@getpaseo/plugin && npm run build:server:clean && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli && npm pack --dry-run --workspace=@getpaseo/highlight && npm pack --dry-run --workspace=@getpaseo/relay && npm pack --dry-run --workspace=@getpaseo/protocol && npm pack --dry-run --workspace=@getpaseo/client && npm pack --dry-run --workspace=@getpaseo/plugin && npm pack --dry-run --workspace=@getpaseo/server && npm pack --dry-run --workspace=@getpaseo/cli",
+    "release:publish:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public && npm publish --dry-run --workspace=@getpaseo/relay --access public && npm publish --dry-run --workspace=@getpaseo/protocol --access public && npm publish --dry-run --workspace=@getpaseo/client --access public && npm publish --dry-run --workspace=@getpaseo/plugin --access public && npm publish --dry-run --workspace=@getpaseo/server --access public && npm publish --dry-run --workspace=@getpaseo/cli --access public",
+    "release:publish:beta:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/relay --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/protocol --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/client --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/plugin --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/server --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/cli --access public --tag beta",
+    "release:publish": "npm publish --workspace=@getpaseo/highlight --access public && npm publish --workspace=@getpaseo/relay --access public && npm publish --workspace=@getpaseo/protocol --access public && npm publish --workspace=@getpaseo/client --access public && npm publish --workspace=@getpaseo/plugin --access public && npm publish --workspace=@getpaseo/server --access public && npm publish --workspace=@getpaseo/cli --access public",
+    "release:publish:beta": "npm publish --workspace=@getpaseo/highlight --access public --tag beta && npm publish --workspace=@getpaseo/relay --access public --tag beta && npm publish --workspace=@getpaseo/protocol --access public --tag beta && npm publish --workspace=@getpaseo/client --access public --tag beta && npm publish --workspace=@getpaseo/plugin --access public --tag beta && npm publish --workspace=@getpaseo/server --access public --tag beta && npm publish --workspace=@getpaseo/cli --access public --tag beta",
    "release:push": "node scripts/push-current-release-tag.mjs",
    "release:beta:patch": "npm run release:check && npm run version:all:beta:patch && npm run release:publish:beta && npm run release:push",
    "release:beta:minor": "npm run release:check && npm run version:all:beta:minor && npm run release:publish:beta && npm run release:push",
@@ -4,6 +4,7 @@ const pkg = require("./package.json");
 const withAndroidAsyncStorageSize = require("./plugins/with-android-async-storage-size");
 const withAndroidProfileable = require("./plugins/with-android-profileable");
 const withFdroidAutolinking = require("./plugins/with-fdroid-autolinking");
+const withPasteInput = require("./plugins/with-paste-input");
 const { getNativeReleaseVersion } = require("./native-release-version");
 const appVariant = process.env.APP_VARIANT ?? "production";
 const isFdroidBuild = process.env.PASEO_FDROID_BUILD === "1";
@@ -139,7 +140,8 @@ export default {
    },
    plugins: [
      "expo-router",
-      [withAndroidAsyncStorageSize, 10],
+      withPasteInput,
+      [withAndroidAsyncStorageSize, 64],
      ...buildProfile.cameraPlugins,
      [
        "expo-splash-screen",
@@ -11,8 +11,8 @@ import {
 } from "../support/helpers/settings";

 const ACP_PROVIDER = {
-  id: "hermes",
-  name: "Hermes",
+  id: "minimax-code",
+  name: "MiniMax Code",
 };

 interface ProviderCatalogDaemonClient {
@@ -22,7 +22,7 @@ interface ProviderCatalogDaemonClient {
 }

 test.describe("ACP provider catalog", () => {
-  test("adds a catalog provider from settings", async ({ page }) => {
+  test("adds MiniMax Code from settings", async ({ page }) => {
    const client = await connectDaemonClient<ProviderCatalogDaemonClient>({
      clientIdPrefix: "provider-catalog-e2e",
    });
@@ -2,6 +2,7 @@ import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { test, expect, type Page } from "../support/fixtures";
 import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
+import { openChangesPanel } from "../support/helpers/workspace-tabs";

 function visibleComposer(page: Page) {
  return page.locator("textarea[data-composer-input]").filter({ visible: true }).first();
@@ -31,8 +32,7 @@ test("adds a changed file to the focused chat without replacing its composer dra
    await expect(agentComposer).toBeEditable({ timeout: 30_000 });
    await agentComposer.fill("Preserve this thought");

-    await page.getByRole("button", { name: "Open explorer" }).click();
-    await page.getByTestId("explorer-tab-changes").click();
+    await openChangesPanel(page);
    const changedFile = page.getByText("changed file.ts", { exact: true }).first();
    await expect(changedFile).toBeVisible({ timeout: 30_000 });
    await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
@@ -726,7 +726,7 @@ async function recordDelayedRunningTransition(
  gate.holdNextAgentStreamEvent("turn_started");
  gate.holdNextAgentUpdate(agent.agentId, "running");
  gate.holdNextServerMessage("send_agent_message_response");
-  gate.setAgentStreamItemSuppressed("assistant_message", true);
+  gate.setAgentStreamSuppressed(true);
  await recordTurnFrames(page, prompt);
  await installActivityContinuityOracle(page, prompt);
  await submitMessage(page, prompt);
@@ -779,13 +779,13 @@ async function recordDelayedRunningTransition(
    const checkpoints = await readActivityContinuityOracle(page);
    expectActivityContinuity(checkpoints);
    expect(elapsedBeforeAuthoritative).toBe(0);
-    gate.setAgentStreamItemSuppressed("assistant_message", false);
+    gate.setAgentStreamSuppressed(false);
    return { frames, checkpoints };
  } finally {
    if (!turnReleased) gate.releaseHeldAgentStreamEvent("turn_started");
    if (!snapshotReleased) gate.releaseHeldAgentUpdate(agent.agentId, "running");
    if (!responseReleased) gate.releaseHeldServerMessage("send_agent_message_response");
-    gate.setAgentStreamItemSuppressed("assistant_message", false);
+    gate.setAgentStreamSuppressed(false);
  }
 }

@@ -814,6 +814,8 @@ test("keeps the first prompt of a new agent in place through authoritative hydra
    await expectComposerVisible(page);

    const prompt = "Delay synthetic user message by 300ms.";
+    gate.holdNextServerMessage("fetch_agent_timeline_response");
+    gate.setAgentStreamEventSuppressed("timeline", true);
    await attachImageFromMenu(page, FIRST_PROMPT_IMAGE);
    await expectAttachmentPill(page, "composer-image-attachment-pill");
    await recordTurnFrames(page, prompt);
@@ -821,7 +823,10 @@ test("keeps the first prompt of a new agent in place through authoritative hydra

    const submittedRow = page.getByTestId("user-message").filter({ hasText: prompt }).first();
    await expect(submittedRow).toBeVisible();
-    await gate.waitForServerMessage("fetch_agent_timeline_response");
+    await gate.waitForHeldServerMessage("fetch_agent_timeline_response");
+    gate.truncateHeldTimelineAfterLast("user_message");
+    gate.releaseHeldServerMessage("fetch_agent_timeline_response");
+    await expect(submittedRow.getByTestId("rewind-menu-trigger")).toBeVisible();
    await recordPaintsFor(page, 80);
    expectAtomicFirstPromptTransition(await stopTurnFrameRecording(page));
  } finally {
@@ -3,10 +3,13 @@ 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(
@@ -28,7 +31,7 @@ async function completeSubmittedTurn(
 async function rewindConversation(page: Page, userMessage: Locator, prompt: string): Promise<void> {
  await userMessage.getByText(prompt, { exact: true }).hover();
  await userMessage.getByRole("button", { name: "Rewind to this message", exact: true }).click();
-  await page.getByRole("button", { name: "Rewind conversation", exact: true }).click();
+  await page.getByRole("menuitem", { name: "Rewind conversation", exact: true }).click();
 }

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

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

    try {
+      const rewindCompletion = await holdRewindCompletion(page, agent.agentId);
      await openAgentRoute(page, agent);
      await expectComposerVisible(page);
-      const userMessage = await completeSubmittedTurn(page, agent, prompt);
+      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();

-      await rewindConversation(page, userMessage, 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 expect(page.getByText("(end of synthetic stream)", { exact: true })).toHaveCount(0);
-      await expectComposerDraft(page, prompt);
+      await expect(page.getByTestId("user-message").filter({ hasText: rewoundPrompt })).toHaveCount(
+        0,
+      );
+      await expectComposerDraft(page, preservedDraft);
+      await expectNearBottom(page);
    } finally {
      await agent.cleanup();
    }
@@ -24,12 +24,23 @@ import {
 } from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import { seedWorkspace } from "../support/helpers/seed-client";
-import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import {
+  createAgentTabFromMenu,
+  waitForWorkspaceTabsVisible,
+} from "../support/helpers/workspace-tabs";
 import { getServerId } from "../support/helpers/server-id";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
+import { WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES } from "@/screens/workspace/workspace-deck-retention";
 import { delayBrowserAgentCreatedStatus } from "../support/helpers/new-workspace";
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
-import { selectModel } from "../support/helpers/app";
+import { gotoAppShell, openSettings, selectModel } from "../support/helpers/app";
+import { observeTimelineSubscriptions } from "../support/helpers/timeline-delivery";
+import {
+  expectResumeOverflowFallsBackToOneTail,
+  rememberTimelineRequestCounts,
+} from "../support/helpers/timeline-resume";
+import { workspaceDeckEntryLocator } from "../support/helpers/workspace-ui";
+import { expectInFlightForkAvailable } from "../support/helpers/assistant-fork";
 import {
  scrollTimelineToNewestLoadedEdge,
  scrollTimelineUntilOlderHistoryIsReachable,
@@ -257,14 +268,20 @@ async function submitMessageThatWillBeRejected(page: Page, prompt: string): Prom

 async function expectRejectedSubmissionRestored(
  page: Page,
-  input: { prompt: string; errorMessage: string },
+  input: { prompt: string; errorMessage: string; preservesActiveTurn?: boolean },
 ): Promise<void> {
-  await expect(page.getByText(input.errorMessage)).toBeVisible({ timeout: 30_000 });
+  await expect(page.getByRole("alert").filter({ hasText: input.errorMessage })).toBeVisible({
+    timeout: 30_000,
+  });
  await expectComposerDraft(page, input.prompt);
  await expectComposerEditable(page);
  await expectAttachmentPill(page, "composer-image-attachment-pill");
-  await expect(page.getByRole("button", { name: "Send message" })).toBeEnabled();
  await expect(page.getByTestId("user-message").filter({ hasText: input.prompt })).toHaveCount(0);
+  if (input.preservesActiveTurn) {
+    await expect(page.getByTestId("turn-working-indicator")).toBeVisible();
+    return;
+  }
+  await expect(page.getByRole("button", { name: "Send message" })).toBeEnabled();
  await expect(page.getByTestId("turn-working-indicator")).toHaveCount(0);
 }

@@ -277,6 +294,77 @@ async function retryRestoredSubmission(page: Page, prompt: string): Promise<void
  await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
 }

+async function configureSteerInSettings(page: Page): Promise<void> {
+  const modifier = process.platform === "darwin" ? "Meta" : "Control";
+  await page.keyboard.press(`${modifier}+Comma`);
+  await expect(page).toHaveURL(/\/settings\/general$/);
+  await selectSteerInSettings(page);
+}
+
+async function selectSteerInSettings(page: Page): Promise<void> {
+  await selectSendBehaviorInSettings(page, "Steer", "steer");
+}
+
+/** Steer is the default, so the interrupt path only gets exercised by opting back into it. */
+async function configureInterruptInSettings(page: Page): Promise<void> {
+  const modifier = process.platform === "darwin" ? "Meta" : "Control";
+  await page.keyboard.press(`${modifier}+Comma`);
+  await expect(page).toHaveURL(/\/settings\/general$/);
+  await selectSendBehaviorInSettings(page, "Interrupt", "interrupt");
+}
+
+async function selectSendBehaviorInSettings(
+  page: Page,
+  behaviorLabel: string,
+  stored: string,
+): Promise<void> {
+  await page.getByRole("button", { name: /^Default send: / }).click();
+  await page.getByRole("menuitem", { name: behaviorLabel, exact: true }).click();
+  await expect
+    .poll(async () => {
+      const raw = await page.evaluate(() => localStorage.getItem("@paseo:app-settings"));
+      return raw ? (JSON.parse(raw) as { sendBehavior?: unknown }).sendBehavior : null;
+    })
+    .toBe(stored);
+}
+
+async function replaySteeredSleepTurnInBrowser(
+  page: Page,
+  testInfo: { workerIndex: number },
+  shape: "claude" | "codex",
+): Promise<void> {
+  const gate = await installDaemonWebSocketGate(page);
+  gate.holdNextShellToolCall("completed");
+  await gotoAppShell(page);
+  await openSettings(page);
+  await selectSteerInSettings(page);
+  const agent = await startRunningMockAgent(page, {
+    prefix: `steer-replay-${shape}-${testInfo.workerIndex}-`,
+    model: "ten-second-stream",
+    prompt: `Replay a ${shape}-shaped foreground shell tool call while the user steers this turn.`,
+  });
+  try {
+    await expect(page.getByTestId("tool-call-badge").last()).toBeVisible({ timeout: 30_000 });
+    await expectComposerVisible(page);
+    await submitMessage(page, "hello");
+
+    await expect(page.getByText("hello", { exact: true })).toHaveCount(1);
+    await expect(page.getByRole("button", { name: /^Worked for/ })).toHaveCount(0);
+    await expectInFlightForkAvailable(page);
+
+    await gate.waitForHeldServerMessage();
+    gate.releaseHeldServerMessage();
+    await agent.client.waitForFinish(agent.agentId, 30_000);
+
+    await expect(page.getByText("hello", { exact: true })).toHaveCount(1);
+    await expect(page.getByRole("button", { name: /^Worked for/ })).toHaveCount(1);
+    await expect(page.getByRole("button", { name: "Fork chat" }).last()).toBeVisible();
+  } finally {
+    gate.restore();
+    await agent.cleanup();
+  }
+}
+
 async function queueMessage(page: Page, prompt: string): Promise<void> {
  await fillComposerDraft(page, prompt);
  await sendDraftToQueue(page);
@@ -336,6 +424,66 @@ async function expectInterruptedTurnOrderAfterReconnect(
  }
 }

+async function expectHiddenStreamingSubmissionOrderAfterWorkspaceEviction(
+  page: Page,
+  testInfo: { workerIndex: number },
+): Promise<void> {
+  const subscriptions = observeTimelineSubscriptions(page);
+  const gate = await installDaemonWebSocketGate(page);
+  const target = await seedMockAgentWorkspace({
+    repoPrefix: `submission-hidden-stream-${testInfo.workerIndex}-`,
+    title: "Hidden streaming submission",
+    model: "ten-second-stream",
+  });
+  const evictionAgents = await Promise.all(
+    Array.from({ length: WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES }, (_unused, index) =>
+      seedMockAgentWorkspace({
+        repoPrefix: `submission-workspace-eviction-${testInfo.workerIndex}-${index}-`,
+        title: `Workspace eviction ${index + 1}`,
+      }),
+    ),
+  );
+  const prompt = "Keep this hidden image prompt before its streaming output.";
+  const targetDeckEntry = workspaceDeckEntryLocator(page, getServerId(), target.workspaceId);
+
+  try {
+    await openAgentRoute(page, target);
+    await expectComposerVisible(page);
+    await subscriptions.waitForSubscribedAgents([target.agentId]);
+
+    const userMessageCount = gate.getAgentStreamItemCount("user_message");
+    gate.setAgentStreamSuppressed(true);
+    const promptRow = await submitMessageWithImage(page, prompt);
+    await gate.waitForAgentStreamItem("user_message", userMessageCount + 1);
+
+    for (const evictionAgent of evictionAgents) {
+      await openAgentRoute(page, evictionAgent);
+      await expectComposerVisible(page);
+    }
+    await expect(targetDeckEntry).toHaveCount(0);
+    await subscriptions.waitForSubscribedAgents([
+      evictionAgents[WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES - 1]!.agentId,
+    ]);
+    gate.setAgentStreamSuppressed(false);
+
+    await target.client.waitForFinish(target.agentId, 30_000);
+    const requestsBeforeReturn = rememberTimelineRequestCounts(gate);
+    await openAgentRoute(page, target);
+    await expectComposerVisible(page);
+    await subscriptions.waitForSubscribedAgents([target.agentId]);
+
+    const response = page.getByText("(end of synthetic stream)", { exact: true }).last();
+    await expect(promptRow).toBeVisible();
+    await expect(response).toBeVisible();
+    await expectRenderedBefore(promptRow, response);
+    expectResumeOverflowFallsBackToOneTail(gate, requestsBeforeReturn);
+  } finally {
+    gate.setAgentStreamSuppressed(false);
+    gate.restore();
+    await Promise.all([...evictionAgents.map((agent) => agent.cleanup()), target.cleanup()]);
+  }
+}
+
 async function expectCompletedSubmissionClearsAfterMissedRunningTransition(
  page: Page,
  testInfo: { workerIndex: number },
@@ -627,7 +775,7 @@ async function expectRenderedBefore(first: Locator, second: Locator): Promise<vo
 async function openWorkspaceDraft(page: Page, workspaceId: string): Promise<void> {
  await page.goto(buildHostWorkspaceRoute(getServerId(), workspaceId));
  await waitForWorkspaceTabsVisible(page);
-  await page.getByTestId("workspace-new-agent-tab-inline").click();
+  await createAgentTabFromMenu(page);
  await expectComposerVisible(page);
 }

@@ -801,9 +949,9 @@ test.describe("Agent message submission", () => {

      gate.holdNextClientRequest("send_agent_message_request");
      await fillComposerDraft(page, "Replace the running turn without duplicating its action.");
-      await expect(
-        page.getByRole("button", { name: "Send and interrupt", exact: true }),
-      ).toHaveCount(1);
+      await expect(page.getByRole("button", { name: "Send and steer", exact: true })).toHaveCount(
+        1,
+      );
      await expect(page.getByRole("button", { name: "Stop agent", exact: true })).toHaveCount(0);
      await expect(page.getByRole("button", { name: "Interrupt agent", exact: true })).toHaveCount(
        0,
@@ -963,6 +1111,115 @@ test.describe("Agent message submission", () => {
    await retryRestoredSubmission(page, prompt);
  });

+  test("restores an ambiguous Steer failure without retrying or interrupting", async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(120_000);
+    const gate = await installDaemonWebSocketGate(page);
+    const prompt = "Restore this ambiguous Steer submission.";
+    const agent = await startRunningMockAgent(page, {
+      prefix: `steer-ambiguous-${testInfo.workerIndex}-`,
+      model: "one-minute-stream",
+      prompt: "Keep this turn active while a Steer request fails.",
+      featureValues: { mockSteerAmbiguousFailures: 1 },
+    });
+    try {
+      await configureSteerInSettings(page);
+      await page.goBack();
+      await expectComposerVisible(page);
+      await expectAgentReadyToInterrupt(page);
+      const sendsBefore = gate.getClientRequestCount("send_agent_message_request");
+      const cancelsBefore = gate.getClientRequestCount("cancel_agent_request");
+
+      await submitMessageThatWillBeRejected(page, prompt);
+      await expectRejectedSubmissionRestored(page, {
+        prompt,
+        errorMessage: "Requested mock steer transport failure",
+        preservesActiveTurn: true,
+      });
+
+      expect(gate.getClientRequestCount("send_agent_message_request")).toBe(sendsBefore + 1);
+      expect(gate.getClientRequestCount("cancel_agent_request")).toBe(cancelsBefore);
+      expect(gate.getClientRequests("send_agent_message_request").at(-1)).toMatchObject({
+        text: prompt,
+        activeTurnBehavior: "steer",
+      });
+    } finally {
+      gate.restore();
+      await agent.cleanup();
+    }
+  });
+
+  test("keeps an optimistic Steer prompt inside the active turn before acknowledgement", async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(120_000);
+    const gate = await installDaemonWebSocketGate(page);
+    const agent = await startRunningMockAgent(page, {
+      prefix: `steer-optimistic-${testInfo.workerIndex}-`,
+      model: "one-minute-stream",
+      prompt: "Keep this turn active while the user steers it.",
+    });
+    try {
+      await configureSteerInSettings(page);
+      await page.goBack();
+      await expectComposerVisible(page);
+      await expectAgentReadyToInterrupt(page);
+      gate.holdNextServerMessage("send_agent_message_response");
+      await submitMessage(page, "hello");
+      await gate.waitForHeldServerMessage("send_agent_message_response");
+      await expect(page.getByText("hello", { exact: true })).toHaveCount(1);
+      await expect(page.getByText(/^Worked for/)).toHaveCount(0);
+      gate.releaseHeldServerMessage("send_agent_message_response");
+      await expect(page.getByText("hello", { exact: true })).toHaveCount(1);
+    } finally {
+      gate.restore();
+      await agent.cleanup();
+    }
+  });
+
+  test("sends interrupt behavior on the wire when the user opts out of steering", async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(120_000);
+    const gate = await gateNextAgentMessage(page);
+    const agent = await startRunningMockAgent(page, {
+      prefix: `interrupt-submission-${testInfo.workerIndex}-`,
+      model: "one-minute-stream",
+      prompt: "Keep this turn active until the user interrupts it.",
+    });
+    try {
+      await configureInterruptInSettings(page);
+      await page.goBack();
+      await expectComposerVisible(page);
+      await expectAgentReadyToInterrupt(page);
+
+      const prompt = "Interrupt the running turn.";
+      await fillComposerDraft(page, prompt);
+      await expect(
+        page.getByRole("button", { name: "Send and interrupt", exact: true }),
+      ).toHaveCount(1);
+      await composerLocator(page).press("Enter");
+
+      const request = await gate.waitForRequest();
+      expect(request.activeTurnBehavior).toBe("interrupt");
+      gate.accept();
+      await expect(page.getByTestId("user-message").filter({ hasText: prompt })).toHaveCount(1);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("replays Claude-shaped steering inside one active turn", async ({ page }, testInfo) => {
+    test.setTimeout(120_000);
+    await replaySteeredSleepTurnInBrowser(page, testInfo, "claude");
+  });
+
+  test("replays Codex-shaped steering inside one active turn", async ({ page }, testInfo) => {
+    test.setTimeout(120_000);
+    await replaySteeredSleepTurnInBrowser(page, testInfo, "codex");
+  });
+
  test("restores overlapping queued sends when their connection fails", async ({
    page,
  }, testInfo) => {
@@ -1013,6 +1270,13 @@ test.describe("Agent message submission", () => {
    await expectInterruptedTurnOrderAfterReconnect(page, testInfo);
  });

+  test("keeps a streaming hidden submission before its output after workspace eviction", async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(240_000);
+    await expectHiddenStreamingSubmissionOrderAfterWorkspaceEviction(page, testInfo);
+  });
+
  test("clears an attachment-only submission when canonical history arrives after a missed running transition", async ({
    page,
  }, testInfo) => {
@@ -0,0 +1,215 @@
+import { access } from "node:fs/promises";
+import { expect, test as base } from "../support/fixtures";
+import {
+  answerNextRemovalWarning,
+  cancelSkillSelection,
+  chooseAllSkills,
+  chooseCustomSkills,
+  expectInstalledSkills,
+  expectSavedSelection,
+  expectSkillFile,
+  openAgentSkillsSettings,
+  openSkillSelection,
+  saveSkillSelection,
+  startAgentSkillsSandbox,
+  toggleSkill,
+  type AgentSkillsSandbox,
+} from "../support/helpers/agent-skills";
+import { readVerticalGap, waitForSettledPosition } from "../support/helpers/sheet-layout";
+
+const test = base.extend<{ skills: AgentSkillsSandbox }>({
+  // oxlint-disable-next-line no-empty-pattern -- Playwright requires destructuring for fixture dependency discovery.
+  skills: async ({}, provide) => {
+    const sandbox = await startAgentSkillsSandbox();
+    try {
+      await provide(sandbox);
+    } finally {
+      await sandbox.close();
+    }
+  },
+});
+
+test.describe("Host agent skills", () => {
+  test.describe.configure({ timeout: 120_000 });
+
+  test("installs a custom selection, cancels a draft, then installs all skills", async ({
+    page,
+    skills,
+  }) => {
+    const custom = skills.available.slice(0, 2);
+    const cancelledAddition = skills.available[2]!;
+    await openAgentSkillsSettings(page, skills);
+
+    await openSkillSelection(page);
+    await chooseCustomSkills(page, custom);
+    await saveSkillSelection(page);
+    await expectInstalledSkills(skills, custom);
+    await expectSavedSelection(skills, { mode: "custom", skills: custom });
+
+    await openSkillSelection(page);
+    await toggleSkill(page, cancelledAddition);
+    await cancelSkillSelection(page);
+    await expectInstalledSkills(skills, custom);
+    await expectSavedSelection(skills, { mode: "custom", skills: custom });
+
+    await openSkillSelection(page);
+    await chooseAllSkills(page);
+    await saveSkillSelection(page);
+    await expectSavedSelection(skills, { mode: "all" });
+    await expectInstalledSkills(skills, skills.available);
+  });
+
+  test("dismisses and then accepts removal confirmation", async ({ page, skills }) => {
+    const retained = skills.available.slice(0, 2);
+    const removed = skills.available.slice(2);
+    await skills.install({ mode: "all" });
+    await openAgentSkillsSettings(page, skills);
+    await openSkillSelection(page);
+    await chooseCustomSkills(page, retained);
+
+    const dismissedWarning = answerNextRemovalWarning(page, "dismiss");
+    await saveSkillSelection(page);
+    const dismissedDialog = await dismissedWarning;
+    expect(dismissedDialog.message()).toContain("Remove deselected skills?");
+    for (const skill of removed) expect(dismissedDialog.message()).toContain(skill);
+    await expectInstalledSkills(skills, skills.available);
+    await expectSavedSelection(skills, { mode: "all" });
+
+    const acceptedWarning = answerNextRemovalWarning(page, "accept");
+    await saveSkillSelection(page);
+    expect((await acceptedWarning).message()).toContain(
+      "Anything you added inside those skill folders",
+    );
+    await expectInstalledSkills(skills, retained);
+    await expectSavedSelection(skills, { mode: "custom", skills: retained });
+  });
+
+  test("warns before removing a partial installation", async ({ page, skills }) => {
+    const partial = skills.available.at(-1)!;
+    const retained = skills.available.filter((name) => name !== partial);
+    await skills.install({ mode: "all" });
+    await skills.keepSkillOnlyIn(partial, "claude");
+    await openAgentSkillsSettings(page, skills);
+    await openSkillSelection(page);
+    await chooseCustomSkills(page, retained);
+
+    const warning = answerNextRemovalWarning(page, "dismiss");
+    await saveSkillSelection(page);
+    expect((await warning).message()).toContain(partial);
+    await expectSkillFile(skills, "claude", partial, "SKILL.md");
+    await expectSavedSelection(skills, { mode: "all" });
+  });
+
+  test("warns without deleting user files from an externally restored skill", async ({
+    page,
+    skills,
+  }) => {
+    const retained = skills.available.slice(0, 2);
+    const drift = skills.available[2]!;
+    await skills.install({ mode: "custom", skills: retained });
+    await skills.placeSkillOnDisk(drift, "claude", {
+      "SKILL.md": `# ${drift}\n`,
+      "notes/mine.md": "user notes",
+    });
+    await openAgentSkillsSettings(page, skills);
+    await openSkillSelection(page);
+
+    const warning = answerNextRemovalWarning(page, "dismiss");
+    await saveSkillSelection(page);
+    expect((await warning).message()).toContain(drift);
+    await expectSkillFile(skills, "claude", drift, "notes/mine.md");
+    await expectSavedSelection(skills, { mode: "custom", skills: retained });
+  });
+
+  test("keeps the sheet open with an error when convergence fails", async ({ page, skills }) => {
+    await openAgentSkillsSettings(page, skills);
+    await openSkillSelection(page);
+    await skills.blockAgentsDirectory();
+    await chooseCustomSkills(page, [skills.available[0]!]);
+    await saveSkillSelection(page);
+
+    await expect(
+      page.getByText("Could not save your skill selection.", { exact: true }),
+    ).toBeVisible();
+    await expect(page.getByRole("switch", { name: "All skills", exact: true })).toBeVisible();
+    await skills.unblockAgentsDirectory();
+    await expectSavedSelection(skills, { mode: "all" });
+  });
+
+  test("serializes concurrent saves through the daemon command surface", async ({ skills }) => {
+    const firstSelection = { mode: "custom" as const, skills: [skills.available[0]!] };
+    const secondSelection = { mode: "custom" as const, skills: [skills.available[1]!] };
+
+    const first = skills.client.saveAgentSkillsSelection(firstSelection, skills.available);
+    const second = skills.client.saveAgentSkillsSelection(secondSelection, skills.available);
+    await expect(Promise.all([first, second])).resolves.toMatchObject([
+      { confirmationRequired: null, selection: firstSelection },
+      { confirmationRequired: null, selection: secondSelection },
+    ]);
+
+    await expectInstalledSkills(skills, secondSelection.skills);
+    await expectSavedSelection(skills, secondSelection);
+  });
+
+  test("ignores agent config environment overrides", async ({ skills }) => {
+    await skills.install({ mode: "custom", skills: [skills.available[0]!] });
+
+    await expect(
+      access(`${skills.home}/../ignored-claude-config/skills`).then(
+        () => true,
+        () => false,
+      ),
+    ).resolves.toBe(false);
+    await expect(
+      access(`${skills.home}/../ignored-codex-home/skills`).then(
+        () => true,
+        () => false,
+      ),
+    ).resolves.toBe(false);
+  });
+});
+
+function allSkillsCard(page: Parameters<typeof openSkillSelection>[0]) {
+  return page.getByTestId("skill-selection-all-card");
+}
+
+function skillListCard(page: Parameters<typeof openSkillSelection>[0]) {
+  return page.getByTestId("skill-selection-list-card");
+}
+
+function bundledSkillsLabel(page: Parameters<typeof openSkillSelection>[0]) {
+  return page.getByText("Bundled skills", { exact: true });
+}
+
+test.describe("Agent skills sheet inset", () => {
+  test.describe.configure({ timeout: 120_000 });
+
+  test.describe("compact", () => {
+    test.use({ viewport: { width: 390, height: 844 } });
+
+    test("keeps more space above the bundled skills label than below", async ({ page, skills }) => {
+      await openAgentSkillsSettings(page, skills, { compact: true });
+      await openSkillSelection(page);
+      await waitForSettledPosition(page.getByTestId("skill-selection-sheet"));
+
+      expect({
+        aboveLabel: await readVerticalGap(allSkillsCard(page), bundledSkillsLabel(page)),
+        belowLabel: await readVerticalGap(bundledSkillsLabel(page), skillListCard(page)),
+      }).toEqual({ aboveLabel: 16, belowLabel: 12 });
+    });
+  });
+
+  test.describe("desktop", () => {
+    test.use({ viewport: { width: 1280, height: 900 } });
+
+    test("keeps more space above the bundled skills label than below", async ({ page, skills }) => {
+      await openAgentSkillsSettings(page, skills);
+      await openSkillSelection(page);
+
+      expect({
+        aboveLabel: await readVerticalGap(allSkillsCard(page), bundledSkillsLabel(page)),
+        belowLabel: await readVerticalGap(bundledSkillsLabel(page), skillListCard(page)),
+      }).toEqual({ aboveLabel: 16, belowLabel: 12 });
+    });
+  });
+});
@@ -0,0 +1,151 @@
+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)))
+  ];
+}
@@ -26,9 +26,41 @@ import {
  expectTimelineViewportAnchoredAfterPrepend,
  userNavigatesTimelineToHistoryStartWithKeyboard,
  userScrollsTimelineToHistoryStart,
+  waitForPersistedCanonicalTimelineRange,
 } from "../support/helpers/timeline-pagination";
+import { trackAgentTimelineRequests } from "../support/helpers/agent-timeline-gate";
+import { seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 test.describe("Agent timeline pagination", () => {
+  test("resumes a persisted canonical timeline after its exact end", async ({ page }) => {
+    const prompt = "timeline persisted range resumes without tail replay";
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "timeline-persisted-range-",
+      title: "Persisted timeline range",
+      initialPrompt: prompt,
+    });
+    try {
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, prompt);
+      const range = await waitForPersistedCanonicalTimelineRange(page, agent.agentId);
+
+      const tracker = await trackAgentTimelineRequests(page, agent.agentId);
+      await page.reload();
+      await expectTimelinePromptVisible(page, prompt);
+
+      const request = await tracker.nextRequest();
+      expect(request).toEqual({
+        direction: "after",
+        cursor: { epoch: range.epoch, seq: range.endSeq },
+      });
+      await tracker.waitForResponse();
+      expect(tracker.requests().some((entry) => entry.direction === "tail")).toBe(false);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
  test("keeps a fixed history-start gutter before, during, and after pagination", async ({
    page,
  }) => {
@@ -59,14 +91,16 @@ test.describe("Agent timeline pagination", () => {
      await expectTimelinePromptVisible(page, agent.newestPrompt);
      await expectTimelinePromptCentered(page, agent.newestPrompt);
      await expectTimelinePromptNotMounted(page, agent.oldestPrompt);
+      await expectTimelinePromptNotMounted(page, agent.initialTailOldestPrompt);

      await userScrollsTimelineToHistoryStart(page);
+      await expectTimelinePromptVisible(page, agent.initialTailOldestPrompt);
      await history.expectRequestedPages(1);
      history.releasePage(1);
      await history.expectSettledWithRequestedPages(1);
-      await expectTimelinePromptCentered(page, agent.firstOlderPagePrompt);

      await userScrollsTimelineToHistoryStart(page);
+      await expectTimelinePromptCentered(page, agent.firstOlderPagePrompt);
      await history.expectRequestedPages(2);
    } finally {
      await agent.cleanup();
@@ -13,9 +13,10 @@ import {
 import {
  commitTimelineTurnsWhileDisconnected,
  disconnectViewedTimeline,
-  expectOneTailCheckWithoutCatchUpPages,
+  expectOneResumeCheckWithoutTail,
+  expectResumeOverflowFallsBackToOneTail,
  rememberTimelineRequestCounts,
-  restoreViewedTimelineWithHeldTail,
+  restoreViewedTimelineWithHeldResponse,
 } from "../support/helpers/timeline-resume";

 test.describe("Agent timeline resume", () => {
@@ -29,11 +30,11 @@ test.describe("Agent timeline resume", () => {
      const requests = rememberTimelineRequestCounts(gate);
      await disconnectViewedTimeline(page, gate);
      const background = await commitTimelineTurnsWhileDisconnected(agent, 24);
-      await restoreViewedTimelineWithHeldTail(page, gate);
+      await restoreViewedTimelineWithHeldResponse(page, gate);

      await expectTimelinePromptVisible(page, background.newestPrompt);
      await expectTimelinePromptNotMounted(page, background.firstPrompt);
-      expectOneTailCheckWithoutCatchUpPages(gate, requests);
+      expectResumeOverflowFallsBackToOneTail(gate, requests);
      await scrollTimelineUntilOlderHistoryIsReachable(page, background.firstPrompt);
    } finally {
      gate.restore();
@@ -53,10 +54,10 @@ test.describe("Agent timeline resume", () => {
      const requests = rememberTimelineRequestCounts(gate);

      await disconnectViewedTimeline(page, gate);
-      await restoreViewedTimelineWithHeldTail(page, gate);
+      await restoreViewedTimelineWithHeldResponse(page, gate);

      await expectTimelinePresentationUnchanged(page, presentation);
-      expectOneTailCheckWithoutCatchUpPages(gate, requests);
+      expectOneResumeCheckWithoutTail(gate, requests);
    } finally {
      gate.restore();
      await agent.cleanup();
@@ -0,0 +1,87 @@
+import { expect, test } from "../support/fixtures";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import {
+  expectTimelinePromptVisible,
+  openAgentTimeline,
+  seedLongMockAgentTimeline,
+} from "../support/helpers/timeline-pagination";
+import {
+  disconnectViewedTimeline,
+  restoreViewedTimelineWithHeldResponse,
+} from "../support/helpers/timeline-resume";
+
+test.describe("Agent timeline sync retry", () => {
+  test("a refused catch-up offers a retry that reports pending, failure, and recovery", async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(120_000);
+    const gate = await installDaemonWebSocketGate(page);
+    const agent = await seedLongMockAgentTimeline({ turns: 2 });
+    try {
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+
+      gate.failTimelineResponses(agent.agentId);
+      await disconnectViewedTimeline(page, gate);
+      await restoreViewedTimelineWithHeldResponse(page, gate);
+
+      const callout = page.getByTestId("agent-timeline-sync-error");
+      const retry = page.getByTestId("agent-timeline-sync-retry");
+      await expect(callout).toBeVisible({ timeout: 30_000 });
+      await expect(retry).toBeEnabled();
+      await page.screenshot({ path: testInfo.outputPath("1-sync-error.png"), fullPage: true });
+
+      gate.holdTimelineResponses(agent.agentId);
+      await retry.click();
+      await gate.waitForHeldTimelineResponse();
+      await expect(retry).toBeDisabled();
+      await expect(retry).toHaveText("Retrying…");
+      await page.screenshot({ path: testInfo.outputPath("2-retry-pending.png"), fullPage: true });
+
+      gate.releaseHeldTimelineResponses();
+      await expect(retry).toBeEnabled({ timeout: 30_000 });
+      await expect(callout).toBeVisible();
+      await page.screenshot({ path: testInfo.outputPath("3-retry-failed.png"), fullPage: true });
+
+      gate.allowTimelineResponses();
+      await retry.click();
+      await expect(callout).toBeHidden({ timeout: 30_000 });
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+      await page.screenshot({ path: testInfo.outputPath("4-recovered.png"), fullPage: true });
+    } finally {
+      gate.restore();
+      await agent.cleanup();
+    }
+  });
+
+  test("a refused first load offers a retry instead of a dead panel", async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(120_000);
+    const gate = await installDaemonWebSocketGate(page);
+    const agent = await seedLongMockAgentTimeline({ turns: 2 });
+    try {
+      gate.failTimelineResponses(agent.agentId);
+      await openAgentTimeline(page, agent);
+
+      const loadError = page.getByTestId("agent-load-error");
+      const retry = page.getByTestId("agent-load-error-retry");
+      await expect(loadError).toBeVisible({ timeout: 60_000 });
+      await expect(loadError).toContainText("already has an active writer");
+      await page.screenshot({ path: testInfo.outputPath("5-load-error.png"), fullPage: true });
+
+      await retry.click();
+      await expect(loadError).toBeVisible({ timeout: 30_000 });
+      await page.screenshot({ path: testInfo.outputPath("6-load-retry-failed.png") });
+
+      gate.allowTimelineResponses();
+      await retry.click();
+      await expect(loadError).toBeHidden({ timeout: 30_000 });
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+      await page.screenshot({ path: testInfo.outputPath("7-load-recovered.png"), fullPage: true });
+    } finally {
+      gate.restore();
+      await agent.cleanup();
+    }
+  });
+});
@@ -35,7 +35,7 @@ test("keeps the selected workspace visible in Pure black", async ({ page }, test
    await row.click();

    await expect(row).toHaveAttribute("aria-selected", "true");
-    await expect(row).toHaveCSS("background-color", "rgb(22, 22, 22)");
+    await expect(row).toHaveCSS("background-color", "rgb(17, 17, 17)");
    await page.screenshot({
      path: testInfo.outputPath("pure-black-selected-workspace.png"),
      fullPage: true,
@@ -47,7 +47,7 @@ test("keeps the selected workspace visible in Pure black", async ({ page }, test

 test("applies the interface font size to settings text", async ({ page }) => {
  await page.addInitScript(() => {
-    localStorage.setItem("@paseo:app-settings", JSON.stringify({ uiFontSize: 24 }));
+    localStorage.setItem("@paseo:app-settings", JSON.stringify({ uiBaseFontSize: 21 }));
  });
  await page.goto("/settings");
  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
@@ -56,11 +56,14 @@ test("applies the interface font size to settings text", async ({ page }) => {
  const sectionTitle = page.getByText("Theme", { exact: true }).first();
  await expect(sectionTitle).toHaveCSS("font-size", "18px");

-  const fontSizeInput = page.getByLabel("Interface font size");
-  await expect(fontSizeInput).toHaveValue("24");
-  await fontSizeInput.fill("12");
-  await fontSizeInput.press("Tab");
+  const interfaceSizeInput = page.getByLabel("Interface font size");
+  const contentSizeInput = page.getByLabel("Content font size");
+  await expect(interfaceSizeInput).toHaveValue("21");
+  await expect(contentSizeInput).toHaveValue("21");
+  await interfaceSizeInput.fill("12");
+  await interfaceSizeInput.press("Tab");

-  await expect(fontSizeInput).toHaveValue("12");
-  await expect(sectionTitle).toHaveCSS("font-size", "9px");
+  await expect(interfaceSizeInput).toHaveValue("12");
+  await expect(contentSizeInput).toHaveValue("21");
+  await expect(sectionTitle).toHaveCSS("font-size", "10px");
 });
@@ -0,0 +1,79 @@
+import { test } from "../support/fixtures";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import {
+  archiveFinishedSubagents,
+  expectArchiveFinishedInProgress,
+  expectArchiveFinishedRetry,
+  expectManagedSubagentArchived,
+  expectManagedSubagentUnarchived,
+  expectSubagentRowGone,
+  expectSubagentRowVisible,
+  holdManagedSubagentArchiveRequest,
+  openSubagentsTrack,
+  rejectNextManagedSubagentArchiveRequest,
+  seedParentWithSubagent,
+} from "../support/helpers/subagents";
+
+test.describe("Archive finished subagents", () => {
+  let workspace: SeededWorkspace;
+
+  test.beforeAll(async () => {
+    workspace = await seedWorkspace({ repoPrefix: "archive-finished-subagents-" });
+  });
+
+  test.afterAll(async () => {
+    await workspace?.cleanup();
+  });
+
+  test("archives a finished managed child from the track", async ({ page }) => {
+    const agents = await seedParentWithSubagent(workspace, {
+      parentTitle: "Archive parent",
+      childTitle: "Finished child",
+    });
+    await workspace.client.waitForAgentUpsert(
+      agents.child.id,
+      (snapshot) => snapshot.status === "idle",
+    );
+
+    const archiveGate = await holdManagedSubagentArchiveRequest(page, agents.child.id);
+    await openAgentRoute(page, { workspaceId: agents.workspaceId, agentId: agents.parent.id });
+    await openSubagentsTrack(page);
+    await expectSubagentRowVisible(page, agents.child.id);
+
+    await archiveFinishedSubagents(page);
+    await archiveGate.waitForRequest();
+
+    await expectSubagentRowGone(page, agents.child.id);
+    await expectArchiveFinishedInProgress(page, 0, 1);
+    await expectManagedSubagentUnarchived(workspace, agents.child.id);
+    archiveGate.release();
+    await expectManagedSubagentArchived(workspace, agents.child.id);
+  });
+
+  test("restores a failed child and retries the archive", async ({ page }) => {
+    const agents = await seedParentWithSubagent(workspace, {
+      parentTitle: "Retry parent",
+      childTitle: "Retry child",
+    });
+    await workspace.client.waitForAgentUpsert(
+      agents.child.id,
+      (snapshot) => snapshot.status === "idle",
+    );
+
+    const rejection = await rejectNextManagedSubagentArchiveRequest(page, agents.child.id);
+    await openAgentRoute(page, { workspaceId: agents.workspaceId, agentId: agents.parent.id });
+    await openSubagentsTrack(page);
+    await expectSubagentRowVisible(page, agents.child.id);
+
+    await archiveFinishedSubagents(page);
+    await rejection.waitForRejection();
+
+    await expectSubagentRowVisible(page, agents.child.id);
+    await expectArchiveFinishedRetry(page, 1, 1);
+    await archiveFinishedSubagents(page);
+
+    await expectSubagentRowGone(page, agents.child.id);
+    await expectManagedSubagentArchived(workspace, agents.child.id);
+  });
+});
@@ -90,11 +90,7 @@ async function openTabSwitcher(page: Page) {
 async function openModelSelector(page: Page) {
  await page.getByRole("button", { name: /Select model/ }).click();
  await expectBottomSheetOpen(page);
-  await expect(
-    page.getByLabel("Bottom Sheet", { exact: true }).getByText("Ten second stream", {
-      exact: true,
-    }),
-  ).toBeVisible({ timeout: 10_000 });
+  await expect(page.getByTestId("agent-controls-settings-list")).toBeVisible({ timeout: 10_000 });
 }

 async function openAndCloseTabSwitcherTwice(page: Page) {
@@ -124,15 +120,23 @@ test.describe("mobile bottom sheet reopen", () => {
    });
  });

-  test("model selector closes after model selection", async ({ page }) => {
+  test("search selection returns to configuration options", async ({ page }) => {
    await withMobileMockAgent(page, async () => {
      await openModelSelector(page);
-      const sheet = page.getByLabel("Bottom Sheet", { exact: true });
+      const sheet = page.getByTestId("agent-controls-model-sheet");

-      await sheet.getByText("Ten second stream", { exact: true }).click();
+      await page.getByTestId("model-search-all-input").click();
+      const model = page.getByRole("button", { name: /^Ten second stream/ });
+      await expect(model).toBeVisible({
+        timeout: 10_000,
+      });

-      await expect(sheet).not.toBeVisible({ timeout: 10_000 });
-      await expect(page.getByRole("button", { name: /Ten second stream/ })).toBeVisible();
+      await model.click();
+
+      await expect(sheet).toBeVisible();
+      await expect(page.getByTestId("agent-controls-settings-list")).toBeVisible();
+      await expect(page.getByTestId("agent-controls-model")).toContainText("Ten second stream");
+      await expect(page.getByTestId("agent-controls-model-browser-sheet")).not.toBeVisible();
    });
  });
 });
@@ -0,0 +1,58 @@
+import { expect, test, type Page } 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-" });
+
+  try {
+    await page.setViewportSize({ width: 1400, height: 900 });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await waitForWorkspaceTabsVisible(page);
+
+    await page.keyboard.press(CHANGES_SHORTCUT);
+
+    await expect(sidePanel(page).getByTestId("workspace-tab-working_diff")).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);
+  } finally {
+    await workspace.cleanup();
+  }
+});
@@ -119,6 +119,7 @@ test.describe("desktop chat outline", () => {
    test("previews and jumps to the focused prompt from the keyboard", async ({ page }) => {
      await focusChatOutlinePrompt(page, 1);
      await expectChatOutlinePreview(page, agent.prompts[0]);
+      await expectTimelinePromptNotMounted(page, agent.oldestPrompt);

      await pressEnterOnFocusedPrompt(page);
      await expectTimelinePromptLandedBelowTop(page, agent.oldestPrompt);
@@ -1,7 +1,9 @@
 import { execFileSync } from "node:child_process";
 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";

 const COMMIT_SUBJECT = "Show commit timestamps";

@@ -13,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 page.getByRole("button", { name: "Open explorer" }).click();
+  await openChangesPanel(page);
  const commitsSection = page.getByRole("button", { name: /Commits/i });
  await expect(commitsSection).toBeVisible({ timeout: 30_000 });
  await commitsSection.click();
@@ -33,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 page.getByRole("button", { name: "Open explorer" }).click();
+  await openChangesPanel(page);
  const commitsSection = page.getByRole("button", { name: /Commits/i });
  await expect(commitsSection).toBeVisible({ timeout: 30_000 });
  await commitsSection.click();
@@ -49,14 +51,29 @@ test("commit history shows dates and shares diff layout preferences", async ({
  const panel = page.getByTestId("commit-diff-panel").filter({ visible: true });
  await expect(panel.getByTestId("commit-diff-toolbar")).toBeVisible({ timeout: 30_000 });
  const layoutToggle = panel.getByTestId("commit-diff-toggle-layout");
+  const [commitToolbarBox, layoutToggleBox, layoutToggleGlyphBox] = await Promise.all([
+    panel.getByTestId("commit-diff-header").boundingBox(),
+    layoutToggle.boundingBox(),
+    layoutToggle.locator("svg").boundingBox(),
+  ]);
+  if (!commitToolbarBox || !layoutToggleBox || !layoutToggleGlyphBox) {
+    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(layoutToggleGlyphBox.width).toBe(14);
+  expect(layoutToggleGlyphBox.height).toBe(14);
  await expect(layoutToggle).toHaveAccessibleName("Switch to side-by-side diff");
-  await expect(panel.getByTestId("diff-code-row-0")).toBeVisible({ timeout: 30_000 });
+  await expect(panel.getByTestId("git-diff-canvas")).toBeVisible({ timeout: 30_000 });
+  await expectCommitDiffHeaderGeometry(panel);

  await layoutToggle.click();
  await expect(layoutToggle).toHaveAccessibleName("Switch to unified diff");
-  await expect(panel.getByTestId("diff-code-row-0")).toHaveCount(0);
+  await expect(panel.locator('[data-testid^="diff-code-row-"]')).toHaveCount(0);
  await expect(panel.getByTestId("diff-file-0-body")).toBeVisible();

+  await page.getByTestId(/^workspace-tab-commit_diff_/).hover();
  await page.getByTestId(/^workspace-commit-diff-close-/).click();
  await expect(panel).toHaveCount(0);
  await commitRow.click();
@@ -67,7 +84,7 @@ test("commit history shows dates and shares diff layout preferences", async ({

  await page.setViewportSize({ width: 480, height: 900 });
  await expect(panel.getByTestId("commit-diff-toolbar")).toHaveCount(0);
-  await expect(panel.getByTestId("diff-code-row-0")).toBeVisible();
+  await expect(panel.getByTestId("git-diff-canvas")).toBeVisible();
 });

 async function createFeatureCommit(repoPath: string): Promise<void> {
@@ -84,3 +101,25 @@ async function createFeatureCommit(repoPath: string): Promise<void> {
    },
  });
 }
+
+async function expectCommitDiffHeaderGeometry(panel: Locator): Promise<void> {
+  const [header, content, name, stat] = await Promise.all([
+    panel.getByTestId("diff-file-0").boundingBox(),
+    panel.getByTestId("diff-file-0-header-content").boundingBox(),
+    panel.getByTestId("diff-file-0-name").boundingBox(),
+    panel.getByTestId("diff-file-0-stat").boundingBox(),
+  ]);
+  expect(header).not.toBeNull();
+  expect(content).not.toBeNull();
+  expect(name).not.toBeNull();
+  expect(stat).not.toBeNull();
+  expect(header!.height).toBeCloseTo(30, 0);
+  expect(content!.x).toBeCloseTo(header!.x, 0);
+  expect(content!.width).toBeCloseTo(header!.width, 0);
+  expect(name!.x - header!.x).toBeCloseTo(12, 0);
+  expect(name!.x + name!.width).toBeLessThan(stat!.x);
+  expect(Math.abs(name!.y + name!.height / 2 - (stat!.y + stat!.height / 2))).toBeLessThanOrEqual(
+    1,
+  );
+  expect(stat!.x + stat!.width).toBeLessThan(header!.x + header!.width);
+}
@@ -544,6 +544,88 @@ test.describe("Composer autocomplete", () => {
    }
  });

+  test("uses the live cursor when accepting a slash command", async ({ page }) => {
+    await installListCommandsStub(page);
+    const agent = await openReadyMockAgent(page);
+
+    try {
+      const input = composerLocator(page);
+      await expect(input).toBeEditable({ timeout: 30_000 });
+      await input.fill("/tdd");
+      await expect(
+        page
+          .getByTestId("composer-autocomplete-popover")
+          .getByText("/tdd", { exact: true })
+          .first(),
+      ).toBeVisible({ timeout: 30_000 });
+
+      await input.evaluate((element) => {
+        if (!(element instanceof HTMLTextAreaElement)) {
+          throw new Error("Composer input is not a textarea");
+        }
+        element.setSelectionRange(0, 0);
+        element.dispatchEvent(new Event("select", { bubbles: true }));
+        element.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: "Tab",
+            bubbles: true,
+            cancelable: true,
+          }),
+        );
+      });
+
+      await expect(input).toHaveValue("/tdd");
+      const selectionStart = await input.evaluate(
+        (element) => (element as HTMLTextAreaElement).selectionStart,
+      );
+      expect(selectionStart).toBe(0);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("uses the live input when clicking a slash command", async ({ page }) => {
+    await installListCommandsStub(page);
+    const agent = await openReadyMockAgent(page);
+
+    try {
+      const input = composerLocator(page);
+      await expect(input).toBeEditable({ timeout: 30_000 });
+      await input.fill("/td");
+      const option = page
+        .getByTestId("composer-autocomplete-popover")
+        .getByText("/tdd", { exact: true })
+        .first();
+      await expect(option).toBeVisible({ timeout: 30_000 });
+
+      await option.evaluate((element) => {
+        const textarea = document.querySelector('textarea[aria-label="Message agent..."]');
+        if (!(textarea instanceof HTMLTextAreaElement)) {
+          throw new Error("Composer input is not a textarea");
+        }
+        const valueSetter = Object.getOwnPropertyDescriptor(
+          HTMLTextAreaElement.prototype,
+          "value",
+        )?.set;
+        if (!valueSetter) throw new Error("Textarea value setter is unavailable");
+        valueSetter.call(textarea, "/tdd suffix");
+        textarea.setSelectionRange(4, 4);
+        textarea.dispatchEvent(
+          new InputEvent("input", {
+            bubbles: true,
+            data: "d suffix",
+            inputType: "insertText",
+          }),
+        );
+        (element as HTMLElement).click();
+      });
+
+      await expect(input).toHaveValue("/tdd suffix");
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
  test("stays anchored to the composer when the desktop sidebar is open", async ({ page }) => {
    await installListCommandsStub(page);
    const agent = await openReadyMockAgent(page);
@@ -0,0 +1,132 @@
+import { rm, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { openFilesPanel } from "../support/helpers/workspace-tabs";
+
+const APP_SETTINGS_KEY = "@paseo:app-settings";
+
+function visibleMainPane(page: Page) {
+  return page.getByTestId("workspace-pane-main").filter({ visible: true });
+}
+
+async function seedChangedAgent(repoPrefix: string) {
+  const workspace = await seedMockAgentWorkspace({
+    repoPrefix,
+    title: "Composer diff stat",
+    repo: { withRemote: true },
+  });
+  try {
+    await rm(path.join(workspace.cwd, "remote.git"), { recursive: true });
+    await writeFile(
+      path.join(workspace.cwd, "README.md"),
+      "# Temp Repo\nexport const one = 1;\nexport const two = 2;\n",
+    );
+    await workspace.client.checkoutRefresh(workspace.cwd);
+    await expect
+      .poll(async () => {
+        const workspaces = await workspace.client.fetchWorkspaces();
+        return (
+          workspaces.entries.find((entry) => entry.id === workspace.workspaceId)?.diffStat ?? null
+        );
+      })
+      .toEqual({ additions: 2, deletions: 0 });
+    return workspace;
+  } catch (error) {
+    await workspace.cleanup();
+    throw error;
+  }
+}
+
+test("composer diff stat toggles Changes in the preferred Side panel", async ({ page }) => {
+  const workspace = await seedChangedAgent("composer-diff-stat-side-");
+
+  try {
+    await page.setViewportSize({ width: 1400, height: 900 });
+    await openAgentRoute(page, {
+      workspaceId: workspace.workspaceId,
+      agentId: workspace.agentId,
+    });
+
+    const pill = page.getByTestId("composer-diff-stat-pill");
+    await expect(pill).toBeVisible({ timeout: 30_000 });
+    await expect(pill).toContainText("+2");
+    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({
+      timeout: 30_000,
+    });
+    await expect(sidePanel.getByTestId("working-diff-panel")).toBeVisible({ timeout: 30_000 });
+
+    await test.step("switching from another Side panel view reveals Changes", async () => {
+      await openFilesPanel(page);
+      await expect(sidePanel.getByTestId("file-explorer-tree-scroll")).toBeVisible();
+
+      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(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();
+  }
+});
+
+test("composer diff stat opens the compact explorer instead of a Changes tab", async ({ page }) => {
+  const workspace = await seedChangedAgent("composer-diff-stat-compact-");
+
+  try {
+    await page.setViewportSize({ width: 390, height: 844 });
+    await openAgentRoute(page, {
+      workspaceId: workspace.workspaceId,
+      agentId: workspace.agentId,
+    });
+
+    await page.getByTestId("composer-diff-stat-pill").click();
+
+    await expect(page.getByTestId("changes-header")).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);
+  const workspace = await seedChangedAgent("composer-diff-stat-tab-");
+
+  try {
+    await page.setViewportSize({ width: 1400, height: 900 });
+    await openAgentRoute(page, {
+      workspaceId: workspace.workspaceId,
+      agentId: workspace.agentId,
+    });
+
+    await page.getByTestId("composer-diff-stat-pill").click();
+
+    const mainPane = visibleMainPane(page);
+    await expect(mainPane.getByTestId("workspace-tab-working_diff")).toBeVisible({
+      timeout: 30_000,
+    });
+    await expect(mainPane.getByTestId("working-diff-panel")).toBeVisible({ timeout: 30_000 });
+    await expect(page.getByTestId("workspace-side-panel")).toHaveCount(0);
+  } finally {
+    await workspace.cleanup();
+  }
+});
@@ -0,0 +1,121 @@
+import { expect, test, type Page } from "../support/fixtures";
+import {
+  expectNearBottom,
+  scrollAgentChatToBottom,
+  waitForScrollableChat,
+} from "../support/helpers/agent-bottom-anchor";
+import { awaitAssistantMessage } from "../support/helpers/agent-stream";
+import { composerLocator, expectComposerVisible } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+async function composerHeight(page: Page): Promise<number> {
+  return composerLocator(page).evaluate((element) => element.getBoundingClientRect().height);
+}
+
+async function expectComposerHeight(page: Page, expected: number): Promise<void> {
+  await expect.poll(() => composerHeight(page)).toBe(expected);
+}
+
+async function pressComposerKeyAndMeasureNextPaint(page: Page, key: string): Promise<number> {
+  const composer = composerLocator(page);
+  await installNextComposerPaintProbe(page);
+  await composer.press(key);
+  return readNextComposerPaintHeight(page);
+}
+
+async function typeComposerTextAndMeasureNextPaint(page: Page, text: string): Promise<number> {
+  const composer = composerLocator(page);
+  await installNextComposerPaintProbe(page);
+  await composer.pressSequentially(text);
+  return readNextComposerPaintHeight(page);
+}
+
+async function installNextComposerPaintProbe(page: Page): Promise<void> {
+  await composerLocator(page).evaluate((element) => {
+    Reflect.set(
+      globalThis,
+      "__composerNextPaintHeight",
+      new Promise<number>((resolve) => {
+        element.addEventListener(
+          "input",
+          () => {
+            requestAnimationFrame(() => resolve(element.getBoundingClientRect().height));
+          },
+          { once: true },
+        );
+      }),
+    );
+  });
+}
+
+async function readNextComposerPaintHeight(page: Page): Promise<number> {
+  return page.evaluate(() => Reflect.get(globalThis, "__composerNextPaintHeight"));
+}
+
+test("blank composer lines remain present and keep their measured height", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-whitespace-",
+    title: "Composer whitespace",
+  });
+
+  try {
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    const composer = composerLocator(page);
+    const blankLines = "\n\n\n\n\n";
+    const collapsedHeight = await composerHeight(page);
+
+    await test.step("grow the composer with blank lines followed by text", async () => {
+      await composer.fill(`${blankLines}x`);
+      await expect(composer).toHaveValue(`${blankLines}x`);
+      await expect.poll(() => composerHeight(page)).toBeGreaterThan(collapsedHeight);
+    });
+
+    await test.step("delete only the text without losing the blank lines or height", async () => {
+      const expandedHeight = await composerHeight(page);
+      await composer.press("Backspace");
+      await expect(composer).toHaveValue(blankLines);
+      await expectComposerHeight(page, expandedHeight);
+    });
+
+    await test.step("grow on the first paint of a newline and stay stable when it receives a glyph", async () => {
+      await composer.fill("alpha\nbeta");
+      const filledLineHeight = await composerHeight(page);
+      const trailingLineHeight = await pressComposerKeyAndMeasureNextPaint(page, "Shift+Enter");
+      expect(trailingLineHeight).toBeGreaterThan(filledLineHeight);
+
+      const filledTrailingLineHeight = await typeComposerTextAndMeasureNextPaint(page, "x");
+      await expect(composer).toHaveValue("alpha\nbeta\nx");
+      expect(filledTrailingLineHeight).toBe(trailingLineHeight);
+    });
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("composer growth keeps a bottom-pinned chat at the bottom", async ({ page }) => {
+  test.setTimeout(90_000);
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-bottom-anchor-",
+    title: "Composer bottom anchor",
+    initialPrompt: "Produce enough content to make the chat scrollable.",
+  });
+
+  try {
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await awaitAssistantMessage(page);
+    await waitForScrollableChat(page, { minScrollableDistance: 200, timeout: 30_000 });
+    await scrollAgentChatToBottom(page);
+
+    const composer = composerLocator(page);
+    await composer.fill("alpha");
+    for (let line = 0; line < 8; line += 1) {
+      await composer.press("Shift+Enter");
+    }
+
+    await expectNearBottom(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
@@ -0,0 +1,5 @@
+/** Successful Canvas2D POC run at 6× Chromium CPU slowdown on the checked-in fixture. */
+export const DIFF_POC_BASELINE = {
+  medianFrameMs: 25,
+  p95FrameMs: 50,
+} as const;
@@ -0,0 +1,587 @@
+import { writeFile } from "node:fs/promises";
+import path from "node:path";
+import type { CDPSession, Locator, Page, TestInfo } from "@playwright/test";
+import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
+import { test, expect } from "../support/fixtures";
+import { getServerId } from "../support/helpers/server-id";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { createTempGitRepo } from "../support/helpers/workspace";
+import { openChangesPanel, waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import { DIFF_POC_BASELINE } from "./diff-performance-baseline";
+
+const RUN_DIFF_PERF = process.env.PASEO_DIFF_PERF_E2E === "1";
+const diffPerfDescribe = RUN_DIFF_PERF ? test.describe : test.describe.skip;
+const LINE_COUNT_PER_FILE = 1_200;
+const FILE_PATHS = ["src/large-a.ts", "src/large-b.ts"] as const;
+const CPU_SLOWDOWN = Number(process.env.PASEO_DIFF_PERF_CPU_SLOWDOWN ?? 6);
+const CHANGES_PREFERENCES_KEY = "@paseo:changes-preferences";
+const POC_MEDIAN_FRAME_MS = Number(
+  process.env.PASEO_DIFF_POC_MEDIAN_FRAME_MS ?? DIFF_POC_BASELINE.medianFrameMs,
+);
+const POC_P95_FRAME_MS = Number(
+  process.env.PASEO_DIFF_POC_P95_FRAME_MS ?? DIFF_POC_BASELINE.p95FrameMs,
+);
+const MAX_MEDIAN_FRAME_MS = POC_MEDIAN_FRAME_MS * 1.1;
+const MAX_P95_FRAME_MS = POC_P95_FRAME_MS * 1.1;
+
+diffPerfDescribe("Diff canvas performance", () => {
+  test("opening a review stays responsive in a large diff", async ({ page }) => {
+    test.setTimeout(120_000);
+    const repo = await createLargeDiffRepository();
+    const client = await connectSeedClient();
+    let cdp: CDPSession | null = null;
+
+    try {
+      const created = await client.createWorkspace({
+        source: { kind: "directory", path: repo.path },
+      });
+      if (!created.workspace) {
+        throw new Error(created.error ?? "Failed to create diff performance workspace");
+      }
+
+      await configureUnwrappedUnifiedDiff(page);
+      await page.setViewportSize({ width: 1400, height: 900 });
+      await page.goto(buildHostWorkspaceRoute(getServerId(), created.workspace.id));
+      await waitForWorkspaceTabsVisible(page);
+      await openChangesPanel(page);
+      await expect(page.getByTestId("git-diff-canvas")).toBeVisible({ timeout: 30_000 });
+
+      cdp = await page.context().newCDPSession(page);
+      await cdp.send("Emulation.setCPUThrottlingRate", { rate: CPU_SLOWDOWN });
+      const elapsedMs = await openFirstReviewEditor(page);
+      expect(elapsedMs).toBeLessThanOrEqual(200 * CPU_SLOWDOWN);
+    } finally {
+      await cdp?.send("Emulation.setCPUThrottlingRate", { rate: 1 }).catch(() => undefined);
+      await cdp?.detach().catch(() => undefined);
+      await client.close().catch(() => undefined);
+      await repo.cleanup().catch(() => undefined);
+    }
+  });
+
+  test("one canvas stays filled through continuous fast scrolling", async ({ page }, testInfo) => {
+    test.setTimeout(180_000);
+    const repo = await createLargeDiffRepository();
+    const client = await connectSeedClient();
+    let cdp: CDPSession | null = null;
+    let traceStarted = false;
+
+    try {
+      const created = await client.createWorkspace({
+        source: { kind: "directory", path: repo.path },
+      });
+      if (!created.workspace) {
+        throw new Error(created.error ?? "Failed to create diff performance workspace");
+      }
+
+      await configureUnwrappedUnifiedDiff(page);
+      await page.setViewportSize({ width: 1400, height: 900 });
+      await page.goto(buildHostWorkspaceRoute(getServerId(), created.workspace.id));
+      await waitForWorkspaceTabsVisible(page);
+      await openChangesPanel(page);
+      await expect(page.getByTestId("git-diff-canvas")).toBeVisible({ timeout: 30_000 });
+
+      await expectSingleCanvasSurface(page);
+      cdp = await page.context().newCDPSession(page);
+      await cdp.send("Emulation.setCPUThrottlingRate", { rate: CPU_SLOWDOWN });
+      await startChromiumTrace(cdp);
+      traceStarted = true;
+      await startRendererInstrumentation(page);
+
+      const scrollReports = [];
+      const heapUsage = [];
+      for (let cycle = 0; cycle < 3; cycle += 1) {
+        scrollReports.push(await continuouslyScrollCanvas(page));
+        heapUsage.push(await collectHeapUsage(cdp));
+      }
+      await expectContinuousFramesMatchStableRender(
+        page,
+        scrollReports.flatMap((report) => report.frameSignatures),
+      );
+      const frameImages = await captureCanvasAtScrollIntervals(page);
+      for (const [frameIndex, frame] of frameImages.entries()) {
+        await writeFile(testInfo.outputPath(`diff-canvas-frame-${frameIndex}.png`), frame.image);
+        await testInfo.attach(`diff-canvas-frame-${frameIndex}`, {
+          body: frame.image,
+          contentType: "image/png",
+        });
+        expect(frame.image.byteLength).toBeGreaterThan(4_000);
+      }
+
+      await expectIndependentHorizontalOffsetsSurviveVerticalScrolling(page);
+      const renderer = await readRendererInstrumentation(page);
+      const measuredCycles = scrollReports.slice(1);
+      expect(Math.max(...measuredCycles.map((cycle) => cycle.medianFrameMs))).toBeLessThanOrEqual(
+        MAX_MEDIAN_FRAME_MS,
+      );
+      expect(Math.max(...measuredCycles.map((cycle) => cycle.p95FrameMs))).toBeLessThanOrEqual(
+        MAX_P95_FRAME_MS,
+      );
+      for (const cycle of scrollReports) {
+        expect(Math.abs(cycle.maximumScrollTop - cycle.endScrollTop)).toBeLessThanOrEqual(1);
+      }
+      expect(heapUsage.at(-1)!.usedSize).toBeLessThanOrEqual(
+        heapUsage[0]!.usedSize * 1.1 + 1_000_000,
+      );
+      expect(renderer.addedElements).toBe(0);
+      expect(renderer.removedElements).toBe(0);
+      expect(renderer.reactCommits).toBeLessThanOrEqual(2);
+
+      await reloadDiffPresentation(page, { layout: "unified", wrapLines: true });
+      const wrapped = await measureAdditionalPerformanceScenario(page, cdp, testInfo, "wrapped");
+      await reloadDiffPresentation(page, { layout: "split", wrapLines: false });
+      const split = await measureAdditionalPerformanceScenario(page, cdp, testInfo, "split");
+
+      const report = {
+        cpuSlowdown: CPU_SLOWDOWN,
+        pocBaseline: {
+          medianFrameMs: POC_MEDIAN_FRAME_MS,
+          p95FrameMs: POC_P95_FRAME_MS,
+        },
+        sourceFiles: FILE_PATHS.length,
+        sourceLines: FILE_PATHS.length * LINE_COUNT_PER_FILE,
+        scrollReports,
+        heapUsage,
+        renderer,
+        wrapped,
+        split,
+        canvasPngBytes: frameImages.map((frame) => frame.image.byteLength),
+      };
+      await attachPerformanceReport(testInfo, report);
+      await stopChromiumTrace(cdp, testInfo);
+      traceStarted = false;
+
+      await cdp.send("Emulation.setCPUThrottlingRate", { rate: 1 });
+    } finally {
+      if (cdp && traceStarted) {
+        await stopChromiumTrace(cdp, testInfo).catch(() => undefined);
+      }
+      await cdp?.send("Emulation.setCPUThrottlingRate", { rate: 1 }).catch(() => undefined);
+      await cdp?.detach().catch(() => undefined);
+      await client.close().catch(() => undefined);
+      await repo.cleanup().catch(() => undefined);
+    }
+  });
+});
+
+async function measureAdditionalPerformanceScenario(
+  page: Page,
+  cdp: CDPSession,
+  testInfo: TestInfo,
+  name: "wrapped" | "split",
+) {
+  await expectSingleCanvasSurface(page);
+  await startRendererInstrumentation(page);
+  const scrollReports = [];
+  const heapUsage = [];
+  for (let cycle = 0; cycle < 3; cycle += 1) {
+    scrollReports.push(await continuouslyScrollCanvas(page));
+    heapUsage.push(await collectHeapUsage(cdp));
+  }
+  await expectContinuousFramesMatchStableRender(
+    page,
+    scrollReports.flatMap((report) => report.frameSignatures),
+  );
+  const frames = await captureCanvasAtScrollIntervals(page);
+  for (const [index, frame] of frames.entries()) {
+    await writeFile(testInfo.outputPath(`diff-canvas-${name}-frame-${index}.png`), frame.image);
+    await testInfo.attach(`diff-canvas-${name}-frame-${index}`, {
+      body: frame.image,
+      contentType: "image/png",
+    });
+    expect(frame.image.byteLength).toBeGreaterThan(4_000);
+  }
+  const measuredCycles = scrollReports.slice(1);
+  expect(Math.max(...measuredCycles.map((cycle) => cycle.medianFrameMs))).toBeLessThanOrEqual(
+    MAX_MEDIAN_FRAME_MS,
+  );
+  expect(Math.max(...measuredCycles.map((cycle) => cycle.p95FrameMs))).toBeLessThanOrEqual(
+    MAX_P95_FRAME_MS,
+  );
+  for (const cycle of scrollReports) {
+    expect(Math.abs(cycle.maximumScrollTop - cycle.endScrollTop)).toBeLessThanOrEqual(1);
+  }
+  expect(heapUsage.at(-1)!.usedSize).toBeLessThanOrEqual(heapUsage[0]!.usedSize * 1.1 + 1_000_000);
+  const renderer = await readRendererInstrumentation(page);
+  expect(renderer.addedElements).toBe(0);
+  expect(renderer.removedElements).toBe(0);
+  expect(renderer.reactCommits).toBeLessThanOrEqual(2);
+  return {
+    scrollReports,
+    heapUsage,
+    renderer,
+    canvasPngBytes: frames.map((frame) => frame.image.byteLength),
+  };
+}
+
+async function reloadDiffPresentation(
+  page: Page,
+  requestedPresentation: { layout: "unified" | "split"; wrapLines: boolean },
+): Promise<void> {
+  await page.evaluate(
+    ({ preferencesKey, presentation }) => {
+      const current = JSON.parse(localStorage.getItem(preferencesKey) ?? "{}") as object;
+      localStorage.setItem(preferencesKey, JSON.stringify({ ...current, ...presentation }));
+    },
+    { preferencesKey: CHANGES_PREFERENCES_KEY, presentation: requestedPresentation },
+  );
+  await page.reload();
+  await waitForWorkspaceTabsVisible(page);
+  await openChangesPanel(page);
+  await expect(page.getByTestId("git-diff-canvas")).toBeVisible({ timeout: 30_000 });
+}
+
+async function createLargeDiffRepository() {
+  const repo = await createTempGitRepo("diff-perf-", {
+    files: FILE_PATHS.map((filePath, fileIndex) => ({
+      path: filePath,
+      content: `export const baseline_${fileIndex} = 0;\n`,
+    })),
+  });
+  for (const [fileIndex, filePath] of FILE_PATHS.entries()) {
+    const generatedLines = Array.from(
+      { length: LINE_COUNT_PER_FILE },
+      (_, lineIndex) =>
+        `export const generated_${fileIndex}_${lineIndex} = "${lineIndex}-${"wide".repeat(16)}";`,
+    ).join("\n");
+    await writeFile(
+      path.join(repo.path, filePath),
+      `export const baseline_${fileIndex} = 1;\n${generatedLines}\n`,
+    );
+  }
+  return repo;
+}
+
+async function configureUnwrappedUnifiedDiff(page: Page): Promise<void> {
+  await page.addInitScript(
+    ({ preferencesKey }) => {
+      const scope = globalThis as typeof globalThis & {
+        __PASEO_DIFF_REACT_STATS__?: { commits: number };
+      };
+      scope.__PASEO_DIFF_REACT_STATS__ = { commits: 0 };
+      if (!localStorage.getItem(preferencesKey)) {
+        localStorage.setItem(
+          preferencesKey,
+          JSON.stringify({
+            layout: "unified",
+            viewMode: "flat",
+            wrapLines: false,
+            hideWhitespace: false,
+          }),
+        );
+      }
+    },
+    { preferencesKey: CHANGES_PREFERENCES_KEY },
+  );
+}
+
+async function openFirstReviewEditor(page: Page): Promise<number> {
+  const body = page.getByTestId("diff-file-0-body");
+  const canvas = page.getByTestId("git-diff-canvas");
+  const [bodyBounds, fontSize] = await Promise.all([
+    body.boundingBox(),
+    canvas.evaluate((element) => Number.parseFloat(getComputedStyle(element).fontSize)),
+  ]);
+  if (!bodyBounds) throw new Error("Expanded diff body has no bounds");
+  const lineHeight = Math.round(fontSize * 1.5);
+  const startedAt = performance.now();
+  await page.mouse.click(bodyBounds.x + 120, bodyBounds.y + lineHeight * 1.5);
+  await expect(page.getByTestId("inline-review-editor")).toBeVisible();
+  return performance.now() - startedAt;
+}
+
+async function expectSingleCanvasSurface(page: Page): Promise<void> {
+  await expect(page.locator("canvas")).toHaveCount(1);
+  await expect(page.locator('[data-testid^="diff-code-row-"]')).toHaveCount(0);
+  const elementCount = await page
+    .getByTestId("git-diff-canvas-root")
+    .evaluate((root) => root.querySelectorAll("*").length);
+  expect(elementCount).toBeLessThan(150);
+}
+
+async function continuouslyScrollCanvas(page: Page): Promise<{
+  medianFrameMs: number;
+  p95FrameMs: number;
+  maximumFrameMs: number;
+  slowFrames: number;
+  endScrollTop: number;
+  maximumScrollTop: number;
+  frameSignatures: Array<{ scrollTop: number; signature: number }>;
+}> {
+  return page.getByTestId("git-diff-scroll").evaluate(async (element) => {
+    const scroll = element as HTMLElement;
+    const maximumScrollTop = scroll.scrollHeight - scroll.clientHeight;
+    scroll.scrollTop = 0;
+    const frameDurations: number[] = [];
+    const frameSignatures: Array<{ scrollTop: number; signature: number }> = [];
+    let previousFrame = performance.now();
+
+    for (let step = 1; step <= 90; step += 1) {
+      await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+      const now = performance.now();
+      frameDurations.push(now - previousFrame);
+      previousFrame = now;
+      scroll.scrollTop = (maximumScrollTop * step) / 90;
+      scroll.dispatchEvent(new Event("scroll", { bubbles: false }));
+      if (step % 10 === 0) {
+        await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+        const canvas = document.querySelector<HTMLCanvasElement>(
+          '[data-testid="git-diff-canvas"]',
+        )!;
+        frameSignatures.push({
+          scrollTop: scroll.scrollTop,
+          signature: canvasSignature(canvas, scroll),
+        });
+        previousFrame = performance.now();
+      }
+    }
+    await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+
+    const ordered = [...frameDurations].sort((left, right) => left - right);
+    const percentile = (fraction: number) =>
+      ordered[Math.min(ordered.length - 1, Math.floor(ordered.length * fraction))] ?? 0;
+    return {
+      medianFrameMs: percentile(0.5),
+      p95FrameMs: percentile(0.95),
+      maximumFrameMs: Math.max(...frameDurations),
+      slowFrames: frameDurations.filter((duration) => duration > 50).length,
+      endScrollTop: scroll.scrollTop,
+      maximumScrollTop,
+      frameSignatures,
+    };
+
+    function canvasSignature(canvasElement: HTMLCanvasElement, scrollElement: HTMLElement): number {
+      const sample = document.createElement("canvas");
+      sample.width = 64;
+      sample.height = 36;
+      const context = sample.getContext("2d")!;
+      const canvasCssHeight = Number.parseFloat(canvasElement.style.height);
+      const canvasTop = Number.parseFloat(canvasElement.style.top);
+      const pixelRatio = canvasElement.height / canvasCssHeight;
+      const sourceY = (scrollElement.scrollTop - canvasTop) * pixelRatio;
+      context.drawImage(
+        canvasElement,
+        0,
+        sourceY,
+        canvasElement.width,
+        scrollElement.clientHeight * pixelRatio,
+        0,
+        0,
+        sample.width,
+        sample.height,
+      );
+      const pixels = context.getImageData(0, 0, sample.width, sample.height).data;
+      let hash = 2166136261;
+      for (const value of pixels) hash = Math.imul(hash ^ value, 16777619);
+      return hash >>> 0;
+    }
+  });
+}
+
+interface CapturedCanvasFrame {
+  scrollTop: number;
+  image: Buffer;
+}
+
+async function captureCanvasAtScrollIntervals(page: Page): Promise<CapturedCanvasFrame[]> {
+  const scroll = page.getByTestId("git-diff-scroll");
+  const frames: CapturedCanvasFrame[] = [];
+  for (let step = 0; step <= 8; step += 1) {
+    const scrollTop = await scroll.evaluate(async (element, progress) => {
+      const scrollElement = element as HTMLElement;
+      scrollElement.scrollTop =
+        (scrollElement.scrollHeight - scrollElement.clientHeight) * Number(progress);
+      scrollElement.dispatchEvent(new Event("scroll", { bubbles: false }));
+      await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+      return scrollElement.scrollTop;
+    }, step / 8);
+    frames.push({ scrollTop, image: await scroll.screenshot() });
+  }
+  return frames;
+}
+
+async function expectContinuousFramesMatchStableRender(
+  page: Page,
+  samples: Array<{ scrollTop: number; signature: number }>,
+): Promise<void> {
+  const stable = await page.getByTestId("git-diff-scroll").evaluate(async (element, frames) => {
+    const canvas = document.querySelector<HTMLCanvasElement>('[data-testid="git-diff-canvas"]')!;
+    const signatures: number[] = [];
+    for (const frame of frames) {
+      element.scrollTop = frame.scrollTop;
+      element.dispatchEvent(new Event("scroll", { bubbles: false }));
+      await new Promise<void>((resolve) =>
+        requestAnimationFrame(() => requestAnimationFrame(() => resolve())),
+      );
+      const sample = document.createElement("canvas");
+      sample.width = 64;
+      sample.height = 36;
+      const context = sample.getContext("2d")!;
+      drawVisibleCanvas(context, canvas, element as HTMLElement, sample.width, sample.height);
+      const pixels = context.getImageData(0, 0, sample.width, sample.height).data;
+      let hash = 2166136261;
+      for (const value of pixels) hash = Math.imul(hash ^ value, 16777619);
+      signatures.push(hash >>> 0);
+    }
+    return signatures;
+
+    function drawVisibleCanvas(
+      context: CanvasRenderingContext2D,
+      canvasElement: HTMLCanvasElement,
+      scroll: HTMLElement,
+      width: number,
+      height: number,
+    ): void {
+      const canvasCssHeight = Number.parseFloat(canvasElement.style.height);
+      const canvasTop = Number.parseFloat(canvasElement.style.top);
+      const pixelRatio = canvasElement.height / canvasCssHeight;
+      const sourceY = (scroll.scrollTop - canvasTop) * pixelRatio;
+      context.drawImage(
+        canvasElement,
+        0,
+        sourceY,
+        canvasElement.width,
+        scroll.clientHeight * pixelRatio,
+        0,
+        0,
+        width,
+        height,
+      );
+    }
+  }, samples);
+  expect(stable).toEqual(samples.map((sample) => sample.signature));
+}
+
+async function expectIndependentHorizontalOffsetsSurviveVerticalScrolling(
+  page: Page,
+): Promise<void> {
+  const first = page.getByTestId("diff-file-0-horizontal-scroll");
+  const second = page.getByTestId("diff-file-1-horizontal-scroll");
+  const firstOffset = await setHorizontalOffset(first, 240);
+  const secondOffset = await setHorizontalOffset(second, 120);
+  expect(firstOffset).not.toBe(secondOffset);
+  await page.getByTestId("git-diff-scroll").evaluate(async (element) => {
+    element.scrollTop = element.scrollHeight - element.clientHeight;
+    element.dispatchEvent(new Event("scroll", { bubbles: false }));
+    await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+    element.scrollTop = 0;
+    element.dispatchEvent(new Event("scroll", { bubbles: false }));
+    await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+  });
+  await expect.poll(() => first.evaluate((element) => element.scrollLeft)).toBe(firstOffset);
+  await expect.poll(() => second.evaluate((element) => element.scrollLeft)).toBe(secondOffset);
+}
+
+async function setHorizontalOffset(locator: Locator, offset: number) {
+  return locator.evaluate(async (element, nextOffset) => {
+    element.scrollLeft = nextOffset;
+    element.dispatchEvent(new Event("scroll", { bubbles: false }));
+    await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+    return element.scrollLeft;
+  }, offset);
+}
+
+async function startRendererInstrumentation(page: Page): Promise<void> {
+  await page.getByTestId("git-diff-canvas-root").evaluate((root) => {
+    const scope = globalThis as typeof globalThis & {
+      __PASEO_DIFF_REACT_STATS__?: { commits: number };
+      __PASEO_DIFF_RENDERER_STATS__?: {
+        initialCommits: number;
+        addedElements: number;
+        removedElements: number;
+      };
+    };
+    const reactStats = scope.__PASEO_DIFF_REACT_STATS__ ?? { commits: 0, unmounts: 0 };
+    const stats = {
+      initialCommits: reactStats.commits,
+      addedElements: 0,
+      removedElements: 0,
+    };
+    scope.__PASEO_DIFF_RENDERER_STATS__ = stats;
+    new MutationObserver((records) => {
+      for (const record of records) {
+        stats.addedElements += Array.from(record.addedNodes).filter(
+          (node) => node.nodeType === Node.ELEMENT_NODE,
+        ).length;
+        stats.removedElements += Array.from(record.removedNodes).filter(
+          (node) => node.nodeType === Node.ELEMENT_NODE,
+        ).length;
+      }
+    }).observe(root, { childList: true, subtree: true });
+  });
+}
+
+async function readRendererInstrumentation(page: Page): Promise<{
+  reactCommits: number;
+  addedElements: number;
+  removedElements: number;
+}> {
+  return page.evaluate(() => {
+    const scope = globalThis as typeof globalThis & {
+      __PASEO_DIFF_REACT_STATS__?: { commits: number };
+      __PASEO_DIFF_RENDERER_STATS__?: {
+        initialCommits: number;
+        addedElements: number;
+        removedElements: number;
+      };
+    };
+    const react = scope.__PASEO_DIFF_REACT_STATS__!;
+    const renderer = scope.__PASEO_DIFF_RENDERER_STATS__!;
+    return {
+      reactCommits: react.commits - renderer.initialCommits,
+      addedElements: renderer.addedElements,
+      removedElements: renderer.removedElements,
+    };
+  });
+}
+
+async function collectHeapUsage(cdp: CDPSession): Promise<{ usedSize: number; totalSize: number }> {
+  await cdp.send("HeapProfiler.collectGarbage");
+  return cdp.send("Runtime.getHeapUsage");
+}
+
+async function startChromiumTrace(cdp: CDPSession): Promise<void> {
+  await cdp.send("Tracing.start", {
+    categories: [
+      "devtools.timeline",
+      "v8.execute",
+      "blink.user_timing",
+      "disabled-by-default-v8.cpu_profiler",
+    ].join(","),
+    transferMode: "ReturnAsStream",
+  });
+}
+
+async function stopChromiumTrace(cdp: CDPSession, testInfo: TestInfo): Promise<void> {
+  const completed = new Promise<string>((resolve, reject) => {
+    cdp.once("Tracing.tracingComplete", ({ stream }) => {
+      if (stream) resolve(stream);
+      else reject(new Error("Chromium trace completed without a stream"));
+    });
+  });
+  await cdp.send("Tracing.end");
+  const stream = await completed;
+  const chunks: string[] = [];
+  let eof = false;
+  while (!eof) {
+    const chunk = await cdp.send("IO.read", { handle: stream });
+    chunks.push(chunk.data);
+    eof = chunk.eof;
+  }
+  await cdp.send("IO.close", { handle: stream });
+  const trace = chunks.join("");
+  await writeFile(testInfo.outputPath("diff-canvas-chromium-trace.json"), trace);
+  await testInfo.attach("diff-canvas-chromium-trace", {
+    body: trace,
+    contentType: "application/json",
+  });
+}
+
+async function attachPerformanceReport(
+  testInfo: TestInfo,
+  report: Record<string, unknown>,
+): Promise<void> {
+  await testInfo.attach("diff-canvas-performance", {
+    body: JSON.stringify(report, null, 2),
+    contentType: "application/json",
+  });
+}
@@ -0,0 +1,33 @@
+import { expect, test } from "../support/fixtures";
+import { gotoWorkspace, pressDirectNewTabShortcut } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { openChangesPanel, waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+
+test.describe("Direct terminal shortcut pane placement", () => {
+  test("opens a terminal in the focused pane", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "direct-terminal-shortcut-pane-" });
+
+    try {
+      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 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);
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
@@ -0,0 +1,80 @@
+import { expect, type Locator, type Page } from "@playwright/test";
+import { test } from "../support/fixtures";
+import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+
+function visibleNewTabPanel(page: Page): Locator {
+  return page.getByTestId("workspace-new-tab-panel").filter({ visible: true });
+}
+
+async function expectLauncherSelection(launcher: Locator, name: string): Promise<void> {
+  await expect(launcher.getByRole("button", { name, exact: true })).toBeFocused();
+}
+
+async function openSidePanelWithKeyboard(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;
+}
+
+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-" });
+
+    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 });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("a new split pane focuses its launcher and supports arrow navigation", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "empty-pane-split-keyboard-" });
+
+    try {
+      await gotoWorkspace(page, workspace.workspaceId);
+      await waitForWorkspaceTabsVisible(page);
+      await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+
+      const launcher = visibleNewTabPanel(page);
+      await expect(launcher).toBeVisible({ timeout: 30_000 });
+      await expectLauncherSelection(launcher, "Agent");
+
+      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 page.keyboard.press("Enter");
+
+      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toBeVisible({
+        timeout: 30_000,
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
@@ -0,0 +1,228 @@
+// Locks two behaviours that used to break together on web/desktop:
+// 1) with the explorer pane focused, a newly appearing agent must auto-open into the
+//    MAIN pane in the background — the explorer pane is a background surface and must
+//    never swallow entity tabs or lose the user's focus, and
+// 2) splitting a tab out of a pane leaves a New tab behind, and the app must stay
+//    interactive in the [agent | New | explorer] state.
+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";
+
+function visible(page: Page, testId: string): Locator {
+  return page.getByTestId(testId).filter({ visible: true });
+}
+
+function agentTabChip(page: Page, agentId: string): Locator {
+  return visible(page, `workspace-tab-agent_${agentId}`);
+}
+
+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. */
+function explorerTabRow(page: Page): Locator {
+  return visible(page, "workspace-tabs-row").filter({
+    has: page.getByTestId("workspace-tab-working_diff"),
+  });
+}
+
+function mainTabRow(page: Page): Locator {
+  return visible(page, "workspace-tabs-row").filter({
+    hasNot: page.getByTestId("workspace-tab-working_diff"),
+  });
+}
+
+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 closeSeededDraftInMainPane(page: Page): Promise<void> {
+  const chip = draftTabChip(page).first();
+  await chip.hover();
+  await page
+    .locator('[data-testid^="workspace-draft-close-"]')
+    .filter({ visible: true })
+    .first()
+    .click();
+  await expect(draftTabChip(page)).toHaveCount(0, { timeout: 15_000 });
+}
+
+function newTabPaneChild(page: Page): Locator {
+  return page
+    .getByTestId("split-group-child")
+    .filter({ has: page.getByTestId("workspace-new-tab-panel") })
+    .first();
+}
+
+async function emptyPaneBox(page: Page) {
+  const paneChild = newTabPaneChild(page);
+  await expect(paneChild).toBeVisible({ timeout: 15_000 });
+  const box = await paneChild.boundingBox();
+  expect(box).not.toBeNull();
+  if (!box) throw new Error("New tab pane has no bounding box");
+  return box;
+}
+
+async function paneBoxContainingChip(page: Page, chip: Locator) {
+  const paneChild = page.getByTestId("split-group-child").filter({ has: chip }).first();
+  await expect(paneChild).toBeVisible({ timeout: 15_000 });
+  const box = await paneChild.boundingBox();
+  expect(box).not.toBeNull();
+  if (!box) throw new Error("Pane has no bounding box");
+  return box;
+}
+
+/** dnd-kit pointer drag from a tab chip to an absolute point. */
+async function dragChipTo(
+  page: Page,
+  chip: Locator,
+  target: { x: number; y: number },
+): Promise<void> {
+  const chipBox = await chip.boundingBox();
+  expect(chipBox).not.toBeNull();
+  if (!chipBox) throw new Error("Dragged chip has no bounding box");
+
+  await page.mouse.move(chipBox.x + chipBox.width / 2, chipBox.y + chipBox.height / 2);
+  await page.mouse.down();
+  // Exceed the 8px PointerSensor activation distance before heading to the target.
+  await page.mouse.move(chipBox.x + chipBox.width / 2 + 12, chipBox.y + chipBox.height / 2 + 4);
+  await page.mouse.move(target.x, target.y, { steps: 20 });
+  await page.mouse.up();
+}
+
+test.describe("explorer pane tab placement", () => {
+  test("agents open in the main pane and New-tab splits keep the app usable", async ({
+    page,
+  }, testInfo) => {
+    const consoleErrors: string[] = [];
+    page.on("console", (message) => {
+      if (message.type() === "error") consoleErrors.push(message.text());
+    });
+    page.on("pageerror", (error) => consoleErrors.push(`pageerror: ${String(error)}`));
+
+    const workspace = await seedWorkspace({ repoPrefix: "explorer-pane-placement-" });
+    let agentId = "";
+
+    try {
+      await test.step("empty workspace seeds a draft in the main pane", async () => {
+        await gotoWorkspace(page, workspace.workspaceId);
+        await waitForWorkspaceTabsVisible(page);
+        await expect(draftTabChip(page).first()).toBeVisible({ timeout: 30_000 });
+      });
+
+      await test.step("focus the explorer pane", async () => {
+        await focusExplorerPane(page);
+      });
+
+      await test.step("an agent appearing now opens in the main pane, not the explorer pane", async () => {
+        const agent = await workspace.client.createAgent({
+          provider: "mock",
+          cwd: workspace.repoPath,
+          workspaceId: workspace.workspaceId,
+          title: "Explorer Placement Agent",
+          modeId: "load-test",
+          model: "ten-second-stream",
+          // Keep the agent streaming through the drag so pane contents are live,
+          // matching the reporter's "spinners were still going" environment.
+          initialPrompt: "stream please",
+        });
+        agentId = agent.id;
+        await expect(agentTabChip(page, agentId).first()).toBeVisible({ timeout: 30_000 });
+
+        await expect(
+          mainTabRow(page).first().getByTestId(`workspace-tab-agent_${agentId}`),
+        ).toBeVisible();
+        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",
+        );
+      });
+
+      await test.step("close the draft; the agent is the main pane's only tab", async () => {
+        await closeSeededDraftInMainPane(page);
+        await expect(
+          mainTabRow(page).first().locator('[data-testid^="workspace-tab-"]'),
+        ).toHaveCount(1);
+        await testInfo.attach("before-drag", {
+          body: await page.screenshot(),
+          contentType: "image/png",
+        });
+      });
+
+      await test.step("split the agent out of the main pane, leaving it empty", async () => {
+        const chip = agentTabChip(page, agentId).first();
+        const mainBox = await paneBoxContainingChip(page, chip);
+        // Land inside the left 15% edge band of the main pane content.
+        await dragChipTo(page, chip, {
+          x: mainBox.x + mainBox.width * 0.06,
+          y: mainBox.y + mainBox.height * 0.6,
+        });
+        await testInfo.attach("after-split", {
+          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 });
+        await expect(page.getByTestId("workspace-new-tab-panel")).toBeVisible();
+      });
+
+      await test.step("app must stay interactive after the split", async () => {
+        // JS main thread alive?
+        const pong = await page.evaluate("1 + 1");
+        expect(pong).toBe(2);
+
+        // Pointer interaction alive? Selecting the agent chip must still work.
+        const chip = agentTabChip(page, agentId).first();
+        await chip.click({ position: { x: 12, y: 13 }, timeout: 5_000 });
+        await expect(chip).toHaveAttribute("aria-selected", "true", { timeout: 5_000 });
+
+        // Clicking inside the New tab pane (focuses it) must not lock anything. Aim
+        // above the vertically centred launcher, which would open a tab instead.
+        const emptyPane = newTabPaneChild(page);
+        await emptyPane.click({ position: { x: 40, y: 120 }, timeout: 5_000 });
+
+        // A second drag must work: center-drop the agent tab back into the New pane.
+        const target = await emptyPaneBox(page);
+        await dragChipTo(page, chip, {
+          x: target.x + target.width / 2,
+          y: target.y + target.height / 2,
+        });
+        await testInfo.attach("after-center-drop", {
+          body: await page.screenshot(),
+          contentType: "image/png",
+        });
+
+        // The agent chip must have replaced New in that pane and stay clickable.
+        await expect(page.getByTestId("workspace-new-tab-panel")).toHaveCount(0, {
+          timeout: 10_000,
+        });
+        await agentTabChip(page, agentId)
+          .first()
+          .click({ position: { x: 12, y: 13 } });
+
+        // The explorer toggle must still respond.
+        await visible(page, "workspace-explorer-toggle").first().click({ timeout: 5_000 });
+        await testInfo.attach("after-interactions", {
+          body: await page.screenshot(),
+          contentType: "image/png",
+        });
+      });
+
+      await testInfo.attach("console-errors", {
+        body: JSON.stringify(consoleErrors, null, 2),
+        contentType: "application/json",
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
@@ -0,0 +1,131 @@
+// Reported on 0.5.0-beta.1 desktop: after upgrading, the old docked explorer
+// sidebar and the new explorer pane were both visible, and on Windows the
+// sidebar had no close button because the window controls own that corner.
+//
+// The sidebar rendered off a persisted `desktop.fileExplorerOpen` flag that no
+// migration cleared and that the rerouted explorer toggle no longer wrote. The
+// explorer is now one surface per layout, so that flag must not resurrect it.
+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 { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+
+function visible(page: Page, testId: string): Locator {
+  return page.getByTestId(testId).filter({ visible: true });
+}
+
+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");
+}
+
+/** Seed exactly what a pre-pane build wrote after the user opened the sidebar once. */
+async function seedRetiredSidebarState(page: Page): Promise<void> {
+  await page.addInitScript(() => {
+    localStorage.setItem(
+      "panel-state",
+      JSON.stringify({
+        version: 14,
+        state: {
+          desktop: { agentListOpen: true, fileExplorerOpen: true, focusModeEnabled: false },
+          explorerTab: "changes",
+          explorerTabByCheckout: {},
+          expandedPathsByWorkspace: {},
+          diffCollapsedFoldersByWorkspace: {},
+          collapsedFilePathsByWorkspace: {},
+          sidebarWidth: 340,
+          explorerWidth: 400,
+          explorerSortOption: "name",
+          explorerShowHiddenFiles: true,
+          treeRailWidth: 320,
+        },
+      }),
+    );
+  });
+}
+
+test.describe("explorer surface after upgrading from the docked sidebar", () => {
+  test("a persisted fileExplorerOpen flag no longer renders a second explorer", async ({
+    page,
+  }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "explorer-surface-upgrade-" });
+
+    try {
+      await seedRetiredSidebarState(page);
+      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);
+
+        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 toggle.click();
+        await expect(sidePanel(page)).toHaveCount(0, { timeout: 15_000 });
+        await expect(dockedSidebar(page)).toHaveCount(0);
+      });
+
+      await test.step("the retired keys are migrated out of storage", async () => {
+        const persisted = await readPersistedPanelState(page);
+        expect(persisted).not.toBeNull();
+        expect(persisted).not.toContain("fileExplorerOpen");
+        expect(persisted).not.toContain("explorerWidth");
+        // Everything else the user had must survive the migration.
+        expect(persisted).toContain('"sidebarWidth":340');
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("toggle-both-sidebars closes and restores the agent list and the explorer", async ({
+    page,
+  }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "explorer-surface-both-" });
+    const modifier = process.platform === "darwin" ? "Meta" : "Control";
+
+    try {
+      await gotoWorkspace(page, workspace.workspaceId);
+      await waitForWorkspaceTabsVisible(page);
+
+      const agentList = visible(page, "sidebar-sessions");
+      const toggle = visible(page, "workspace-explorer-toggle").first();
+
+      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(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(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();
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
@@ -38,10 +38,7 @@ function fitsViewportWidth(element: HTMLElement): boolean {
 }

 async function replaceEditorText(page: Page, content: string): Promise<void> {
-  const contentElement = editor(page);
-  await contentElement.click();
-  await contentElement.press("Control+A");
-  await contentElement.type(content);
+  await editor(page).fill(content);
 }

 async function openWorkspaceFile(page: Page, filename: string): Promise<void> {
@@ -93,6 +90,87 @@ async function seedAgentWithFileLink(input: LinkedFile) {
 }

 test.describe("CodeMirror workspace file editing", () => {
+  test("renders a lockfile-sized read-only source with a bounded CodeMirror DOM", async ({
+    page,
+  }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "file-source-lockfile-",
+      title: "Large source",
+      initialPrompt: "Generate a title and a git branch name. Return JSON only.",
+    });
+    const lockfile = `${'{"packages":['}${Array.from({ length: 42_000 }, (_, index) => `{"name":"package-${index}","version":"1.0.0"}`).join(",")}]}`;
+    await writeFile(path.join(session.cwd, "package-lock.json"), lockfile, "utf8");
+
+    try {
+      await openAgentRoute(page, session);
+      await openWorkspaceFile(page, "package-lock.json");
+
+      await expect(page.getByTestId("file-source-editor")).toBeVisible();
+      await expect(editor(page)).toContainText('"package-0"');
+      await expect.poll(() => page.locator(".cm-line").count()).toBeLessThan(200);
+    } finally {
+      await session.cleanup();
+    }
+  });
+
+  test("keeps the app interactive around a plain 11 MB source", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "file-source-plain-",
+      title: "Plain large source",
+      initialPrompt: "Generate a title and a git branch name. Return JSON only.",
+    });
+    await writeFile(
+      path.join(session.cwd, "plain.txt"),
+      "plain source\n".repeat(1_050_000),
+      "utf8",
+    );
+
+    try {
+      await openAgentRoute(page, session);
+      await openWorkspaceFile(page, "plain.txt");
+      await expect(page.getByTestId("file-source-editor")).toBeVisible();
+      await expect(editor(page)).toContainText("plain source");
+      await expect.poll(() => page.locator(".cm-line").count()).toBeLessThan(200);
+
+      await page.getByTestId(`workspace-tab-agent_${session.agentId}`).first().click();
+      await expect(page.getByTestId("message-input-root")).toBeVisible();
+      await page.getByTestId("workspace-tab-file_plain.txt").first().click();
+      await expect(page.getByTestId("file-source-editor")).toBeVisible();
+    } finally {
+      await session.cleanup();
+    }
+  });
+
+  test("refuses a file above the display budget and keeps its tab recoverable", async ({
+    page,
+  }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "file-source-unsupported-",
+      title: "Unsupported large source",
+      initialPrompt: "Generate a title and a git branch name. Return JSON only.",
+    });
+    await writeFile(
+      path.join(session.cwd, "too-large.txt"),
+      Buffer.alloc(51 * 1024 * 1024),
+      "utf8",
+    );
+
+    try {
+      await openAgentRoute(page, session);
+      await openWorkspaceFile(page, "too-large.txt");
+      await expect(page.getByTestId("file-source-too-large")).toContainText(
+        "This file is too large to display",
+      );
+
+      await page.getByTestId(`workspace-tab-agent_${session.agentId}`).first().click();
+      await expect(page.getByTestId("message-input-root")).toBeVisible();
+      await page.getByTestId("workspace-tab-file_too-large.txt").first().click();
+      await expect(page.getByTestId("file-source-too-large")).toBeVisible();
+    } finally {
+      await session.cleanup();
+    }
+  });
+
  test("opens an assistant file link at its referenced line", async ({ page }) => {
    const target = "target.ts:42";
    const session = await seedAgentWithFileLink({
@@ -120,7 +198,7 @@ test.describe("CodeMirror workspace file editing", () => {

      const sourceEditor = editor(page);
      await sourceEditor.click();
-      await sourceEditor.press("Control+Home");
+      await sourceEditor.press("ControlOrMeta+Home");
      await expect(page.getByLabel(/^Line 1, column \d+$/)).toBeVisible();

      await page
@@ -154,9 +232,8 @@ test.describe("CodeMirror workspace file editing", () => {
      await page.setViewportSize({ width: 1280, height: 900 });
      await openAgentRoute(page, session);

-      await page.getByRole("button", { name: "Split pane right" }).first().click();
-      await expect(page.getByTestId("workspace-tabs-row").filter({ visible: true })).toHaveCount(2);
      await openWorkspaceFile(page, "target.ts");
+      await expect(page.getByTestId("workspace-tabs-row").filter({ visible: true })).toHaveCount(2);

      await page
        .getByTestId(`workspace-tab-agent_${session.agentId}`)
@@ -245,13 +322,13 @@ test.describe("CodeMirror workspace file editing", () => {
    const initialModeBox = await modeControl.boundingBox();
    expect(initialModeBox).not.toBeNull();
    const initialModeX = initialModeBox!.x;
-    await content.press("Control+End");
+    await content.press("ControlOrMeta+End");
    await expect(page.getByLabel(/Line 12, column \d+/)).toBeVisible();
    const movedModeBox = await modeControl.boundingBox();
    expect(movedModeBox).not.toBeNull();
    expect(movedModeBox!.x).toBe(initialModeX);

-    await content.press("Control+a");
+    await content.press("ControlOrMeta+a");
    const selection = editorHost.locator(".cm-selectionBackground").first();
    await expect(selection).toBeVisible();
    await expect(selection).toHaveCSS("background-color", "rgba(255, 255, 255, 0.2)");
@@ -347,14 +424,13 @@ test.describe("CodeMirror workspace file editing", () => {
    await replaceEditorText(page, "const localWins = 5;\n");
    await writeFile(sourcePath, "const diskLoses = 6;\n", "utf8");
    await expect(page.getByTestId("file-conflict-alert")).toBeVisible();
+    await page.getByRole("button", { name: "Overwrite", exact: true }).click();
+    await expect.poll(() => readFile(sourcePath, "utf8")).toBe("const localWins = 5;\n");
    for (const fileName of ["one.ts", "two.ts", "three.ts", "four.ts"]) {
      await openWorkspaceFile(page, fileName);
    }
-    await page.getByTestId("workspace-tab-file_source.ts").filter({ visible: true }).click();
+    await openWorkspaceFile(page, "source.ts");
    await expect(editor(page)).toContainText("const localWins = 5;");
-    await expect(page.getByTestId("file-conflict-alert")).toBeVisible();
-    await page.getByRole("button", { name: "Overwrite", exact: true }).click();
-    await expect.poll(() => readFile(sourcePath, "utf8")).toBe("const localWins = 5;\n");

    await replaceEditorText(page, "const discarded = 7;\n");
    await writeFile(sourcePath, "const diskWins = 8;\n", "utf8");
@@ -418,10 +494,7 @@ test.describe("CodeMirror workspace file editing", () => {
      .filter({ visible: true })
      .first()
      .click({ button: "right" });
-    await page
-      .getByTestId("workspace-tab-context-file_draft.ts-close")
-      .filter({ visible: true })
-      .click();
+    await page.getByRole("menuitem", { name: "Close", exact: true }).click();
    expect(closePrompt).toContain("Closing it will discard the draft.");

    await expect(page.getByTestId("file-source-editor")).toBeVisible();
@@ -441,20 +514,21 @@ test.describe("CodeMirror workspace file editing", () => {
    await workspace.navigateTo();
    await openWorkspaceFile(page, "notes.md");

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

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

    await openWorkspaceFile(page, "pixel.png");
-    const image = page.getByTestId("workspace-file-pane").locator("img");
+    const image = visibleFilePane.locator("img");
    await expect(image).toBeVisible();
    const initialSource = await image.getAttribute("src");
    await writeFile(imagePath, BLUE_PIXEL);
@@ -3,6 +3,7 @@ import path from "node:path";
 import { expect, type Page } from "@playwright/test";
 import { test } from "../support/fixtures";
 import { openFileExplorer } from "../support/helpers/file-explorer";
+import { openChangesPanel } from "../support/helpers/workspace-tabs";
 import { gotoWorkspace } from "../support/helpers/launcher";
 import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
@@ -110,6 +111,21 @@ test.afterEach(async () => {
  await workspace?.cleanup();
 });

+test("file explorer rows share the workspace title opacity treatment", async ({ page }) => {
+  await gotoWorkspace(page, workspace.workspaceId);
+  await openFileExplorer(page);
+
+  const row = page
+    .getByTestId("file-explorer-tree-scroll")
+    .getByTestId(/^file-explorer-row-\d+$/)
+    .first();
+  const name = row.getByTestId(/-name$/);
+  await expect(row).toHaveCSS("opacity", "1");
+  await expect(name).toHaveCSS("opacity", "0.76");
+  await row.hover();
+  await expect(name).toHaveCSS("opacity", "1");
+});
+
 test("creates, renames, copies, and deletes entries through the file explorer", async ({
  context,
  page,
@@ -437,7 +453,7 @@ test("hides unsupported file operations and revert actions", async ({ page }) =>
  await expect(filesMenu.getByText("Delete", { exact: true })).toHaveCount(0);
  await page.keyboard.press("Escape");

-  await page.getByTestId("explorer-tab-changes").click();
+  await openChangesPanel(page);
  await expect(page.getByTestId("diff-file-0")).toBeVisible({ timeout: 30_000 });
  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
  await expect(page.getByTestId("diff-file-0-duplicate")).toHaveCount(0);
@@ -0,0 +1,147 @@
+import { expect } from "@playwright/test";
+import { test } from "../support/fixtures";
+import { delayFileReadResponse } from "../support/helpers/file-read-gate";
+import {
+  expandFolder,
+  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;
+
+test.beforeAll(async () => {
+  workspace = await seedWorkspace({
+    repoPrefix: "file-transition-",
+    repo: {
+      files: [
+        { path: "src/a.ts", content: "export const sourceA = true;\n" },
+        { path: "src/b.ts", content: "export const sourceB = true;\n" },
+        { path: "docs/b.md", content: "# Markdown B\n" },
+      ],
+    },
+  });
+});
+
+test.afterAll(async () => workspace?.cleanup());
+
+async function openSourceA(page: import("@playwright/test").Page) {
+  await openFileExplorer(page);
+  await expandFolder(page, "src");
+  await openFileFromExplorer(page, "a.ts");
+  await expect(page.getByText("export const sourceA = true;")).toBeVisible({ timeout: 30_000 });
+}
+
+async function assertHeldFileTransition(
+  page: import("@playwright/test").Page,
+  targetPath: string,
+  finalText: string,
+  gate: Awaited<ReturnType<typeof delayFileReadResponse>>,
+) {
+  await page.evaluate(() => {
+    const originalChip = document.querySelector('[data-testid="workspace-tab-file_src/a.ts"]');
+    (
+      window as typeof window & { __fileTransitionOriginalChip?: Element | null }
+    ).__fileTransitionOriginalChip = originalChip;
+  });
+  await page.evaluate((tabTestId) => {
+    const timeline: Array<{ chip: boolean; loading: boolean; unavailable: boolean }> = [];
+    const sample = () => {
+      const next = {
+        chip: Boolean(document.querySelector(`[data-testid="${tabTestId}"]`)),
+        loading: Boolean(document.querySelector('[data-testid="file-preview-loading"]')),
+        unavailable: Boolean(document.querySelector('[data-testid="file-preview-unsupported"]')),
+      };
+      if (JSON.stringify(timeline.at(-1)) !== JSON.stringify(next)) timeline.push(next);
+    };
+    sample();
+    const observer = new MutationObserver(sample);
+    observer.observe(document.body, { childList: true, subtree: true, characterData: true });
+    (
+      window as typeof window & { __fileTransitionTimeline?: typeof timeline }
+    ).__fileTransitionTimeline = timeline;
+    (
+      window as typeof window & { __fileTransitionObserver?: MutationObserver }
+    ).__fileTransitionObserver = observer;
+  }, `workspace-tab-file_${targetPath}`);
+  await openFileFromExplorer(page, targetPath.split("/").pop() as string);
+  await gate.waitUntilHeld();
+
+  const targetChip = page.getByTestId(`workspace-tab-file_${targetPath}`).first();
+  await expect(targetChip).toBeVisible();
+  await expect(targetChip).toContainText(targetPath.split("/").pop() as string);
+  await expect(page.getByTestId("file-preview-loading")).toBeVisible();
+  await expect(page.getByTestId("file-preview-unsupported")).toHaveCount(0);
+  await expect(page.getByText("export const sourceA = true;")).toHaveCount(0);
+
+  const chipIdentity = await page.evaluate((tabTestId) => {
+    const windowWithOriginal = window as typeof window & {
+      __fileTransitionOriginalChip?: Element | null;
+    };
+    const originalChip = windowWithOriginal.__fileTransitionOriginalChip ?? null;
+    const currentChip = document.querySelector(`[data-testid="${tabTestId}"]`);
+    return {
+      originalStillConnected: originalChip?.isConnected ?? false,
+      sameNode: originalChip === currentChip,
+    };
+  }, `workspace-tab-file_${targetPath}`);
+  expect(chipIdentity).toEqual({ originalStillConnected: true, sameNode: true });
+
+  const heldTimeline = await page.evaluate(
+    () =>
+      (
+        window as typeof window & {
+          __fileTransitionTimeline?: Array<{
+            chip: boolean;
+            loading: boolean;
+            unavailable: boolean;
+          }>;
+        }
+      ).__fileTransitionTimeline ?? [],
+  );
+  expect(heldTimeline).toContainEqual(expect.objectContaining({ chip: true, loading: true }));
+  expect(heldTimeline).not.toContainEqual(expect.objectContaining({ unavailable: true }));
+  const descriptorIndex = heldTimeline.findIndex((sample) => sample.chip);
+  expect(heldTimeline.slice(descriptorIndex)).not.toContainEqual(
+    expect.objectContaining({ chip: false }),
+  );
+
+  gate.release();
+  await expect(page.getByText(finalText)).toBeVisible({ timeout: 30_000 });
+  await expect(page.getByTestId("file-preview-loading")).toHaveCount(0);
+  const timeline = await page.evaluate(() => {
+    const windowWithTimeline = window as typeof window & {
+      __fileTransitionTimeline?: Array<{ chip: boolean; loading: boolean; unavailable: boolean }>;
+      __fileTransitionObserver?: MutationObserver;
+    };
+    windowWithTimeline.__fileTransitionObserver?.disconnect();
+    return windowWithTimeline.__fileTransitionTimeline ?? [];
+  });
+  expect(
+    timeline.filter((sample, index) => sample.loading && !timeline[index - 1]?.loading),
+  ).toHaveLength(1);
+}
+
+test.describe("File target transitions", () => {
+  test("keeps the Markdown descriptor and loading state stable through a real delayed read", async ({
+    page,
+  }) => {
+    const gate = await delayFileReadResponse(page, "docs/b.md");
+    await page.reload();
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openSourceA(page);
+    await expandFolder(page, "docs");
+    await assertHeldFileTransition(page, "docs/b.md", "Markdown B", gate);
+  });
+
+  test("keeps the source descriptor and loading state stable through a real delayed read", async ({
+    page,
+  }) => {
+    const gate = await delayFileReadResponse(page, "src/b.ts");
+    await page.reload();
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openSourceA(page);
+    await assertHeldFileTransition(page, "src/b.ts", "export const sourceB = true;", gate);
+  });
+});
@@ -0,0 +1,142 @@
+// 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");
+  });
+});
@@ -0,0 +1,60 @@
+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();
+    }
+  });
+});
@@ -1,17 +1,21 @@
 import { test, expect } from "../support/fixtures";
+import type { Locator } from "@playwright/test";
 import {
  gotoWorkspace,
  assertNewChatTileVisible,
  assertNewTabMenuTriggerVisible,
  assertSingleNewTabButton,
-  pressNewTabShortcut,
+  openNewTabMenuWithShortcut,
  clickNewChat,
  clickNewTerminal,
  countTabsOfKind,
+  waitForTabBar,
+  pressNewTabShortcut,
  getTabTestIds,
  waitForTabWithTitle,
  measureTileTransition,
  sampleTabsDuringTransition,
+  expectTabTitleFits,
  terminalSurfaceLocator,
 } from "../support/helpers/launcher";
 import { expectComposerVisible, composerLocator } from "../support/helpers/composer";
@@ -20,13 +24,47 @@ import {
  setupDeterministicPrompt,
 } from "../support/helpers/terminal-perf";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import {
+  expectTerminalOutputContains,
+  seedTerminalProfiles,
+  type TerminalProfile,
+} from "../support/helpers/new-workspace-launch";
+import { gotoAppShell } from "../support/helpers/app";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import { getServerId } from "../support/helpers/server-id";

 // ─── Shared state ──────────────────────────────────────────────────────────

 let workspace: SeededWorkspace;
+let secondWorkspaceId: string | null = null;
+
+const EMPTY_PROMPT_PROFILE: TerminalProfile = {
+  id: "e2e-empty-prompt",
+  name: "Empty Prompt",
+  command: "/bin/sh",
+  args: ["-c", 'echo prompt-args: "$#"; sleep 10', "profile-name", "{{{prompt}}}"],
+};
+
+async function tabTestIds(tabs: Locator): Promise<(string | null)[]> {
+  return tabs.evaluateAll((elements) =>
+    elements.map((element) => element.getAttribute("data-testid")),
+  );
+}
+
+function tabIdentityKey(snapshot: Array<{ id: string }>): string {
+  return JSON.stringify(snapshot.map(({ id }) => id));
+}

 test.beforeAll(async () => {
  workspace = await seedWorkspace({ repoPrefix: "launcher-e2e-" });
+  const created = await workspace.client.createWorkspace({
+    source: { kind: "directory", path: workspace.repoPath, projectId: workspace.projectId },
+    title: "launcher-e2e-cmd-t-switch-target",
+  });
+  if (!created.workspace) {
+    throw new Error(created.error ?? "Failed to create secondary workspace for cmd+t switch test");
+  }
+  secondWorkspaceId = created.workspace.id;
 });

 test.afterAll(async () => {
@@ -38,31 +76,124 @@ test.afterAll(async () => {
 // ═══════════════════════════════════════════════════════════════════════════

 test.describe("Tab creation", () => {
-  test("Cmd+T opens a new agent tab with composer", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
+  test("Cmd+T keeps creating a New tab after workspace switches", async ({ page }) => {
+    if (!secondWorkspaceId) {
+      throw new Error("Secondary workspace was not created");
+    }

-    await pressNewTabShortcut(page);
+    const serverId = getServerId();
+    const switchWorkspaceRow = async (workspaceId: string) => {
+      const row = page.getByTestId(`sidebar-workspace-row-${serverId}:${workspaceId}`).first();
+      await expect(row).toBeVisible({ timeout: 30_000 });
+      await row.click();
+      // The shortcut must follow the route, so prove the route actually moved first.
+      await expect(page).toHaveURL(new RegExp(`workspace/${workspaceId}(\\b|/|$)`), {
+        timeout: 15_000,
+      });
+      await waitForTabBar(page);
+    };

-    await expectComposerVisible(page);
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+
+    const sequence = [workspace.workspaceId, secondWorkspaceId];
+    for (let i = 0; i < 8; i++) {
+      await switchWorkspaceRow(sequence[i % sequence.length]);
+      await pressNewTabShortcut(page);
+      await expect(
+        page.getByTestId("workspace-new-tab-panel").filter({ visible: true }),
+        `New tab did not open after switch ${i}`,
+      ).toBeVisible({
+        timeout: 5_000,
+      });
+    }
  });

-  test("opening two new tabs creates two draft tabs", async ({ page }) => {
+  test("retained inactive workspaces cannot own New tab shortcuts", async ({ page }) => {
    await gotoWorkspace(page, workspace.workspaceId);
+    const workspaceUrl = page.url();
+    const modifier = process.platform === "darwin" ? "Meta" : "Control";
+    const newTabCountBefore = await countTabsOfKind(page, "new_tab");

+    await page.keyboard.press(`${modifier}+Comma`);
+    await expect(page.getByRole("navigation", { name: "Settings" })).toBeVisible();
+
+    await page.keyboard.press(`${modifier}+t`);
+
+    await page.goto(workspaceUrl);
+    await assertNewTabMenuTriggerVisible(page);
+    await expect.poll(() => countTabsOfKind(page, "new_tab")).toBe(newTabCountBefore);
+  });
+
+  test("Cmd+T creates a New tab without creating an agent", async ({ page }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
    const countBefore = await countTabsOfKind(page, "draft");

-    await pressNewTabShortcut(page);
-    await expect
-      .poll(() => countTabsOfKind(page, "draft"), { timeout: 15_000 })
-      .toBe(countBefore + 1);
-    const countAfterFirst = await countTabsOfKind(page, "draft");
+    await openNewTabMenuWithShortcut(page);
+
+    await expect.poll(() => countTabsOfKind(page, "draft")).toBe(countBefore);
+    await expect(
+      page.getByTestId("workspace-new-tab-panel").filter({ visible: true }),
+    ).toBeVisible();
+  });
+
+  test("clicking + opens its menu without creating a New tab", async ({ page }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
+    const countBefore = await countTabsOfKind(page, "new_tab");
+
+    await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).click();
+
+    await expect(
+      page.getByTestId("workspace-new-tab-menu").filter({ visible: true }),
+    ).toBeVisible();
+    await expect.poll(() => countTabsOfKind(page, "new_tab")).toBe(countBefore);
+  });
+
+  test("opening two New tabs creates two independent tab identities", async ({ page }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
+
+    const newTabs = page
+      .locator('[data-testid^="workspace-tab-tab_"]')
+      .filter({ hasText: "New tab" });
+    const countBefore = await newTabs.count();

-    // Blur the composer so the second shortcut isn't swallowed by the focused input
-    await page.evaluate(() => (document.activeElement as HTMLElement)?.blur?.());
    await pressNewTabShortcut(page);
-    await expect
-      .poll(() => countTabsOfKind(page, "draft"), { timeout: 15_000 })
-      .toBe(countAfterFirst + 1);
+    await expect(newTabs).toHaveCount(countBefore + 1);
+    const firstIds = await tabTestIds(newTabs);
+
+    await pressNewTabShortcut(page);
+    await expect(newTabs).toHaveCount(countBefore + 2);
+    const ids = await tabTestIds(newTabs);
+    expect(new Set(ids).size).toBe(ids.length);
+    expect(ids.filter((id) => !firstIds.includes(id))).toHaveLength(1);
+  });
+
+  test("New tab exposes shortcuts and supports arrow navigation after refocus", async ({
+    page,
+  }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
+    await openNewTabMenuWithShortcut(page);
+
+    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 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(agent).toBeFocused();
+
+    await page.keyboard.press("ArrowDown");
+    await expect(terminal).toBeFocused();
+    await page.keyboard.press("ArrowUp");
+    await expect(agent).toBeFocused();
+
+    await page.locator("body").click({ position: { x: 1, y: 1 } });
+    await panel.click({ position: { x: 20, y: 20 } });
+    await expect(agent).toBeFocused();
  });

  test("clicking new agent tab creates a draft tab", async ({ page }) => {
@@ -90,12 +221,61 @@ test.describe("Tab creation", () => {
    expect(terminalTabs.length).toBeGreaterThanOrEqual(1);
  });

+  test("launching a profile from the New tab menu drops its empty prompt argument", async ({
+    page,
+  }) => {
+    test.setTimeout(45_000);
+    const profileSeed = await seedTerminalProfiles([EMPTY_PROMPT_PROFILE]);
+
+    try {
+      await gotoWorkspace(page, workspace.workspaceId);
+      await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).click();
+      await page
+        .getByTestId("workspace-new-tab-menu")
+        .filter({ visible: true })
+        .getByRole("menuitem", { name: EMPTY_PROMPT_PROFILE.name })
+        .click();
+
+      await expectTerminalOutputContains(page, "prompt-args: 0");
+    } finally {
+      await profileSeed.restore();
+    }
+  });
+
+  test("terminal profiles are grouped with a settings action", async ({ page }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
+    await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).click();
+
+    const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
+    await expect(menu.getByText("Terminal profiles", { exact: true })).toBeVisible();
+
+    const editProfiles = menu.getByTestId("workspace-new-tab-menu-edit-terminal-profiles");
+    await expect(editProfiles).toHaveAccessibleName("Edit profiles");
+
+    await editProfiles.click();
+    await expect(page).toHaveURL(/\/settings\/hosts\/[^/]+\/terminals$/);
+  });
+
  test("tab bar shows action buttons per pane", async ({ page }) => {
    await gotoWorkspace(page, workspace.workspaceId);
    await assertSingleNewTabButton(page);
    await assertNewChatTileVisible(page);
    await assertNewTabMenuTriggerVisible(page);
  });
+
+  test("never shades the New tab button", async ({ page }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
+
+    const tabRow = page.getByTestId("workspace-tabs-row").filter({ visible: true }).first();
+    const scrollArea = tabRow.getByTestId("workspace-tabs-scroll");
+    const newTabButtonInScroll = await scrollArea.getByTestId("workspace-new-tab-button").count();
+    const scrollShades = await tabRow
+      .locator('[data-testid^="workspace-tabs-scroll-shade-"]')
+      .count();
+
+    expect(newTabButtonInScroll === 0 || scrollShades === 0).toBe(true);
+    await expect(tabRow.getByTestId("workspace-new-tab-button")).toBeVisible();
+  });
 });

 // ═══════════════════════════════════════════════════════════════════════════
@@ -193,25 +373,35 @@ test.describe("Terminal title propagation", () => {
 // ═══════════════════════════════════════════════════════════════════════════

 test.describe("Tab transitions (no flash)", () => {
-  test("New agent tab transition has no blank intermediate tab state", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
+  test("New agent tab transition has no blank intermediate tab state", async ({
+    page,
+    withWorkspace,
+  }) => {
+    const isolatedWorkspace = await withWorkspace({ prefix: "launcher-no-flash-" });
+    await isolatedWorkspace.navigateTo();
+    await pressNewTabShortcut(page);
+    await expect(
+      page.getByTestId("workspace-new-tab-panel").filter({ visible: true }),
+    ).toBeVisible();

-    // Sample tabs at high frequency across the transition
-    const snapshots = await sampleTabsDuringTransition(page, () => clickNewChat(page), 2_000, 30);
+    // Sample the single New → Agent replacement, not the separate action that
+    // creates the New tab in the first place.
+    const snapshots = await sampleTabsDuringTransition(page, async () => {
+      await page.getByTestId("workspace-new-tab-agent").filter({ visible: true }).first().click();
+    });

    // Every snapshot should have at least one tab — no blank/zero-tab frames
    for (const snapshot of snapshots) {
      expect(snapshot.length).toBeGreaterThanOrEqual(1);
    }

-    // Tab count should never spike excessively (no duplicate flash from add-then-remove).
-    // When running in-suite, previous tests may have created tabs on the shared workspace,
-    // so we allow +2 tolerance for accumulated state and React render batching.
-    const counts = snapshots.map((s) => s.length);
-    const maxCount = Math.max(...counts);
+    // Replacement is atomic: the set of identities changes once, while its size stays fixed.
+    const counts = snapshots.map((snapshot) => snapshot.length);
    const initialCount = counts[0] ?? 0;

-    expect(maxCount).toBeLessThanOrEqual(initialCount + 2);
+    expect(counts.every((count) => count === initialCount)).toBe(true);
+    expect(new Set(snapshots.map(tabIdentityKey)).size).toBeLessThanOrEqual(2);
+    await expectTabTitleFits(page, "New Agent", { min: 96, max: 160 });
  });

  test("Terminal transition completes within visual budget", async ({ page }) => {
@@ -34,6 +34,8 @@ const STREAMED_MERMAID = [
 test("keeps a Mermaid diagram rendered while its message streams, completes, and reloads", async ({
  page,
 }) => {
+  test.setTimeout(120_000);
+
  const agent = await seedMockAgentWorkspace({
    repoPrefix: "mermaid-streaming-",
    title: "Streaming Mermaid",
@@ -0,0 +1,49 @@
+import { expect } from "@playwright/test";
+import { test } from "../support/fixtures";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+
+test("a workspace with an existing agent never presents New during startup", async ({ page }) => {
+  const workspace = await seedWorkspace({ repoPrefix: "new-tab-startup-agent-" });
+  const agent = await workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.repoPath,
+    workspaceId: workspace.workspaceId,
+    title: "Existing startup agent",
+    modeId: "load-test",
+    model: "ten-second-stream",
+    initialPrompt: "ready",
+  });
+
+  try {
+    await page.addInitScript(() => {
+      Reflect.set(globalThis, "__paseoSawVisibleNewTab", false);
+      function recordVisibleNewTab() {
+        const panel = document.querySelector('[data-testid="workspace-new-tab-panel"]');
+        if (panel?.getClientRects().length) {
+          Reflect.set(globalThis, "__paseoSawVisibleNewTab", true);
+        }
+      }
+      window.addEventListener("DOMContentLoaded", () => {
+        new MutationObserver(recordVisibleNewTab).observe(document.documentElement, {
+          childList: true,
+          subtree: true,
+        });
+        recordVisibleNewTab();
+      });
+    });
+
+    await gotoWorkspace(page, workspace.workspaceId);
+    await expect(
+      page.getByTestId(`workspace-tab-agent_${agent.id}`).filter({ visible: true }),
+    ).toHaveAttribute("aria-selected", "true", { timeout: 30_000 });
+    await expect(page.getByTestId("workspace-new-tab-panel").filter({ visible: true })).toHaveCount(
+      0,
+    );
+    expect(await page.evaluate(() => Reflect.get(globalThis, "__paseoSawVisibleNewTab"))).toBe(
+      false,
+    );
+  } finally {
+    await workspace.cleanup();
+  }
+});
@@ -1,4 +1,4 @@
-import { test } from "../support/fixtures";
+import { expect, test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
@@ -85,4 +85,52 @@ test.describe("New workspace composer draft", () => {
      await project.cleanup();
    }
  });
+
+  test("does not restore a submitted draft after deferred publication", async ({ page }) => {
+    const project = await seedWorkspace({ repoPrefix: "new-workspace-submitted-draft-" });
+
+    try {
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+      await openNewWorkspaceComposer(page, {
+        projectKey: project.projectKey,
+        projectDisplayName: project.projectDisplayName,
+      });
+
+      const composer = page.getByRole("textbox", { name: "Message agent..." });
+      const createButton = page.getByTestId("workspace-create-submit");
+      await expect(composer).toBeEditable({ timeout: 30_000 });
+      await expect(createButton).toBeEnabled({ timeout: 30_000 });
+
+      await composer.evaluate((element, draft) => {
+        if (!(element instanceof HTMLTextAreaElement)) {
+          throw new Error("Composer input is not a textarea");
+        }
+        const valueSetter = Object.getOwnPropertyDescriptor(
+          HTMLTextAreaElement.prototype,
+          "value",
+        )?.set;
+        if (!valueSetter) throw new Error("Textarea value setter is unavailable");
+        valueSetter.call(element, draft);
+        element.dispatchEvent(
+          new InputEvent("input", {
+            bubbles: true,
+            data: draft,
+            inputType: "insertText",
+          }),
+        );
+        const button = document.querySelector('[data-testid="workspace-create-submit"]');
+        if (!(button instanceof HTMLElement)) {
+          throw new Error("Create button is unavailable");
+        }
+        button.click();
+      }, DRAFT);
+
+      await page.waitForURL((url) => url.pathname.includes("/workspace/"), { timeout: 30_000 });
+      await openGlobalNewWorkspaceComposer(page);
+      await expectNewWorkspaceDraft(page, "");
+    } finally {
+      await project.cleanup();
+    }
+  });
 });
@@ -0,0 +1,83 @@
+import { mkdtempSync, realpathSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "../support/fixtures";
+import { submitMessage } from "../support/helpers/composer";
+import { waitForPermissionPrompt } from "../support/helpers/permissions";
+import { cleanupRewindFlow, type AgentHandle, launchAgent } from "../support/helpers/rewind-flow";
+
+const scenarios = [
+  {
+    provider: "claude" as const,
+    providerConfig: { model: "haiku", modeId: "plan" },
+    planPrompt:
+      "Do not ask questions. Produce a concise plan to append the line 'Hello' to README.md, then present it for approval. Do not implement it.",
+    planText: "README.md",
+    steerPrompt: "Do not implement anything. Reply exactly CLAUDE_STEER_RECEIVED and stop.",
+    reply: "CLAUDE_STEER_RECEIVED",
+  },
+  {
+    provider: "codex" as const,
+    providerConfig: { featureValues: { plan_mode: true } },
+    planPrompt:
+      "Produce a concise implementation plan with exactly these steps: Inspect permission steering; Implement permission steering; Verify permission steering. Do not implement it.",
+    planText: "Inspect permission steering",
+    steerPrompt: "Do not produce another plan. Reply exactly CODEX_STEER_RECEIVED and stop.",
+    reply: "CODEX_STEER_RECEIVED",
+  },
+];
+
+test.describe("composer steer supersedes plan approval", () => {
+  for (const scenario of scenarios) {
+    test(`${scenario.provider} keeps the rejected plan in the timeline`, async ({
+      page,
+    }, testInfo) => {
+      test.setTimeout(420_000);
+      const cwd = realpathSync(
+        mkdtempSync(path.join(tmpdir(), `paseo-permission-steer-${scenario.provider}-`)),
+      );
+      let handle: AgentHandle | undefined;
+
+      try {
+        handle = await launchAgent({
+          page,
+          provider: scenario.provider,
+          cwd,
+          mode: "full-access",
+          providerConfig: scenario.providerConfig,
+        });
+        await submitMessage(page, scenario.planPrompt);
+        await waitForPermissionPrompt(page, 180_000);
+
+        const pendingPlan = page.getByTestId("permission-plan-card");
+        await expect(pendingPlan).toContainText(scenario.planText);
+        const pendingScreenshot = testInfo.outputPath(`${scenario.provider}-pending-plan.png`);
+        await page.screenshot({ path: pendingScreenshot });
+        await testInfo.attach(`${scenario.provider} pending plan`, {
+          path: pendingScreenshot,
+          contentType: "image/png",
+        });
+
+        await submitMessage(page, scenario.steerPrompt);
+        await expect(pendingPlan).toHaveCount(0, { timeout: 30_000 });
+        const rejectedPlan = page.getByTestId("timeline-plan-card");
+        await expect(rejectedPlan).toBeVisible({ timeout: 30_000 });
+        await expect(rejectedPlan).toContainText(scenario.planText);
+        await expect(
+          page.getByTestId("assistant-message").filter({ hasText: scenario.reply }),
+        ).toBeVisible({
+          timeout: 180_000,
+        });
+
+        const rejectedScreenshot = testInfo.outputPath(`${scenario.provider}-rejected-plan.png`);
+        await page.screenshot({ path: rejectedScreenshot });
+        await testInfo.attach(`${scenario.provider} rejected plan`, {
+          path: rejectedScreenshot,
+          contentType: "image/png",
+        });
+      } finally {
+        await cleanupRewindFlow({ handle, cwd });
+      }
+    });
+  }
+});
@@ -0,0 +1,209 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { getServerId } from "../support/helpers/server-id";
+import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import {
+  expectSettingsHeader,
+  openHostSection,
+  openSettingsHost,
+} from "../support/helpers/settings";
+
+function observePluginCatalog(page: Page) {
+  let responses = 0;
+  page.on("websocket", (socket) => {
+    socket.on("framereceived", ({ payload }) => {
+      if (typeof payload !== "string") return;
+      try {
+        const envelope = JSON.parse(payload) as {
+          type?: unknown;
+          message?: { type?: unknown };
+        };
+        const message = envelope.type === "session" ? envelope.message : envelope;
+        if (message?.type === "plugin.catalog.get.response") responses += 1;
+      } catch {
+        return;
+      }
+    });
+  });
+  return {
+    waitForInitialFetch: async () => {
+      await expect.poll(() => responses).toBeGreaterThan(0);
+    },
+  };
+}
+
+function pluginSource(title: string, renderError?: string): string {
+  return `import React from "react";
+import { Text } from "react-native";
+export default function contribute(plugin) {
+  function Surface() {
+    ${renderError ? `throw new Error(${JSON.stringify(renderError)});` : ""}
+    const cleanups = Number(globalThis.sessionStorage?.getItem("paseo-plugin-cleanups") || "0");
+    return <Text>${title} cleanup {cleanups}</Text>;
+  }
+  plugin.addSurface("main", Surface);
+  plugin.addSidebarItem({ id: "main", title: ${JSON.stringify(title)}, icon: "Blocks", surface: "main" });
+  ${
+    renderError
+      ? `function HealthySurface() { return <Text>Healthy contribution</Text>; }
+  plugin.addSurface("healthy", HealthySurface);
+  plugin.addSidebarItem({ id: "healthy", title: "Healthy surface", icon: "Blocks", surface: "healthy" });`
+      : ""
+  }
+  return () => {
+    const storage = globalThis.sessionStorage;
+    if (storage) {
+      const cleanups = Number(storage.getItem("paseo-plugin-cleanups") || "0");
+      storage.setItem("paseo-plugin-cleanups", String(cleanups + 1));
+    }
+  };
+}`;
+}
+
+async function openPluginSettings(page: Page): Promise<void> {
+  const serverId = getServerId();
+  await openSettings(page);
+  await openSettingsHost(page, serverId);
+  await openHostSection(page, serverId, "plugins");
+  await expectSettingsHeader(page, "Plugins");
+}
+
+async function reloadPlugin(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Reload", exact: true }).click();
+  await expect(page.getByText("Reloaded e2e-plugin", { exact: true })).toBeVisible();
+}
+
+async function expectContributionBody(page: Page, expectedBody: string): Promise<void> {
+  const body = page.getByText(expectedBody, { exact: true }).filter({ visible: true });
+  await expect(body).toHaveCount(1);
+  await expect(body).toBeVisible();
+}
+
+async function openContribution(page: Page, title: string, expectedBody: string): Promise<void> {
+  await page.getByRole("button", { name: title, exact: true }).click();
+  await expectContributionBody(page, expectedBody);
+}
+
+async function leavePluginSettings(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Back", exact: true }).click();
+  await expect(page).not.toHaveURL(/\/settings\//);
+}
+
+async function openContributionFromSettings(
+  page: Page,
+  title: string,
+  expectedBody: string,
+): Promise<void> {
+  await leavePluginSettings(page);
+  await openContribution(page, title, expectedBody);
+}
+
+async function reloadActiveContribution(
+  page: Page,
+  client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>,
+  expectedBody: string,
+): Promise<void> {
+  await client.reloadPlugin("e2e-plugin");
+  await expectContributionBody(page, expectedBody);
+}
+
+async function expectContributionRemoved(page: Page, title: string): Promise<void> {
+  await expect(page.getByRole("button", { name: title, exact: true })).not.toBeVisible();
+}
+
+test("installs, reloads, recovers, disables, and removes a trusted local plugin", async ({
+  page,
+}) => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-e2e-"));
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await client.getDaemonConfig();
+  await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: "e2e-plugin" }));
+  await writeFile(path.join(directory, "index.tsx"), pluginSource("Plugin v1"));
+
+  try {
+    const catalog = observePluginCatalog(page);
+    await gotoAppShell(page);
+    await openPluginSettings(page);
+    await catalog.waitForInitialFetch();
+    await client.patchDaemonConfig({ pluginsEnabled: false });
+    await page.getByRole("switch", { name: "Enable plugins" }).click();
+    await expect(page.getByText("Plugins enabled", { exact: true })).toBeVisible();
+    await page.getByLabel("Plugin directory").fill(directory);
+    await page.getByLabel("Plugin installation ID").focus();
+    await expect(page.getByLabel("Plugin installation ID")).toHaveValue("e2e-plugin");
+    await page.getByRole("button", { name: "Install directory" }).click();
+    await expect(page.getByText("Installed e2e-plugin", { exact: true })).toBeVisible();
+    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+    await openContributionFromSettings(page, "Plugin v1", "Plugin v1 cleanup 0");
+
+    await openPluginSettings(page);
+    await reloadPlugin(page);
+    await openContributionFromSettings(page, "Plugin v1", "Plugin v1 cleanup 1");
+
+    await writeFile(path.join(directory, "index.tsx"), pluginSource("Plugin v2"));
+    await openPluginSettings(page);
+    await reloadPlugin(page);
+    await openContributionFromSettings(page, "Plugin v2", "Plugin v2 cleanup 2");
+    await expect(page.getByRole("button", { name: "Plugin v1", exact: true })).not.toBeVisible();
+
+    await writeFile(
+      path.join(directory, "index.tsx"),
+      pluginSource("Broken surface", "render exploded"),
+    );
+    await openPluginSettings(page);
+    await reloadPlugin(page);
+    await openContributionFromSettings(page, "Broken surface", "Plugin failed: render exploded");
+    await openContribution(page, "Healthy surface", "Healthy contribution");
+    await openContribution(page, "Broken surface", "Plugin failed: render exploded");
+
+    await writeFile(path.join(directory, "index.tsx"), pluginSource("Recovered surface"));
+    await reloadActiveContribution(page, client, "Recovered surface cleanup 4");
+    await expect(
+      page.getByRole("button", { name: "Broken surface", exact: true }),
+    ).not.toBeVisible();
+
+    await writeFile(path.join(directory, "index.tsx"), "export default broken syntax !!!");
+    await openPluginSettings(page);
+    await page.getByRole("button", { name: "Reload", exact: true }).click();
+    await expect(page.getByTestId("plugin-management-feedback")).toContainText("Request failed");
+    await expect(page.getByLabel("e2e-plugin failed")).toBeVisible();
+    await leavePluginSettings(page);
+    await expectContributionRemoved(page, "Recovered surface");
+
+    await writeFile(path.join(directory, "index.tsx"), pluginSource("Plugin v3"));
+    await openPluginSettings(page);
+    await page.getByRole("button", { name: "Reload", exact: true }).click();
+    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+    await openContributionFromSettings(page, "Plugin v3", "Plugin v3 cleanup 5");
+
+    await openPluginSettings(page);
+    await page.getByRole("button", { name: "Disable", exact: true }).click();
+    await expect(page.getByLabel("e2e-plugin disabled")).toBeVisible();
+    await leavePluginSettings(page);
+    await expectContributionRemoved(page, "Plugin v3");
+
+    await openPluginSettings(page);
+    await page.getByRole("button", { name: "Enable", exact: true }).click();
+    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+    await openContributionFromSettings(page, "Plugin v3", "Plugin v3 cleanup 6");
+
+    await openPluginSettings(page);
+    page.once("dialog", (dialog) => dialog.accept());
+    await page.getByRole("button", { name: "Remove", exact: true }).click();
+    await expect(page.getByText("No plugins configured", { exact: true })).toBeVisible();
+
+    await page.getByLabel("Plugin directory").fill(directory);
+    await page.getByRole("button", { name: "Install directory" }).click();
+    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+    await gotoAppShell(page);
+    await openContribution(page, "Plugin v3", "Plugin v3 cleanup 7");
+  } finally {
+    await client.removePlugin("e2e-plugin").catch(() => undefined);
+    await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled ?? false });
+    await client.close().catch(() => undefined);
+    await rm(directory, { recursive: true, force: true });
+  }
+});
@@ -0,0 +1,118 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "../support/fixtures";
+import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import { openSettingsSection } from "../support/helpers/settings";
+
+const PLUGIN_ID = "plugin-theme-e2e";
+
+// Catppuccin Mocha: base, text, surface0, surface1, mauve, subtext0, overlay0.
+const PLUGIN_SOURCE = `export default function contribute(plugin) {
+  plugin.addTheme({
+    id: "mocha",
+    name: "Catppuccin Mocha",
+    appearance: "dark",
+    colors: {
+      background: "#1e1e2e",
+      foreground: "#cdd6f4",
+      raised: "#313244",
+      control: "#45475a",
+      border: "#45475a",
+      accent: "#cba6f7",
+      mutedForeground: "#a6adc8",
+      ring: "#6c7086",
+    },
+  });
+  plugin.addTheme({
+    id: "latte",
+    name: "Catppuccin Latte",
+    appearance: "light",
+    colors: {
+      background: "#eff1f5",
+      foreground: "#4c4f69",
+      raised: "#e6e9ef",
+      control: "#dce0e8",
+      border: "#ccd0da",
+      accent: "#8839ef",
+      mutedForeground: "#6c6f85",
+      ring: "#9ca0b0",
+    },
+  });
+  return () => {};
+}`;
+
+// settingsStyles.sectionHeaderTitle paints from foregroundMuted, so the section heading proves the
+// contributed palette reached the semantic tokens rather than just the swatch.
+const MOCHA_MUTED_FOREGROUND = "rgb(166, 173, 200)";
+const LATTE_MUTED_FOREGROUND = "rgb(108, 111, 133)";
+
+test("applies a contributed theme and falls back when its plugin is gone", async ({
+  page,
+}, testInfo) => {
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-theme-e2e-"));
+  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previousConfig = await client.getDaemonConfig();
+  await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: PLUGIN_ID }));
+  await writeFile(path.join(directory, "index.ts"), PLUGIN_SOURCE);
+
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory);
+    await page.goto("/settings");
+    await expect(page.getByTestId("settings-sidebar")).toBeVisible();
+    await openSettingsSection(page, "appearance");
+
+    const sectionTitle = page.getByText("Theme", { exact: true }).first();
+    await page.getByLabel("Theme: System", { exact: true }).click();
+    const mochaItem = page.getByText("Catppuccin Mocha", { exact: true });
+    await expect(mochaItem).toBeVisible({ timeout: 30_000 });
+    await page.screenshot({
+      path: testInfo.outputPath("plugin-theme-picker.png"),
+      animations: "disabled",
+      fullPage: true,
+    });
+
+    await test.step("a contributed light theme uses the light palette", async () => {
+      await page.getByText("Catppuccin Latte", { exact: true }).click();
+      await expect(page.getByLabel("Theme: Catppuccin Latte", { exact: true })).toBeVisible();
+      await expect(sectionTitle).toHaveCSS("color", LATTE_MUTED_FOREGROUND);
+      await page.getByLabel("Theme: Catppuccin Latte", { exact: true }).click();
+    });
+
+    await mochaItem.click();
+    await expect(page.getByLabel("Theme: Catppuccin Mocha", { exact: true })).toBeVisible();
+    await expect(sectionTitle).toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
+    await page.screenshot({
+      path: testInfo.outputPath("plugin-theme-applied.png"),
+      fullPage: true,
+    });
+
+    await test.step("the selection survives a reload", async () => {
+      await page.reload();
+      await expect(page.getByLabel("Theme: Catppuccin Mocha", { exact: true })).toBeVisible({
+        timeout: 30_000,
+      });
+      await expect(sectionTitle).toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
+    });
+
+    await test.step("removing the plugin falls back to the default theme", async () => {
+      await client.removePlugin(PLUGIN_ID);
+      await expect(page.getByLabel("Theme: System", { exact: true })).toBeVisible({
+        timeout: 30_000,
+      });
+      await expect(sectionTitle).not.toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
+      await page.screenshot({
+        path: testInfo.outputPath("plugin-theme-fallback.png"),
+        fullPage: true,
+      });
+    });
+  } finally {
+    await client.removePlugin(PLUGIN_ID).catch(() => undefined);
+    await client
+      .patchDaemonConfig({ pluginsEnabled: previousConfig.config.pluginsEnabled ?? false })
+      .catch(() => undefined);
+    await client.close().catch(() => undefined);
+    await rm(directory, { recursive: true, force: true });
+  }
+});
@@ -0,0 +1,247 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { TestInfo } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { openCommandCenter } from "../support/helpers/command-center";
+import { addConnectedHostAndReload } from "../support/helpers/hosts";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import { buildAgentRoute } from "../support/helpers/mock-agent";
+import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  closeMobileAgentSidebar,
+  expectMobileAgentSidebarHidden,
+} from "../support/helpers/sidebar";
+import {
+  switchWorkspaceViaSidebar,
+  waitForWorkspaceInSidebar,
+} from "../support/helpers/workspace-ui";
+
+const PLUGIN_ID = "workspace-panel-e2e";
+const WIDE_VIEWPORT = { width: 1280, height: 900 };
+const COMPACT_VIEWPORT = { width: 390, height: 844 };
+
+function isSettledWorkspaceUrl(url: URL): boolean {
+  return url.pathname.includes("/workspace/") && !url.searchParams.has("open");
+}
+
+function pluginSource(): string {
+  return `import React, { useRef } from "react";
+import { Text, View } from "react-native";
+import { useAgent, useWorkspace } from "@getpaseo/plugin";
+
+function WorkspacePanel({ workspaceId, host, layout }) {
+  const workspace = useWorkspace(workspaceId, (value) => ({ id: value.id }));
+  const renderCount = useRef(0);
+  renderCount.current += 1;
+  return <View><Text>Workspace bridge {workspace?.id}</Text><Text>Workspace renders {renderCount.current}</Text><Text>Host {host.id}</Text><Text>Layout {layout.compact ? "compact" : "wide"}</Text></View>;
+}
+
+function AgentPanel({ workspaceId, agentId, host, layout }) {
+  const workspace = useWorkspace(workspaceId, (value) => ({ id: value.id }));
+  const agent = useAgent(agentId, (value) => ({ id: value.id }));
+  return <View><Text>Agent bridge {agent?.id}</Text><Text>Workspace {workspace?.id}</Text><Text>Host {host.id}</Text><Text>Layout {layout.compact ? "compact" : "wide"}</Text></View>;
+}
+
+function DirectCollisionSurface() {
+  return <View><Text>Direct collision surface</Text></View>;
+}
+
+function SidebarCollisionSurface() {
+  return <View><Text>Sidebar collision surface</Text></View>;
+}
+
+export default function contribute(plugin) {
+  plugin.addSurface("collision", DirectCollisionSurface);
+  plugin.addSurface("sidebar-destination", SidebarCollisionSurface);
+  plugin.addSidebarItem({ id: "collision", title: "Collision sidebar", icon: "Blocks", surface: "sidebar-destination" });
+  plugin.addWorkspacePanel({ id: "workspace", title: "Workspace inspector", icon: "PanelsTopLeft", context: "workspace", Component: WorkspacePanel });
+  plugin.addWorkspacePanel({ id: "agent", title: "Agent inspector", icon: "PanelTop", context: "agent", Component: AgentPanel });
+  plugin.addCommandCenterItem({ id: "global", title: "Plugin global action", icon: "Blocks", context: "global", onSelect() {} });
+  plugin.addCommandCenterItem({ id: "surface", title: "Open direct collision surface", icon: "Blocks", context: "workspace", onSelect({ openSurface }) { openSurface("collision"); } });
+  plugin.addCommandCenterItem({ id: "workspace", title: "Open plugin workspace", icon: "PanelsTopLeft", context: "workspace", onSelect({ openPanel }) { openPanel("workspace"); } });
+  plugin.addCommandCenterItem({ id: "agent", title: "Open plugin agent", icon: "PanelTop", context: "agent", onSelect({ openPanel }) { openPanel("agent"); } });
+  return () => {};
+}`;
+}
+
+async function searchCommands(page: Page, query: string) {
+  const panel = await openCommandCenter(page);
+  await panel.getByTestId("command-center-input").fill(query);
+  return panel;
+}
+
+async function expectCommandAvailable(page: Page, title: string): Promise<void> {
+  const panel = await searchCommands(page, title);
+  await expect(panel.getByRole("button", { name: title, exact: true })).toBeVisible();
+  await page.keyboard.press("Escape");
+}
+
+async function expectCommandUnavailable(page: Page, title: string): Promise<void> {
+  const panel = await searchCommands(page, title);
+  await expect(panel.getByRole("button", { name: title, exact: true })).toHaveCount(0);
+  await page.keyboard.press("Escape");
+}
+
+async function runCommand(page: Page, title: string): Promise<void> {
+  const panel = await searchCommands(page, title);
+  await panel.getByRole("button", { name: title, exact: true }).click();
+  await expect(panel).not.toBeVisible();
+}
+
+async function openCompactSidebar(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Open menu", exact: true }).click();
+  await expect(page.getByTestId("sidebar-command-center-search")).toBeVisible();
+}
+
+async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
+  const screenshot = testInfo.outputPath(`${name}.png`);
+  await page.screenshot({ path: screenshot });
+  await testInfo.attach(name, { path: screenshot, contentType: "image/png" });
+}
+
+test.describe("plugin workspace panels and Command Center", () => {
+  test.describe.configure({ timeout: 240_000 });
+
+  test("follows workspace, agent, host, compact, and unavailable state", async ({
+    page,
+  }, testInfo) => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-workspace-panel-e2e-"));
+    const primaryClient = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+    const previousConfig = await primaryClient.getDaemonConfig();
+    const primary = await seedWorkspace({ repoPrefix: "plugin-panel-primary-" });
+    const secondaryDaemon = await startIsolatedHostDaemon("plugin-panel-secondary");
+    const secondary = await seedWorkspace({
+      repoPrefix: "plugin-panel-secondary-",
+      port: secondaryDaemon.port,
+    });
+    await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: PLUGIN_ID }));
+    await writeFile(path.join(directory, "index.tsx"), pluginSource());
+
+    try {
+      await primaryClient.patchDaemonConfig({ pluginsEnabled: true });
+      await primaryClient.installDirectoryPlugin(directory);
+      await page.setViewportSize(WIDE_VIEWPORT);
+      await gotoAppShell(page);
+      await addConnectedHostAndReload(page, {
+        serverId: secondaryDaemon.serverId,
+        label: "Secondary plugin host",
+        port: secondaryDaemon.port,
+        primaryLabel: "Primary plugin host",
+      });
+      await waitForWorkspaceInSidebar(page, {
+        serverId: getServerId(),
+        workspaceId: primary.workspaceId,
+      });
+      await waitForWorkspaceInSidebar(page, {
+        serverId: secondaryDaemon.serverId,
+        workspaceId: secondary.workspaceId,
+      });
+
+      await test.step("workspace context opens the real wide panel bridge", async () => {
+        await switchWorkspaceViaSidebar({
+          page,
+          serverId: getServerId(),
+          workspaceId: primary.workspaceId,
+        });
+        await expectCommandAvailable(page, "Plugin global action");
+        await expectCommandAvailable(page, "Open plugin workspace");
+        await expectCommandUnavailable(page, "Open plugin agent");
+        await runCommand(page, "Open plugin workspace");
+        await expect(page.getByText(`Workspace bridge ${primary.workspaceId}`)).toBeVisible();
+        const renderCount = Number(
+          (await page.getByText(/Workspace renders \d+/).textContent())?.split(" ").at(-1),
+        );
+        await primaryClient.setWorkspaceTitle(primary.workspaceId, "Unrelated title update");
+        await expect(page.getByTestId("workspace-header-title")).toHaveText(
+          "Unrelated title update",
+        );
+        expect(
+          Number((await page.getByText(/Workspace renders \d+/).textContent())?.split(" ").at(-1)),
+        ).toBe(renderCount);
+        await expect(page.getByText(`Host ${getServerId()}`, { exact: true })).toBeVisible();
+        await expect(page.getByText("Layout wide", { exact: true })).toBeVisible();
+        await capture(page, testInfo, "plugin-workspace-panel-wide");
+      });
+
+      await test.step("direct and sidebar routes preserve same-id contribution kind", async () => {
+        await runCommand(page, "Open direct collision surface");
+        await expect(page.getByText("Direct collision surface", { exact: true })).toBeVisible();
+        await expect(page.getByText("Sidebar collision surface", { exact: true })).toHaveCount(0);
+        await page.getByTestId("plugin-surface-close").click();
+
+        await page.getByTestId(`plugin-sidebar-${PLUGIN_ID}-collision`).click();
+        await expect(page.getByText("Sidebar collision surface", { exact: true })).toBeVisible();
+        await expect(page.getByText("Direct collision surface", { exact: true })).toHaveCount(0);
+        await capture(page, testInfo, "plugin-surface-kind-collision");
+        await page.getByTestId("plugin-surface-close").click();
+      });
+
+      await test.step("switching hosts removes commands from an uninstalled host", async () => {
+        await switchWorkspaceViaSidebar({
+          page,
+          serverId: secondaryDaemon.serverId,
+          workspaceId: secondary.workspaceId,
+        });
+        await expectCommandUnavailable(page, "Plugin global action");
+        await expectCommandUnavailable(page, "Open plugin workspace");
+      });
+
+      await test.step("legacy sidebar URLs survive a full browser navigation", async () => {
+        await page.goto(`/h/${encodeURIComponent(getServerId())}/plugin/${PLUGIN_ID}/collision`);
+        await page.waitForURL(new RegExp(`/plugin/${PLUGIN_ID}/sidebar/collision(?:\\?.*)?$`));
+        await expect(page.getByText("Sidebar collision surface", { exact: true })).toBeVisible();
+      });
+
+      await test.step("agent context opens the compact panel with synchronous snapshots", async () => {
+        const agent = await primary.client.createAgent({
+          provider: "mock",
+          cwd: primary.repoPath,
+          workspaceId: primary.workspaceId,
+          title: "Plugin panel context agent",
+          model: "ten-second-stream",
+          modeId: "load-test",
+        });
+        await page.goto(buildAgentRoute(primary.workspaceId, agent.id));
+        await page.waitForURL(isSettledWorkspaceUrl, { timeout: 60_000 });
+        await page.setViewportSize(COMPACT_VIEWPORT);
+        await openCompactSidebar(page);
+        await runCommand(page, "Open plugin agent");
+        await closeMobileAgentSidebar(page);
+        await expectMobileAgentSidebarHidden(page);
+        await expect(page.getByText(`Agent bridge ${agent.id}`)).toBeVisible();
+        await expect(
+          page.getByText(`Workspace ${primary.workspaceId}`, { exact: true }),
+        ).toBeVisible();
+        await expect(page.getByText(`Host ${getServerId()}`, { exact: true })).toBeVisible();
+        await expect(page.getByText("Layout compact", { exact: true })).toBeVisible();
+        await capture(page, testInfo, "plugin-agent-panel-compact");
+      });
+
+      await test.step("removing the active plugin renders the panel unavailable", async () => {
+        await primaryClient.removePlugin(PLUGIN_ID);
+        await expect(
+          page.getByText("This plugin panel is unavailable.", { exact: true }),
+        ).toBeVisible({
+          timeout: 30_000,
+        });
+        await capture(page, testInfo, "plugin-panel-unavailable");
+        await openCompactSidebar(page);
+        await expectCommandUnavailable(page, "Open plugin agent");
+      });
+    } finally {
+      await primaryClient.removePlugin(PLUGIN_ID).catch(() => undefined);
+      await primaryClient
+        .patchDaemonConfig({ pluginsEnabled: previousConfig.config.pluginsEnabled ?? false })
+        .catch(() => undefined);
+      await primaryClient.close().catch(() => undefined);
+      await primary.cleanup().catch(() => undefined);
+      await secondary.cleanup().catch(() => undefined);
+      await secondaryDaemon.close().catch(() => undefined);
+      await rm(directory, { recursive: true, force: true });
+    }
+  });
+});
@@ -102,11 +102,11 @@ test.describe("PR pane", () => {
    await expectPrPaneTitle(page, "Work in progress");
  });

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

-    await expectPrPaneCheckSummary(page, { passed: 2, failed: 1, pending: 1 });
+    await expectPrPaneCheckSummary(page, { success: 2, failure: 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, { passed: 0, failed: 0, pending: 0 });
+    await expectPrPaneCheckSummary(page, { success: 0, failure: 0, pending: 0 });
    await expectPrPaneTitle(page, "PR with no checks");
  });
 });
@@ -45,12 +45,19 @@ import {
  unblockPaseoConfigWrites,
 } from "../support/helpers/project-settings";
 import { gotoAppShell } from "../support/helpers/app";
+import { openCompactSettings } from "../support/helpers/settings";
 import {
  addProjectFlowInput,
  chooseAddProjectMethod,
  openAddProjectFlow,
 } from "../support/helpers/add-project-flow";
 import { createTempGitRepo } from "../support/helpers/workspace";
+import {
+  buildOpenProjectRoute,
+  buildProjectsSettingsRoute,
+  buildSettingsRoute,
+} from "@/utils/host-routes";
+import { getServerId } from "../support/helpers/server-id";

 const updatedSetup = ["npm install", "npm run build"];

@@ -321,6 +328,33 @@ test.describe("Projects settings", () => {
  });
 });

+test.describe("Projects settings — compact navigation", () => {
+  test.use({ viewport: { width: 390, height: 844 } });
+
+  test("project Back returns through Projects and Settings without reopening the project", async ({
+    page,
+    editableProject,
+  }) => {
+    await gotoAppShell(page);
+    await openCompactSettings(page, buildOpenProjectRoute());
+    await page.getByRole("button", { name: "Projects", exact: true }).click();
+    await expect(page).toHaveURL(buildProjectsSettingsRoute(getServerId()));
+
+    await openProjectSettings(page, editableProject.name);
+    await expect(page.getByRole("button", { name: "Back", exact: true })).toHaveCount(1);
+    await expect(page.getByRole("button", { name: "Back to projects", exact: true })).toHaveCount(
+      0,
+    );
+
+    await page.getByRole("button", { name: "Back", exact: true }).click();
+    await expect(page).toHaveURL(buildProjectsSettingsRoute(getServerId()));
+
+    await page.getByRole("button", { name: "Back", exact: true }).click();
+    await expect(page).toHaveURL(buildSettingsRoute());
+    await expect(page.getByTestId("settings-sidebar")).toBeVisible();
+  });
+});
+
 test.describe("Projects settings — error UX", () => {
  test("stale-write callout appears on save, disables save, and reload clears it", async ({
    page,
@@ -21,21 +21,22 @@ async function openMockAgentAtMobileBreakpoint(page: Page) {

 async function openProviderSettingsFromModelSelector(page: Page) {
  await page.getByRole("button", { name: /Select model/ }).click();
-  await expect(page.getByLabel("Bottom Sheet", { exact: true })).toBeVisible({ timeout: 10_000 });
+  const configuration = page.getByTestId("agent-controls-model-sheet");
+  await expect(configuration).toBeVisible({ timeout: 10_000 });
+  await page.getByTestId("agent-controls-model").click();

-  const openCodeRow = page.getByText("OpenCode", { exact: true }).first();
-  if (await openCodeRow.isVisible().catch(() => false)) {
-    await openCodeRow.click();
-  }
+  const modelBrowser = page.getByTestId("agent-controls-model-browser-sheet");
+  await expect(modelBrowser).toBeVisible({ timeout: 10_000 });

  await page.getByRole("button", { name: /Open .* settings/ }).click();
  await expect(page.getByTestId("provider-settings-sheet")).toBeVisible({ timeout: 10_000 });
 }

-async function expectModelSelectorVisible(page: Page) {
-  await expect(page.getByRole("button", { name: /Open .* settings/ })).toBeVisible({
+async function expectModelBrowserVisible(page: Page) {
+  await expect(page.getByTestId("agent-controls-model-browser-sheet")).toBeVisible({
    timeout: 10_000,
  });
+  await expect(page.getByRole("button", { name: /Open .* settings/ })).toBeVisible();
 }

 async function closeTopSheet(page: Page) {
@@ -180,7 +181,7 @@ test.describe("provider settings overlay stack", () => {
    }
  });

-  test("provider settings and children close back through the model selector stack", async ({
+  test("provider settings and children close back through the model browser to configuration", async ({
    page,
  }) => {
    test.setTimeout(180_000);
@@ -192,13 +193,18 @@ test.describe("provider settings overlay stack", () => {
      await exerciseProviderSettingsStack(page);
      await closeSheetByHeaderButton(page, "provider-settings-sheet");

-      await expectModelSelectorVisible(page);
+      await expectModelBrowserVisible(page);
      await page.getByRole("button", { name: /Open .* settings/ }).click();
      await expect(page.getByTestId("provider-settings-sheet")).toBeVisible({ timeout: 10_000 });
      await exerciseProviderSettingsStack(page);
      await closeSheetByHeaderButton(page, "provider-settings-sheet");

-      await expectModelSelectorVisible(page);
+      await expectModelBrowserVisible(page);
+      await closeTopSheet(page);
+      await expect(page.getByTestId("agent-controls-model-browser-sheet")).not.toBeVisible({
+        timeout: 10_000,
+      });
+      await expect(page.getByTestId("agent-controls-settings-list")).toBeVisible();
      await closeTopSheet(page);
    } finally {
      await session.cleanup();
@@ -89,6 +89,9 @@ test.describe("real provider subagent timelines", () => {
        }
        await rows.first().click();

+        // Choosing a row is a menu selection: the track panel goes with it.
+        await expect(page.getByTestId("subagents-track-header-panel")).toBeHidden();
+
        const panel = page.getByTestId("provider-subagent-panel");
        await expect(panel).toBeVisible({ timeout: 30_000 });
        if (scenario.expectedSubtitle) {
@@ -133,6 +136,8 @@ test.describe("real provider subagent timelines", () => {
        await expect(
          page.getByTestId("assistant-message").filter({ hasText: "ROOT_DONE" }).last(),
        ).toBeVisible({ timeout: 60_000 });
+        // Opening the subagent's tab closed the panel with the parent's pane.
+        await openSubagentsTrack(page);
        const archiveFinished = page.getByTestId("subagents-track-archive-finished");
        await expect(archiveFinished).toBeVisible({ timeout: 30_000 });
        await archiveFinished.click();
@@ -0,0 +1,50 @@
+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 = 190_000;
+const MAX_SERIALIZED_CHARS = 45_000;

 const test = base.extend<{ replicaCacheAgent: MockAgentWorkspace }>({
  replicaCacheAgent: async ({ page: _page }, provide) => {
@@ -10,6 +10,7 @@ import {
  fillComposerDraft,
  submitMessage,
 } from "../support/helpers/composer";
+import { readReplicaCache, writeReplicaCache } from "../support/helpers/replica-cache-storage";

 // UI plumbing contract against the dev mock provider. Real-provider behavior is tested in `daemon-e2e/*-rewind.real.e2e.test.ts`.

@@ -27,39 +28,28 @@ async function expectUserMessageVisible(page: Page, text: string): Promise<void>

 async function rewriteCachedMessageAsLegacyRow(page: Page, prompt: string): Promise<void> {
  await expect
-    .poll(() =>
-      page.evaluate((messageText) => {
-        const raw = localStorage.getItem("@paseo:replica-cache");
-        if (!raw) return false;
-        const cache = JSON.parse(raw) as {
-          hosts?: Array<{ timeline?: { items?: Array<Record<string, unknown>> } | null }>;
-        };
-        for (const host of cache.hosts ?? []) {
-          for (const item of host.timeline?.items ?? []) {
-            if (item.kind === "user_message" && item.text === messageText && item.messageId) {
-              return true;
-            }
+    .poll(async () => {
+      const cache = await readReplicaCache(page);
+      if (!cache) return false;
+      for (const host of cache.hosts ?? []) {
+        for (const item of host.timeline?.items ?? []) {
+          if (item.kind === "user_message" && item.text === prompt && item.messageId) {
+            return true;
          }
        }
-        return false;
-      }, prompt),
-    )
+      }
+      return false;
+    })
    .toBe(true);

-  await page.evaluate((messageText) => {
-    const key = "@paseo:replica-cache";
-    const raw = localStorage.getItem(key);
-    if (!raw) throw new Error("Replica cache was not persisted");
-    const cache = JSON.parse(raw) as {
-      hosts?: Array<{ timeline?: { items?: Array<Record<string, unknown>> } | null }>;
-    };
-    const cachedMessage = cache.hosts
-      ?.flatMap((host) => host.timeline?.items ?? [])
-      .find((item) => item.kind === "user_message" && item.text === messageText);
-    if (!cachedMessage) throw new Error("Cached user message was not found");
-    delete cachedMessage.messageId;
-    localStorage.setItem(key, JSON.stringify(cache));
-  }, prompt);
+  const cache = await readReplicaCache(page);
+  if (!cache) throw new Error("Replica cache was not persisted");
+  const cachedMessage = cache.hosts
+    ?.flatMap((host) => host.timeline?.items ?? [])
+    .find((item) => item.kind === "user_message" && item.text === prompt);
+  if (!cachedMessage) throw new Error("Cached user message was not found");
+  delete cachedMessage.messageId;
+  await writeReplicaCache(page, cache);
 }

 async function waitForCurrentSubmissionExcludedFromCache(
@@ -67,46 +57,34 @@ async function waitForCurrentSubmissionExcludedFromCache(
  prompt: string,
 ): Promise<void> {
  await expect
-    .poll(() =>
-      page.evaluate((messageText) => {
-        const raw = localStorage.getItem("@paseo:replica-cache");
-        if (!raw) return false;
-        const cache = JSON.parse(raw) as {
-          hosts?: Array<{ timeline?: { items?: Array<Record<string, unknown>> } | null }>;
-        };
-        return !cache.hosts
-          ?.flatMap((host) => host.timeline?.items ?? [])
-          .some(
-            (item) =>
-              item.kind === "user_message" &&
-              item.text === messageText &&
-              typeof item.clientMessageId === "string" &&
-              item.messageId === undefined,
-          );
-      }, prompt),
-    )
+    .poll(async () => {
+      const cache = await readReplicaCache(page);
+      if (!cache) return false;
+      return !cache.hosts
+        ?.flatMap((host) => host.timeline?.items ?? [])
+        .some(
+          (item) =>
+            item.kind === "user_message" &&
+            item.text === prompt &&
+            typeof item.clientMessageId === "string" &&
+            item.messageId === undefined,
+        );
+    })
    .toBe(true);
 }

 async function waitForCachedMessageWithoutProviderId(page: Page, prompt: string): Promise<void> {
  await expect
-    .poll(() =>
-      page.evaluate((messageText) => {
-        const raw = localStorage.getItem("@paseo:replica-cache");
-        if (!raw) return false;
-        const cache = JSON.parse(raw) as {
-          hosts?: Array<{ timeline?: { items?: Array<Record<string, unknown>> } | null }>;
-        };
-        return cache.hosts
-          ?.flatMap((host) => host.timeline?.items ?? [])
-          .some(
-            (item) =>
-              item.kind === "user_message" &&
-              item.text === messageText &&
-              item.messageId === undefined,
-          );
-      }, prompt),
-    )
+    .poll(async () => {
+      const cache = await readReplicaCache(page);
+      if (!cache) return false;
+      return cache.hosts
+        ?.flatMap((host) => host.timeline?.items ?? [])
+        .some(
+          (item) =>
+            item.kind === "user_message" && item.text === prompt && item.messageId === undefined,
+        );
+    })
    .toBe(true);
 }

@@ -148,16 +126,13 @@ test.describe("Rewind sheet", () => {
      title: "Rewind cache upgrade e2e",
      initialPrompt: prompt,
    });
-    let heldTimelineRequest = false;

    try {
      await openAgentRoute(page, session);
      await expectUserMessageVisible(page, prompt);
+      await gate.drop();
      await rewriteCachedMessageAsLegacyRow(page, prompt);
-      gate.holdNextClientRequest("fetch_agent_timeline_request");
      await page.reload();
-      await gate.waitForHeldClientRequest();
-      heldTimelineRequest = true;

      const restoredMessage = userMessage(page, prompt);
      await expect(restoredMessage).toBeVisible();
@@ -165,7 +140,6 @@ test.describe("Rewind sheet", () => {
      await expect(restoredMessage.getByTestId("rewind-menu-trigger")).toHaveCount(0);
      await waitForCachedMessageWithoutProviderId(page, prompt);
    } finally {
-      if (heldTimelineRequest) gate.releaseHeldClientRequest();
      gate.restore();
      await session.cleanup();
    }
@@ -1,28 +1,22 @@
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
-import { test, expect, type Page } from "../support/fixtures";
+import { test, expect } from "../support/fixtures";
 import { gotoWorkspace, clickNewTerminal } from "../support/helpers/launcher";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
-import { expectExplorerEntryVisible } from "../support/helpers/file-explorer";
-import { expectNoTerminalTabs, clickFirstTerminalTab } from "../support/helpers/workspace-tabs";
+import { expectExplorerEntryVisible, openFileExplorer } from "../support/helpers/file-explorer";
+import {
+  expectNoTerminalTabs,
+  clickFirstTerminalTab,
+  openChangesPanel,
+} from "../support/helpers/workspace-tabs";

 // Model B: two workspaces can back the SAME directory. What follows from that
 // split is the contract these specs pin:
-//   - The right sidebar (file browser / git changes) reads the directory, so it
-//     is IDENTICAL across same-directory workspaces.
+//   - Files and Changes read the directory, so their content is IDENTICAL
+//     across same-directory workspaces.
 //   - Tabs (agents, terminals) are owned by the workspace, so they are
 //     INDEPENDENT across same-directory workspaces.

-// On desktop the explorer is pinned open; on narrow layouts it must be toggled.
-// Open it either way, then select the requested tab.
-async function openExplorerTab(page: Page, tab: "files" | "changes"): Promise<void> {
-  const openButton = page.getByRole("button", { name: "Open explorer" }).first();
-  if (await openButton.isVisible().catch(() => false)) {
-    await openButton.click();
-  }
-  await page.getByTestId(`explorer-tab-${tab}`).click();
-}
-
 async function createSecondWorkspaceOnSameDir(
  seeded: SeededWorkspace,
  title: string,
@@ -41,7 +35,7 @@ async function createSecondWorkspaceOnSameDir(
 test.describe("Same-directory workspaces", () => {
  test.describe.configure({ timeout: 180_000 });

-  test("the right sidebar is shared: a directory change shows in both same-dir workspaces", async ({
+  test("directory-backed Files and Changes content is shared across same-dir workspaces", async ({
    page,
  }) => {
    const seeded = await seedWorkspace({ repoPrefix: "same-dir-shared-" });
@@ -71,19 +65,19 @@ test.describe("Same-directory workspaces", () => {
      // Workspace A: the new file shows in both the file browser and the git
      // changes view.
      await gotoWorkspace(page, seeded.workspaceId);
-      await openExplorerTab(page, "files");
+      await openFileExplorer(page);
      await expectExplorerEntryVisible(page, "SHARED_CHANGE.md");
-      await openExplorerTab(page, "changes");
+      await openChangesPanel(page);
      await expect(
        page.getByTestId("git-diff-scroll").getByText("SHARED_CHANGE.md", { exact: true }).first(),
      ).toBeVisible({ timeout: 30_000 });

-      // Workspace B (same directory): the SAME change is visible. The right
-      // sidebar content does not differ between the two views.
+      // Workspace B (same directory): the SAME directory-backed content is
+      // visible even though the panel tabs belong to a different workspace.
      await gotoWorkspace(page, secondWorkspaceId);
-      await openExplorerTab(page, "files");
+      await openFileExplorer(page);
      await expectExplorerEntryVisible(page, "SHARED_CHANGE.md");
-      await openExplorerTab(page, "changes");
+      await openChangesPanel(page);
      await expect(
        page.getByTestId("git-diff-scroll").getByText("SHARED_CHANGE.md", { exact: true }).first(),
      ).toBeVisible({ timeout: 30_000 });
@@ -12,12 +12,12 @@ test("Settings language selector switches General labels", async ({ page }) => {
  await expect(page.getByText("Default send", { exact: true }).first()).toBeVisible();

  await page.getByRole("button", { name: "System", exact: true }).click();
-  await page.getByRole("button", { name: "简体中文 - Simplified Chinese", exact: true }).click();
+  await page.getByRole("menuitem", { name: "简体中文 - Simplified Chinese", exact: true }).click();

  await expect(page.getByText("默认发送", { exact: true }).first()).toBeVisible();

  await page.getByRole("button", { name: "简体中文", exact: true }).click();
-  await page.getByRole("button", { name: "English - 英语", exact: true }).click();
+  await page.getByRole("menuitem", { name: "English - 英语", exact: true }).click();

  await expect(page.getByText("Default send", { exact: true }).first()).toBeVisible();
 });
@@ -30,12 +30,12 @@ test("Settings language selector switches to Korean", async ({ page }) => {
  await openSettingsSection(page, "general");

  await page.getByRole("button", { name: "System", exact: true }).click();
-  await page.getByRole("button", { name: "한국어 - Korean", exact: true }).click();
+  await page.getByRole("menuitem", { name: "한국어 - Korean", exact: true }).click();

  await expect(page.getByText("기본 전송", { exact: true }).first()).toBeVisible();

  await page.getByRole("button", { name: "한국어", exact: true }).click();
-  await page.getByRole("button", { name: "English - 영어", exact: true }).click();
+  await page.getByRole("menuitem", { name: "English - 영어", exact: true }).click();

  await expect(page.getByText("Default send", { exact: true }).first()).toBeVisible();
 });
@@ -2,6 +2,7 @@ import { test, expect } from "../support/fixtures";
 import {
  buildHostWorkspaceRoute,
  buildOpenProjectRoute,
+  buildSettingsHostSectionRoute,
  buildSettingsRoute,
  buildSettingsSectionRoute,
 } from "@/utils/host-routes";
@@ -181,6 +182,28 @@ test.describe("Settings — compact master-detail", () => {
    await expectSettingsSidebarVisible(page);
  });

+  test("host picker settings opens Overview and backs through the settings list", async ({
+    page,
+    withWorkspace,
+  }) => {
+    const workspace = await withWorkspace({ prefix: "host-picker-settings-back-" });
+    const workspaceRoute = buildHostWorkspaceRoute(getServerId(), workspace.workspaceId);
+
+    await openWorkspace(page, workspace);
+    await page.getByRole("button", { name: "Open menu", exact: true }).click();
+    await page.getByTestId("sidebar-hosts-trigger").click();
+    await page.getByRole("button", { name: /Open .* settings/ }).click();
+
+    await expectAppRoute(page, buildSettingsHostSectionRoute(getServerId(), "host"));
+    await expect(page.getByText("Overview", { exact: true })).toBeVisible();
+
+    await goBackInSettings(page);
+    await expectCompactSettingsList(page);
+
+    await goBackInSettings(page);
+    await expectAppRoute(page, workspaceRoute);
+  });
+
  test("switching the host picker on the settings list scopes host rows without navigating", async ({
    page,
  }) => {
@@ -12,7 +12,7 @@ async function pressSettingsToggleShortcut(page: import("@playwright/test").Page

 async function expectSendBehavior(
  page: import("@playwright/test").Page,
-  expected: "interrupt" | "queue",
+  expected: "interrupt" | "queue" | "steer",
 ) {
  await expect
    .poll(async () => {
@@ -70,9 +70,28 @@ test.describe("Settings toggle tab regression", () => {
      await pressSettingsToggleShortcut(page);
      await expect(page).toHaveURL(/\/settings\/general$/);

-      await page.getByRole("button", { name: "Queue", exact: true }).click();
+      const defaultSendTrigger = page.getByRole("button", {
+        name: "Default send: Steer",
+        exact: true,
+      });
+      await expect(defaultSendTrigger).toBeVisible();
+      await expect(page.getByRole("menuitem", { name: "Queue", exact: true })).toHaveCount(0);
+
+      await defaultSendTrigger.click();
+      await expect(page.getByRole("menuitem", { name: "Steer", exact: true })).toHaveAttribute(
+        "aria-checked",
+        "true",
+      );
+      await page.getByRole("menuitem", { name: "Queue", exact: true }).click();
      await expectSendBehavior(page, "queue");
-      await page.getByRole("button", { name: "Interrupt", exact: true }).click();
+      const queuedDefaultSendTrigger = page.getByRole("button", {
+        name: "Default send: Queue",
+        exact: true,
+      });
+      await expect(queuedDefaultSendTrigger).toBeVisible();
+
+      await queuedDefaultSendTrigger.click();
+      await page.getByRole("menuitem", { name: "Interrupt", exact: true }).click();
      await expectSendBehavior(page, "interrupt");

      await pressSettingsToggleShortcut(page);
@@ -0,0 +1,238 @@
+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();
+    }
+  });
+});
@@ -0,0 +1,127 @@
+import { expect } from "@playwright/test";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  closeSidebarDisplayPreferences,
+  openSidebarProjectFilter,
+  pinWorkspaceFromSidebar,
+  selectAllProjectsFilter,
+  selectSidebarStatusGrouping,
+  toggleProjectFilter,
+} from "../support/helpers/sidebar";
+
+test.describe("Sidebar project filter", () => {
+  test.describe.configure({ timeout: 180_000 });
+
+  test("pins the sidebar to one project across both grouping modes", async ({ page }) => {
+    // Two temp repos means two projects, which is also what makes the `Project ›` row appear.
+    const alpha = await seedWorkspace({ repoPrefix: "project-filter-alpha-", title: "Alpha work" });
+    const beta = await seedWorkspace({ repoPrefix: "project-filter-beta-", title: "Beta work" });
+    const serverId = getServerId();
+    const alphaRow = page.getByTestId(`sidebar-workspace-row-${serverId}:${alpha.workspaceId}`);
+    const betaRow = page.getByTestId(`sidebar-workspace-row-${serverId}:${beta.workspaceId}`);
+    const filterTrigger = page.getByTestId("sidebar-display-project-filter");
+
+    try {
+      await gotoAppShell(page);
+      await expect(alphaRow).toBeVisible({ timeout: 30_000 });
+      await expect(betaRow).toBeVisible({ timeout: 30_000 });
+
+      await openSidebarProjectFilter(page);
+      await expect(page.getByTestId("sidebar-project-filter-all")).toBeVisible();
+      await toggleProjectFilter(page, alpha.projectKey);
+      await closeSidebarDisplayPreferences(page);
+
+      await expect(alphaRow).toBeVisible();
+      await expect(betaRow).toHaveCount(0, { timeout: 10_000 });
+
+      // The indicator reads the filter as it is applied, so it must be on here.
+      await page.getByTestId("sidebar-display-preferences-menu").click();
+      await expect(filterTrigger).toBeVisible();
+      await expect(filterTrigger.getByTestId("menu-sub-indicator")).toBeVisible();
+      await closeSidebarDisplayPreferences(page);
+
+      // Status grouping builds its rows from the workspace entries rather than the projects
+      // array, so a filter applied in only one of the two places passes every check above and
+      // silently fails right here.
+      await selectSidebarStatusGrouping(page);
+      await closeSidebarDisplayPreferences(page);
+      await expect(alphaRow).toBeVisible({ timeout: 15_000 });
+      await expect(betaRow).toHaveCount(0);
+
+      // The filter is view state and survives a cold load.
+      await page.reload();
+      await expect(alphaRow).toBeVisible({ timeout: 30_000 });
+      await expect(betaRow).toHaveCount(0);
+
+      await openSidebarProjectFilter(page);
+      await selectAllProjectsFilter(page);
+      await closeSidebarDisplayPreferences(page);
+      await expect(alphaRow).toBeVisible();
+      await expect(betaRow).toBeVisible({ timeout: 15_000 });
+    } finally {
+      await beta.cleanup();
+      await alpha.cleanup();
+    }
+  });
+
+  test("keeps the display menu reachable when the pinned section swallows the filtered project", async ({
+    page,
+  }) => {
+    // Pinning hoists a chat out of its project, and a project whose chats are ALL hoisted is
+    // dropped from the project list entirely. Filter to that project and the list body has no
+    // project rows left — so the header, which carries the only route back to the filter page,
+    // has to survive on the strength of the filter alone.
+    const alpha = await seedWorkspace({
+      repoPrefix: "project-filter-pinned-",
+      title: "Pinned work",
+    });
+    const beta = await seedWorkspace({ repoPrefix: "project-filter-other-", title: "Other work" });
+    const serverId = getServerId();
+    const alphaRow = page.getByTestId(`sidebar-workspace-row-${serverId}:${alpha.workspaceId}`);
+
+    try {
+      await gotoAppShell(page);
+      await expect(alphaRow).toBeVisible({ timeout: 30_000 });
+
+      await openSidebarProjectFilter(page);
+      await toggleProjectFilter(page, alpha.projectKey);
+      await closeSidebarDisplayPreferences(page);
+
+      await pinWorkspaceFromSidebar(page, alpha.workspaceId);
+      await expect(alphaRow).toBeVisible();
+
+      // The way out of the filter is still on screen.
+      await expect(page.getByTestId("sidebar-display-preferences-menu")).toBeVisible();
+      await openSidebarProjectFilter(page);
+      await selectAllProjectsFilter(page);
+      await closeSidebarDisplayPreferences(page);
+      await expect(
+        page.getByTestId(`sidebar-workspace-row-${serverId}:${beta.workspaceId}`),
+      ).toBeVisible({ timeout: 15_000 });
+    } finally {
+      await beta.cleanup();
+      await alpha.cleanup();
+    }
+  });
+
+  test("hides the filter row when there is only one project", async ({ page }) => {
+    const only = await seedWorkspace({ repoPrefix: "project-filter-solo-", title: "Solo work" });
+    const serverId = getServerId();
+
+    try {
+      await gotoAppShell(page);
+      await expect(
+        page.getByTestId(`sidebar-workspace-row-${serverId}:${only.workspaceId}`),
+      ).toBeVisible({ timeout: 30_000 });
+
+      await page.getByTestId("sidebar-display-preferences-menu").click();
+      await expect(page.getByTestId("sidebar-display-preferences-content")).toBeVisible();
+      await expect(page.getByTestId("sidebar-display-project-filter")).toHaveCount(0);
+    } finally {
+      await only.cleanup();
+    }
+  });
+});
@@ -18,7 +18,25 @@ async function visibleBoundingBox(row: Locator) {
  return box;
 }

-async function quickDragFirstRowAfterSecond(rows: Locator) {
+async function pressProjectRow(rows: Locator) {
+  await rows.page().mouse.down();
+}
+
+async function pressWorkspaceRow(rows: Locator) {
+  const solidScrimStop = rows
+    .nth(0)
+    .getByTestId("sidebar-workspace-trailing-scrim")
+    .locator("stop")
+    .nth(1);
+  const hoverScrimColor = await solidScrimStop.getAttribute("stop-color");
+  await rows.page().mouse.down();
+  await expect.poll(() => solidScrimStop.getAttribute("stop-color")).not.toBe(hoverScrimColor);
+}
+
+async function quickDragFirstRowAfterSecond(
+  rows: Locator,
+  pressRow: (rows: Locator) => Promise<void>,
+) {
  await expect(rows).toHaveCount(2);
  const before = await rowTestIds(rows);
  const sourceBox = await visibleBoundingBox(rows.nth(0));
@@ -29,15 +47,19 @@ async function quickDragFirstRowAfterSecond(rows: Locator) {
  const target = { x: targetBox.x + targetBox.width / 2, y: targetBox.y + targetBox.height / 2 };

  await page.mouse.move(source.x, source.y);
-  await page.mouse.down();
+  const trailingScrim = rows.nth(0).getByTestId("sidebar-workspace-trailing-scrim");
+  await pressRow(rows);
  await page.mouse.move(source.x, source.y + 7);
+  await expect(trailingScrim).toHaveCount(0);
  await page.mouse.move(target.x, target.y, { steps: 4 });
  await page.mouse.up();

  await expect.poll(() => rowTestIds(rows)).toEqual([before[1], before[0]]);
 }

-test("projects and workspaces reorder with an immediate mouse drag", async ({ page }) => {
+test("projects, workspaces, and pinned chats reorder with an immediate mouse drag", async ({
+  page,
+}) => {
  const firstProject = await seedWorkspace({ repoPrefix: "sidebar-reorder-first-" });
  const secondProject = await seedWorkspace({ repoPrefix: "sidebar-reorder-second-" });

@@ -61,6 +83,7 @@ test("projects and workspaces reorder with an immediate mouse drag", async ({ pa
    const secondProjectTestId = `sidebar-project-row-${projectEquivalenceViewKey(secondProject.projectKey)}`;
    await quickDragFirstRowAfterSecond(
      page.locator(`[data-testid="${firstProjectTestId}"], [data-testid="${secondProjectTestId}"]`),
+      pressProjectRow,
    );
    const firstWorkspaceTestId = `sidebar-workspace-row-${getServerId()}:${firstProject.workspaceId}`;
    const secondWorkspaceTestId = `sidebar-workspace-row-${getServerId()}:${secondWorkspace.workspace.id}`;
@@ -68,6 +91,17 @@ test("projects and workspaces reorder with an immediate mouse drag", async ({ pa
      page.locator(
        `[data-testid="${firstWorkspaceTestId}"], [data-testid="${secondWorkspaceTestId}"]`,
      ),
+      pressWorkspaceRow,
+    );
+
+    await firstProject.client.setWorkspacePinned(firstProject.workspaceId, true);
+    await secondProject.client.setWorkspacePinned(secondProject.workspaceId, true);
+    const secondProjectWorkspaceTestId = `sidebar-workspace-row-${getServerId()}:${secondProject.workspaceId}`;
+    await quickDragFirstRowAfterSecond(
+      page.locator(
+        `[data-testid="${firstWorkspaceTestId}"], [data-testid="${secondProjectWorkspaceTestId}"]`,
+      ),
+      pressWorkspaceRow,
    );
  } finally {
    await firstProject.cleanup();
@@ -1,26 +1,39 @@
+import type { Locator } from "@playwright/test";
 import { expect, test, type Page } from "../support/fixtures";

 test.use({ viewport: { width: 1600, height: 900 } });

-async function expectBorderHighlight(page: Page, testID: string) {
+async function expectBorderHighlight(
+  page: Page,
+  testID: string,
+  hoverTarget: Locator,
+  expectedWidth: string,
+) {
  const handle = page.getByTestId(testID);
  await expect(handle).toBeVisible();
  await expect(page.getByTestId(`${testID}-highlight`)).toHaveCount(0);

-  await handle.hover();
+  await hoverTarget.hover();

  const highlight = page.getByTestId(`${testID}-highlight`);
  await expect(highlight).toBeVisible();
-  await expect(highlight).toHaveCSS("width", "1px");
+  await expect(highlight).toHaveCSS("width", expectedWidth);
  await expect(highlight).not.toHaveCSS("background-color", "rgba(0, 0, 0, 0)");
 }

-test("both sidebar borders highlight on hover", async ({ page, withWorkspace }) => {
+test("sidebar and workspace pane borders highlight on hover", async ({ page, withWorkspace }) => {
  const workspace = await withWorkspace({ prefix: "sidebar-resize-handle-" });
  await workspace.navigateTo();

-  await expectBorderHighlight(page, "left-sidebar-resize-handle");
+  const sidebarHandle = page.getByTestId("left-sidebar-resize-handle");
+  await expectBorderHighlight(page, "left-sidebar-resize-handle", sidebarHandle, "1px");

  await page.getByTestId("workspace-explorer-toggle").first().click();
-  await expectBorderHighlight(page, "explorer-sidebar-resize-handle");
+  const splitHandle = page.getByTestId("workspace-split-resize-handle");
+  await expectBorderHighlight(
+    page,
+    "workspace-split-resize-handle",
+    splitHandle.getByRole("separator"),
+    "3px",
+  );
 });
@@ -1,6 +1,10 @@
 import { test, expect, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import {
+  expectNewWorkspaceProjectSelected,
+  openNewWorkspaceComposer,
+} from "../support/helpers/new-workspace";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import { getServerId } from "../support/helpers/server-id";
 import { selectSidebarStatusGrouping } from "../support/helpers/sidebar";
@@ -142,6 +146,25 @@ async function installPinRpcGate(
 }

 test.describe("Pin workspace shortcut", () => {
+  test("keeps project creation reachable after pinning its only workspace", async ({ page }) => {
+    const workspace = await seedWorkspace({
+      repoPrefix: "pin-project-creation-",
+      title: "Pinned workspace",
+    });
+
+    try {
+      await gotoAppShell(page);
+      await openWorkspace(page, workspace.workspaceId);
+      await page.keyboard.press(PIN_SHORTCUT);
+      await expect(pinnedSection(page)).toBeVisible({ timeout: 10_000 });
+
+      await openNewWorkspaceComposer(page, workspace);
+      await expectNewWorkspaceProjectSelected(page, workspace.projectDisplayName);
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
  test("pins the active workspace while its project section is collapsed", async ({ page }) => {
    const workspace = await seedWorkspace({ repoPrefix: "pin-shortcut-collapsed-" });

@@ -13,6 +13,7 @@ import { expectWorkspaceHeader } from "../support/helpers/workspace-ui";
 import { getServerId } from "../support/helpers/server-id";
 import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
 import { escapeRegex } from "../support/helpers/regex";
+import { openFilesPanel } from "../support/helpers/workspace-tabs";

 const GITHUB_REMOTE_URL = "https://github.com/test-owner/test-repo.git";

@@ -331,7 +332,7 @@ test.describe("Half-screen desktop layout", () => {
    await expect(page.getByTestId("sidebar-settings")).not.toBeVisible();
  });

-  test("yields app navigation to the Explorer", async ({ page }) => {
+  test("keeps app navigation beside the Explorer pane", async ({ page }) => {
    const workspace = await seedWorkspace({ repoPrefix: "sidebar-half-screen-explorer-" });

    try {
@@ -339,44 +340,19 @@ test.describe("Half-screen desktop layout", () => {
      await waitForSidebarProject(page, path.basename(workspace.repoPath));
      await openWorkspaceFromSidebar(page, workspace.workspaceId);

-      await page.getByTestId("workspace-explorer-toggle").first().click();
-      await expect(
-        page.getByTestId("explorer-tab-files").filter({ visible: true }).first(),
-      ).toBeVisible();
-      await expect(page.getByTestId("workspace-explorer-toggle").first()).toBeVisible();
-      await expect(page.getByTestId("explorer-close")).toBeVisible();
-      await expect(page.getByTestId("sidebar-global-new-workspace")).not.toBeVisible();
+      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("sidebar-global-new-workspace")).toBeVisible();
+      await expect(page.getByTestId("workspace-tabs-row").filter({ visible: true })).toHaveCount(2);

-      const centerBounds = await page.getByTestId("workspace-tabs-row").first().boundingBox();
-      const headerGlyphBounds = await page
-        .getByTestId("menu-button")
-        .locator("svg")
-        .first()
-        .boundingBox();
-      const tabGlyphBounds = await page
-        .locator('[data-testid^="workspace-tab-"]')
-        .first()
-        .locator("svg")
-        .first()
-        .boundingBox();
-      expect(centerBounds).not.toBeNull();
-      expect(headerGlyphBounds).not.toBeNull();
-      expect(tabGlyphBounds).not.toBeNull();
-      expect((headerGlyphBounds?.x ?? 0) - (centerBounds?.x ?? 0)).toBeCloseTo(
-        (tabGlyphBounds?.x ?? 0) - (centerBounds?.x ?? 0),
+      await explorerToggle.click();
+      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toHaveCount(
        0,
      );
-
-      await expect
-        .poll(
-          async () =>
-            (await page.getByTestId("workspace-tabs-row").first().boundingBox())?.width ?? 0,
-        )
-        .toBeGreaterThanOrEqual(400);
-
-      await page.getByTestId("explorer-close").click();
-      await expect(page.getByTestId("explorer-tab-files")).not.toBeVisible();
-      await expect(page.getByTestId("workspace-explorer-toggle").first()).toBeVisible();
+      await expect(explorerToggle).toHaveAccessibleName("Open side panel");
+      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
    } finally {
      await workspace.cleanup();
    }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`../../../../../../packages/website/public/phone-1.png`
				`@@ -0,0 +1 @@`
				`Monitor and control your local AI coding agents from anywhere`
				`@@ -0,0 +1 @@`
				`ローカルのAIコーディングエージェントをどこからでも操作`
				`@@ -0,0 +1 @@`
				`随时随地监控和控制本地的 AI 编程 agents`