Normalize plan file ids across platforms

Surface plans as first-class timeline items
2026-07-29 12:01:31 +00:00 · 2026-05-31 10:05:24 +07:00 · 2026-05-31 10:05:24 +07:00
1274 changed files with 34734 additions and 129325 deletions
--- a/.agents/skills/release-beta/SKILL.md
+++ b/.agents/skills/release-beta/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: release-beta
-description: Cut a beta release of Paseo. Use when the user says "release beta", "cut a beta", "ship a beta", "beta release", or "/release-beta". Betas are release candidates on the beta channel — they carry an in-place changelog entry, don't move the website download target, and publish npm only on the beta dist-tag.
+description: Cut a beta release of Paseo. Use when the user says "release beta", "cut a beta", "ship a beta", "beta release", or "/release-beta". Betas are silent release candidates — no changelog, no website move.
 user-invocable: true
 ---

@@ -8,4 +8,4 @@ user-invocable: true

 Read `docs/release.md` in the Paseo repo and follow the **Beta flow** section end-to-end. Run the **Beta release** completion checklist at the bottom of that doc.

-Key rules the doc enforces — each beta updates an in-place `CHANGELOG.md` entry (`## X.Y.Z-beta.N`) that gets overwritten at promotion (never leave a stale `-beta.N` heading behind), and betas publish npm only with the explicit `beta` dist-tag.
+Key rule the doc enforces — betas don't touch `CHANGELOG.md`. Don't draft release notes.
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -6,8 +6,6 @@ body:
  - type: markdown
    attributes:
      value: |
-        I'm a solo maintainer and don't always keep up with GitHub Issues daily. If something is urgent or blocking you, [Discord](https://discord.gg/jz8T2uahpH) is the fastest place to reach me.
-
        Before opening, please:

        - search existing issues for the same symptom
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
  - name: Discord
    url: https://discord.gg/jz8T2uahpH
-    about: Urgent or blocking issues, quick questions, sharing a video of a bug, or anything that's better as a chat.
+    about: Quick questions, sharing a video of a bug, or anything that's better as a chat. A lot of issues start better here.
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,6 @@ env:
 jobs:
  format:
    runs-on: ubuntu-latest
-    env:
-      # This job never executes Electron. Skipping the hosted binary avoids
-      # unrelated npm ci failures when Electron's CDN returns 504.
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

@@ -40,8 +36,6 @@ jobs:

  lint:
    runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

@@ -64,8 +58,6 @@ jobs:

  typecheck:
    runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

@@ -96,8 +88,6 @@ jobs:
        os: [ubuntu-latest, windows-latest]
    runs-on: ${{ matrix.os }}
    name: server-tests (${{ matrix.os }})
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4
        with:
@@ -141,35 +131,8 @@ jobs:
          node-version: "22"
          cache: "npm"

-      - name: Install dependencies with Electron retry
-        if: runner.os != 'Windows'
-        run: |
-          for attempt in 1 2 3; do
-            if npm ci; then
-              exit 0
-            else
-              exit_code=$?
-            fi
-            if [ "$attempt" -eq 3 ]; then
-              exit $exit_code
-            fi
-            sleep $((attempt * 20))
-          done
-
-      - name: Install dependencies with Electron retry
-        if: runner.os == 'Windows'
-        shell: pwsh
-        run: |
-          for ($attempt = 1; $attempt -le 3; $attempt++) {
-            npm ci
-            if ($LASTEXITCODE -eq 0) {
-              exit 0
-            }
-            if ($attempt -eq 3) {
-              exit $LASTEXITCODE
-            }
-            Start-Sleep -Seconds (20 * $attempt)
-          }
+      - name: Install dependencies
+        run: npm ci

      - name: Build server stack
        run: npm run build:server
@@ -179,8 +142,6 @@ jobs:

  app-tests:
    runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

@@ -189,23 +150,11 @@ jobs:
          node-version: "22"
          cache: "npm"

-      - name: Install dependencies with retry
-        run: |
-          for attempt in 1 2 3; do
-            if npm ci; then
-              exit 0
-            else
-              exit_code=$?
-            fi
-            if [ "$attempt" -eq 3 ]; then
-              exit $exit_code
-            fi
-            sleep $((attempt * 20))
-          done
+      - name: Install dependencies
+        run: npm ci

      - name: Install Playwright browsers
-        timeout-minutes: 10
-        run: npx playwright install chromium
+        run: npx playwright install --with-deps chromium

      - name: Build app dependencies
        run: npm run build:app-deps
@@ -215,8 +164,6 @@ jobs:

  sdk-tests:
    runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

@@ -242,8 +189,6 @@ jobs:

  playwright:
    runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

@@ -252,23 +197,11 @@ jobs:
          node-version: "22"
          cache: "npm"

-      - name: Install dependencies with retry
-        run: |
-          for attempt in 1 2 3; do
-            if npm ci; then
-              exit 0
-            else
-              exit_code=$?
-            fi
-            if [ "$attempt" -eq 3 ]; then
-              exit $exit_code
-            fi
-            sleep $((attempt * 20))
-          done
+      - name: Install dependencies
+        run: npm ci

      - name: Install Playwright browsers
-        timeout-minutes: 10
-        run: npx playwright install chromium
+        run: npx playwright install --with-deps chromium

      - name: Build app dependencies
        run: npm run build:app-deps
@@ -296,8 +229,6 @@ jobs:

  relay-tests:
    runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

@@ -322,8 +253,6 @@ jobs:
        shard: [1, 2, 3]
    runs-on: ubuntu-latest
    name: cli-tests (shard ${{ matrix.shard }}/3)
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
    steps:
      - uses: actions/checkout@v4

--- a/.gitignore
+++ b/.gitignore
@@ -64,7 +64,6 @@ CLAUDE.local.md

 .debug.conversations/
 .debug/
-.dev/
 .paseo/
 .wrangler/
 **/.wrangler/
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -3,7 +3,6 @@
  "options": {
    "typeAware": false
  },
-  "ignorePatterns": [".dev/**"],
  "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
  "categories": {
    "correctness": "error",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,314 +1,5 @@
 # Changelog

-## 0.1.100 - 2026-06-24
-
-### Added
-
- Cycle agent modes with Shift+Tab
- Select a custom Copilot agent when starting or mid-session ([#1700](https://github.com/getpaseo/paseo/pull/1700))
-
-### Improved
-
- ACP provider catalog updated to the latest registry versions
-
-### Fixed
-
- Claude no longer sends an extra API request after each message ([#1701](https://github.com/getpaseo/paseo/pull/1701))
- OpenCode no longer leaves stray background servers running after sessions end ([#1697](https://github.com/getpaseo/paseo/pull/1697))
- Slash commands and skills now load in OMP agents ([#1698](https://github.com/getpaseo/paseo/pull/1698))
-
-## 0.1.99 - 2026-06-23
-
-### Improved
-
- The PR panel now has a refresh button and clearer loading states ([#1664](https://github.com/getpaseo/paseo/pull/1664))
- Provider diagnostics and model lists now stay in sync ([#1660](https://github.com/getpaseo/paseo/pull/1660))
-
-### Fixed
-
- ACP providers like Grok no longer show duplicate user messages
- Saved composer modes no longer reset while provider data is loading ([#1658](https://github.com/getpaseo/paseo/pull/1658))
- The right sidebar no longer gets stuck on mobile ([#1661](https://github.com/getpaseo/paseo/pull/1661))
-
-## 0.1.98 - 2026-06-21
-
-### Added
-
- See plan usage in-app for Claude, Codex, Copilot, Cursor, Z.AI, Grok, and Kimi ([#1278](https://github.com/getpaseo/paseo/pull/1278) by [@ABorakati](https://github.com/ABorakati))
- Added Ultracode for Claude ([#1625](https://github.com/getpaseo/paseo/pull/1625))
- Detach a subagent to run it on its own ([#1612](https://github.com/getpaseo/paseo/pull/1612))
- Add a project without creating a workspace
- Add a setting to show branch names instead of titles in the sidebar
-
-### Improved
-
- Mid-turn thinking and mode changes now say they apply next turn
- PR merge options name their method: squash, merge, or rebase ([#1608](https://github.com/getpaseo/paseo/pull/1608) by [@mcowger](https://github.com/mcowger))
- A running agent's mode change is remembered for new agents
- Copy a provider's launch diagnostic in one tap ([#1611](https://github.com/getpaseo/paseo/pull/1611))
-
-### Fixed
-
- OpenCode no longer scans your whole disk on macOS desktop ([#1626](https://github.com/getpaseo/paseo/pull/1626))
- Daemon no longer crashes when OpenAI speech has no API key ([#1368](https://github.com/getpaseo/paseo/pull/1368) by [@mcowger](https://github.com/mcowger))
- Reopening an archived Codex agent no longer hangs
- Claude's context meter no longer jumps to subagent usage
- Claude's context meter fills from the first message in a new session
- OpenCode's mode picker now respects your disabled modes ([#1366](https://github.com/getpaseo/paseo/pull/1366) by [@mcowger](https://github.com/mcowger))
- File links and @-mentions find files in dot-folders and deep paths ([#1609](https://github.com/getpaseo/paseo/pull/1609))
- Archiving a project's last workspace no longer makes it vanish ([#1631](https://github.com/getpaseo/paseo/pull/1631))
- Collapsed sidebar projects stay collapsed
-
-## 0.1.97 - 2026-06-18
-
-### Added
-
- **Simplify workspace model** — run multiple workspaces on the same code without a worktree, each with its own agents, terminals, and status ([#1539](https://github.com/getpaseo/paseo/pull/1539))
- **Reopen archived workspaces from History** — restore a past workspace even after its worktree was removed
- **Terminals show when their agent is working, idle, or waiting for input** ([#1507](https://github.com/getpaseo/paseo/pull/1507))
- **Attach files to agents on mobile** ([#1501](https://github.com/getpaseo/paseo/pull/1501))
- **Hide dotfiles in the file explorer** ([#1516](https://github.com/getpaseo/paseo/pull/1516) by [@yuruiz](https://github.com/yuruiz))
- **Pin terminal, browser, and new-tab buttons to the tab row and sidebar**
- **Create a new workspace with a keyboard shortcut**
-
-### Improved
-
- Workspace titles come from your first prompt and are shorter ([#1563](https://github.com/getpaseo/paseo/pull/1563))
- Copy a workspace's branch or path from its hover card
- Terminals stay smooth under heavy output ([#1500](https://github.com/getpaseo/paseo/pull/1500))
- Worktrees are removed when their last workspace is archived ([#1562](https://github.com/getpaseo/paseo/pull/1562))
- Finish notifications include subagent results ([#1558](https://github.com/getpaseo/paseo/pull/1558))
- Cursor lists only models you can select ([#1556](https://github.com/getpaseo/paseo/pull/1556))
- ACP provider catalog updated to the latest registry versions
-
-### Fixed
-
- Brief daemon slowdowns no longer drop your connection
- Linux AppImage updates no longer hang on quit or delete the app ([#1485](https://github.com/getpaseo/paseo/pull/1485) by [@xpufx](https://github.com/xpufx))
- Opening Providers settings no longer crashes on Android ([#1537](https://github.com/getpaseo/paseo/pull/1537))
- Coding-agent terminal shortcuts work on Windows ([#1509](https://github.com/getpaseo/paseo/pull/1509))
- ACP and Kimi sessions can be imported again ([#1510](https://github.com/getpaseo/paseo/pull/1510) by [@wbxl2000](https://github.com/wbxl2000))
- ACP agents shut down without leaving orphaned processes ([#1460](https://github.com/getpaseo/paseo/pull/1460) by [@yeshan333](https://github.com/yeshan333))
- Imported session previews show clean prompts ([#1502](https://github.com/getpaseo/paseo/pull/1502))
- Local pairing offers use the correct app URL ([#1187](https://github.com/getpaseo/paseo/pull/1187) by [@aibaiiqpl](https://github.com/aibaiiqpl))
- The app no longer freezes from repeated provider re-probes
- Removing a project from the sidebar now removes the project itself instead of leaving it behind
- Workspace shortcut numbers no longer appear for the wrong key ([#1580](https://github.com/getpaseo/paseo/pull/1580) by [@cleiter](https://github.com/cleiter))
- Chats no longer hang when a message contains unmatched backticks ([#1585](https://github.com/getpaseo/paseo/pull/1585) by [@thaning0](https://github.com/thaning0))
-
-## 0.1.96 - 2026-06-13
-
-_This release only fixes an Android issue — desktop users don't need to update._
-
-### Fixed
-
- On Android, the sidebar no longer reappears and gets stuck after you open a chat
-
-## 0.1.95 - 2026-06-13
-
-### Added
-
- **Attach any file to agents on desktop** ([#1474](https://github.com/getpaseo/paseo/pull/1474))
-
-### Improved
-
- The git push button shows before merge actions when your branch is ahead ([#1488](https://github.com/getpaseo/paseo/pull/1488))
- SVG attachments are uploaded to disk
- Switching workspaces feels smoother
-
-### Fixed
-
- Fixed cases where outdated GitHub data could be shown ([#1491](https://github.com/getpaseo/paseo/pull/1491))
- Uploaded images in PR comments and review threads now load in the PR panel ([#1486](https://github.com/getpaseo/paseo/pull/1486))
- Opening a project whose folder is missing shows a clear error ([#1490](https://github.com/getpaseo/paseo/pull/1490))
- The new workspace title moves out of the way of the keyboard ([#1489](https://github.com/getpaseo/paseo/pull/1489))
- Sidebars no longer open on their own on Android
-
-## 0.1.94 - 2026-06-12
-
-### Added
-
- **Attach pull request comments, reviews, threads, and failed check logs to chat from the PR panel** ([#1400](https://github.com/getpaseo/paseo/pull/1400))
- **Use Paseo in Arabic, Chinese, English, French, Russian, and Spanish** ([#1282](https://github.com/getpaseo/paseo/pull/1282), [#1478](https://github.com/getpaseo/paseo/pull/1478) by [@chyendongnhanh338](https://github.com/chyendongnhanh338), [@dwyanewang](https://github.com/dwyanewang))
- **Create reusable terminal profiles from Host settings**
- **Open workspaces in Antigravity** ([#1424](https://github.com/getpaseo/paseo/pull/1424) by [@krumpyzoid](https://github.com/krumpyzoid))
-
-### Improved
-
- Claude skills appear in prompt autocomplete as you type ([#1464](https://github.com/getpaseo/paseo/pull/1464))
- Copy file paths directly from file preview tab menus ([#1473](https://github.com/getpaseo/paseo/pull/1473))
- PR status stays current after an agent merges a branch ([#1455](https://github.com/getpaseo/paseo/pull/1455))
- Workspace tabs stay fast by retaining only the active workspace screens ([#1472](https://github.com/getpaseo/paseo/pull/1472))
-
-### Fixed
-
- Composer send shortcuts no longer conflict with other keyboard shortcuts
- Multi-question prompts advance one answer at a time ([#1462](https://github.com/getpaseo/paseo/pull/1462))
- Imported Pi sessions keep their original model and thinking settings ([#1441](https://github.com/getpaseo/paseo/pull/1441) by [@thomasaull](https://github.com/thomasaull))
- Reconnecting to a desktop host keeps the saved shell and workspace route
- Worktree terminals no longer appear in parent workspaces
- Mobile reconnects show the welcome screen correctly
-
-## 0.1.93 - 2026-06-10
-
-### Added
-
- **Claude Fable 5 is available in the Claude model picker** ([#1443](https://github.com/getpaseo/paseo/pull/1443) by [@0-Captain](https://github.com/0-Captain))
-
-## 0.1.92 - 2026-06-10
-
-### Added
-
- **Skills autocomplete inside prompts**
-
-### Improved
-
- Provider catalog is inline in Host settings ([#1423](https://github.com/getpaseo/paseo/pull/1423))
- Manual update checks skip staged rollout delays
- CodeWhale replaces DeepSeek TUI in the provider catalog
- ACP provider catalog entries are updated for Cline, Codebuddy Code, DimCode, Factory Droid, Gemini, Nova, and Qoder
- OMP has its own icon and website page
- Model selector descriptions are clearer
- ACP provider errors show the provider's real failure message
-
-### Fixed
-
- New Paseo worktree branches can push their first commits
- Imported sessions no longer open blank or in the wrong workspace
- Windows Explorer opens the selected workspace instead of Documents ([#1412](https://github.com/getpaseo/paseo/pull/1412) by [@bjspi](https://github.com/bjspi))
- Windows editor shortcuts installed as command shims launch correctly ([#1387](https://github.com/getpaseo/paseo/pull/1387) by [@Peter7896](https://github.com/Peter7896))
- ACP providers that cannot use MCP servers can start correctly
- Removed hosts no longer leave host pages stuck connecting
- File preview links open in your external browser
- Chat stays pinned to the latest message while output streams
- The mobile composer send button no longer shifts while typing
-
-## 0.1.91 - 2026-06-08
-
-### Added
-
- **Open multiple desktop windows** ([#1355](https://github.com/getpaseo/paseo/pull/1355) by [@arieel-ost](https://github.com/arieel-ost))
- **Open browser pop-ups and links inside workspace tabs** ([#1375](https://github.com/getpaseo/paseo/pull/1375))
- **Use the command center from mobile**
- **Add OMP as a provider** ([#1388](https://github.com/getpaseo/paseo/pull/1388))
-
-### Improved
-
- New workspaces remember your last provider, mode, and thinking choices
- Git controls now default ready branches to pull requests and hide unavailable pull or push actions
- Desktop-managed hosts recover more reliably after stale daemon state
- Daemon status now explains authentication failures
- Project search skips Python virtual environments ([#1356](https://github.com/getpaseo/paseo/pull/1356))
- Config files can include `$schema` for editor help
- Claude MCP servers preserve always-load tool settings ([#1333](https://github.com/getpaseo/paseo/pull/1333) by [@nodomain](https://github.com/nodomain))
- Claude profiles keep their configured models ([#1311](https://github.com/getpaseo/paseo/pull/1311) by [@ilteoood](https://github.com/ilteoood))
- Provider loading can wait longer on slow machines ([#1346](https://github.com/getpaseo/paseo/pull/1346) by [@nodomain](https://github.com/nodomain))
- The Kimi catalog entry now points to Kimi Code CLI ([#1403](https://github.com/getpaseo/paseo/pull/1403) by [@wbxl2000](https://github.com/wbxl2000))
- ACP provider catalog entries are updated for Auggie, Claude Agent, Cline, Codebuddy Code, DimCode, Factory Droid, fast-agent, Gemini, GitHub Copilot, and Nova
- Local dictation crash reports show more useful details ([#1379](https://github.com/getpaseo/paseo/pull/1379))
- Daemon logs show why managed workers exit
-
-### Fixed
-
- Pi compaction slash commands run correctly ([#1338](https://github.com/getpaseo/paseo/pull/1338) by [@chyendongnhanh338](https://github.com/chyendongnhanh338))
- Auto-archiving still works after a merged PR branch is deleted ([#1378](https://github.com/getpaseo/paseo/pull/1378))
- Worktrees can check out existing branch refs correctly ([#1358](https://github.com/getpaseo/paseo/pull/1358) by [@dixonl90](https://github.com/dixonl90))
- File downloads work when daemon password protection is enabled ([#1351](https://github.com/getpaseo/paseo/pull/1351) by [@nodomain](https://github.com/nodomain))
- iOS markdown links are tappable again ([#1334](https://github.com/getpaseo/paseo/pull/1334) by [@kaspesi](https://github.com/kaspesi))
- iOS markdown images render correctly
- Windows workspaces load their providers correctly ([#1329](https://github.com/getpaseo/paseo/pull/1329))
- Removing a localhost host stops its local daemon ([#1297](https://github.com/getpaseo/paseo/pull/1297) by [@mcowger](https://github.com/mcowger))
- Provider settings sheets stack correctly
- The new workspace screen no longer opens behind the mobile sidebar
- Global agent listing works again ([#1420](https://github.com/getpaseo/paseo/pull/1420))
- OpenCode compaction summaries stay out of chat
- OpenCode agents sharing a workspace keep their own Paseo tools
-
-## 0.1.90 - 2026-06-04
-
-### Added
-
- **Group the sidebar by status so workspaces waiting on you, ready to review, working, and done are visible at a glance** ([#1317](https://github.com/getpaseo/paseo/pull/1317))
- **Start a new workspace from the global sidebar button without choosing a project first** ([#1324](https://github.com/getpaseo/paseo/pull/1324))
- **Open the active file directly in your editor, file manager, or GitHub instead of only opening the workspace root** ([#1285](https://github.com/getpaseo/paseo/pull/1285) by [@aaronzhongg](https://github.com/aaronzhongg))
- **Automatically archive clean PR workspaces after the PR is merged from host settings** ([#1313](https://github.com/getpaseo/paseo/pull/1313))
- **Desktop-managed Paseo skills stay current after installing a newer desktop build** ([#1309](https://github.com/getpaseo/paseo/pull/1309))
- **Dart files and Dart code blocks are now syntax-highlighted** ([#1326](https://github.com/getpaseo/paseo/pull/1326))
-
-### Improved
-
- Sidebar workspaces can be marked as read when they are ready to review or failed ([#1317](https://github.com/getpaseo/paseo/pull/1317))
- Child agents keep unattended permissions when delegated across providers ([#1315](https://github.com/getpaseo/paseo/pull/1315))
- Scheduled agents open with the real prompt and title instead of looking empty ([#1316](https://github.com/getpaseo/paseo/pull/1316))
- Git controls prioritize the action that gets a ready branch shipped ([#1316](https://github.com/getpaseo/paseo/pull/1316))
- Multiple agent questions are shown one at a time
- OpenCode questions with free-write answers show the typed response in Paseo
- Delegated agent activity is visible on the parent workspace
- Sessions are ordered by latest activity
- ACP provider catalog entries are updated for Claude Agent, Cline, Codebuddy Code, Factory Droid, and Qoder
-
-### Fixed
-
- Timeline catch-up no longer leaves older messages unloaded
- Markdown code in file previews renders correctly
- Long dictation retries no longer stall new audio
- Settings host picker navigation works from host settings pages
- Diff gutter rows stay aligned with changed code
- Mobile sidebar gestures stay responsive under load
- Compact sheets keep their footer and bottom spacing visible
-
-## 0.1.89 - 2026-06-02
-
-### Added
-
- **Open workspace services through public service proxy links** ([#1280](https://github.com/getpaseo/paseo/pull/1280) by [@mcowger](https://github.com/mcowger))
- **Choose where new worktrees are created** ([#1230](https://github.com/getpaseo/paseo/pull/1230) by [@mcowger](https://github.com/mcowger))
- **Desktop windows reopen at the same size and position** ([#1224](https://github.com/getpaseo/paseo/pull/1224) by [@everton-dgn](https://github.com/everton-dgn))
- **Delegated agents can run independently and send recurring heartbeat updates**
-
-### Improved
-
- Composer controls fit better in narrow panes
- Fork pull request badges stay visible in worktrees
- Cline in the ACP catalog is updated to v3
-
-### Fixed
-
- Archiving a worktree finishes even if teardown hits an error ([#1260](https://github.com/getpaseo/paseo/pull/1260) by [@mcowger](https://github.com/mcowger))
- iOS chat messages render bold, italics, strikethrough, and line breaks correctly ([#1254](https://github.com/getpaseo/paseo/pull/1254) by [@outofrange-consulting](https://github.com/outofrange-consulting))
- Right-edge split pane resizing no longer clips ([#1261](https://github.com/getpaseo/paseo/pull/1261) by [@everton-dgn](https://github.com/everton-dgn))
- Pi extension command output no longer hangs
- Delegated agents no longer appear in workspace alert counts
-
-## 0.1.88 - 2026-06-01
-
-### Added
-
- **Choose an app theme from the new Appearance settings**
- **Set a custom interface font**
- **Set a custom code font**
- **Adjust the interface text size**
- **Adjust the code text size**
- **Choose a syntax highlighting theme**
- **Keep cron schedules aligned to a chosen time zone** ([#1232](https://github.com/getpaseo/paseo/pull/1232) by [@damselem](https://github.com/damselem))
-
-### Improved
-
- Settings now has a flatter sidebar with a host picker
- Workspace tab switching is faster
- Compact composers now show context usage as a percentage
- Agent terminals opened in workspace subdirectories now appear with the rest of the workspace terminals
- macOS displays can idle normally while the desktop app is open ([#1242](https://github.com/getpaseo/paseo/pull/1242) by [@fireblue](https://github.com/fireblue))
- Large generated diffs now show a clear too-large placeholder instead of trying to render the whole file
-
-### Fixed
-
- Chat history catches up correctly around long-running tool updates
- Terminal panes keep the right size after splitting or resizing panes
- Restored terminal snapshots reflow correctly after the pane size changes
- Workspace scripts menus keep the right size after launching a service
- iOS chat messages no longer hide inline links, URLs, or linked file paths ([#1257](https://github.com/getpaseo/paseo/pull/1257) by [@outofrange-consulting](https://github.com/outofrange-consulting))
-
 ## 0.1.87 - 2026-05-30

 ### Added
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -36,24 +36,19 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [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/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/terminal-performance.md](docs/terminal-performance.md)   | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
 | [docs/testing.md](docs/testing.md)                             | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
 | [docs/mobile-testing.md](docs/mobile-testing.md)               | Maestro and mobile test workflows                                                                                              |
 | [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md) | Isolated in-process daemon test harness                                                                                        |
 | [docs/android.md](docs/android.md)                             | App variants, local/cloud builds, EAS workflows                                                                                |
 | [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                                                                  |

 ## Quick start

 ```bash
-npm run dev                          # Start the dev daemon
-npm run dev:app                      # Start Expo against the dev daemon
-npm run dev:desktop                  # Start Electron desktop dev
+npm run dev                          # Start daemon + Expo in Tmux
 npm run cli -- ls -a -g              # List all agents
 npm run cli -- daemon status         # Check daemon status
 npm run typecheck                    # Always run after changes
@@ -62,8 +57,6 @@ npm run format                       # Auto-format with Biome
 npm run format:check                 # Check formatting without writing
 ```

-Repo dev commands use checkout-local state by default. In this checkout, `PASEO_HOME` resolves to `.dev/paseo-home`, and `npm run cli -- ...` targets that same dev home automatically. The packaged desktop app and production-style daemon keep using `~/.paseo` on port `6767`.
-
 See [docs/development.md](docs/development.md) for full setup, build sync requirements, and debugging.

 ## Critical rules
--- a/README.md
+++ b/README.md
@@ -4,11 +4,6 @@

 <h1 align="center">Paseo</h1>

-<p align="center">
-  <a href="README.md">English</a> ·
-  <a href="README.zh-CN.md">简体中文</a>
-</p>
-
 <p align="center">
  <a href="https://github.com/getpaseo/paseo/stargazers">
    <img src="https://img.shields.io/github/stars/getpaseo/paseo?style=flat&logo=github" alt="GitHub stars">
@@ -37,10 +32,6 @@
  <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
 </p>

-> [!NOTE]
-> I'm a solo maintainer and don't always keep up with GitHub Issues daily.
-> If something is urgent or blocking you, [Discord](https://discord.gg/jz8T2uahpH) is the fastest place to reach me.
-
 ---

 Run agents in parallel on your own machines. Ship from your phone or your desk.
@@ -154,6 +145,52 @@ npm run typecheck

 - [paseo-relay](https://github.com/zenghongtu/paseo-relay) — self-hosted relay in Go

+### Self-hosted relay TLS
+
+Self-hosted relays use `ws://` unless TLS is opted in. For a relay behind nginx on 443, start the daemon with:
+
+```bash
+PASEO_RELAY_ENDPOINT=127.0.0.1:8080 \
+PASEO_RELAY_PUBLIC_ENDPOINT=relay.example.com:443 \
+PASEO_RELAY_USE_TLS=true \
+paseo daemon start
+```
+
+Equivalent config:
+
+```json
+{
+  "daemon": {
+    "relay": {
+      "enabled": true,
+      "endpoint": "127.0.0.1:8080",
+      "publicEndpoint": "relay.example.com:443",
+      "useTls": true
+    }
+  }
+}
+```
+
+Minimal nginx WebSocket proxy:
+
+```nginx
+server {
+  listen 443 ssl;
+  server_name relay.example.com;
+
+  ssl_certificate /etc/letsencrypt/live/relay.example.com/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/relay.example.com/privkey.pem;
+
+  location /ws {
+    proxy_pass http://127.0.0.1:8080;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+  }
+}
+```
+
 ---

 <p align="center">
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -1,217 +0,0 @@
-<p align="center">
-  <img src="packages/website/public/logo.svg" width="64" height="64" alt="Paseo logo">
-</p>
-
-<h1 align="center">Paseo</h1>
-
-<p align="center">
-  <a href="README.md">English</a> ·
-  <a href="README.zh-CN.md">简体中文</a>
-</p>
-
-<p align="center">
-  <a href="https://github.com/getpaseo/paseo/stargazers">
-    <img src="https://img.shields.io/github/stars/getpaseo/paseo?style=flat&logo=github" alt="GitHub stars">
-  </a>
-  <a href="https://github.com/getpaseo/paseo/releases">
-    <img src="https://img.shields.io/github/v/release/getpaseo/paseo?style=flat&logo=github" alt="GitHub release">
-  </a>
-  <a href="https://x.com/moboudra">
-    <img src="https://img.shields.io/badge/%40moboudra-555?logo=x" alt="X">
-  </a>
-  <a href="https://discord.gg/jz8T2uahpH">
-    <img src="https://img.shields.io/badge/Discord-555?logo=discord" alt="Discord">
-  </a>
-  <a href="https://www.reddit.com/r/PaseoAI/">
-    <img src="https://img.shields.io/badge/Reddit-555?logo=reddit" alt="Reddit">
-  </a>
-</p>
-
-<p align="center">Claude Code、Codex、Copilot、OpenCode 和 Pi agents 的统一界面。</p>
-
-<p align="center">
-  <img src="https://paseo.sh/hero-mockup.png" alt="Paseo app screenshot" width="100%">
-</p>
-
-<p align="center">
-  <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
-</p>
-
-> [!NOTE]
-> 我是独立维护者，不一定每天都能及时处理 GitHub Issues。
-> 如果问题很紧急或阻塞了你，[Discord](https://discord.gg/jz8T2uahpH) 是最快联系到我的地方。
-
---
-
-在你自己的机器上并行运行 agents。无论在手机上还是桌前，都能推进交付。
-
- **自托管：** Agents 在你的机器上运行，使用完整的本地开发环境、工具、配置和技能。
- **多提供商：** 通过同一个界面使用 Claude Code、Codex、Copilot、OpenCode 和 Pi。为每个任务选择合适的模型。
- **语音控制：** 在语音模式下口述任务或讨论问题。需要免手操作时很方便。
- **跨设备：** 支持 iOS、Android、桌面端、Web 和 CLI。在桌前开始工作，用手机查看进度，也可以从终端脚本化操作。
- **隐私优先：** Paseo 没有遥测、追踪，也不会强制登录。
-
-## 快速开始
-
-Paseo 会运行一个名为 daemon 的本地服务，用来管理你的 coding agents。桌面 app、移动 app、Web app 和 CLI 等客户端都会连接到它。
-
-### 前置条件
-
-你至少需要安装一个 agent CLI，并用你的凭据完成配置：
-
- [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
- [Codex](https://github.com/openai/codex)
- [GitHub Copilot](https://github.com/features/copilot/cli/)
- [OpenCode](https://github.com/anomalyco/opencode)
- [Pi](https://pi.dev)
-
-### 桌面 app（推荐）
-
-从 [paseo.sh/download](https://paseo.sh/download) 或 [GitHub releases 页面](https://github.com/getpaseo/paseo/releases)下载。打开 app 后 daemon 会自动启动，不需要再安装其他东西。
-
-如果要从手机连接，在 Settings 中扫描显示的二维码。
-
-### CLI / 无头模式
-
-安装 CLI 并启动 Paseo：
-
-```bash
-npm install -g @getpaseo/cli
-paseo
-```
-
-终端中会显示一个二维码。你可以从任意客户端连接。这个方式适合服务器和远程机器。
-
-完整安装和配置见：
-
- [文档](https://paseo.sh/docs)
- [配置参考](https://paseo.sh/docs/configuration)
-
-## CLI
-
-你能在 app 中完成的事情，也都可以在终端中完成。
-
-```bash
-paseo run --provider claude/opus-4.6 "implement user authentication"
-paseo run --provider codex/gpt-5.4 --worktree feature-x "implement feature X"
-
-paseo ls                           # 列出正在运行的 agents
-paseo attach abc123                # 实时流式查看输出
-paseo send abc123 "also add tests" # 发送后续任务
-
-# 在远程 daemon 上运行
-paseo --host workstation.local:6767 run "run the full test suite"
-```
-
-更多内容见[完整 CLI 参考](https://paseo.sh/docs/cli)。
-
-## Skills
-
-Skills 会教你的 agent 使用 Paseo 来编排其他 agents。
-
-```bash
-npx skills add getpaseo/paseo
-```
-
-然后在任意 agent 对话中使用：
-
- `/paseo-handoff` — 在 agents 之间交接工作。我会用它先和 Claude 规划，再交给 Codex 实现。
- `/paseo-loop` — 让 agent 按明确验收标准循环工作（也叫 Ralph loops），也可以加 verifier。
- `/paseo-advisor` — 启动单个 agent 作为 advisor，提供第二意见，但不把工作委托出去。
- `/paseo-committee` — 组建两个风格互补的 agents，让它们后退一步做根因分析并产出计划。
-
-## 开发
-
-Monorepo 包结构速览：
-
- `packages/server`：Paseo daemon（agent 进程编排、WebSocket API、MCP server）
- `packages/app`：Expo 客户端（iOS、Android、Web）
- `packages/cli`：用于 daemon 和 agent 工作流的 `paseo` CLI
- `packages/desktop`：Electron 桌面 app
- `packages/relay`：用于远程连接的 relay 包
- `packages/website`：营销站点和文档（`paseo.sh`）
-
-常用命令：
-
-```bash
-# 运行所有本地开发服务
-npm run dev
-
-# 单独运行某个界面
-npm run dev:server
-npm run dev:app
-npm run dev:desktop
-npm run dev:website
-
-# 构建 server stack
-npm run build:server
-
-# 全仓库检查
-npm run typecheck
-```
-
-## 社区
-
- [paseo-relay](https://github.com/zenghongtu/paseo-relay) — Go 实现的自托管 relay
-
-### 自托管 relay TLS
-
-自托管 relay 默认使用 `ws://`，除非显式启用 TLS。对于 nginx 后面、监听 443 的 relay，可以这样启动 daemon：
-
-```bash
-PASEO_RELAY_ENDPOINT=127.0.0.1:8080 \
-PASEO_RELAY_PUBLIC_ENDPOINT=relay.example.com:443 \
-PASEO_RELAY_USE_TLS=true \
-paseo daemon start
-```
-
-等价配置：
-
-```json
-{
-  "daemon": {
-    "relay": {
-      "enabled": true,
-      "endpoint": "127.0.0.1:8080",
-      "publicEndpoint": "relay.example.com:443",
-      "useTls": true
-    }
-  }
-}
-```
-
-最小 nginx WebSocket 代理配置：
-
-```nginx
-server {
-  listen 443 ssl;
-  server_name relay.example.com;
-
-  ssl_certificate /etc/letsencrypt/live/relay.example.com/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/relay.example.com/privkey.pem;
-
-  location /ws {
-    proxy_pass http://127.0.0.1:8080;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $host;
-  }
-}
-```
-
---
-
-<p align="center">
-  <a href="https://star-history.com/#getpaseo/paseo&Date">
-    <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date&theme=dark">
-      <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date">
-      <img src="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date" alt="Star history chart for getpaseo/paseo" width="600" style="max-width: 100%;">
-    </picture>
-  </a>
-</p>
-
-## License
-
-AGPL-3.0
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -14,23 +14,14 @@ Each agent in `AgentManager` carries a `lastStatus` of `initializing`, `idle`, `

 ## Relationships

-Agents can launch other agents via the agent-scoped `create_agent` MCP tool. Agent-scoped creation is always asynchronous. `relationship` and `workspace` are separate decisions:
+Agents can launch other agents via the `create_agent` MCP tool. When they do, the daemon stamps the new agent with a label `paseo.parent-agent-id` pointing back at the caller (`packages/server/src/server/agent/mcp-server.ts:804`). The client surfaces that as `agent.parentAgentId`.

- `relationship` decides whether the new agent belongs under the caller.
- `workspace` decides where the new agent lives and whether a new workspace/worktree is created.
+There is exactly one relationship type today: `parentAgentId`. The daemon does not distinguish between:

-`relationship: { kind: "subagent" }` stamps the created agent with `paseo.parent-agent-id`, pointing back at the creating agent. The client surfaces that as `agent.parentAgentId`. This requires an agent-scoped MCP session.
+- **Subagents** — children that exist as part of the parent's work (e.g. orchestration tasks the parent delegates and waits on)
+- **Detached agents** — children launched to take over from the parent (e.g. handoffs, fire-and-forget delegations)

-`relationship: { kind: "detached" }` creates a sibling/root agent (e.g. handoffs, fire-and-forget delegations). The daemon may still use the creating agent for cwd/config inheritance, but it does not write `paseo.parent-agent-id`.
-
- **Subagents** — exist as part of the creating agent's work, appear in that agent's subagent track, and are archived with it.
- **Detached agents** — stand on their own, do not appear in the creating agent's subagent track, and are not archived with it.
-
-`workspace: { kind: "current" }` uses the caller's workspace and can optionally override the runtime cwd. It requires an agent-scoped MCP session. `workspace: { kind: "create", source: { kind: "directory" | "worktree", ... } }` creates a new workspace for the new agent; worktree creation goes through the Paseo worktree workflow and stamps the agent with that fresh workspace id.
-
-Users can also detach an existing subagent from the subagents track. Detach removes the `paseo.parent-agent-id` label only: it does not stop, archive, move, or restart the agent. The agent keeps its current `cwd` and `workspaceId`, leaves the former parent's track, and behaves like a root agent for tab close, workspace activity, and future parent archive.
-
-`notifyOnFinish` defaults to `true` for agent-scoped creation and background prompt follow-ups because most delegated work needs to report back to the creating agent. Set it to `false` only for truly fire-and-forget agents or prompts.
+Both look the same in storage. This is an accepted limitation — see [Limitations](#limitations).

 ## Archive

@@ -63,12 +54,6 @@ Closing a tab on a **subagent** (any agent with `parentAgentId`) is **layout-onl

 The asymmetry is intentional: a subagent's home is the parent's track, not the tab. Tabs are ephemeral viewing slots; the track is the persistent record of the parent's children.

-## Workspace activity
-
-Agent lifecycle status stays literal: a parent agent is `idle` when its own turn is idle, even if a child is running.
-
-Workspace status is an aggregate activity signal computed **per `workspaceId`**: a workspace's status reflects only records whose `workspaceId === workspace.id`. Ownership is never derived from `cwd` — many workspaces may share one directory, and same-`cwd` siblings do not clump under one status. A root agent contributes its normal state bucket to its owning workspace only. Running subagents contribute `running` to their root parent's owning workspace (by the parent agent's `workspaceId`), not to the subagent's current `cwd` or worktree. Non-running subagent attention, permission, and error states stay in the parent's subagents track and do not escalate the workspace bucket.
-
 ## The subagents track

 The collapsible track above the composer in an agent's pane (`packages/app/src/subagents/track.tsx`). Membership rule (`packages/app/src/subagents/select.ts`):
@@ -79,8 +64,6 @@ parentAgentId === thisAgent.id  AND  !archivedAt

 Archived subagents disappear from the track, by design. To remove a subagent from the track without closing its tab, use the **archive button (X)** on the row — it opens a confirm dialog and archives the subagent on confirm. That same archive shows the subagent leave the track on every connected client.

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

 The decision was to **decouple "close tab" from "archive" only for subagents**, rather than universally:
@@ -88,13 +71,18 @@ The decision was to **decouple "close tab" from "archive" only for subagents**,
 - **Closing a tab on a root agent still archives** — preserves the existing UX users are trained on
 - **Closing a tab on a subagent is layout-only** — fixes the lossy "click to read, close to dismiss view, lose the row" flow
 - **Archive button on track rows** — gives subagents an explicit lifecycle gesture in their home surface
- **Detach button on track rows** — lets a subagent continue independently without killing its work
 - **Cascade archive on parent** — keeps subagents from leaking when the parent is archived

 We considered universal decoupling (no tab close ever archives, archive is always explicit) but rejected it: it changes a behavior root-agent users rely on.

 ## Limitations

+### Detached agents are cascade-archived
+
+The daemon can't tell a "subagent" apart from a "detached agent" — both carry `paseo.parent-agent-id`. So when you archive an agent that previously launched a detached child (e.g. via `/paseo-handoff`), cascade will archive the detached child too, even though semantically it should outlive the originator.
+
+Until a richer relation model lands (e.g. a `relation: "subagent" | "detached"` field on creation, or a separate channel for handoff launches), this trade-off stands. Workaround: don't archive an agent whose work was handed off, or unarchive the detached child afterward.
+
 ### Subagent accumulation under long-lived parents

 A parent that spawns many subagents will see the track grow. There's no automatic cleanup for completed subagents — the user prunes via the archive button on each row. A bulk gesture (e.g. "archive all idle children") could land later if this becomes a real problem.
@@ -109,15 +97,13 @@ Closing a subagent's tab on one client doesn't affect other clients' layouts. Th
 $PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json
 ```

-`{cwd-with-dashes}` is derived from the agent's filesystem `cwd`. It is not the workspace id; agent storage stays cwd-keyed while workspace identity is the opaque workspace id.
-
 Each agent is a single JSON file. Fields relevant to this doc:

-| Field                             | Type          | Meaning                                                                                      |
-| --------------------------------- | ------------- | -------------------------------------------------------------------------------------------- |
-| `id`                              | `string`      | Stable identifier                                                                            |
-| `archivedAt`                      | `string?`     | Soft-delete timestamp (ISO 8601)                                                             |
-| `labels["paseo.parent-agent-id"]` | `string?`     | Parent agent ID, set automatically by `create_agent` when `relationship.kind === "subagent"` |
-| `lastStatus`                      | `AgentStatus` | `initializing` / `idle` / `running` / `error` / `closed`                                     |
+| Field                             | Type          | Meaning                                                       |
+| --------------------------------- | ------------- | ------------------------------------------------------------- |
+| `id`                              | `string`      | Stable identifier                                             |
+| `archivedAt`                      | `string?`     | Soft-delete timestamp (ISO 8601)                              |
+| `labels["paseo.parent-agent-id"]` | `string?`     | Parent agent ID, set automatically by `create_agent` MCP tool |
+| `lastStatus`                      | `AgentStatus` | `initializing` / `idle` / `running` / `error` / `closed`      |

 See [`docs/data-model.md`](./data-model.md) for the full agent record.
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -87,7 +87,7 @@ code imports from `@getpaseo/client`.

 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 (path-shaped today and opaque-encoded for routing), not a directly meaningful filesystem path.
+- Expo Router navigation (`/h/[serverId]/workspace/[workspaceId]`, `/h/[serverId]/agent/[agentId]`, etc.)
 - `HostRuntimeController` manages saved host connections, reconnection, and per-host runtime state
 - `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/`
@@ -132,12 +132,6 @@ Electron wrapper for macOS, Linux, and Windows.
 - Native file access for workspace integration
 - Same WebSocket client as mobile app

-**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.
->
-> **In-app browser panes are not yet per-window.** The active-browser id (`features/browser-webviews.ts`) and the webview registration queue (`pendingBrowserWebviewIds` in `main.ts`) are process-global. With browser panes open in two windows, a menu Reload can target the other window's webview, and near-simultaneous webview attach across windows can register under the wrong browser id. Multi-window v1 ships windows; making the browser-webview subsystem window-scoped is a follow-up.
-
 ### `packages/website` — Marketing site

 TanStack Router + Cloudflare Workers. Serves paseo.sh.
@@ -189,8 +183,6 @@ Terminal I/O is sent as binary WebSocket frames decoded by `decodeTerminalStream
 - 1-byte slot: terminal slot id
 - variable payload: bytes for output/input, JSON-encoded `{ rows, cols }` for resize, terminal snapshot for snapshot

-Terminal PTY size is last-interacting-client-wins. A client claims the PTY size only when its terminal viewport genuinely changes size or the user focuses/taps the terminal. Passive rendering work — attaching, restoring visibility, font settling, renderer refits, or just looking at a visible terminal — must not send a resize frame. The server does not broadcast resize ownership; the resized PTY redraws through normal output, and every attached client renders that output in its own local viewport.
-
 There is also a separate file-transfer binary frame format in the same directory, used for download/upload streams.

 ### Compatibility rules
@@ -232,44 +224,13 @@ initializing → idle ⇄ running
 - Timeline is append-only with epochs (each run starts a new epoch). Storage uses sequence numbers for 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.
-
-## Right-sidebar boundary: directory-backed vs workspace-owned
-
-Two workspaces can share the same `cwd` (e.g. a `directory` workspace and a `local_checkout` workspace on the same folder, or several workspaces opened against one checkout). Model B keeps these distinct: they share everything the directory determines, but nothing the workspace owns. The right-sidebar surfaces split cleanly along this line, and the split is enforced purely by **what each piece of state is keyed by**.
-
-**Directory-backed (shared by same-`cwd` workspaces) — keyed by `(serverId, cwd)`, never by `workspaceId`:**
-
-| Surface                | Key                                                      | Source                                                  |
-| ---------------------- | -------------------------------------------------------- | ------------------------------------------------------- |
-| Git status             | `checkoutStatusQueryKey(serverId, cwd)`                  | `packages/app/src/git/query-keys.ts`                    |
-| Git diff               | `checkoutDiffQueryKey(serverId, cwd, mode, baseRef, ws)` | `packages/app/src/git/query-keys.ts`                    |
-| GitHub PR status       | `checkoutPrStatusQueryKey(serverId, cwd)`                | `packages/app/src/git/query-keys.ts`                    |
-| PR pane timeline       | `prPaneTimelineQueryKey({ serverId, cwd, prNumber })`    | `packages/app/src/git/pull-request-panel/query-keys.ts` |
-| File preview content   | `["workspaceFile", serverId, cwd, path]`                 | `packages/app/src/components/file-pane.tsx`             |
-| File explorer listings | fetched via `listDirectory(workspaceRoot, path)`         | `packages/app/src/hooks/use-file-explorer-actions.ts`   |
-
-**Workspace-owned (independent per workspace) — keyed by `workspaceId` (falling back to `cwd` only when no `workspaceId` exists):**
-
-| State                        | Key builder / store                                | Source                                                        |
-| ---------------------------- | -------------------------------------------------- | ------------------------------------------------------------- |
-| Review draft comments        | `buildReviewDraftKey` / `buildReviewDraftScopeKey` | `packages/app/src/review/store.ts`                            |
-| Diff mode override           | review-draft scope key (in-memory)                 | `packages/app/src/review/state.ts`                            |
-| Composer attachments         | `buildWorkspaceAttachmentScopeKey`                 | `packages/app/src/attachments/workspace-attachments-store.ts` |
-| File explorer nav/open state | `fileExplorer` map keyed `workspace:{workspaceId}` | `packages/app/src/hooks/use-file-explorer-actions.ts`         |
-| File explorer expanded paths | `expandedPathsByWorkspace[workspaceStateKey]`      | `packages/app/src/stores/panel-store/state.ts`                |
-
-`diff-pane.tsx` is the canonical wiring site: it passes `{ serverId, cwd }` to the git queries and `{ serverId, workspaceId, cwd }` to the draft/override/attachment scope keys.
-
-**Do not "fix" the sharing away.** Re-keying a directory-backed query by `workspaceId` makes same-`cwd` workspaces diverge (two windows onto the same git tree showing different diffs). Re-keying owned state (drafts, expanded paths) by `cwd` makes them leak between distinct workspaces on the same folder. The `workspaceId`-keyed builders carry a `// workspaceId is opaque; do not parse this key back into a path.` comment — the opaque-id fallback to `cwd` exists only for old payloads without a `workspaceId`, not as a content-sharing mechanism.
-
-One deliberate non-violation: `AgentFileExplorerState.directories`/`files` cache directory listings inside the `workspaceId`-keyed explorer map. Same-`cwd` workspaces therefore keep duplicate caches, but they can never diverge — both fetch the identical directory via `listDirectory(workspaceRoot, …)`. This is duplication, not leakage, and is left as-is.
+- Agent state persists to `$PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json` (timeline rows live alongside the record)

 ## Agent providers

 Each provider implements the `AgentClient` interface in `agent/agent-sdk-types.ts`. Provider implementations live in `agent/providers/`.

-The built-in, user-facing providers are Claude Code, Codex, Copilot, OpenCode, Pi, and OMP. Additional adapters exist in the same directory for ACP-compatible agents and internal use:
+The built-in, user-facing providers are Claude Code, Codex, Copilot, OpenCode, and Pi. Additional adapters exist in the same directory for ACP-compatible agents and internal use:

 | Provider           | Wraps                                | Session format                                     |
 | ------------------ | ------------------------------------ | -------------------------------------------------- |
--- a/docs/custom-providers.md
+++ b/docs/custom-providers.md
@@ -35,7 +35,7 @@ Provider IDs must be lowercase alphanumeric with hyphens (`/^[a-z][a-z0-9-]*$/`)

 ## Extending a built-in provider

-Use `extends` to create a new provider entry that inherits from a built-in provider (claude, codex, copilot, opencode, pi, omp). The new provider gets its own entry in the provider list, with its own label, environment, and model definitions.
+Use `extends` to create a new provider entry that inherits from a built-in provider (claude, codex, copilot, opencode, pi). The new provider gets its own entry in the provider list, with its own label, environment, and model definitions.

 ```json
 {
@@ -347,41 +347,6 @@ Override the command used to launch any provider with the `command` field. This

 The `command` array completely replaces the default command for that provider. The binary must exist on the system — Paseo checks for its availability and will mark the provider as unavailable if not found.

-### Pi-compatible forks with their own session directory
-
-OMP already ships as a built-in provider option. It is disabled by default; enable it with:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "omp": { "enabled": true }
-    }
-  }
-}
-```
-
-For other providers that keep Pi's `--mode rpc` API but write sessions somewhere else, extend `pi`, replace the command, and provide the JSONL session directory:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-pi-fork": {
-        "extends": "pi",
-        "label": "My Pi Fork",
-        "command": ["my-pi-fork"],
-        "params": {
-          "sessionDir": "~/.my-pi-fork/sessions"
-        }
-      }
-    }
-  }
-}
-```
-
-The session directory is used only for importing sessions that were started outside Paseo. Launching and resuming still go through the configured command, so this example resumes with `my-pi-fork --mode rpc --session <session-file>`.
-
 ---

 ## Disabling a provider
@@ -399,7 +364,7 @@ Set `enabled: false` to hide a provider from the provider list. The provider wil
 }
 ```

-This works for both built-in and custom providers. To re-enable, set `enabled: true` or remove the `enabled` field entirely. Most providers are enabled by default; OMP is intentionally disabled by default and requires `enabled: true`.
+This works for both built-in and custom providers. To re-enable, set `enabled: true` or remove the `enabled` field entirely (providers are enabled by default).

 ---

@@ -409,7 +374,7 @@ The [Agent Client Protocol (ACP)](https://agentclientprotocol.com) is an open st

 ACP agents communicate over JSON-RPC 2.0 on stdio. Paseo spawns the agent process and talks to it through stdin/stdout.

-Paseo also ships an in-app ACP provider catalog for common agents, including CodeWhale, Cursor, DeepAgents, DimCode, Gemini CLI, Hermes, Qwen Code, and Kimi Code. Catalog entries create the same `extends: "acp"` provider config shown below.
+Paseo also ships an in-app ACP provider catalog for common agents, including Cursor, DeepAgents, DeepSeek TUI, DimCode, Gemini CLI, Hermes, Qwen Code, and Kimi Code. Catalog entries create the same `extends: "acp"` provider config shown below.

 ### Adding a generic ACP provider

@@ -438,25 +403,6 @@ Required fields for ACP providers:
 - `label`
 - `command` — the command to spawn the agent process (must support ACP over stdio)

-By default, Paseo injects its internal MCP server into ACP providers so agents can use Paseo tools such as subagent creation. Some ACP adapters cannot create sessions when `mcpServers` is non-empty. Disable injected MCP for those providers with `params.supportsMcpServers: false`:
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-agent": {
-        "extends": "acp",
-        "label": "My Agent",
-        "command": ["my-agent", "acp"],
-        "params": {
-          "supportsMcpServers": false
-        }
-      }
-    }
-  }
-}
-```
-
 ### Generic ACP diagnostics

 Paseo diagnostics for `extends: "acp"` providers report the configured command, resolved launcher binary, version output, ACP `initialize`, ACP `session/new`, model count, modes, and final status.
@@ -593,19 +539,18 @@ When an `additionalModels` entry has the same `id` as a discovered model, it upd

 Every entry under `agents.providers` accepts these fields:

-| Field              | Type                      | Required          | Description                                                        |
-| ------------------ | ------------------------- | ----------------- | ------------------------------------------------------------------ |
-| `extends`          | `string`                  | Yes (custom only) | Built-in provider ID to inherit from, or `"acp"`                   |
-| `label`            | `string`                  | Yes (custom only) | Display name in the UI                                             |
-| `description`      | `string`                  | No                | Short description shown in the UI                                  |
-| `command`          | `string[]`                | Yes (ACP only)    | Command to spawn the agent process                                 |
-| `env`              | `Record<string, string>`  | No                | Environment variables to set for the agent process                 |
-| `params`           | `Record<string, unknown>` | No                | Provider-specific options such as `supportsMcpServers: false`      |
-| `models`           | `ProviderProfileModel[]`  | No                | Static model list (overrides runtime discovery)                    |
-| `additionalModels` | `ProviderProfileModel[]`  | No                | Static model additions (merged with runtime discovery or `models`) |
-| `disallowedTools`  | `string[]`                | No                | Tool names to disable for this provider (e.g. `["WebSearch"]`)     |
-| `enabled`          | `boolean`                 | No                | Set to `false` to hide the provider (default: `true`)              |
-| `order`            | `number`                  | No                | Sort order in the provider list                                    |
+| Field              | Type                     | Required          | Description                                                        |
+| ------------------ | ------------------------ | ----------------- | ------------------------------------------------------------------ |
+| `extends`          | `string`                 | Yes (custom only) | Built-in provider ID to inherit from, or `"acp"`                   |
+| `label`            | `string`                 | Yes (custom only) | Display name in the UI                                             |
+| `description`      | `string`                 | No                | Short description shown in the UI                                  |
+| `command`          | `string[]`               | Yes (ACP only)    | Command to spawn the agent process                                 |
+| `env`              | `Record<string, string>` | No                | Environment variables to set for the agent process                 |
+| `models`           | `ProviderProfileModel[]` | No                | Static model list (overrides runtime discovery)                    |
+| `additionalModels` | `ProviderProfileModel[]` | No                | Static model additions (merged with runtime discovery or `models`) |
+| `disallowedTools`  | `string[]`               | No                | Tool names to disable for this provider (e.g. `["WebSearch"]`)     |
+| `enabled`          | `boolean`                | No                | Set to `false` to hide the provider (default: `true`)              |
+| `order`            | `number`                 | No                | Sort order in the provider list                                    |

 ### Model definition

@@ -632,7 +577,7 @@ Each entry in the `models` array:

 The built-in `claude` provider appends concrete model IDs from `~/.claude/settings.json` to its first-party Claude model list. Paseo reads the top-level `model` field and these `env` keys: `ANTHROPIC_MODEL`, `ANTHROPIC_SMALL_FAST_MODEL`, `ANTHROPIC_DEFAULT_OPUS_MODEL`, `ANTHROPIC_DEFAULT_SONNET_MODEL`, and `ANTHROPIC_DEFAULT_HAIKU_MODEL`.

-This lets users who already configured Claude Code for Bedrock, OpenRouter, ollama, Z.AI, or another Anthropic-compatible gateway select the exact model ID in Paseo. When `agents.providers.claude.models` is set it **replaces** both the hardcoded first-party Claude list and any settings.json-discovered entries; use `agents.providers.claude.additionalModels` to keep the first-party list and append curated entries on top.
+This lets users who already configured Claude Code for Bedrock, OpenRouter, ollama, Z.AI, or another Anthropic-compatible gateway select the exact model ID in Paseo. `agents.providers.claude.models` is still supported and is additive for the built-in Claude provider; duplicate IDs are de-duplicated.

 ### Gotcha: `extends: "claude"` with third-party endpoints

@@ -659,7 +604,7 @@ Use `disallowedTools` to disable unsupported tools:

 ### Valid `extends` values

-Built-in providers: `claude`, `codex`, `copilot`, `opencode`, `pi`, `omp`
+Built-in providers: `claude`, `codex`, `copilot`, `opencode`, `pi`

 Special value: `acp` — creates a generic ACP provider (requires `command`)

--- a/docs/data-model.md
+++ b/docs/data-model.md
@@ -27,13 +27,10 @@ $PASEO_HOME/
 ├── projects/
 │   ├── projects.json                    # Project registry
 │   └── workspaces.json                  # Workspace registry
-├── runtime/
-│   └── managed-processes/
-│       └── {recordId}.json              # Helper processes owned by Paseo; reconciled on daemon bootstrap
 └── push-tokens.json                     # Expo push notification tokens
 ```

-The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` by stripping the filesystem root and replacing path separators with `-` (Windows drive letters become a `C-` style prefix). Persistent server stores write atomically by writing a temp file in the target directory and then renaming it into place.
+The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` by stripping the filesystem root and replacing path separators with `-` (Windows drive letters become a `C-` style prefix). Atomic writes (temp file + rename): agent records, chat, project/workspace registries, push tokens. Non-atomic (plain `writeFile`): `config.json`, `schedules/*.json`, `loops/loops.json`, `server-id`, `daemon-keypair.json`.

 ---

@@ -43,30 +40,29 @@ The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` b

 Each agent is stored as a separate JSON file, grouped by project directory.

-| Field                | Type                                     | Description                                                                                                                                                                                                                                                                                                                                                                         |
-| -------------------- | ---------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                 | `string`                                 | UUID, primary key                                                                                                                                                                                                                                                                                                                                                                   |
-| `provider`           | `string`                                 | Agent provider (`"claude"`, `"codex"`, `"opencode"`, etc.)                                                                                                                                                                                                                                                                                                                          |
-| `cwd`                | `string`                                 | Working directory the agent operates in                                                                                                                                                                                                                                                                                                                                             |
-| `workspaceId`        | `string?`                                | Owning workspace id — the single source of ownership. Every agent is stamped with one at create time; legacy cwd-only records are backfilled once by `migrations/backfill-workspace-id.migration.ts` (the only place a cwd→id mapping exists). Runtime code never infers ownership or status from cwd: status is computed per `workspaceId`, and same-cwd siblings are independent. |
-| `createdAt`          | `string` (ISO 8601)                      | Creation timestamp                                                                                                                                                                                                                                                                                                                                                                  |
-| `updatedAt`          | `string` (ISO 8601)                      | Last update timestamp                                                                                                                                                                                                                                                                                                                                                               |
-| `lastActivityAt`     | `string?` (ISO 8601)                     | Last activity timestamp                                                                                                                                                                                                                                                                                                                                                             |
-| `lastUserMessageAt`  | `string?` (ISO 8601)                     | Last user message timestamp                                                                                                                                                                                                                                                                                                                                                         |
-| `title`              | `string?`                                | User-visible title                                                                                                                                                                                                                                                                                                                                                                  |
-| `labels`             | `Record<string, string>`                 | Key-value labels (default `{}`). `paseo.parent-agent-id` is set automatically for `create_agent` subagent relationships — see [agent-lifecycle.md](./agent-lifecycle.md)                                                                                                                                                                                                            |
-| `lastStatus`         | `AgentStatus`                            | One of: `"initializing"`, `"idle"`, `"running"`, `"error"`, `"closed"`                                                                                                                                                                                                                                                                                                              |
-| `lastModeId`         | `string?`                                | Last active mode ID                                                                                                                                                                                                                                                                                                                                                                 |
-| `config`             | `SerializableConfig?`                    | Agent session configuration (see below)                                                                                                                                                                                                                                                                                                                                             |
-| `runtimeInfo`        | `RuntimeInfo?`                           | Live runtime state (see below)                                                                                                                                                                                                                                                                                                                                                      |
-| `features`           | `AgentFeature[]?`                        | Provider-reported features (toggles/selects)                                                                                                                                                                                                                                                                                                                                        |
-| `persistence`        | `PersistenceHandle?`                     | Handle for resuming sessions                                                                                                                                                                                                                                                                                                                                                        |
-| `lastError`          | `string?` (nullable)                     | Last error message, if any                                                                                                                                                                                                                                                                                                                                                          |
-| `requiresAttention`  | `boolean?`                               | Whether the agent needs user attention                                                                                                                                                                                                                                                                                                                                              |
-| `attentionReason`    | `"finished" \| "error" \| "permission"?` | Why attention is needed                                                                                                                                                                                                                                                                                                                                                             |
-| `attentionTimestamp` | `string?` (ISO 8601)                     | When attention was flagged                                                                                                                                                                                                                                                                                                                                                          |
-| `internal`           | `boolean?`                               | Whether this is a system-internal agent (loop workers, etc.)                                                                                                                                                                                                                                                                                                                        |
-| `archivedAt`         | `string?` (ISO 8601)                     | Soft-delete timestamp                                                                                                                                                                                                                                                                                                                                                               |
+| Field                | Type                                     | Description                                                                                                                                                               |
+| -------------------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `id`                 | `string`                                 | UUID, primary key                                                                                                                                                         |
+| `provider`           | `string`                                 | Agent provider (`"claude"`, `"codex"`, `"opencode"`, etc.)                                                                                                                |
+| `cwd`                | `string`                                 | Working directory the agent operates in                                                                                                                                   |
+| `createdAt`          | `string` (ISO 8601)                      | Creation timestamp                                                                                                                                                        |
+| `updatedAt`          | `string` (ISO 8601)                      | Last update timestamp                                                                                                                                                     |
+| `lastActivityAt`     | `string?` (ISO 8601)                     | Last activity timestamp                                                                                                                                                   |
+| `lastUserMessageAt`  | `string?` (ISO 8601)                     | Last user message timestamp                                                                                                                                               |
+| `title`              | `string?`                                | User-visible title                                                                                                                                                        |
+| `labels`             | `Record<string, string>`                 | Key-value labels (default `{}`). `paseo.parent-agent-id` set automatically when launched via the `create_agent` MCP tool — see [agent-lifecycle.md](./agent-lifecycle.md) |
+| `lastStatus`         | `AgentStatus`                            | One of: `"initializing"`, `"idle"`, `"running"`, `"error"`, `"closed"`                                                                                                    |
+| `lastModeId`         | `string?`                                | Last active mode ID                                                                                                                                                       |
+| `config`             | `SerializableConfig?`                    | Agent session configuration (see below)                                                                                                                                   |
+| `runtimeInfo`        | `RuntimeInfo?`                           | Live runtime state (see below)                                                                                                                                            |
+| `features`           | `AgentFeature[]?`                        | Provider-reported features (toggles/selects)                                                                                                                              |
+| `persistence`        | `PersistenceHandle?`                     | Handle for resuming sessions                                                                                                                                              |
+| `lastError`          | `string?` (nullable)                     | Last error message, if any                                                                                                                                                |
+| `requiresAttention`  | `boolean?`                               | Whether the agent needs user attention                                                                                                                                    |
+| `attentionReason`    | `"finished" \| "error" \| "permission"?` | Why attention is needed                                                                                                                                                   |
+| `attentionTimestamp` | `string?` (ISO 8601)                     | When attention was flagged                                                                                                                                                |
+| `internal`           | `boolean?`                               | Whether this is a system-internal agent (loop workers, etc.)                                                                                                              |
+| `archivedAt`         | `string?` (ISO 8601)                     | Soft-delete timestamp                                                                                                                                                     |

 ### Nested: SerializableConfig

@@ -130,14 +126,6 @@ Each agent is stored as a separate JSON file, grouped by project directory.

 ---

-## Runtime-only Terminal Sessions
-
-Terminals are live daemon state, not persisted JSON records. A terminal carries a `workspaceId` while it is running; workspace-scoped terminal lists include only terminals with the matching `workspaceId`. Legacy live terminals without an owner remain visible to unscoped terminal reads but contribute to no workspace status.
-
-Terminal activity contributes to the workspace status bucket **per `workspaceId`**: a working terminal drives `running` onto the workspace it carries only. Same-`cwd` siblings are untouched; terminal visibility is likewise `workspaceId`-scoped.
-
---
-
 ## 2. Daemon Configuration

 **Path:** `$PASEO_HOME/config.json`
@@ -159,9 +147,6 @@ Single file, validated with `PersistedConfigSchema`.
  app: {
    baseUrl: string
  },
-  worktrees?: {
-    root?: string            // optional root for new worktrees; defaults to $PASEO_HOME/worktrees
-  },
  providers: {
    openai: { apiKey: string },
    local: { modelsDir: string }
@@ -199,7 +184,7 @@ Local speech model ids are intentionally narrow: STT uses `parakeet-tdt-0.6b-v2-

 **Path:** `$PASEO_HOME/schedules/{id}.json`

-One file per schedule. ID is 8 hex characters.
+One file per schedule. ID is 8 hex characters. Writes are direct (not atomic).

 | Field       | Type                                  | Description                      |
 | ----------- | ------------------------------------- | -------------------------------- |
@@ -221,7 +206,7 @@ One file per schedule. ID is 8 hex characters.
 ### Nested: ScheduleCadence (discriminated union on `type`)

 - `{ type: "every", everyMs: number }` — interval in milliseconds
- `{ type: "cron", expression: string, timezone?: string }` — cron expression; absent `timezone` means UTC, present `timezone` is an IANA time zone used for local wall-clock recurrence
+- `{ type: "cron", expression: string }` — cron expression

 ### Nested: ScheduleTarget (discriminated union on `type`)

@@ -398,25 +383,16 @@ emptied duplicate.

 Array of workspace records. A workspace is a specific working directory within a project.

-| Field         | Type                                            | Description                                                                                                                                                                           |
-| ------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `workspaceId` | `string`                                        | Opaque stable identifier (`wks_<hex>`), generated independently of the directory. MUST NOT be treated as a path; compare by exact equality. Use the `cwd` field for directory access. |
-| `projectId`   | `string`                                        | FK to Project.projectId                                                                                                                                                               |
-| `cwd`         | `string`                                        | Filesystem path                                                                                                                                                                       |
-| `kind`        | `"local_checkout" \| "worktree" \| "directory"` |                                                                                                                                                                                       |
-| `displayName` | `string`                                        | The human name (the generated/derived title). Decoupled from `branch` by construction.                                                                                                |
-| `title`       | `string \| null`                                | User-set name override layered over `displayName`. Null means "use `displayName`".                                                                                                    |
-| `branch`      | `string \| null`                                | The worktree's git branch. Separate from `displayName`/`title`; only worktree workspaces set it. A branch rename writes this and never the name.                                      |
-| `createdAt`   | `string` (ISO 8601)                             |                                                                                                                                                                                       |
-| `updatedAt`   | `string` (ISO 8601)                             |                                                                                                                                                                                       |
-| `archivedAt`  | `string \| null` (ISO 8601)                     | Soft-delete; required nullable                                                                                                                                                        |
-
-> **Opaque-ID invariant:** `workspaceId` is opaque identity, never a filesystem path. Filesystem and git operations take `cwd`/`workspaceDirectory` only — never the id. Path-derived grouping keys (e.g. `deriveWorkspaceDirectoryKey`, used at bootstrap to group agents into a workspace) are directory keys, not workspace identity, and must not be persisted or compared as ids.
-
-`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
-than treating it as valid.
+| Field         | Type                                            | Description                    |
+| ------------- | ----------------------------------------------- | ------------------------------ |
+| `workspaceId` | `string`                                        | Primary key                    |
+| `projectId`   | `string`                                        | FK to Project.projectId        |
+| `cwd`         | `string`                                        | Filesystem path                |
+| `kind`        | `"local_checkout" \| "worktree" \| "directory"` |                                |
+| `displayName` | `string`                                        |                                |
+| `createdAt`   | `string` (ISO 8601)                             |                                |
+| `updatedAt`   | `string` (ISO 8601)                             |                                |
+| `archivedAt`  | `string \| null` (ISO 8601)                     | Soft-delete; required nullable |

 ---

@@ -451,13 +427,6 @@ These small files are not validated as full Zod schemas but are persisted under

 These live in React Native `AsyncStorage` or browser `IndexedDB`, not on the daemon filesystem.

-### Keying convention: directory-backed vs workspace-owned
-
-Right-sidebar client state splits on whether it is determined by the directory or owned by the workspace (two workspaces can share one `cwd`). The split is enforced by the cache key, so changing a key changes the sharing semantics — see [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned) for the full table.
-
- **Directory-backed** (shared by same-`cwd` workspaces): keyed by `(serverId, cwd)`. Git status/diff, GitHub PR status, PR timeline, file preview content. These are TanStack Query caches, not persisted stores.
- **Workspace-owned** (independent per workspace): keyed by `workspaceId`, with `cwd` used only as a fallback when no `workspaceId` is present. Review draft comments (`@paseo:review-draft-store`), diff-mode overrides (in-memory), workspace composer attachments, and file-explorer nav/expand state. The `workspaceId` part of these keys is **opaque** — never parse it back into a path.
-
 ### Draft Store

 **AsyncStorage key:** `paseo-drafts` (version 2)
--- a/docs/design.md
+++ b/docs/design.md
@@ -94,8 +94,6 @@ Five primitives. The pick is determined by option count, the need to search, and

 `<AdaptiveModalSheet>` is for a focused task. Multi-field forms (`packages/app/src/components/add-host-modal.tsx`, `packages/app/src/components/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`), confirmations with detail, anything that earns a backdrop. Bottom sheet on compact, centered card on desktop. Raw `Modal` is wrong for any of these.

-`<AdaptiveModalSheet>` owns compact bottom safe-area padding inside the sheet so the sheet background still reaches the screen bottom. If a sheet's first snap point is shorter than its header, content, and safe-area clearance, raise that snap point rather than moving the sheet container.
-
 `confirmDialog` is for destructive yes/no and imperative confirmation. Promise-based: `await confirmDialog({ destructive: true, ... })`. Anything where a wrong click loses work.

 Three themes is `DropdownMenu`. Thirty hosts is `Combobox`. A label and a value is `AdaptiveModalSheet`. "Are you sure?" is `confirmDialog`.
--- a/docs/development.md
+++ b/docs/development.md
@@ -8,28 +8,18 @@
 ## Running the dev server

 ```bash
-npm run dev:server
-npm run dev:app
-npm run dev:desktop
+npm run dev
 ```

-Root checkout dev is intentionally split across terminals:
-
- `npm run dev:server` runs the daemon on `127.0.0.1:6768`.
- `npm run dev:app` runs Expo on `http://localhost:8081` and connects to the dev daemon.
- `npm run dev:desktop` runs its own Electron-flavored Expo server on the first free port from `8082` through `8089`. It never claims port `8081`.
-
-`npm run dev` is only a shorthand for `npm run dev:server`. Keep `127.0.0.1:6767` for the packaged app and production-style `~/.paseo` state.
+`scripts/dev.sh` runs the daemon and Expo together via `concurrently`, fronted by [`portless`](https://www.npmjs.com/package/portless) so each service is reachable at a stable name like `https://daemon.localhost` / `https://app.localhost` instead of a fixed port. The underlying TCP ports are ephemeral — never hardcode them. (Windows uses `scripts/dev.ps1`, which still binds the daemon to `localhost:6767` directly.)

 ### PASEO_HOME

-`PASEO_HOME` is the directory that holds runtime state (agents, worktrees, workspace config, sockets, daemon log). Resolution rules:
+`PASEO_HOME` is the directory that holds runtime state (agents, sockets, daemon log). Resolution rules:

 - The **server itself** (e.g. when launched by the desktop app or `npm run start`) defaults to `~/.paseo` (see `packages/server/src/server/paseo-home.ts`).
- **Repo dev scripts** default to `$ROOT/.dev/paseo-home`, where `$ROOT` is the current checkout or worktree root. This keeps all dev state scoped to the checkout instead of the packaged desktop app.
- **`npm run cli -- ...`** runs through the same dev-home wrapper as the dev scripts, so the in-repo CLI automatically targets the current checkout's `.dev/paseo-home` and configured dev daemon endpoint.
- **Paseo-created worktrees** seed `$PASEO_WORKTREE_PATH/.dev/paseo-home` from `$PASEO_SOURCE_CHECKOUT_PATH/.dev/paseo-home` by copying durable JSON metadata. Runtime files like pid files, sockets, and logs are not copied.
- **This repo's worktree setup** also best-effort seeds `packages/app/ios` and the newest `.dev/ios-build` entry from the source checkout so iOS simulator services can reuse native project and Xcode cache state when it is safe enough to do so.
+- **`npm run dev` from a git worktree** derives a stable home like `~/.paseo-<worktree-name>` and, on first run, seeds it from `~/.paseo` by copying agent/project JSON metadata and `config.json`. Checkout/worktree directories are not copied.
+- **`npm run dev` from the main checkout** (not a worktree) uses a fresh `mktemp` directory under `$TMPDIR` and removes it on exit. Set `PASEO_HOME` explicitly to keep state across runs.

 Override knobs:

@@ -42,125 +32,16 @@ PASEO_DEV_RESET_HOME=1 npm run dev            # clear and reseed the derived wor
 ### Daemon endpoints

 - Stable daemon launched by the desktop app: `localhost:6767`.
- Root checkout dev daemon: `localhost:6768`.
- Root checkout Expo: `http://localhost:8081`.
- Root checkout desktop dev Expo: first free port from `8082` through `8089`.
+- `npm run dev` (macOS/Linux): portless URLs only — read them from the `dev.sh` banner or `portless get daemon` / `portless get app`.
 - `npm run dev` (Windows): `localhost:6767` for the daemon.

-In Paseo-managed worktree services, use the injected service environment rather than hardcoded root checkout ports.
-
-### Expo Router layout ownership
-
-Each layout owns only the routes directly inside its directory. In the root
-layout, register `h/[serverId]`; do not register host leaf routes such as
-`h/[serverId]/workspace/[workspaceId]`, `h/[serverId]/open-project`, or
-`h/[serverId]/index` there. The `h/[serverId]/_layout.tsx` file owns those leaf
-routes with its own nested stack and relative screen names:
-`workspace/[workspaceId]/index`, `open-project`, `index`, and so on. Expo Router
-warns with `[Layout children]: No route named ...` when a layout registers
-grandchildren. Treat that warning as a route-tree bug: on native, this shape can
-leave a nested index route mounted without its local dynamic params and render a
-blank screen.
-
-Do not paper over missing required route params by reading global params in the
-leaf. Required dynamic params belong to the matched route. If
-`useLocalSearchParams()` misses one, fix the layout ownership.
-
-Keep non-route modules out of `src/app`. Expo Router treats ordinary `.ts` and
-`.tsx` files there as routes, which produces `missing the required default
-export` warnings and pollutes the route tree. Put shared route policy in
-`src/navigation`, `src/utils`, or another non-route directory.
-
-Treat `/h/[serverId]` as the host home route. It resolves to the last remembered
-workspace for that host after the workspace-selection store hydrates unless the
-host's hydrated workspace list proves that workspace is gone; hosts without a
-remembered workspace go to `open-project`.
-
-Keep workspace identity and retention outside native-stack `getId`/
-`dangerouslySingular`. Expo Router maps `dangerouslySingular` to React
-Navigation `getId`, and `getId` has broken Android native-stack/Fabric by
-reordering an already-mounted workspace screen.
-
-### iOS simulator preview service
-
-Paseo worktrees expose the native iOS dev app through the `ios-simulator` service in `paseo.json`. The service URL serves the simulator preview at `/.sim`, so the preview link is `${PASEO_URL}/.sim`.
-
-The service is designed for concurrent worktrees: it derives a deterministic simulator identity from the worktree path, uses the worktree's assigned `PASEO_PORT`, pins `serve-sim` to that simulator UDID, and only tears down that worktree's helper/simulator state. It must not rely on the globally booted simulator or any fixed Metro port.
-
-Worktree setup best-effort seeds the generated iOS project and newest native build cache from the source checkout before the service runs. The service still validates the native project by running Expo prebuild and Xcode; the seed only avoids paying all setup/build cost from a cold worktree every time.
-
-Starting the service must not create, focus, reveal, or leave behind macOS Simulator.app windows. The browser preview is the user-visible simulator surface.
+In any worktree-style or portless setup, never assume default ports.

 ### Desktop renderer profiling

 `npm run dev:desktop` starts Electron with Chromium remote debugging enabled on
 `http://127.0.0.1:9223` so renderer CPU profiles can be captured through CDP.
-It launches its own Electron-flavored Expo server and passes that URL to Electron.
-Override the CDP port with `PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when `9223` is busy.
-
-### React render profiling
-
-The app has a gated React render profiler in
-`packages/app/src/utils/render-profiler.tsx`. Wrap the component boundary you want
-to measure with `RenderProfile`, then open the app with `?renderProfile=1`. When
-the query param is absent, `RenderProfile` returns children directly and records
-nothing.
-
-Captured samples are exposed on `globalThis.__PASEO_RENDER_PROFILE__`. Call
-`globalThis.__PASEO_RESET_RENDER_PROFILE__?.()` after warm-up and before the
-interaction you want to measure. If a memo comparator or subscription boundary
-needs explanation, call `recordRenderProfileReasons(id, reasons)` while profiling;
-reason counts are exposed on `globalThis.__PASEO_RENDER_PROFILE_REASONS__`.
-
-Use this workflow for any render investigation:
-
-1. Add stable `RenderProfile` boundaries around the suspected root and expensive
-   children. Keep IDs specific enough to compare before and after.
-2. Reproduce against real app state, not toy fixtures, whenever practical.
-3. Record an idle baseline first. If idle is noisy, fix or account for that
-   before optimizing the interaction.
-4. Warm up the route, reset profiler samples, run the exact interaction, then
-   compare `actualDuration`, render counts, and per-commit samples.
-5. When a memo boundary still renders, record reasons before changing code. Do
-   not guess from object identity alone.
-6. Keep changes that move the measured profile. Remove probes or memo wrappers
-   that do not move the number.
-
-What this caught during the workspace tab investigation:
-
- A large apparent workspace cost was real interaction work, not daemon noise;
-  the idle baseline stayed near zero.
- The expensive stream rerender was mostly prop identity churn from pane context
-  callbacks and capability objects, not new stream data.
- Stabilizing provider actions at the pane boundary helped because every mounted
-  panel consumes that context.
- Comparing value-shaped capability flags beat preserving object identity through
-  unrelated stores.
- Some plausible fixes did not pay off: memoizing the tab row and composer draft
-  object barely moved the profile, so they were removed.
-
-Existing scenario script: workspace agent/terminal tab switching. Start Expo on
-web, keep a daemon available, then run:
-
-```bash
-PASEO_PROFILE_SERVER_ID=<server-id> \
-PASEO_PROFILE_WORKSPACE_ID=<workspace-path> \
-PASEO_PROFILE_AGENT_ID=<agent-id> \
-  npm run profile:workspace-tabs --workspace=@getpaseo/app
-```
-
-This script opens the app with `?renderProfile=1`, creates a temporary terminal
-tab, switches between a real agent and that terminal, prints aggregated React
-Profiler timings, then removes the temporary terminal. It is an example of the
-workflow above, not the only way to use the profiler. Useful knobs:
-
-```bash
-PASEO_PROFILE_APP_URL=http://localhost:19010 # Expo web URL
-PASEO_PROFILE_SWITCH_COUNT=1                # number of agent/terminal switch pairs
-PASEO_PROFILE_SWITCH_WAIT_MS=250            # delay after each click
-PASEO_PROFILE_IDLE_WAIT_MS=3000             # idle baseline before switching
-PASEO_PROFILE_DUMP_COMMITS=1                # include per-commit profiler samples
-```
+Override the port with `PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when `9223` is busy.

 ### Desktop macOS compositor watchdog

@@ -178,12 +59,6 @@ GPU process so Chromium rebuilds the display link. The probe is skipped while
 the screen is locked or the window is hidden or minimized, since a window
 legitimately stops producing frames then.

-The watchdog deliberately leaves background throttling **enabled**. Calling
-`webContents.setBackgroundThrottling(false)` would keep the compositor producing
-frames non-stop, pinning ProMotion displays at 120Hz forever and draining the
-battery while the app is idle — so do not re-add it. The probe's visibility
-guards already prevent throttling from causing a false stall.
-
 ### Daemon logs

 Check `$PASEO_HOME/daemon.log` for daemon logs. The default level is `info`; set
@@ -213,14 +88,12 @@ Every `scripts` entry with `"type": "service"` receives these environment variab

 | Variable                    | Value                                                                                                                     |
 | --------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `PASEO_SERVICE_<NAME>_URL`  | Proxied URL for a declared peer service. Prefer this for peer discovery; it survives peer restarts.                       |
+| `PASEO_SERVICE_<NAME>_URL`  | Proxied daemon URL for a declared peer service. Prefer this for peer discovery; it survives peer restarts.                |
 | `PASEO_SERVICE_<NAME>_PORT` | Raw ephemeral port for a declared peer service. Use only as a bypass escape hatch; it can go stale if that peer restarts. |
 | `PASEO_URL`                 | Self alias for `PASEO_SERVICE_<SELF>_URL`.                                                                                |
 | `PASEO_PORT`                | Self alias for `PASEO_SERVICE_<SELF>_PORT`.                                                                               |
 | `HOST`                      | Bind host for the service process.                                                                                        |

-Service proxy hostnames use the double-dash shape: `web--feature-auth--project.localhost` or, on the default branch, `web--project.localhost`. Optional public aliases use the same leftmost label under the configured public base host.
-
 `<NAME>` is normalized from the script name by uppercasing it, replacing each run of non-`A-Z0-9` characters with `_`, and trimming leading or trailing `_`. For example, `app-server` and `app.server` both normalize to `APP_SERVER`; that collision fails at spawn time with an actionable error.

 `PORT` is not injected by default. If a framework requires `PORT`, set it in the command:
@@ -240,7 +113,7 @@ Service proxy hostnames use the double-dash shape: `web--feature-auth--project.l

 Package imports resolve through package exports to compiled `dist/` output, not sibling `src/` files. This is true in local dev and in published packages: the app, daemon, CLI, and SDK consumers should all exercise the same runtime paths.

-`npm run dev:server` builds the server-side workspace packages once, then keeps `@getpaseo/protocol` and `@getpaseo/client` fresh with TypeScript watch builds while the daemon runs. If you change protocol schemas or client code outside that watch workflow, rebuild the producer before trusting runtime behavior.
+`npm run dev`, `npm run dev:server`, and `npm run dev:app` build the workspace packages they need once, then keep `@getpaseo/protocol` and `@getpaseo/client` fresh with TypeScript watch builds while the daemon or Expo runs. If you change protocol schemas or client code outside those watch workflows, rebuild the producer before trusting runtime behavior.

 Use the named root build targets instead of remembering workspace dependency chains:

@@ -259,26 +132,9 @@ 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`.

-## ACP provider catalog versions
-
-The in-app ACP provider catalog pins package-runner entries (`npx`, `npm exec`,
-and `uvx`) to exact package versions. Run the drift checker regularly — and
-before releases — so catalog installs do not sit on stale agent versions:
-
-```bash
-npm run acp:version-drift        # report stale/non-exact package pins
-npm run acp:version-drift:check  # same, exits non-zero on drift
-npm run acp:version-drift:update # rewrite catalog pins to latest exact versions
-```
-
-The checker updates only package-runner catalog entries. Providers that use a
-preinstalled binary such as `opencode acp`, `cursor-agent acp`, or `goose acp`
-are reported as skipped because their versions are owned by the user's local
-install.
-
 ## CLI reference

-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.
+Use `npm run cli` to run the in-repo CLI from source (`npx tsx packages/cli/src/index.ts`). 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.

 ```bash
 npm run cli -- ls -a -g              # List all agents globally
@@ -332,7 +188,7 @@ Get the session ID from the agent JSON (`persistence.sessionId`), then:

 ## Testing with Playwright MCP

-Point Playwright MCP at the running Expo web target. For root checkout dev, `npm run dev:app` reserves `http://localhost:8081`. For Paseo-managed worktree app services, use the service URL or port shown by Paseo for that worktree.
+Point Playwright MCP at the running Expo web target. Under `npm run dev` (macOS/Linux) that is the portless URL printed in the dev banner — typically `https://app.localhost`. If you start Expo directly with `expo start --web` (no portless), Metro defaults to `http://localhost:8081`.

 Do NOT use browser history (back/forward). Always navigate by clicking UI elements or using `browser_navigate` with the full URL — the app uses client-side routing and browser history breaks state.

--- a/docs/diagnostics/git-snapshot-startup-reshaping-2026-05-27.md
+++ b/docs/diagnostics/git-snapshot-startup-reshaping-2026-05-27.md
@@ -0,0 +1,211 @@
+# Git Snapshot Startup Reshaping - 2026-05-27
+
+## What changed
+
+The sidebar PR badge no longer has a special per-row fetch path. It is derived from the workspace snapshot, the same way the sidebar already gets branch/diff metadata.
+
+```text
+daemon startup / workspace subscription
+  -> WorkspaceGitService.refreshSnapshot(cwd)
+    -> getCheckoutSnapshotFacts(cwd)
+    -> getCheckoutStatus(cwd, { facts })
+    -> getCheckoutShortstat(cwd, { facts })
+    -> getPullRequestStatus(cwd, github, ..., { facts })
+    -> WorkspaceGitRuntimeSnapshot
+  -> session workspace descriptor githubRuntime.pullRequest
+  -> app useSidebarWorkspacesList()
+  -> SidebarWorkspaceEntry.prHint
+  -> Sidebar row badge + hover card checks
+```
+
+The remaining `checkout_pr_status_request` path is still present for explicit PR surfaces and compatibility, but the sidebar row badge no longer calls `useWorkspacePrHint()` and therefore no longer generates ad hoc checkout PR status requests per visible row.
+
+## Shared Git Facts
+
+`getCheckoutSnapshotFacts()` is now the first git read in the workspace snapshot builder. It gathers facts that were previously rediscovered by separate functions:
+
+- worktree root: `rev-parse --show-toplevel`
+- current branch: `rev-parse --abbrev-ref HEAD`
+- origin remote URL
+- Paseo worktree ownership and stored base ref
+- resolved base ref and best comparison base
+- main repo root
+- branch remote/merge config
+- tracked origin branch
+- pull request lookup target for fork/PR worktrees
+
+Those facts are then passed through `CheckoutContext` so status, shortstat, and PR status reuse the same answers instead of independently re-reading them.
+
+## Current Data Flow
+
+```text
+Workspace subscription / fetch_workspaces
+  -> session workspace registry
+  -> workspaceGitService.getSnapshot(cwd, includeGitHub)
+     -> refresh queue/throttle/dedupe per normalized cwd
+     -> refreshGitSnapshot()
+        -> getCheckoutSnapshotFacts()
+        -> getCheckoutStatus({ facts })
+        -> getCheckoutShortstat({ facts })
+     -> refreshGitHubSnapshot()
+        -> getPullRequestStatus({ facts })
+     -> cached WorkspaceGitRuntimeSnapshot
+  -> WorkspaceDescriptorPayload.gitRuntime
+  -> WorkspaceDescriptorPayload.githubRuntime
+  -> app session store
+  -> useSidebarWorkspacesList()
+     -> diffStat from descriptor
+     -> prHint from descriptor.githubRuntime.pullRequest
+```
+
+## Startup Benchmark
+
+Added deterministic real-home benchmark:
+
+`packages/server/scripts/benchmark-startup-git-real-home.ts`
+
+The script freezes the current Paseo home using the same metadata-copy shape as `scripts/dev-home.sh`: JSON under `agents`, JSON under `projects`, and `config.json`. It then starts an isolated in-process daemon against that frozen home, subscribes to workspaces/agents, records git invocations through `runGitCommand`, and reports elapsed time, git count, max concurrency, CPU, and memory deltas.
+
+The frozen home used for the comparison contained 22 workspaces.
+
+### Before/After
+
+| run         | code shape                 | client shape                              | git commands | failures | elapsed |
+| ----------- | -------------------------- | ----------------------------------------- | -----------: | -------: | ------: |
+| baseline    | before change              | legacy sidebar PR fanout                  |          529 |       20 | 39039ms |
+| split check | after change               | legacy sidebar PR fanout                  |          375 |       15 | 39039ms |
+| after       | after change               | snapshot-only sidebar, no PR badge fanout |          372 |       15 | 31273ms |
+| after 2     | after service fact sharing | snapshot-only sidebar, no PR badge fanout |          308 |       15 | 31334ms |
+
+The server-side fact reuse accounts for nearly all measured git command reduction: `529 -> 375` (`-154`, `-29.1%`) even when the old PR fanout is still forced. Removing the sidebar fanout removes the ad hoc request path, but in this run it only changed command count by `3` because the refreshed workspace snapshots already carried the PR data by the time the fanout ran.
+
+The second pass shares checkout facts between workspace observation setup and snapshot refresh. That removes another `64` git commands from the same frozen-home run: `372 -> 308` (`-17.2%` from the previous after, `-41.8%` from baseline).
+
+### Baseline: before change + legacy PR fanout
+
+```json
+{
+  "scenario": "legacyPrFanout",
+  "workspaceCount": 22,
+  "elapsedMs": 39039,
+  "git": {
+    "total": 529,
+    "failed": 20,
+    "maxConcurrent": 8,
+    "byCommand": [
+      { "key": "show-ref --verify --quiet refs/heads/main", "count": 66 },
+      { "key": "rev-parse --git-common-dir", "count": 58 },
+      { "key": "rev-parse --abbrev-ref HEAD", "count": 50 },
+      { "key": "rev-parse --git-dir", "count": 36 },
+      { "key": "show-ref --verify --quiet refs/remotes/origin/main", "count": 35 },
+      { "key": "symbolic-ref --quiet refs/remotes/origin/HEAD", "count": 35 },
+      { "key": "config --get remote.origin.url", "count": 32 },
+      { "key": "ls-files --others --exclude-standard", "count": 18 },
+      { "key": "rev-parse --absolute-git-dir", "count": 18 },
+      { "key": "merge-base HEAD origin/main", "count": 17 },
+      { "key": "rev-parse --show-toplevel", "count": 14 },
+      { "key": "status --porcelain", "count": 14 }
+    ]
+  },
+  "process": {
+    "cpuUserMs": 2009,
+    "cpuSystemMs": 2428,
+    "rssDeltaMb": -1.5,
+    "heapUsedDeltaMb": 16.9
+  }
+}
+```
+
+### After: after change + snapshot-only sidebar
+
+```json
+{
+  "scenario": "snapshotOnly",
+  "workspaceCount": 22,
+  "elapsedMs": 31273,
+  "git": {
+    "total": 372,
+    "failed": 15,
+    "maxConcurrent": 8,
+    "byCommand": [
+      { "key": "config --get remote.origin.url", "count": 35 },
+      { "key": "show-ref --verify --quiet refs/heads/main", "count": 34 },
+      { "key": "rev-parse --git-common-dir", "count": 31 },
+      { "key": "show-ref --verify --quiet refs/remotes/origin/main", "count": 22 },
+      { "key": "status --porcelain", "count": 22 },
+      { "key": "ls-files --others --exclude-standard", "count": 18 },
+      { "key": "rev-parse --absolute-git-dir", "count": 18 },
+      { "key": "merge-base HEAD origin/main", "count": 17 },
+      { "key": "rev-parse --abbrev-ref HEAD", "count": 17 },
+      { "key": "rev-parse --show-toplevel", "count": 17 },
+      { "key": "symbolic-ref --quiet refs/remotes/origin/HEAD", "count": 17 },
+      { "key": "rev-list --count main..origin/main", "count": 7 }
+    ]
+  },
+  "process": {
+    "cpuUserMs": 1871,
+    "cpuSystemMs": 2152,
+    "rssDeltaMb": 4.4,
+    "heapUsedDeltaMb": 8.8
+  }
+}
+```
+
+### After 2: shared service-level facts
+
+```json
+{
+  "scenario": "snapshotOnly",
+  "workspaceCount": 22,
+  "elapsedMs": 31334,
+  "git": {
+    "total": 308,
+    "failed": 15,
+    "maxConcurrent": 8,
+    "byCommand": [
+      { "key": "show-ref --verify --quiet refs/heads/main", "count": 31 },
+      { "key": "rev-parse --git-common-dir", "count": 26 },
+      { "key": "show-ref --verify --quiet refs/remotes/origin/main", "count": 22 },
+      { "key": "ls-files --others --exclude-standard", "count": 18 },
+      { "key": "status --porcelain", "count": 18 },
+      { "key": "merge-base HEAD origin/main", "count": 17 },
+      { "key": "config --get remote.origin.url", "count": 13 },
+      { "key": "rev-parse --abbrev-ref HEAD", "count": 13 },
+      { "key": "rev-parse --absolute-git-dir", "count": 13 },
+      { "key": "rev-parse --show-toplevel", "count": 13 },
+      { "key": "symbolic-ref --quiet refs/remotes/origin/HEAD", "count": 13 },
+      { "key": "fetch origin --prune", "count": 5 }
+    ]
+  },
+  "process": {
+    "cpuUserMs": 1817,
+    "cpuSystemMs": 1869,
+    "rssDeltaMb": 16.7,
+    "heapUsedDeltaMb": 10.4
+  }
+}
+```
+
+## Snapshot Equivalence Guard
+
+Added a focused utility test proving that status, shortstat, and PR status return the same data when run from shared snapshot facts. The same test records git calls and asserts the facts-backed path does not re-run:
+
+- `rev-parse --show-toplevel`
+- `rev-parse --abbrev-ref HEAD`
+
+Test:
+
+`packages/server/src/utils/checkout-git.test.ts` -> `reuses checkout snapshot facts across status, shortstat, and PR status reads`
+
+## Remaining Waste Visible In Baseline
+
+This pass reshaped the data flow and removed the sidebar PR badge special path. It did not try to optimize every command.
+
+The benchmark still shows repeated per-workspace reads that are candidates for the next pass:
+
+- base ref existence checks still repeat as `show-ref` probes.
+- default branch resolution still repeats `symbolic-ref refs/remotes/origin/HEAD`.
+- repo common-dir lookup is lower, but still above the apparent git workspace count.
+- shortstat still runs its own merge-base/diff/untracked scan per workspace.
+
+The important invariant now is clearer: sidebar-visible git data should flow from `WorkspaceGitService` snapshots, and snapshot builders should receive reusable git facts through `CheckoutContext`.
--- a/docs/diagnostics/opencode-provider-snapshot-timeout-2026-05-27.md
+++ b/docs/diagnostics/opencode-provider-snapshot-timeout-2026-05-27.md
@@ -0,0 +1,389 @@
+# OpenCode Provider Snapshot Startup Timeout Diagnosis - 2026-05-27
+
+## Answer
+
+The startup timeout is real OpenCode provider snapshot work, not an agent resume path.
+
+In the dev-style copied-home reproduction, the OpenCode snapshot misses the 30s budget because several expensive things stack:
+
+1. Paseo starts from a copied `PASEO_HOME` containing 4,851 agent records.
+2. Clients ask for provider snapshots for three cwd scopes at almost the same time:
+   - `/Users/moboudra`
+   - `/Users/moboudra/dev/paseo`
+   - `/Users/moboudra/dev/blankpage/editor`
+3. Each OpenCode snapshot runs two OpenCode SDK calls:
+   - `GET /provider?directory=...` through `client.provider.list()`
+   - `GET /agent?directory=...` through `client.app.agents()`
+4. One cold `opencode serve` process is shared by the three cwd scopes. It took 8.562s to become ready.
+5. After OpenCode was listening, Paseo issued six OpenCode HTTP calls concurrently.
+6. The OpenCode `/provider` responses are large: about 3,549,620 decompressed bytes per cwd.
+7. During the same window, the daemon was still doing heavy startup workspace git work. In the exact 18:14:19-18:14:43 window, the daemon log has 292 git spawn/close events.
+8. The `/provider` calls eventually succeeded, but too late: they completed about 32.2s-32.5s after the snapshot fetch started, while the snapshot timeout is 30s.
+
+So the root cause is:
+
+```text
+Cold OpenCode server startup + three concurrent cwd snapshots + large OpenCode /provider responses + daemon startup git contention causes client.provider.list() to complete after Paseo's 30s snapshot budget.
+```
+
+More precise wording: the contention is machine-level process/CPU/filesystem contention created by daemon startup work, especially git work. It is not proven to be an OpenCode internal lock or a Paseo-only event-loop issue. A daemon-free repro with only OpenCode plus an external git storm slowed the same six OpenCode calls from about 1s to about 30s total.
+
+Manual settings refresh works because it runs after startup contention is gone and uses `force: true`, which creates fresh OpenCode runtime/server state. The same OpenCode provider refreshes then complete in about 1.7s-2.2s.
+
+The daemon does not auto-retry error snapshots. A failed provider snapshot is cached as `status: "error"` until an explicit refresh resets it to loading.
+
+## Follow-up: Normal Copied-Home Startup Check
+
+I later reran a normal dev-daemon startup against a fresh copy of the same Paseo home metadata and drove the app startup request path:
+
+```text
+fetchWorkspaces
+fetchAgents
+getProvidersSnapshot(home scope)
+getProvidersSnapshot(first workspace scope)
+```
+
+That run did not reproduce the 30s OpenCode timeout.
+
+```text
+home scope:
+  OpenCode ready at ~8s
+  availability: 1.6s
+  fetch total: 5.2s
+
+first workspace scope:
+  OpenCode ready at ~26s
+  availability: 2.0s
+  fetch total: 15.4s
+```
+
+The slowest OpenCode operation in that successful run was the workspace-scoped `/provider` response body read: `13.6s`. The daemon log had no `Timed out refreshing OpenCode` entry and no OpenCode provider snapshot failure.
+
+This means the timeout is reproducible under the heavier multi-scope startup contention captured below, but it is not guaranteed on every copied-home dev startup.
+
+## Reproduction Used
+
+The user's correction was right: the useful reproduction is not a random isolated home. It must match `dev.sh` worktree behavior.
+
+Relevant scripts:
+
+- `scripts/dev.sh`
+- `scripts/dev-daemon.sh`
+- `scripts/dev-home.sh`
+
+`dev-home.sh` only seeds this metadata into the dev home:
+
+```text
+agents/**/*.json
+projects/**/*.json
+config.json
+```
+
+It does not copy `chat`, `loops`, `schedules`, sockets, pid files, logs, or worktree contents.
+
+I ran a separate daemon, not the main daemon:
+
+```text
+PASEO_HOME=/var/folders/xl/kkk9drfd3ms_t8x7rmy4z6900000gn/T/paseo-devseed.Wms6pi
+PASEO_LISTEN=127.0.0.1:51116
+PASEO_LOG_LEVEL=trace
+```
+
+Startup facts:
+
+```text
+18:13:39.552 Agent storage initialized: 712ms
+18:13:39.559 Workspace registries bootstrapped: 719ms
+18:13:39.961 Agent registry loaded: 4851 records
+18:13:39.972 Server listening: http://127.0.0.1:51116
+```
+
+The probe then connected four client sessions and requested:
+
+- workspaces
+- active agents
+- provider snapshots for home, paseo, and blankpage/editor
+
+Client-visible result:
+
+```text
+18:14:30.263 /Users/moboudra/dev/blankpage/editor opencode error:
+  OpenCode app.agents timed out after 10s
+
+18:14:41.687 /Users/moboudra/dev/paseo opencode error:
+  Timed out refreshing OpenCode after 30000ms
+
+18:14:41.688 /Users/moboudra opencode error:
+  Timed out refreshing OpenCode after 30000ms
+```
+
+## Exact OpenCode Timeline
+
+OpenCode snapshot requests began at `18:14:10`.
+
+Availability checks:
+
+```text
+18:14:10.780 opencode availability start for /Users/moboudra
+18:14:10.787 opencode availability start for /Users/moboudra/dev/paseo
+18:14:10.800 opencode availability start for /Users/moboudra/dev/blankpage/editor
+
+18:14:11.363 paseo availability complete: 576ms
+18:14:11.376 home availability complete: 597ms
+18:14:11.391 blankpage availability complete: 591ms
+```
+
+OpenCode server acquisition:
+
+```text
+18:14:11.364 OpenCode server spawn start: opencode serve --port 56376
+18:14:19.926 OpenCode server listening after 8562ms
+```
+
+Six SDK calls were then issued:
+
+```text
+18:14:19.931 GET /provider directory=/Users/moboudra/dev/paseo
+18:14:19.931 GET /agent    directory=/Users/moboudra/dev/paseo
+18:14:19.931 GET /provider directory=/Users/moboudra
+18:14:19.931 GET /agent    directory=/Users/moboudra
+18:14:19.931 GET /provider directory=/Users/moboudra/dev/blankpage/editor
+18:14:19.936 GET /agent    directory=/Users/moboudra/dev/blankpage/editor
+```
+
+Why six:
+
+| Cwd                                    | Why that scope exists                                      | Model call                              | Mode call                         |
+| -------------------------------------- | ---------------------------------------------------------- | --------------------------------------- | --------------------------------- |
+| `/Users/moboudra`                      | home/settings provider snapshot                            | `client.provider.list()` -> `/provider` | `client.app.agents()` -> `/agent` |
+| `/Users/moboudra/dev/paseo`            | workspace-scoped provider snapshot for the Paseo workspace | `client.provider.list()` -> `/provider` | `client.app.agents()` -> `/agent` |
+| `/Users/moboudra/dev/blankpage/editor` | workspace/agent cwd snapshot for blankpage/editor          | `client.provider.list()` -> `/provider` | `client.app.agents()` -> `/agent` |
+
+Multiple clients can request the same snapshot scope during startup, but non-forced provider loads are deduped by `(cwd, provider)`. Different cwd scopes are separate loads. Three cwd scopes times two OpenCode SDK calls each is the six OpenCode calls in this repro.
+
+Headers arrived before the 30s timeout:
+
+| Call        | Cwd                             | Headers after request |
+| ----------- | ------------------------------- | --------------------- |
+| `/provider` | `/Users/moboudra`               | 6.462s                |
+| `/agent`    | `/Users/moboudra`               | 6.681s                |
+| `/agent`    | `/Users/moboudra/dev/paseo`     | 6.681s                |
+| `/provider` | `/Users/moboudra/dev/paseo`     | 8.192s                |
+| `/provider` | `/Users/moboudra/dev/blankpage` | 8.654s                |
+| `/agent`    | `/Users/moboudra/dev/blankpage` | 8.649s                |
+
+But body consumption and completion lagged:
+
+```text
+18:14:29.380 /agent home complete, total app.agents duration 9450ms
+18:14:29.813 /agent paseo complete, total app.agents duration 9883ms
+18:14:30.263 /agent blankpage timed out at 10s
+18:14:31.332 /agent blankpage body finally finished, after the 10s app.agents timeout
+
+18:14:41.687 paseo snapshot outer 30s timeout fires
+18:14:41.688 home snapshot outer 30s timeout fires
+
+18:14:43.593 /provider home completes, provider.list duration 23664ms, total listModels 32218ms
+18:14:43.798 /provider blankpage completes, provider.list duration 23868ms, total listModels 32411ms
+18:14:43.839 /provider paseo completes, provider.list duration 23911ms, total listModels 32476ms
+```
+
+The useful `/provider` results arrived about 1.9s-2.2s after the snapshot manager had already marked home and paseo as failed.
+
+## Why Settings Refresh Works
+
+After the daemon settled, I ran the same refresh path through the daemon on port `51116`, using `refreshProvidersSnapshot({ providers: ["opencode"] })`.
+
+Results:
+
+```text
+home refresh:
+  total: 2165ms
+  status: ready
+  models: 409
+  modes: 5
+
+/Users/moboudra/dev/paseo refresh:
+  total: 1675ms
+  status: ready
+  models: 409
+  modes: 5
+
+/Users/moboudra/dev/blankpage/editor refresh:
+  total: 1794ms
+  status: ready
+  models: 409
+  modes: 5
+```
+
+Trace details for the manual-style refresh:
+
+```text
+OpenCode server acquisition: 708ms-1291ms
+/agent completion: 433ms-592ms after request start
+/provider completion: 524ms-618ms after request start
+```
+
+That proves the startup failure is not bad credentials, not a permanently wedged OpenCode install, and not OpenCode generally taking more than 30s. It is startup timing and contention.
+
+## Minimal OpenCode-Only Repros
+
+### OpenCode Only, No Daemon, No Artificial Load
+
+I started a fresh `opencode serve`, waited for stdout `listening on`, then issued the same six HTTP calls concurrently:
+
+```text
+GET /provider?directory=/Users/moboudra
+GET /agent?directory=/Users/moboudra
+GET /provider?directory=/Users/moboudra/dev/paseo
+GET /agent?directory=/Users/moboudra/dev/paseo
+GET /provider?directory=/Users/moboudra/dev/blankpage/editor
+GET /agent?directory=/Users/moboudra/dev/blankpage/editor
+```
+
+Three runs:
+
+| Run | `opencode serve` ready | All six calls complete |
+| --- | ---------------------- | ---------------------- |
+| 1   | 1376ms                 | 1295ms                 |
+| 2   | 906ms                  | 1050ms                 |
+| 3   | 939ms                  | 898ms                  |
+
+Slowest individual call in those runs:
+
+```text
+/provider /Users/moboudra/dev/paseo: 1270ms total
+/agent /Users/moboudra/dev/blankpage/editor: 1251ms total
+```
+
+So six concurrent OpenCode calls alone are not the bug.
+
+### OpenCode Only Plus External Git Storm, No Daemon
+
+I then ran the same OpenCode-only six-call test while an external shell spawned repeated git commands across the same real workspaces/worktrees. This did not use the Paseo daemon.
+
+Result:
+
+```text
+opencode serve ready: 15479ms
+all six OpenCode calls complete: 15176ms after server ready
+combined cold-start + calls: about 30655ms
+```
+
+Individual calls under the external git storm:
+
+| Call        | Cwd                                    |   Total |
+| ----------- | -------------------------------------- | ------: |
+| `/provider` | `/Users/moboudra`                      | 10684ms |
+| `/agent`    | `/Users/moboudra`                      | 10767ms |
+| `/provider` | `/Users/moboudra/dev/paseo`            | 13220ms |
+| `/agent`    | `/Users/moboudra/dev/paseo`            | 13147ms |
+| `/provider` | `/Users/moboudra/dev/blankpage/editor` | 14675ms |
+| `/agent`    | `/Users/moboudra/dev/blankpage/editor` | 15038ms |
+
+This is the daemon-free minimal evidence that process/filesystem contention can push the same OpenCode cold-start + six-call workload to the same 30s boundary.
+
+## Why It Does Not Retry
+
+`ProviderSnapshotManager.getSnapshot()` only starts background warmup for:
+
+- no existing snapshot
+- missing providers
+- entries still in `loading` with no active load
+
+When refresh fails, `refreshProvider()` stores:
+
+```text
+status: "error"
+error: "Timed out refreshing OpenCode after 30000ms"
+```
+
+An `error` entry is not treated as stale/loading by `getSnapshot()`, so normal reads keep returning the cached error.
+
+Settings refresh calls `refresh_providers_snapshot_request`, which routes to:
+
+```text
+refreshSettingsSnapshot()
+clearCachedProviders()
+resetSnapshotToLoading()
+refreshProviders(... force: true)
+```
+
+That is why you have to force a manual refresh.
+
+## Git Work During The Repro
+
+This is not the final optimization report, but it matters for the timeout because it overlaps exactly with OpenCode response handling.
+
+Total git commands in the dev-style copied-home daemon log:
+
+```text
+632 spawned
+632 closed
+```
+
+Top cwd counts:
+
+| Count | Cwd                                                                                   |
+| ----: | ------------------------------------------------------------------------------------- |
+|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/merry-ladybug`                             |
+|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/hopeful-eel`                               |
+|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/fix-compaction-cancel-loading`             |
+|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/fix-archive-worktree-session-history`      |
+|    44 | `/Users/moboudra/.paseo/worktrees/0vpo9h4b/breezy-toad`                               |
+|    36 | `/Users/moboudra/.paseo/worktrees/steering-policy-refactor-detached`                  |
+|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/integration-session-mcp-command-stack`     |
+|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/fix-provider-diagnostic-binary-resolution` |
+|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/feat-voice-runtime-on-demand`              |
+|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/feat-find-in-pane`                         |
+|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/epic-paseo-client-sdk`                     |
+|    24 | `/Users/moboudra/dev/paseo`                                                           |
+|    24 | `/Users/moboudra/dev/blankpage/editor`                                                |
+|    24 | `/Users/moboudra/dev/faro/main`                                                       |
+|    24 | `/Users/moboudra/dev/konbert/web`                                                     |
+|    24 | `/Users/moboudra/dev/paseo-cloud`                                                     |
+
+In the exact OpenCode pressure window, `18:14:19` through `18:14:43`, there were:
+
+```text
+142 git command spawns
+150 git command closes
+```
+
+The main repeated command shapes were:
+
+```text
+76  git rev-parse --show-toplevel
+72  git status --porcelain
+72  git show-ref --verify --quiet refs/remotes/origin/main
+72  git show-ref --verify --quiet refs/heads/main
+16  git config --get branch.main.remote
+16  git config --get branch.main.merge
+16  git rev-list --count main..origin/main
+16  git rev-list --count origin/main..main
+```
+
+## Original `log.txt` Alignment
+
+The original startup showed the same home and paseo outer timeout shape:
+
+```text
+16:04:22.466 /Users/moboudra/dev/paseo:
+  Timed out refreshing OpenCode after 30000ms
+
+16:04:22.482 /Users/moboudra:
+  Timed out refreshing OpenCode after 30000ms
+```
+
+The original logs did not include SDK fetch/header/body timing, so they could only show the wrapper-level timeout. The dev-style copied-home reproduction with instrumentation now shows the missing link: the `/provider` calls completed just after the 30s snapshot budget.
+
+## Files Instrumented For Diagnosis
+
+Temporary trace instrumentation was added to:
+
+- `packages/server/src/server/agent/provider-snapshot-manager.ts`
+- `packages/server/src/server/agent/providers/opencode-agent.ts`
+- `packages/server/src/server/agent/providers/opencode/runtime.ts`
+- `packages/server/src/server/agent/providers/opencode/server-manager.ts`
+
+The instrumentation is behavior-neutral and only emits trace logs.
--- a/docs/diagnostics/startup-sequence-analysis-2026-05-27.md
+++ b/docs/diagnostics/startup-sequence-analysis-2026-05-27.md
@@ -0,0 +1,381 @@
+# Daemon Startup Sequence Analysis - 2026-05-27
+
+Source log: `log.txt` at repository root.
+
+Scope: current sliced startup log, starting at daemon worker startup and ending after workspace registry reconciliation and the first OpenCode heartbeat.
+
+This report is descriptive only. It does not propose optimizations.
+
+## Executive Summary
+
+The daemon becomes ready quickly, then does a heavy post-listen startup pass driven by reconnecting clients and workspace/app hydration.
+
+- Worker start: `16:03:46.678`, line 1.
+- Server listening: `16:03:48.285`, line 47, elapsed `602ms`.
+- First client hello: `16:03:50.285`, line 66.
+- Workspace registries reconciled: `16:04:33.666`, line 1777, elapsed `45983ms`.
+
+The startup shape is therefore:
+
+- Daemon listen readiness: about `0.6s`.
+- Client reconnect plus workspace/app/provider hydration: about `45s`.
+- No git commands after workspace registry reconciliation in this slice.
+
+## Method
+
+I parsed structured trace lines from `log.txt`, especially:
+
+- `Git command closed`
+- `agent.session.inbound`
+- `agent.session.outbound`
+- `ws_slow_request`
+- provider snapshot warnings
+- provider resume events
+
+Important limitation: git command logs do not carry a websocket request id, so per-request attribution is inferred from timing and server code paths. Per-workspace git counts, command shapes, durations, and failures are exact for this log.
+
+Relevant code paths checked:
+
+- `packages/server/src/server/session.ts`
+  - `fetch_workspaces_request` calls `syncWorkspaceGitObservers(payload.entries)`.
+  - `checkout_status_request` calls `workspaceGitService.getSnapshot(resolvedCwd)`.
+  - `checkout_pr_status_request` calls `workspaceGitService.getSnapshot(cwd)`.
+- `packages/server/src/server/workspace-git-service.ts`
+  - checkout snapshot/root resolution uses `git rev-parse --show-toplevel`.
+  - snapshot refresh collects dirty state, upstream/ahead/behind, ref existence, and base divergence.
+- `packages/app/src/contexts/session-context.tsx`
+  - initial workspace hydration calls `client.fetchWorkspaces({ sort: activity_at desc, subscribe, page limit 200 })`.
+- `packages/app/src/hooks/use-sidebar-workspaces-list.ts`
+  - sidebar workspace refresh also calls `client.fetchWorkspaces({ sort: activity_at desc, page limit 200 })`.
+
+## Startup Timeline
+
+| time           | line | event                                                              |
+| -------------- | ---: | ------------------------------------------------------------------ |
+| `16:03:46.678` |    1 | `DaemonRunner` starts daemon worker                                |
+| `16:03:47.683` |    4 | worker spawned                                                     |
+| `16:03:47.684` |    6 | daemon keypair loaded                                              |
+| `16:03:48.281` |   44 | bootstrap complete, ready to listen                                |
+| `16:03:48.285` |   47 | server listening on `0.0.0.0:6767`                                 |
+| `16:03:50.274` |   60 | first websocket awaiting hello                                     |
+| `16:03:50.285` |   66 | first client connected via hello                                   |
+| `16:04:22.466` |  987 | OpenCode provider snapshot timeout for `/Users/moboudra/dev/paseo` |
+| `16:04:22.482` | 1002 | OpenCode provider snapshot timeout for `/Users/moboudra`           |
+| `16:04:24.183` | 1201 | OpenCode provider subscribe starts                                 |
+| `16:04:24.183` | 1202 | OpenCode provider subscribe ready                                  |
+| `16:04:24.306` | 1214 | OpenCode server connected event                                    |
+| `16:04:25.933` | 1321 | OpenCode agent resumed from persistence                            |
+| `16:04:33.666` | 1777 | workspace registries reconciled                                    |
+| `16:04:34.197` | 1783 | OpenCode heartbeat                                                 |
+| `16:04:44.200` | 1789 | OpenCode heartbeat                                                 |
+
+## Git Command Totals
+
+Total git commands in the sliced startup: `444`.
+
+| phase                           | commands | failures | summed process time |
+| ------------------------------- | -------: | -------: | ------------------: |
+| daemon bootstrap before listen  |       13 |        4 |               445ms |
+| post-listen before first client |        1 |        0 |              2020ms |
+| client reconnect + reconcile    |      430 |       71 |            120813ms |
+| after reconcile                 |        0 |        0 |                 0ms |
+| total                           |      444 |       75 |            123278ms |
+
+Summed process time is not wall-clock time. Many commands overlap.
+
+## Git Command Categories
+
+| category                                             | commands | failures | summed process time | max duration |
+| ---------------------------------------------------- | -------: | -------: | ------------------: | -----------: |
+| ahead/behind: `rev-list --count ...`                 |      115 |       30 |             35815ms |       1557ms |
+| refs: `show-ref --verify --quiet ...`                |       86 |        2 |             14680ms |       1303ms |
+| upstream config: `config --get branch.*`             |       85 |       13 |             26437ms |       1624ms |
+| root detection: `rev-parse --show-toplevel`          |       80 |       30 |             24164ms |       1426ms |
+| dirty status: `status --porcelain`                   |       50 |        0 |             12670ms |       2020ms |
+| base divergence: `rev-list --left-right --count ...` |       28 |        0 |              9512ms |       1085ms |
+
+What those categories mean in the app:
+
+- Root detection: determine whether a cwd is inside a git repo and find its checkout root.
+- Dirty status: show dirty/clean workspace state.
+- Upstream config and ahead/behind: show branch tracking and sync state.
+- Ref existence and base divergence: compare checkout branch against candidate base refs for checkout/PR status.
+
+## Per-Workspace Git Work
+
+Columns:
+
+- `phase`: `pre/warm/reconnect/after`
+- `cats`: `root/dirty/upstream/ahead/refs/base/other`
+- `total_ms`: summed process time for that workspace
+
+| workspace                                                               | cmds | fail | phase      | cats              | total_ms | max_ms | window                      | failing command shapes                                                                                                                                                                                                                                                                        |
+| ----------------------------------------------------------------------- | ---: | ---: | ---------- | ----------------- | -------: | -----: | --------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `~/.paseo/worktrees/1luy0po7/fix-compaction-cancel-loading`             |   33 |    9 | `0/0/33/0` | `3/3/3/9/12/3/0`  |     8255 |   1460 | `16:03:52.908-16:04:24.019` | `3x config --get branch.fix-compaction-cancel-loading.remote`; `3x rev-list --count fix-compaction-cancel-loading..origin/fix-compaction-cancel-loading`; `3x rev-list --count origin/fix-compaction-cancel-loading..fix-compaction-cancel-loading`                                           |
+| `~/.paseo/worktrees/1luy0po7/hopeful-eel`                               |   33 |    9 | `0/0/33/0` | `3/3/3/9/12/3/0`  |     8468 |   1544 | `16:03:53.245-16:04:27.334` | `3x config --get branch.feat/markdown-annotations.remote`; `3x rev-list --count feat/markdown-annotations..origin/feat/markdown-annotations`; `3x rev-list --count origin/feat/markdown-annotations..feat/markdown-annotations`                                                               |
+| `~/.paseo/worktrees/1luy0po7/merry-ladybug`                             |   33 |    9 | `0/0/33/0` | `3/3/3/9/12/3/0`  |     7154 |   1099 | `16:03:53.696-16:04:29.644` | `3x config --get branch.feat/mcp-configuration.remote`; `3x rev-list --count feat/mcp-configuration..origin/feat/mcp-configuration`; `3x rev-list --count origin/feat/mcp-configuration..feat/mcp-configuration`                                                                              |
+| `~/dev/paseo`                                                           |   30 |    0 | `2/0/28/0` | `5/5/10/10/0/0/0` |     7457 |   1624 | `16:03:48.171-16:04:27.284` |                                                                                                                                                                                                                                                                                               |
+| `~/.paseo/worktrees/0vpo9h4b/dazzling-duck`                             |   27 |    0 | `0/0/27/0` | `3/3/6/6/6/3/0`   |     7617 |   1269 | `16:03:51.918-16:04:23.971` |                                                                                                                                                                                                                                                                                               |
+| `~/.paseo/worktrees/1luy0po7/epic-paseo-client-sdk`                     |   27 |    0 | `0/0/27/0` | `3/3/6/6/6/3/0`   |     7428 |   1426 | `16:03:52.445-16:04:23.991` |                                                                                                                                                                                                                                                                                               |
+| `~/.paseo/worktrees/1luy0po7/fix-provider-diagnostic-binary-resolution` |   27 |    0 | `0/0/27/0` | `3/3/6/6/6/3/0`   |     7764 |   1091 | `16:03:52.681-16:04:23.971` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/emdash`                                                          |   22 |    6 | `0/0/22/0` | `2/2/2/6/8/2/0`   |     3031 |    453 | `16:04:27.351-16:04:29.583` | `2x config --get branch.heads/main.remote`; `2x rev-list --count heads/main..origin/heads/main`; `2x rev-list --count origin/heads/main..heads/main`                                                                                                                                          |
+| `~/dev/opencode`                                                        |   22 |    4 | `0/0/22/0` | `2/2/2/6/8/2/0`   |     2279 |    313 | `16:04:24.058-16:04:24.970` | `2x rev-list --count ecosystem-paseo..origin/ecosystem-paseo`; `2x rev-list --count origin/ecosystem-paseo..ecosystem-paseo`                                                                                                                                                                  |
+| `~/.paseo/worktrees/1luy0po7/integration-session-mcp-command-stack`     |   18 |    0 | `0/0/18/0` | `3/3/6/6/0/0/0`   |     7467 |   1242 | `16:03:53.781-16:04:23.971` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/blankpage/editor`                                                |   18 |    0 | `2/0/16/0` | `3/3/6/6/0/0/0`   |     2418 |    520 | `16:03:48.174-16:04:26.411` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/konbert/web`                                                     |   18 |    0 | `1/1/16/0` | `3/3/6/6/0/0/0`   |     7324 |   2020 | `16:03:48.190-16:04:23.685` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/openchamber`                                                     |   12 |    0 | `0/0/12/0` | `2/2/4/4/0/0/0`   |     1554 |    336 | `16:04:27.399-16:04:29.616` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/superset`                                                        |   12 |    0 | `0/0/12/0` | `2/2/4/4/0/0/0`   |     1019 |    215 | `16:04:27.341-16:04:29.617` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/t3code`                                                          |   12 |    0 | `0/0/12/0` | `2/2/4/4/0/0/0`   |     2761 |    588 | `16:04:27.356-16:04:29.603` |                                                                                                                                                                                                                                                                                               |
+| `~/.paseo/worktrees/0vpo9h4b/breezy-toad`                               |   11 |    5 | `0/0/11/0` | `1/1/1/3/4/1/0`   |     6465 |   1290 | `16:03:51.307-16:04:18.112` | `1x config --get branch.fix/user-delete-dark-mode.remote`; `1x rev-list --count fix/user-delete-dark-mode..origin/fix/user-delete-dark-mode`; `1x rev-list --count origin/fix/user-delete-dark-mode..fix/user-delete-dark-mode`; `2x show-ref --verify --quiet refs/remotes/origin/my-branch` |
+| `~/.paseo/worktrees/1luy0po7/fix-archive-worktree-session-history`      |   11 |    3 | `0/0/11/0` | `1/1/1/3/4/1/0`   |     4303 |    757 | `16:03:52.539-16:04:19.011` | `1x config --get branch.fix-archive-worktree-session-history.remote`; `1x rev-list --count fix-archive-worktree-session-history..origin/fix-archive-worktree-session-history`; `1x rev-list --count origin/fix-archive-worktree-session-history..fix-archive-worktree-session-history`        |
+| `~/.paseo/worktrees/0vpo9h4b/codex-github-mention-implement-db-garbage` |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     4986 |   1005 | `16:03:51.261-16:04:16.878` |                                                                                                                                                                                                                                                                                               |
+| `~/.paseo/worktrees/1luy0po7/feat-find-in-pane`                         |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     5273 |   1130 | `16:03:52.391-16:04:17.682` |                                                                                                                                                                                                                                                                                               |
+| `~/.paseo/worktrees/1luy0po7/feat-voice-runtime-on-demand`              |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     5176 |    839 | `16:03:52.110-16:04:18.254` |                                                                                                                                                                                                                                                                                               |
+| `~/.paseo/worktrees/steering-policy-refactor-detached`                  |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     5993 |   1243 | `16:03:53.984-16:04:17.673` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/faro/main`                                                       |    6 |    0 | `2/0/4/0`  | `1/1/2/2/0/0/0`   |     4964 |   1603 | `16:03:48.168-16:04:03.748` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/paseo-cloud`                                                     |    6 |    0 | `2/0/4/0`  | `1/1/2/2/0/0/0`   |     2123 |   1154 | `16:03:48.159-16:03:56.377` |                                                                                                                                                                                                                                                                                               |
+| `~/dev/assistant`                                                       |    3 |    3 | `1/0/2/0`  | `3/0/0/0/0/0/0`   |       85 |     29 | `16:03:48.165-16:04:24.048` | `3x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/review`                           |    3 |    3 | `1/0/2/0`  | `3/0/0/0/0/0/0`   |      224 |    105 | `16:03:48.197-16:04:26.560` | `3x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/research/orchestrator-worker`                                    |    3 |    3 | `1/0/2/0`  | `3/0/0/0/0/0/0`   |      285 |    144 | `16:03:48.194-16:04:26.575` | `3x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `/tmp`                                                                  |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      113 |     77 | `16:04:27.388-16:04:27.471` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev`                                                                 |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       86 |     58 | `16:04:27.384-16:04:27.457` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/01-claude-opus`                   |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      216 |    185 | `16:04:26.525-16:04:26.543` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/02-codex-gpt55`                   |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       98 |     68 | `16:04:26.353-16:04:26.554` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/03-opencode-zai-glm51`            |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      209 |    158 | `16:04:26.512-16:04:26.576` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/04-opencode-zen-minimax27`        |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      148 |    101 | `16:04:26.431-16:04:26.549` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/05-opencode-zen-kimi26`           |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      231 |    172 | `16:04:26.517-16:04:26.577` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/06-opencode-or-deepseek4pro`      |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       93 |     73 | `16:04:27.365-16:04:27.380` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/07-opencode-zen-gemini35flash`    |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       78 |     66 | `16:04:27.363-16:04:27.375` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/benchmark/dashboard-2026-05-25/08-opencode-zen-gpt55`            |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      120 |     65 | `16:04:27.359-16:04:27.430` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+| `~/dev/assistant/game`                                                  |    1 |    1 | `1/0/0/0`  | `1/0/0/0/0/0/0`   |       13 |     13 | `16:03:48.155-16:03:48.155` | `1x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
+
+## Git Failure Shape
+
+There were 75 nonzero git exits.
+
+Most failures were not timeouts. They were expected probe failures:
+
+- Non-repo checks: `rev-parse --show-toplevel` fails for paths that are not git repositories.
+- Missing upstream config: `config --get branch.<branch>.remote` fails for branches without configured upstream.
+- Missing remote branch graph: `rev-list --count <branch>..origin/<branch>` fails when the remote branch/ref does not exist.
+- Missing ref checks: `show-ref --verify --quiet refs/remotes/origin/my-branch` fails when a candidate ref does not exist.
+
+The `~/dev/opencode` git failures are branch graph probes for `ecosystem-paseo` versus `origin/ecosystem-paseo`, not OpenCode provider startup failures.
+
+## Inbound Client Work
+
+Inbound session messages during the startup window:
+
+| request                           | count |
+| --------------------------------- | ----: |
+| `client_heartbeat`                |    19 |
+| `checkout_pr_status_request`      |    18 |
+| `fetch_agents_request`            |    11 |
+| `fetch_workspaces_request`        |     9 |
+| `get_providers_snapshot_request`  |     9 |
+| `project_icon_request`            |     9 |
+| `fetch_agent_timeline_request`    |     7 |
+| `clear_agent_attention`           |     6 |
+| `list_terminals_request`          |     5 |
+| `subscribe_terminals_request`     |     5 |
+| `list_available_editors_request`  |     2 |
+| `subscribe_checkout_diff_request` |     2 |
+| `checkout_status_request`         |     1 |
+| `fetch_agent_request`             |     1 |
+| `file_explorer_request`           |     1 |
+| `read_project_config_request`     |     1 |
+| `workspace_setup_status_request`  |     1 |
+
+Inbound by client:
+
+| client                                                      | count | top work                                                                                                                                                                                                           |
+| ----------------------------------------------------------- | ----: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Electron `cid_d555...`, origin `http://localhost:8082`      |    68 | `checkout_pr_status_request:18`, `project_icon_request:9`, `clear_agent_attention:6`, `fetch_agent_timeline_request:4`, `fetch_workspaces_request:3`, `fetch_agents_request:3`, `get_providers_snapshot_request:3` |
+| HeadlessChrome `cid_d39...`, origin `http://localhost:8081` |    13 | `client_heartbeat:4`, `fetch_workspaces_request:2`, `fetch_agents_request:2`, `get_providers_snapshot_request:2`                                                                                                   |
+| local web `cid_a2b...`, origin `http://localhost:6767`      |    13 | `client_heartbeat:4`, `fetch_workspaces_request:2`, `fetch_agents_request:2`, `get_providers_snapshot_request:2`                                                                                                   |
+| Android `cid_24c...`, origin `http://10.0.2.2:6767`         |    11 | `client_heartbeat:2`, `fetch_workspaces_request:2`, `fetch_agents_request:2`, `get_providers_snapshot_request:2`                                                                                                   |
+| `cid_70d...`, host `0.0.0.0:6767`                           |     2 | `fetch_agents_request:2`                                                                                                                                                                                           |
+
+## Outbound Client Work
+
+Outbound session messages during the startup window:
+
+| message                            | count |
+| ---------------------------------- | ----: |
+| `providers_snapshot_update`        |   129 |
+| `workspace_update`                 |    81 |
+| `checkout_status_update`           |    76 |
+| `agent_update`                     |    47 |
+| `checkout_pr_status_response`      |    18 |
+| `fetch_agents_response`            |    11 |
+| `fetch_workspaces_response`        |     9 |
+| `get_providers_snapshot_response`  |     9 |
+| `project_icon_response`            |     9 |
+| `fetch_agent_timeline_response`    |     7 |
+| `list_terminals_response`          |     5 |
+| `terminals_changed`                |     5 |
+| `list_available_editors_response`  |     2 |
+| `subscribe_checkout_diff_response` |     2 |
+| `checkout_status_response`         |     1 |
+| `fetch_agent_response`             |     1 |
+| `file_explorer_response`           |     1 |
+| `read_project_config_response`     |     1 |
+| `workspace_setup_status_response`  |     1 |
+
+Provider snapshot updates were large and repeated:
+
+- Around lines 982-986: five `providers_snapshot_update` messages, each `215932` bytes.
+- Around lines 997-1001: five `providers_snapshot_update` messages, each `215898` bytes.
+- Around lines 1250-1254: five `providers_snapshot_update` messages, each `414735` bytes.
+
+## Slow Requests
+
+Slow requests logged during startup:
+
+| time           |                           request | duration | client                | line |
+| -------------- | --------------------------------: | -------: | --------------------- | ---: |
+| `16:04:29.702` |    `fetch_agent_timeline_request` |  39372ms | HeadlessChrome        | 1767 |
+| `16:04:29.702` |    `fetch_agent_timeline_request` |  39212ms | Electron              | 1768 |
+| `16:04:29.702` |    `fetch_agent_timeline_request` |  38914ms | local web             | 1769 |
+| `16:04:33.665` |      `checkout_pr_status_request` |  20181ms | Electron              | 1776 |
+| `16:04:08.109` | `subscribe_checkout_diff_request` |  17618ms | Electron              |  565 |
+| `16:04:29.702` |    `fetch_agent_timeline_request` |  16216ms | Electron              | 1770 |
+| `16:04:06.624` |    `fetch_agent_timeline_request` |  16134ms | Electron              |  524 |
+| `16:04:29.396` |      `checkout_pr_status_request` |  15911ms | Electron              | 1671 |
+| `16:04:29.256` |      `checkout_pr_status_request` |  15772ms | Electron              | 1651 |
+| `16:04:29.149` |      `checkout_pr_status_request` |  15665ms | Electron              | 1638 |
+| `16:04:29.054` |      `checkout_pr_status_request` |  15569ms | Electron              | 1628 |
+| `16:04:28.932` |      `checkout_pr_status_request` |  15448ms | Electron              | 1611 |
+| `16:04:28.809` |      `checkout_pr_status_request` |  15324ms | Electron              | 1601 |
+| `16:04:28.672` |      `checkout_pr_status_request` |  15188ms | Electron              | 1582 |
+| `16:04:28.555` |      `checkout_pr_status_request` |  15071ms | Electron              | 1567 |
+| `16:04:28.421` |      `checkout_pr_status_request` |  14936ms | Electron              | 1556 |
+| `16:04:28.323` |      `checkout_pr_status_request` |  14839ms | Electron              | 1549 |
+| `16:04:28.324` |         `checkout_status_request` |  14839ms | Electron              | 1550 |
+| `16:04:28.189` |      `checkout_pr_status_request` |  14705ms | Electron              | 1536 |
+| `16:04:29.634` |            `fetch_agents_request` |  14590ms | `0.0.0.0:6767` client | 1759 |
+| `16:04:28.006` |      `checkout_pr_status_request` |  14522ms | Electron              | 1526 |
+| `16:04:27.628` |      `checkout_pr_status_request` |  14143ms | Electron              | 1496 |
+| `16:04:27.061` |      `checkout_pr_status_request` |  13576ms | Electron              | 1405 |
+| `16:04:29.645` |            `fetch_agents_request` |  13384ms | `0.0.0.0:6767` client | 1762 |
+| `16:04:02.812` |    `fetch_agent_timeline_request` |  12321ms | Electron              |  440 |
+| `16:04:25.740` |      `checkout_pr_status_request` |  12256ms | Electron              | 1309 |
+| `16:04:25.352` |      `checkout_pr_status_request` |  11867ms | Electron              | 1296 |
+| `16:04:04.217` |    `fetch_agent_timeline_request` |  11751ms | Android               |  462 |
+| `16:04:25.155` |      `checkout_pr_status_request` |  11671ms | Electron              | 1284 |
+| `16:04:23.196` |             `fetch_agent_request` |   9711ms | Electron              | 1070 |
+| `16:04:17.563` |            `project_icon_request` |   4079ms | Electron              |  877 |
+| `16:03:53.022` |  `list_available_editors_request` |   2533ms | Electron              |  254 |
+| `16:04:15.703` |            `project_icon_request` |   2218ms | Electron              |  824 |
+| `16:04:15.696` |            `project_icon_request` |   2211ms | Electron              |  822 |
+| `16:04:15.694` |            `project_icon_request` |   2209ms | Electron              |  820 |
+| `16:04:15.103` |           `file_explorer_request` |   1618ms | Electron              |  806 |
+| `16:04:14.107` |          `list_terminals_request` |    621ms | Electron              |  764 |
+| `16:03:50.945` |          `list_terminals_request` |    614ms | HeadlessChrome        |  156 |
+
+The checkout PR requests are especially clustered: 18 Electron `checkout_pr_status_request` messages arrive together at `16:04:13.484`, lines 699-716. Their slow-request completions drain over the next ~20s, with `inflightRequests` dropping from 20 to 0.
+
+## Provider Findings
+
+### OpenCode
+
+OpenCode provider snapshot refresh had two timeouts:
+
+| time           | line | cwd                         | error                                         |
+| -------------- | ---: | --------------------------- | --------------------------------------------- |
+| `16:04:22.466` |  987 | `/Users/moboudra/dev/paseo` | `Timed out refreshing OpenCode after 30000ms` |
+| `16:04:22.482` | 1002 | `/Users/moboudra`           | `Timed out refreshing OpenCode after 30000ms` |
+
+These are provider snapshot failures, not OpenCode agent resume failures.
+
+The persisted OpenCode agent did resume:
+
+| time           | line | event                                                 |
+| -------------- | ---: | ----------------------------------------------------- |
+| `16:04:24.183` | 1201 | `provider.opencode.subscribe.start`                   |
+| `16:04:24.183` | 1202 | `provider.opencode.subscribe.ready`                   |
+| `16:04:24.306` | 1214 | raw event `server.connected`                          |
+| `16:04:25.933` | 1321 | `Agent resumed from persistence`, provider `opencode` |
+| `16:04:34.197` | 1783 | raw event `server.heartbeat`                          |
+| `16:04:44.200` | 1789 | raw event `server.heartbeat`                          |
+
+There are no `provider.opencode.subscribe.error` or OpenCode agent fatal errors in this slice.
+
+OpenCode-related git:
+
+- `~/dev/opencode` had 22 git commands.
+- Four failed.
+- The failed commands were branch graph probes for `ecosystem-paseo` versus `origin/ecosystem-paseo`.
+- Those failures are git state/probe failures, not OpenCode provider process failures.
+
+### Codex
+
+Codex provider startup observations:
+
+- `provider.codex.spawn` appears multiple times for provider snapshot/config discovery.
+- A persisted Codex agent resumes successfully at `16:04:06.357`, line 518.
+- Debug logs show failed reads of Codex saved config defaults, but these are debug-level and do not become provider startup warnings/errors in this slice.
+- There are unhandled Codex trace event types such as remote-control/status and thread/goal status, but no Codex timeout or fatal provider startup failure in this slice.
+
+### Claude
+
+Claude agents resume successfully:
+
+| time           | line | client   | agent                                  |
+| -------------- | ---: | -------- | -------------------------------------- |
+| `16:04:02.540` |  434 | Electron | `f884552a-1383-4dba-8583-7ae0b6a62353` |
+| `16:04:03.772` |  456 | Android  | `0c89a057-05f2-4e23-9895-84c8e1952310` |
+
+## What Work The App Asked For
+
+The startup work visible in the app/server protocol is:
+
+- Workspace list/sidebar hydration:
+  - `fetch_workspaces_request`, 9 total.
+  - This asks for the workspace list sorted by `activity_at desc`, usually page limit 200.
+  - On the server this triggers workspace git observer sync and workspace update flushing.
+
+- Agent list and agent detail hydration:
+  - `fetch_agents_request`, 11 total.
+  - `fetch_agent_request`, 1 total.
+  - `fetch_agent_timeline_request`, 7 total.
+  - Timeline requests are among the slowest requests in this slice.
+
+- Checkout/PR status UI:
+  - `checkout_pr_status_request`, 18 total, all Electron.
+  - `checkout_status_request`, 1 total.
+  - `subscribe_checkout_diff_request`, 2 total.
+  - These correspond to git snapshot consumers and are clustered during Electron reconnect.
+
+- Provider/model/mode UI:
+  - `get_providers_snapshot_request`, 9 total.
+  - `providers_snapshot_update`, 129 outbound updates.
+  - OpenCode provider snapshot refresh times out twice during this flow.
+
+- Workspace chrome:
+  - `project_icon_request`, 9 total.
+  - `file_explorer_request`, 1 total.
+
+- Terminal panel:
+  - `list_terminals_request`, 5 total.
+  - `subscribe_terminals_request`, 5 total.
+  - `terminals_changed`, 5 outbound updates.
+
+- Attention state:
+  - `clear_agent_attention`, 6 total.
+  - Some failures appear while clearing attention for persisted agents, but these are not provider startup failures.
+
+## Concrete Waste-Looking Work, Without Optimizing Yet
+
+The log shows repeated work in these exact forms:
+
+- 444 git commands total, but only 14 complete before the first client hello. The rest are post-listen startup/client hydration work.
+- Several workspaces get repeated full checkout snapshot patterns:
+  - three 33-command worktrees each get `3` root checks, `3` dirty checks, `3` upstream config probes, `9` ahead/behind probes, `12` ref checks, and `3` base divergence checks.
+  - three 27-command worktrees each get `3` root checks, `3` dirty checks, `6` upstream config probes, `6` ahead/behind probes, `6` ref checks, and `3` base divergence checks.
+  - `~/dev/paseo` gets `5` root checks, `5` dirty checks, `10` upstream config probes, and `10` ahead/behind probes.
+- Electron sends 18 `checkout_pr_status_request` messages at the same timestamp, then they drain slowly over ~20s.
+- Provider snapshot updates are broadcast very frequently: 129 outbound `providers_snapshot_update` messages, including large repeated payloads around 216KB and 415KB.
+- OpenCode snapshot refresh times out twice after 30s, but the actual OpenCode agent connection/resume succeeds.
+
+Again, this section names repeated work observed in the startup. It does not claim which repetition should be removed.
--- a/docs/floating-panels.md
+++ b/docs/floating-panels.md
@@ -60,11 +60,12 @@ quietly relying on:
  Gate `visible` on a screen-focus signal. For panes inside `agent-panel`, the
  `isPaneFocused` prop already exists and flips on pane switches; pass
  `visible={isYourOwnVisible && isPaneFocused}`.
- **Transforms.** `KeyboardShiftProvider` owns the canonical keyboard shift
-  SharedValue, and `useKeyboardShiftStyle()` only adapts that value into
-  translate/padding styles. The composer and chat content must both read that
-  provider-owned value. A portal'd popover is outside the composer tree — it
-  does not get that transform unless you apply it yourself.
+- **Transforms.** The composer is wrapped in a Reanimated `Animated.View` with
+  `translateY: -keyboardShift` (see `use-keyboard-shift-style.ts`). The chat
+  content has the same transform applied (`agent-panel.tsx:939`). They move
+  together because they share the SharedValue. A portal'd popover is outside
+  the composer tree — it does not get that transform unless you apply it
+  yourself.
 - **Layering.** The default root host renders after app content, so it sits
  above compact sidebars. Content overlays that must sit below sidebars should
  use the current `FloatingPanelPortalHost`.
@@ -85,8 +86,7 @@ with Reanimated worklets the result is not always stable.

 If the panel cannot stay inside the transformed ancestor, do not try to track
 the keyboard by re-measuring on every frame. Instead,
-**slave the popover's transform to the same `KeyboardShiftProvider` SharedValue
-the composer uses**:
+**slave the popover's transform to the same SharedValue the composer uses**:

 1. Snapshot `openShift = shift.value` at the moment you measure the anchor.
 2. Apply `useAnimatedStyle(() => ({ transform: [{ translateY: openShift.value - shift.value }] }))`
@@ -95,10 +95,7 @@ the composer uses**:
 When `shift` equals `openShift`, the translate is 0 and the popover sits at
 the measured position. When the keyboard moves afterward, the delta translates
 the popover by exactly the amount the composer translates. They move in
-lockstep, no re-measurement needed. Do not call
-`useReanimatedKeyboardAnimation()` directly for app UI offset policy; Android
-can briefly report a stale nonzero height with closed progress, and the shared
-provider is where that is normalized.
+lockstep, no re-measurement needed.

 Re-measure on `Keyboard.addListener('keyboardDidShow'|'keyboardDidHide')` only
 to refresh the snapshot if the keyboard was mid-transition when the popover
@@ -172,11 +169,6 @@ on that attach races Gorhom's dismiss path and leaves the modal unable to reopen
 Track an explicit phase (`closed` / `presenting` / `presented` / `dismissing`) and
 ignore ref churn while dismissing.

-Do not treat `onChange(-1)` as a close by itself. In a stacked
-`BottomSheetModal`, `-1` can also mean the sheet is temporarily hidden under
-another pushed sheet. Close React state from `onDismiss`; use `onChange` only to
-track phase.
-
 ## Recipe for a new anchored panel

 Before you write a new one, ask:
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -3,10 +3,9 @@
 Authoritative terminology. UI label wins. Don't invent synonyms; use what's here.

 - **Project** — Logical grouping of workspaces sharing a git remote (or main repo root). UI: "Project" / "Add project". Code: `ProjectSummary` (`packages/app/src/utils/projects.ts:22`), `projectKey` (`packages/server/src/server/workspace-registry-model.ts:16`). Forbidden: "Repo", "Repository" as UI label.
- **Workspace** — One concrete `cwd` on one daemon, with git state; belongs to exactly one project. Its `id` is opaque workspace identity; its `cwd` is the filesystem directory. UI: "Workspace". Code: `WorkspaceDescriptorPayload` (`packages/protocol/src/messages.ts:2178`). Don't confuse with: Branch (one branch can back many workspaces via worktrees). Forbidden: "Folder", "Directory" as UI label.
- **Workspace kind** — `"directory" | "local_checkout" | "worktree"`. The git-derived, persisted property of a workspace, used across its lifetime (archive safety, sidebar, grouping). Derived from the cwd's git reality (`deriveWorkspaceKind`, `packages/server/src/server/workspace-registry-model.ts:158`), not stored from a user choice. Code: `PersistedWorkspaceKind` (`packages/server/src/server/workspace-registry-model.ts:8`). Don't confuse with **Isolation** (the create-time intent).
- **Isolation** — Create-time choice for a new workspace: reuse the existing checkout (**Local**) or cut a dedicated git worktree (**New worktree**). A transient setup input, also remembered as a create-form preference; it is not a workspace property. UI: "Isolation" control on the New Workspace screen. Code: `isolation` (`"local" | "worktree"`), `useWorkspaceIsolation` (`packages/app/src/screens/new-workspace-screen.tsx`); persisted as `FormPreferences.isolation` (`packages/app/src/create-agent-preferences/preferences.ts`). Distinct from **Workspace kind**, which is the git-derived property the intent produces (Local → `local_checkout` or `directory` by git-ness; New worktree → `worktree`). On the wire it is the create request's `source.kind` (`directory | worktree`, `packages/protocol/src/messages.ts:1693`).
- **Agent** — See **Agent session**. UI still says "Agent" / "New Agent" in places, but moving toward **Agent session** as the canonical term. Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`). Forbidden: "Task", "Job", "Run".
+- **Workspace** — One concrete `cwd` on one daemon, with git state; belongs to exactly one project. UI: "Workspace". Code: `WorkspaceDescriptorPayload` (`packages/protocol/src/messages.ts:2178`). Don't confuse with: Branch (one branch can back many workspaces via worktrees). Forbidden: "Folder", "Directory" as UI label.
+- **Workspace kind** — `"directory" | "local_checkout" | "worktree"`. Code: `PersistedWorkspaceKind` (`packages/server/src/server/workspace-registry-model.ts:8`).
+- **Agent** — One AI coding agent run on a daemon (one provider, one model, one cwd, one timeline). UI: "Agent" / "New Agent". Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`). Forbidden: "Task", "Job", "Run".
 - **Daemon** — Local Paseo server process; identified by `serverId`. UI: "Daemon" (system contexts only). Code: `serverId` in `ServerInfoStatusPayloadSchema` (`packages/protocol/src/messages.ts:1936`), `DaemonClient` (`packages/client/src/daemon-client.ts`).
 - **Host** — Client-side connection profile pointing at a daemon; bundles one or more `HostConnection`s. UI: "Host" / "Add host" / "Switch host". Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Forbidden: "Connection" (means `HostConnection`, not host).
 - **Project host entry** — One row in a project for a single (project, daemon) pair, aggregating that daemon's workspaces in the project. Internal. Code: `ProjectHostEntry` (`packages/app/src/utils/projects.ts:11`). Don't introduce "Checkout" as a synonym.
@@ -14,18 +13,12 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Branch** — Plain git branch. UI: "Switch branch". Code: `currentBranch` in `WorkspaceGitRuntimePayloadSchema` (`packages/protocol/src/messages.ts:2136`); `BranchSwitcher` (`packages/app/src/components/branch-switcher.tsx`).
 - **Worktree** — Paseo-managed git worktree (`~/.paseo/worktrees/{name}`); also a `workspaceKind` value. UI: CLI + `paseo.json` keys (`worktree.setup`, `worktree.teardown`) only. Code: `ProjectCheckoutLiteGitPaseoPayload` (`packages/protocol/src/messages.ts:2092`); CLI `paseo worktree` (`packages/cli/src/commands/worktree/index.ts:8`). Forbidden: "Checkout" as a synonym.
 - **Repository / Remote** — Internal git inputs (`remoteUrl`, `mainRepoRoot`) used to derive `projectKey`. No UI label.
- **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, GitHub PR 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`.
- **Agent session** — One running instance of an agent inside a workspace (one provider, one model, one cwd, one timeline). The conceptual unit; in the UI this opens as a tab. Moving toward this as the canonical term over "Agent". Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`).
- **Session** — Two senses: (a) per-client connection to a daemon, internal; (b) user-facing agent session, see **Agent session**. Code: `Session` (`packages/server/src/server/session.ts`) for (a). Don't confuse with: provider-side agent session log.
+- **Session** — Per-client connection to a daemon. Internal. Code: `Session` (`packages/server/src/server/session.ts`). Don't confuse with: provider-side agent session log.
 - **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing.
- **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi, OMP). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/protocol/src/messages.ts:198`).
+- **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/protocol/src/messages.ts:198`).
 - **Model** — A specific LLM offered by a provider. UI: "Model" / "Select model". Code: `AgentModelDefinition` (`packages/protocol/src/messages.ts:187`).
- **Tab** — UI surface representing one session inside a workspace. Not a conceptual unit; use **Agent session** when talking about the model. Code: `WorkspaceTabDescriptor` (`packages/app/src/screens/workspace/workspace-tabs-types.ts`).
 - **Terminal** — Workspace-scoped PTY shell streamed over the binary mux channel. UI: "Terminal". Code: `TerminalStreamFrame` (`packages/protocol/src/terminal-stream-protocol.ts`).
- **Schedule** — Cron-style trigger that creates new agents. UI: CLI/MCP (`paseo schedule`, `create_schedule`). Don't confuse with: Heartbeat (cron prompt back into the same agent) or Loop (iterative re-execution of one agent).
- **Heartbeat** — Cron-style prompt sent back into the same agent/conversation. MCP: `create_heartbeat`. Use for reminders and babysitting where the status should return inline.
+- **Schedule** — Cron-style trigger that creates remote agents. UI: CLI only (`paseo schedule`). Code: `ScheduleCreateRequest` (re-exported from `packages/protocol/src/messages.ts`). Don't confuse with: Loop (iterative re-execution of one agent).
 - **Mode** — Provider-specific operational mode (plan, default, full-access, …). UI: icon-only. Code: `modeId` in `AgentSessionConfig` (`packages/protocol/src/messages.ts:257`).
 - **Attachment** — GitHub PR or Issue bound to an agent prompt. UI: "Attach issue or PR". Code: `AgentAttachment` (`packages/protocol/src/messages.ts:782`).
 - **Composer** — The whole prompt surface for sending work to an agent. Code: `Composer` (`packages/app/src/composer/index.tsx`). Don't call this "message input" except for the text-entry subcomponent.
--- a/docs/i18n.md
+++ b/docs/i18n.md
@@ -1,79 +0,0 @@
-# I18n
-
-Paseo client UI translations live in `packages/app/src/i18n`.
-
-## Supported Locales
-
- `en`
- `ar`
- `es`
- `fr`
- `ru`
- `zh-CN`
-
-The persisted app language setting is `"system" | "ar" | "en" | "es" | "fr" | "ru" | "zh-CN"`. `"system"` follows the device or browser locale when it maps to a supported locale; unsupported system locales fall back to English.
-
-## Translation Scope
-
-Translate client-owned UI copy: labels, buttons, empty states, confirmation text, and local status/error wrappers.
-
-Do not translate agent output, daemon output, terminal contents, file paths, provider names, model names, command names, user-authored text, code blocks, logs, or raw protocol/server error text.
-
-## Adding Copy
-
-English source strings live in `packages/app/src/i18n/resources/en.ts`. Simplified Chinese strings live in `packages/app/src/i18n/resources/zh-CN.ts`.
-
-For migrated screens and components, use `useTranslation()` and pass translated text into UI primitives. Low-level primitives such as `<Button>` do not import translation state unless they own the text they render.
-
-Keep resource keys grouped by product surface, not component mechanics.
-
-Run:
-
-```bash
-npx vitest run packages/app/src/i18n/resources.test.ts --bail=1
-```
-
-The parity test catches missing keys between English and Simplified Chinese resources.
-
-## Migration Order
-
-Client UI translation is staged so each pass can migrate complete local copy clusters and keep reviews focused.
-
-1. App shell and shared UI chrome: common actions, headers, sheets, command center, and client-owned toast status.
-2. Composer and agent workflow: composer input, agent controls, permission prompts, plan approval, and agent panel wrapper states.
-3. Settings expansion: Appearance, Shortcuts, Integrations, Permissions, Diagnostics, About, Project settings, Host settings, and provider diagnostics.
-4. Workspace and panels: setup/file/browser/terminal wrapper copy, file explorer local states, import-session flows, and remaining local toast/error wrapper text.
-
-Within a migrated surface, do not leave mixed-language neighboring labels when those labels are owned by the client. Move the whole local copy cluster together.
-
-### Progress
-
- Batch 2 migrated Composer and agent workflow chrome: Composer input and attachments, agent controls, stream permission prompts, agent panel wrapper states, and draft panel descriptors. Provider/model names, provider-defined option labels, agent output, and protocol/server diagnostics remain untranslated.
- Batch 3A migrated Settings Diagnostics/About, Appearance, Shortcuts, Integrations, and Desktop Permissions chrome. Host settings and Project settings remain for Batch 3B; raw runtime status/error details remain untranslated.
- Batch 3B migrated Host settings, Provider diagnostics, and Project settings chrome. Provider/model names, project/host labels, script commands, diagnostic output, file paths, and raw runtime/server error details remain untranslated.
- Batch 4A migrated workspace wrapper chrome for import sessions, file explorer, setup, browser, terminal, and file panels. File paths, URLs, commands, logs, terminal output, provider labels, and raw runtime/server errors remain untranslated.
- Batch 4B migrated workspace tab shell, workspace scripts, Git actions/diff/PR chrome, worktree archive warnings, Open-in-editor controls, and inline review controls. Branch names, PR titles/bodies, check names, workflow names, file paths, diff contents, commands, terminal output, provider labels, and raw runtime/server errors remain untranslated.
- Batch 4C migrated Sidebar project/workspace menus, hide/remove/archive confirmations, workspace rename chrome, New workspace ref picker/create flow, and Open project home tiles. Workspace/project names, branch names, PR titles, paths, provider labels, daemon output, and raw runtime/server errors remain untranslated.
- Batch 4D migrated provider/model selector chrome, provider catalog install modal, add-connection method modal, and paste-pairing-link modal. Provider/model/catalog names, provider descriptions, pairing URLs, protocol parser errors, daemon connection details, and raw runtime/server errors remain untranslated.
- Batch 4E migrated onboarding welcome chrome, direct-connection modal fields/actions/local failure guidance, QR scan permission/unavailable states, and desktop pair-device card. Pairing URLs, host/port placeholders, endpoint values, transport details, protocol parser errors, and raw runtime/server errors remain untranslated.
- Batch 4F migrated realtime voice overlay accessibility labels, rewind menu chrome and fallback toast, DiffViewer default empty state, and service URL chooser copy. Shortcut key names, raw daemon errors, diff contents, URLs, and caller-provided override labels remain untranslated.
- Batch 4G migrated the keyboard shortcuts help dialog to render section titles, row labels, and row notes through translation keys. Shortcut key names, shortcut combos, binding IDs, action IDs, and fallback registry labels remain untranslated.
- Batch 4H migrated Sessions screen chrome and AgentList local UI copy: date section headers, local status labels, fallback session titles, badges, load-more/empty states, and the archive action sheet. Agent titles, project paths, provider icons/labels, host labels, relative timestamps, and raw runtime data remain untranslated.
- Batch 4I migrated message utility chrome: image lightbox labels/errors, code and turn copy accessibility labels, dictation controls, question form fallback placeholders/actions, PlanCard fallback title, assistant image fallback errors, and todo list labels. Message bodies, plan text, todo item text, attachment labels, runtime dictation errors, and agent/tool output remain untranslated.
- Batch 4J migrated workspace tab toast/empty chrome: copy failure messages, copied labels, resume-command availability errors, reload-agent local status, host-disconnected wrapper reuse, and split-pane empty state. Agent IDs, generated resume commands, workspace paths, branch names, and raw reload errors remain untranslated.
- Batch 4K migrated sidebar/project list chrome: host picker fallback/search/title, footer actions and tooltips, Sessions row labels, mobile close label, New workspace tooltip/accessibility label, project-list empty states, and project settings host-load wrapper text. Host names, project names, workspace names, paths, branch names, and raw host errors remain untranslated.
- Batch 4L migrated picker/file/detail utility chrome: project picker states, branch switcher labels/placeholders, file pane loading/empty/fallback errors, tool-call details section/empty labels, and open-file accessibility. Directory paths, branch names, file contents, file sizes, tool details, and raw file-load errors remain untranslated.
- Batch 4M migrated hook/modal utility chrome: image attachment permissions/dialog/errors, copied toast wrappers, rename modal local validation/fallback errors, branch switcher stash/switch prompts and fallback toasts, and workspace setup local fallback errors. Copied labels supplied by callers, branch names, selected paths, raw dialog/API errors, and raw server errors remain untranslated.
- Batch 4N migrated pure view-model/policy utility chrome: import-session fallback titles/previews/empty states and the worktree setup callout. Provider labels and IDs remain runtime values interpolated into translated wrappers.
- Batch 4O migrated remaining small utility chrome: workspace route gate states/actions, compaction markers, archived-agent callout, web browser fallback, desktop quitting overlay, and image drop overlay. Host names, host status values, browser IDs, token counts, and raw route errors remain runtime values.
- Batch 4P migrated provider-selection pure view-model utility copy to direct `i18n.t(...)` calls and removed the local labels parameter path. Provider/model labels, provider IDs, and provider snapshot error messages remain runtime values.
- Batch 4Q migrated desktop update utility chrome: app update status text, update callout titles/actions, generic update errors, and install-error wrappers. Version labels, installer messages, raw update errors, release-channel data, and logs remain runtime values.
- Batch 4R migrated desktop permission utility chrome: permission status details, permission request fallback errors, empty permission statuses, and desktop notification test wrappers. Browser permission states, exception names, and raw browser API error messages remain runtime values.
- Batch 4S migrated desktop daemon settings chrome: built-in daemon status rows, daemon lifecycle toggles, logs/status modals, clipboard alerts, daemon management confirmations/errors, daemon status load errors, and desktop CLI/skills install wrapper errors. PIDs, log paths, log contents, CLI status output, version values, and raw IPC errors remain runtime values.
- Batch 4T migrated remaining attachment/autocomplete utility chrome: user and composer review attachment labels, workspace hover-card accessibility, branch stash restore prompts/toasts, agent autocomplete loading/empty/fallback error text, older-history fallback toast, draft panel labels, and agent-control fallback labels. PR/issue numbers, browser element tags, branch names, provider labels, model labels, agent prompts, command/file names, and raw server errors remain runtime values.
- Batch 4U migrated shared default utility chrome: Combobox and Autocomplete default placeholders/empty/loading labels, drag-overlay and subagent-track loading labels, sub-agent activity fallback headers, and file-preview fallback errors. Caller-provided labels, tab titles, subagent descriptions, file paths, and raw file-load errors remain runtime values.
- Batch 4V migrated Git policy action chrome to direct `i18n.t(...)` calls: commit/pull/push/sync/PR/merge/auto-merge/archive action labels, pending/success labels, and unavailable reasons. Branch/base refs, PR URLs, GitHub merge-state enum values, runtime statuses, and raw Git/GitHub errors remain runtime values.
- Batch 4W migrated remaining local wrapper states: workspace copy unavailable toasts, startup daemon-log loading/empty/load-failed text, and file-explorer workspace/host unavailable fallbacks. Workspace paths, branch names, daemon log contents/paths, checkout query details, and raw file/daemon errors remain runtime values.
- Batch 4X migrated descriptor and command chrome: Pair-device modal header, workspace setup sheet title, terminal panel fallback labels, command-center action titles, and file-pane host-disconnected fallback. Provider/catalog names, command-center search keywords, terminal runtime titles, file paths, and raw read errors remain runtime values.
- Batch 4Y tightened the translation boundary so React components and custom hooks use `useTranslation()` while pure helpers keep direct `i18n.t(...)` fallbacks, and migrated remaining small UI/accessibility fallbacks across message details, menu backdrops, startup errors, sidebar PR badges, settings/project accessibility labels, composer send/create/download fallbacks, client slash-command descriptions, terminal subscribe errors, and desktop update completion text. Provider catalog metadata, shortcut registry fallbacks, agent/daemon/protocol reasons, terminal contents, raw runtime errors, and user/project/workspace names remain untranslated.
- Batch 4Z expanded the supported locale set to the six UN official languages: Arabic, Chinese, English, French, Russian, and Spanish. Arabic, French, Russian, and Spanish now have full client-owned UI resource coverage, with key parity, fallback-ratio, and interpolation-placeholder tests guarding the generated translations. Arabic does not enable RTL layout direction in this batch.
--- a/docs/product.md
+++ b/docs/product.md
@@ -70,8 +70,8 @@ Anyone who builds software:
 ## Current state (May 2026)

 - Desktop (Electron), mobile (iOS/Android), web, CLI
- Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi, OMP
- One-click ACP provider catalog: CodeWhale, Cursor, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
+- Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi
+- One-click ACP provider catalog: Cursor, DeepSeek TUI, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
 - Voice mode: dictate prompts or talk through problems hands-free
 - MCP server exposes the daemon to other agents (create_agent, send_agent_prompt, schedules, terminals, worktrees)
 - Scheduled agents (cron-style triggers) via app, CLI, and MCP
--- a/docs/providers.md
+++ b/docs/providers.md
@@ -10,13 +10,11 @@ Extend `ACPAgentClient` from `packages/server/src/server/agent/providers/acp-age

 The only built-in ACP provider today is `copilot` (`copilot-acp-agent.ts`). `GenericACPAgentClient` (`generic-acp-agent.ts`) is also ACP-based but is used for user-defined custom providers configured via `extends: "acp"` overrides — see [docs/custom-providers.md](custom-providers.md).

-Copilot custom agents are exposed through ACP session config, not the slash-command list. When custom agents are available, Copilot returns a select config option with `id: "agent"` and `category: "_agent"`; Paseo maps that to the `agent` provider feature. Copilot uses the agent display name as the option value, and the blank value means the default Copilot agent.
-
 ### Direct

 Implement the `AgentClient` and `AgentSession` interfaces from `agent-sdk-types.ts` yourself. This gives full control but requires you to handle process management, streaming, permissions, and session persistence from scratch.

-Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`providers/pi/agent.ts`), and `omp` (a Pi-compatible built-in backed by the Pi adapter). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
+Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`providers/pi/agent.ts`). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.

 Pi is a process-backed provider. Paseo requires the user to have the `pi` binary installed and talks to it through `pi --mode rpc`; the server package does not embed Pi's SDK/runtime packages.

@@ -26,29 +24,13 @@ Pi MCP support depends on the open-source `pi-mcp-adapter` extension being loade

 Pi import discovery reads Pi's persisted JSONL session files because Pi RPC does not expose a recent-session listing command. Resume and full history hydration still go through `pi --mode rpc` using the session file as `nativeHandle`.

-OMP is a built-in Pi-compatible provider, disabled by default. It uses the `omp` command and imports terminal-started sessions from `~/.omp/agent/sessions` when enabled. Other Pi-compatible forks can still be custom providers that extend `pi`, override `command`, and set `params.sessionDir` to their JSONL session directory.
-
-Pi and OMP currently use different RPC names for slash-command discovery. The Pi package accepts `get_commands`; OMP accepts `get_available_commands`. Keep this as an explicit adapter setting for the built-in provider instead of probing with a fallback, because both packages return unknown-command errors without the request `id`, which otherwise turns a fast mismatch into the normal RPC timeout.
-
 Pi RPC extension UI dialog requests (`select`, `input`, `editor`, `confirm`) are bridged into Paseo question permissions and answered with `extension_ui_response`. Pi extensions such as `ask_user` may chain dialogs: for example, a `select` can be followed by an optional-comment `input`. When an `ask_user` tool call declares `allowComment: true`, Paseo presents the selection and optional comment as one question permission, answers Pi's initial `select` immediately, then auto-answers the follow-up optional `input` with the comment the user already supplied (or an empty string). Preserve placeholders and optional/skip semantics for standalone optional inputs so the app can still distinguish "skip this optional input" from "cancel the whole dialog." Fire-and-forget extension UI requests such as notifications are intentionally ignored by the provider adapter unless Paseo grows first-class UI for them.

 OpenCode MCP injection is dynamic and session-scoped. Call OpenCode's `mcp.add` endpoint with the MCP server config and do not follow it with `mcp.connect`; `connect` only toggles MCP servers already present in OpenCode's own config. New OpenCode versions return `McpServerNotFoundError`/404 for `connect` after a dynamic add because the server is not config-backed, while older versions silently swallowed the same missing-config path.

 OpenCode owns user message IDs. Do not pass Paseo-generated IDs to OpenCode prompt APIs; let OpenCode create `msg*` IDs and record the user timeline item from the `message.updated` event.

-Every provider adapter owns its canonical user-message timeline rows. When a foreground prompt is accepted, the adapter must emit exactly one `user_message` timeline item for that submitted prompt, using the same message ID it gives to or receives from the provider runtime. Optimistic client messages are UI-only and provider transcript echoes are optional; neither is allowed to be the only source of truth. If the provider later echoes the same submitted user message, dedupe it only within the active turn. Prefer provider-visible message IDs, but ACP runtimes may omit that ID or replace it with a provider-owned one; in that case suppress only echo chunks whose accumulated text is a prefix of the active submitted prompt. Do not perform global transcript text dedupe.
-
-Draft metadata lookups should avoid creating provider sessions when the upstream provider has top-level APIs for that metadata. Prefer `AgentClient.fetchCatalog`, `listCommands`, or `listFeatures` over creating a scratch `AgentSession`; scratch sessions can show up as empty native sessions in provider import/history UIs. `fetchCatalog` is the single discovery API for models and modes — provider implementations may use one process, separate upstream calls, or static data internally, but callers outside the provider do not get separate runtime model/mode probes.
-
-Provider session import has its own contract. The picker calls `listImportableSessions` and receives rows only: provider handle, cwd, title, prompt previews, and last activity. Import calls `importSession({ providerHandleId, cwd })` for the selected row and must not call listing again. The provider returns the resumed session, storage config, persistence handle, and hydrated timeline for that one native session; `AgentManager.importProviderSession` seeds the daemon timeline and publishes the Paseo agent only after it is ready.
-
-## Provider Helper Processes
-
-Provider-owned helper processes that can outlive an individual agent session must be recorded in the daemon's managed-process registry. Store provider/kind metadata, the PID, launch command/args, and process identity captured from the platform process table. Remove the record on normal exit or shutdown.
-
-If a helper process has a readiness phase, the provider's lifecycle model must own the process immediately after `spawn`, before readiness succeeds. Startup timeout, startup exit, and daemon shutdown must all clean up through that owned generation. Do not keep a spawned helper only inside a readiness promise; that creates a live process outside the manager/reaper contract.
-
-Daemon bootstrap reconciles that ledger in the background, without blocking startup: dead PIDs are deleted, PID identity mismatches are deleted without killing anything, only positively matched Paseo-owned leftovers are terminated, and a record whose process cannot be inspected is left in place for the next reconcile rather than deleted. Do not add broad process-name sweepers for provider cleanup; cleanup starts from records Paseo previously wrote.
+Draft metadata lookups should avoid creating provider sessions when the upstream provider has top-level APIs for that metadata. Prefer `AgentClient.listModels`, `listModes`, `listCommands`, or `listFeatures` over creating a scratch `AgentSession`; scratch sessions can show up as empty native sessions in provider import/history UIs.

 ---

@@ -66,23 +48,6 @@ Boundary tests should assert observable behavior: cold reads may call provider a

 ---

-## Provider Usage Fetchers
-
-Provider plan usage is fetch-on-demand, not a daemon push subscription. The app calls `provider.usage.list.request` through React Query when the usage tooltip or Host Usage settings screen is shown, and the daemon returns the normalized `ProviderUsage` list directly.
-
-To add plan usage for a provider, add `packages/server/src/services/quota-fetcher/providers/<provider>.ts` and register it in `packages/server/src/services/quota-fetcher/manifest.ts`. The provider file exports only its fetcher class; provider auth, endpoint constants, API schemas, and normalization helpers stay private in that file. A fetcher owns provider auth/API parsing and returns the generic shape:
-
- `providerId`, `displayName`, `status`, and optional `planLabel`
- any number of `windows` such as Session, Weekly, or Biweekly
- optional `balances` for credits, USD, requests, or tokens
- optional `details` for provider-specific rows
-
-Keep the protocol shape provider-agnostic. Do not add provider-specific renderers for new limit windows; labels and generic bars should carry the UI. API responses should be parsed and normalized with Zod inside the fetcher, while the protocol boundary stays strict so old/new client compatibility is explicit.
-
-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.
-
---
-
 ## ACP Provider Checklist

 ### 1. Create the provider class
@@ -295,7 +260,7 @@ case "my-provider":
  );
 ```

-Add to the `allProviders` array (current built-ins are `claude`, `codex`, `copilot`, `opencode`, `pi`, `omp`):
+Add to the `allProviders` array (current built-ins are `claude`, `codex`, `copilot`, `opencode`, `pi`):

 ```ts
 export const allProviders: AgentProvider[] = [
@@ -342,16 +307,11 @@ interface AgentClient {
    overrides?: Partial<AgentSessionConfig>,
    launchContext?: AgentLaunchContext,
  ): Promise<AgentSession>;
-  fetchCatalog(options: FetchCatalogOptions): Promise<ProviderCatalog>;
+  listModels(options: ListModelsOptions): Promise<AgentModelDefinition[]>;
  isAvailable(): Promise<boolean>;
  // Optional:
-  listImportableSessions(
-    options?: ListImportableSessionsOptions,
-  ): Promise<ImportableProviderSession[]>;
-  importSession(
-    input: ImportProviderSessionInput,
-    context: ImportProviderSessionContext,
-  ): Promise<ImportedProviderSession>;
+  listModes?(options: ListModesOptions): Promise<AgentMode[]>;
+  listPersistedAgents?(options?: ListPersistedAgentsOptions): Promise<PersistedAgentDescriptor[]>;
  getDiagnostic?(): Promise<{ diagnostic: string }>;
 }
 ```
@@ -371,7 +331,7 @@ interface AgentSession {
  getRuntimeInfo(): Promise<AgentRuntimeInfo>;
  getAvailableModes(): Promise<AgentMode[]>;
  getCurrentMode(): Promise<string | null>;
-  setMode(modeId: string): Promise<void | AgentProviderNotice>;
+  setMode(modeId: string): Promise<void>;
  getPendingPermissions(): AgentPermissionRequest[];
  respondToPermission(
    requestId: string,
@@ -383,7 +343,7 @@ interface AgentSession {
  // Optional:
  listCommands?(): Promise<AgentSlashCommand[]>;
  setModel?(modelId: string | null): Promise<void>;
-  setThinkingOption?(thinkingOptionId: string | null): Promise<void | AgentProviderNotice>;
+  setThinkingOption?(thinkingOptionId: string | null): Promise<void>;
  setFeature?(featureId: string, value: unknown): Promise<void>;
  tryHandleOutOfBand?(prompt: AgentPromptInput): {
    run(ctx: { emit: (event: AgentStreamEvent) => void }): Promise<void>;
@@ -391,8 +351,6 @@ interface AgentSession {
 }
 ```

-`setMode` and `setThinkingOption` may return an `AgentProviderNotice` when the provider knows the change needs user-facing context. For example, providers that stage changes until the next turn should return an `info` notice while a turn is already running. The app renders the notice generically as a toast; provider-specific lifecycle behavior stays in the provider implementation.
-
 ### Steps

 1. Create `packages/server/src/server/agent/providers/{name}-agent.ts` implementing both interfaces
--- a/docs/refactors/session-decomposition-plan.md
+++ b/docs/refactors/session-decomposition-plan.md
@@ -13,15 +13,6 @@ Each domain becomes a controller class in its own file with the **exact** contra

 Session shrinks to a connection/dispatch shell: it keeps `handleMessage`, the `??` chain (1739-1751), `emit`/`emitBinary`, `sessionLogger`, connection identity, inflight metrics, lifecycle intents, and the **ordered** `cleanup()`. Each `dispatchXMessage` collapses to `return this.xController.dispatch(msg)`.

-## Progress (shipped — diverged from the original filenames)
-
-The first carves shipped as **deep modules with a narrow Host seam**, not the `dispatch(msg)`-owned-set controllers sketched below: `session.ts` keeps each `dispatchXMessage` switch and delegates per case to the subsystem. Home convention that emerged: session subsystems live at **`session/<domain>/`**, with `session.ts` as the orchestrator shell.
-
- **#1640 — VoiceSession** (`session/voice/voice-session.ts`, seam `VoiceSessionHost`): the STT/TTS/dictation/turn-detection subsystem. _(Originally landed at `server/voice/`; relocated under `session/` so all session subsystems share one home.)_
- **#1644 — CheckoutSession, read side** (`session/checkout/checkout-session.ts`, seam `CheckoutSessionHost`, port `CheckoutDiffSubscriber`): status, branch validate/suggest, diff subscribe/unsubscribe, manual refresh. The workspace-git observer already delegates `emitStatusUpdate`/`scheduleDiffRefresh` to it.
-
-**Next carve — CheckoutSession mutation side (Slice 4 below).** The 17 checkout _write_ handlers still inline in `session.ts` (`dispatchCheckoutMessage`, ~2010) — branch switch/rename, commit, merge, merge-from-base, pull, push, PR create/merge, github set-auto-merge/get-check-details, PR status, PR timeline, github search, stash save/pop/list — move into the existing `session/checkout/checkout-session.ts` behind `CheckoutSessionHost`. The Slice-3 observer entanglement the table fears is already resolved: #1644 moved the status/diff read side into CheckoutSession, so the workspace observer delegates today and this no longer blocks on the WorkspaceController split.
-
 ### Why this is safe at the dispatch seam (verified)

 `dispatchInboundMessage` builds `a() ?? b() ?? ... ?? dispatchMiscMessage()` and short-circuits on the first non-`undefined` **Promise object** (not its resolved value). Message-type spaces are **disjoint** (no duplicate `case` labels across switches), so at most one dispatcher matches any message — collapsing to delegation cannot change which handler runs. `dispatchTerminalMessage` (2150-2153) already proves this. Two quirks preserved verbatim: schedule/\* is reached via the chat dispatcher's OWN `default` arm (2183), not the top-level `??`; and `start_workspace_script_request` (a workspace type) is special-cased before terminal delegation (2150).
@@ -126,7 +117,7 @@ In-place, separately reviewable. Split the `audio_output` TTS-debug branch out o

 ## Slice 7 — VoiceSessionController (XL)

-**Move:** voice handlers + ~25 voice fields + the TTS-debug hook (Slice 6) + `voiceModeAgentId`/`isVoiceMode` + the `shouldAutoAllowVoicePermission` predicate (Slice 3) → the existing `packages/server/src/server/session/voice/voice-session.ts` (see Progress above). Carve voice types out of `dispatchVoiceAndControlMessage`, leaving infra (restart/shutdown/heartbeat/ping/abort) on the shell.
+**Move:** voice handlers + ~25 voice fields + the TTS-debug hook (Slice 6) + `voiceModeAgentId`/`isVoiceMode` + the `shouldAutoAllowVoicePermission` predicate (Slice 3) → `packages/server/src/server/voice/voice-session-controller.ts`. Carve voice types out of `dispatchVoiceAndControlMessage`, leaving infra (restart/shutdown/heartbeat/ping/abort) on the shell.

 **SessionContext surface:** pure `emit`, `emitBinary`, `hasBinaryChannel`, `sessionLogger`/`sessionId`/`paseoHome`, `getSpeechReadiness`, agent-control port `{ loadAgent, reloadWithSystemPrompt, interruptIfRunning, isRunning, sendSpokenText, buildAgentPrompt }`, `getSignal`/`abortCurrent` (Slice 6).

--- a/docs/release.md
+++ b/docs/release.md
@@ -9,9 +9,6 @@ A release has exactly two steps. The agent does the first, the user authorizes t
 **Preparation** (local, reversible — agent does this):

 - format, lint, typecheck all green
- ACP provider catalog drift checked with `npm run acp:version-drift:check`;
-  if stale package-runner pins are intentional, say so explicitly, otherwise run
-  `npm run acp:version-drift:update` and commit the updated catalog
 - draft the changelog, show it to the user, wait for review
 - run the pre-release sanity check, surface findings to the user
 - confirm CI is green
@@ -33,7 +30,7 @@ Rules that apply to both steps:
 There are two supported ways to ship from `main`:

 1. **Direct stable release**: you are ready to ship the current `main` commit to everyone immediately.
-2. **Beta flow**: release candidates on the `beta` channel. Betas carry an in-place changelog entry (beta users check it), publish npm only on the explicit `beta` dist-tag, and never move the website download target off the latest stable.
+2. **Beta flow**: silent release candidates. Betas don't touch the changelog, don't move the website, and don't publish npm or production mobile builds.

 ## Standard release (patch)

@@ -66,19 +63,18 @@ npm run release:push         # Push HEAD + tag (triggers CI workflows)
 ## Beta flow

 ```bash
-npm run release:beta:patch       # Bump to X.Y.Z-beta.1, publish npm beta, push commit + tag
+npm run release:beta:patch       # Bump to X.Y.Z-beta.1, push commit + tag
 # ... test desktop and APK prerelease assets from GitHub Releases ...
 npm run release:beta:next        # Optional: cut X.Y.Z-beta.2, beta.3, ...
 npm run release:promote          # Promote X.Y.Z-beta.N to stable X.Y.Z
 ```

 - Beta tags are published GitHub prereleases like `v0.1.41-beta.1`
- Betas publish npm packages with `--tag beta`, so `npm install @getpaseo/cli@beta` opts in while plain `npm install @getpaseo/cli` stays on `latest`
- Betas publish desktop assets and APKs for testing, but they do not trigger the production web/mobile release flows
+- Betas publish desktop assets and APKs for testing, but they do not publish npm packages and do not trigger the production web/mobile release flows
 - `release:promote` creates a fresh stable tag like `v0.1.41`; the final release never reuses the beta tag
 - Desktop assets now come from the Electron package at `packages/desktop`
 - Beta releases use Electron's `beta` update channel. Users on the stable channel only receive stable releases; users on the beta channel receive beta releases and the final stable release when it is published.
- **Betas carry a changelog entry.** Beta users read release notes, so each beta updates an in-place `CHANGELOG.md` entry (`## X.Y.Z-beta.N`) that `Release Notes Sync` mirrors into the prerelease body on the tag push. The entry is intermediary: promotion overwrites it in place with the final stable entry, so no `-beta.N` heading is ever left behind. See the Changelog policy section.
+- **Betas don't touch `CHANGELOG.md`.** Beta GitHub releases ship with empty notes — that's intentional. The changelog entry is written once, at promotion time, covering the full stable-to-stable diff. The release-notes sync script skips betas cleanly because no matching section exists.

 Use the beta path when you need to:

@@ -89,7 +85,7 @@ Use the beta path when you need to:

 ## Staged rollout (stable channel)

-Stable desktop releases go out via a linear time-based rollout for automatic update checks: 0% admitted when the updater manifests appear, 100% admitted 36 hours later, linear ramp in between. Manual checks bypass the rollout so a user can install immediately when they click **Check**. Beta releases bypass the rollout entirely — beta users always receive updates immediately.
+Stable desktop releases go out via a linear time-based rollout: 0% admitted when the updater manifests appear, 100% admitted 36 hours later, linear ramp in between. Beta releases bypass the rollout entirely — beta users always receive updates immediately.

 The rollout is driven by a `rolloutHours` field stamped into the GitHub Release manifests (`latest-mac.yml`, `latest-linux.yml`, `latest.yml`) by the `finalize-rollout` job in `desktop-release.yml`.

@@ -173,7 +169,7 @@ If N+1 is a hotfix for a bug in N, dispatch `desktop-rollout.yml -f tag=v0.1.<N+
 - **No pause / kill switch.** Once a stable user is admitted, they will install the update on next quit (`autoInstallOnAppQuit = true`). To stop new admissions, ship a superseding release. To "recall" already-admitted users, ship a hotfix `+1` patch.
 - **No rollback.** `allowDowngrade = false`. Bad release = ship a hotfix.
 - **Bootstrap caveat.** Clients running a build older than the rollout feature ignore `rolloutHours` and admit immediately. Rollout protection only applies to clients running the rollout-aware version or later.
- **Up to ~30 min automatic admission latency.** Renderer polls every 30 minutes, so a stable user may take up to that long to be evaluated against the rollout window. Clicking **Check** is manual and bypasses rollout admission.
+- **Up to ~30 min admission latency.** Renderer polls every 30 minutes, so a stable user may take up to that long to be evaluated against the rollout window.

 ## Mobile builds (EAS)

@@ -195,9 +191,6 @@ cd packages/app
 # Recent builds (newest first). Pipe to jq for status only.
 npx eas build:list --limit 8 --non-interactive --json | jq '.[] | {platform, status, appVersion, gitCommitHash}'

-# Recent EAS workflow runs. This is the source of truth for submit/review jobs.
-npx eas workflow:runs --json | jq '.[] | {status, workflowName, trigger, gitCommitHash, startedAt, finishedAt}'
-
 # Filter by platform.
 npx eas build:list --platform ios --limit 5 --non-interactive --json
 npx eas build:list --platform android --limit 5 --non-interactive --json
@@ -205,52 +198,35 @@ npx eas build:list --platform android --limit 5 --non-interactive --json
 # Inspect a specific build.
 npx eas build:view <build-id>

-# Inspect the full release workflow, including submit_ios, submit_android,
-# and submit_ios_for_review.
-npx eas workflow:view <workflow-run-id> --json
-
-# Read failed submit/review job logs.
-npx eas workflow:logs <workflow-job-id> --all-steps --non-interactive
-
 # Stream logs for a build.
 npx eas build:view <build-id> --json | jq '.logFiles[]'
 ```

-A build's `gitCommitHash` must match the release tag commit. `status` walks through `NEW` → `IN_QUEUE` → `IN_PROGRESS` → `FINISHED` (or `ERRORED`/`CANCELED`). The EAS workflow run's `gitCommitHash` and `trigger` must also match the release tag.
+A build's `gitCommitHash` must match the release tag commit. `status` walks through `NEW` → `IN_QUEUE` → `IN_PROGRESS` → `FINISHED` (or `ERRORED`/`CANCELED`).

-Once a build is `FINISHED`, EAS still has release-critical work to do: Android must submit to the Play Store, and iOS must upload to TestFlight **and** submit the build for App Store review. The release is not done until all platforms are on their way through the stores.
-
-For the `Release Mobile` EAS workflow, these jobs must pass:
-
- `build_ios` — iOS binary built
- `submit_ios` — iOS binary uploaded to App Store Connect/TestFlight
- `submit_ios_for_review` — iOS build submitted for App Store review via Fastlane
- `build_android` — Android store binary built
- `submit_android` — Android binary submitted to the Play Store
-
-Do not treat `build_ios: SUCCESS` or `submit_ios: SUCCESS` as a completed iOS release. `submit_ios_for_review: FAILURE` means the iOS release is blocked even if the build is visible in TestFlight.
-
-To confirm the submission landed, inspect the EAS workflow with `npx eas workflow:view <workflow-run-id> --json`. App Store Connect (review state for the matching version/build) and the Play Console track are the final ground truth.
+Once a build is `FINISHED`, EAS auto-submits it to the store: Android via the `submit` block in `eas.json` (EAS-managed Play Console credentials), iOS via the Fastlane `submit_review` lane (uploads to TestFlight, then submits for App Store review). To confirm the submission landed, run `npx eas build:view <build-id>` and open the `Logs` URL it prints — the build's Expo dashboard page has a Submissions section listing each attempt with its store response. App Store Connect (TestFlight tab → ready for review) and the Play Console (Internal testing / Production tracks) are the final ground truth.

 ### Babysitting mobile after a release

-The user rarely opens the Expo dashboard. A failed EAS build or submit/review job can sit silently until users complain about a stale version. After every stable release, set up a long-delay babysit that re-checks GitHub Actions, EAS builds, and the EAS `Release Mobile` workflow for the release tag. If any build is `ERRORED`/`CANCELED`, any workflow is `FAILURE`, or any required submit/review job fails, surface it immediately. If all builds are `FINISHED` and all required submit/review jobs are `SUCCESS`, confirm and stop.
+The user rarely opens the Expo dashboard. A failed EAS build can sit silently until users complain about a stale version. After every stable release, set up a long-delay babysit that re-checks both EAS builds and GitHub Actions for the release tag. If anything is `ERRORED` or `FAILED`, surface it immediately. If everything is `FINISHED`/`SUCCESS`, confirm and stop.

-**Use `create_heartbeat`, never `create_schedule`, for release babysitting.** Babysitting fires back into the current conversation as a wake-up prompt. `create_schedule` starts a fresh agent the user has to find and read; `create_heartbeat` surfaces the build status inline in the conversation that owns the release, where it is impossible to miss. If you find yourself reaching for `create_schedule` for a release babysit, you are about to ship a status report into a void.
+**Use a heartbeat schedule, never a new-agent schedule.** Babysitting fires back into the current conversation as a wake-up prompt — `target: "self"` in `mcp__paseo__create_schedule`. Never use `target: "new-agent"`. A new agent spawns a fresh conversation the user has to find and read; a heartbeat surfaces the build status inline in the conversation that owns the release, where it is impossible to miss. If you find yourself reaching for `new-agent` for a release babysit, you are about to ship a status report into a void.

 Pattern:

 ```jsonc
-// mcp__paseo__create_heartbeat arguments
+// mcp__paseo__create_schedule arguments
 {
  "name": "vX.Y.Z release babysit heartbeat",
-  "cron": "*/15 * * * *",
+  "every": "15m",
  "maxRuns": 8, // covers ~2h of build + store-submission window
-  "prompt": "Heartbeat: check vX.Y.Z release. Run gh run list, eas build:list, eas workflow:runs, and eas workflow:view for the matching Release Mobile run. Report concisely. The release is not done until desktop/APK workflows are green, EAS builds are FINISHED, Android submit_android is SUCCESS, and iOS submit_ios + submit_ios_for_review are SUCCESS. Flag any ERRORED/FAILED/CANCELED/FAILURE loudly.",
+  "target": "self", // heartbeat, NOT "new-agent"
+  "cwd": "/path/to/paseo",
+  "prompt": "Heartbeat: check vX.Y.Z release builds. Run gh run list + eas build:list, report concisely; flag any ERRORED/FAILED/CANCELED.",
 }
 ```

-Tight cadence on purpose. The first run fires immediately, giving a near-real-time status check before the conversation closes. Subsequent runs at 15-minute intervals catch transitions quickly: a failed EAS build or failed App Store review submission at +20m should not wait until +50m to surface. Keep the prompt short — the heartbeat is a status probe, not a research task — and have it bail out as soon as every platform is actually on its store path so the remaining runs do not generate noise.
+Tight cadence on purpose. The first run fires immediately, giving a near-real-time status check before the conversation closes. Subsequent runs at 15-minute intervals catch transitions quickly: a failed EAS build that errors at +20m should not wait until +50m to surface. Keep the prompt short — the heartbeat is a status probe, not a research task — and have it bail out as soon as everything is green so the remaining runs do not generate noise.

 ## Release notes on GitHub

@@ -260,8 +236,7 @@ The GitHub Release body is populated automatically by the `Release Notes Sync` w

 - The website download page points to GitHub's latest published **stable** release.
 - Published beta prereleases are public on GitHub Releases, but they do **not** become the website download target.
- The download target only moves when you publish the final stable release tag like `v0.1.41`.
- The public `/changelog` page renders `CHANGELOG.md` as-is, so the in-flight `-beta.N` entry shows there once it lands on `main` — that's intended, it's where beta users check what's coming. Only the **download target** stays pinned to the latest stable; the download links read GitHub's releases API, not the changelog, so a `-beta.N` heading on top never affects them.
+- The website only moves when you publish the final stable release tag like `v0.1.41`.
 - The website itself is deployed by `Deploy Website` (Cloudflare Workers), which redeploys on `release: published` for non-prerelease releases and on pushes to `main` that touch `CHANGELOG.md` or `packages/website/**`.

 ## Fixing a failed release build
@@ -305,7 +280,6 @@ This ensures the checkout ref matches the actual code on `main` with the fix inc
 - `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
- If `release:publish:beta` partially fails, re-run it — npm skips already-published versions and keeps prereleases off `latest` because every publish uses `--tag beta`
 - The website uses GitHub's latest published release API for download links, so published beta prereleases do not replace the stable download target.

 ## Changelog format
@@ -314,24 +288,20 @@ Release notes depend on the changelog heading format. The heading **must** be st

 ```
 ## X.Y.Z - YYYY-MM-DD
-## X.Y.Z-beta.N - YYYY-MM-DD
 ```

-No prefix (`v`), no extra text. `Release Notes Sync` matches the `## X.Y.Z` (or `## X.Y.Z-beta.N`) line for the pushed tag to extract the version. A malformed heading breaks the release-notes sync for that tag.
+No prefix (`v`), no extra text. The parser matches the first `## X.Y.Z` line to extract the version. A malformed heading will break download links on the homepage.

 ## Changelog policy

- `CHANGELOG.md` includes stable releases and the current beta line.
- The first beta of a version inserts a top entry like `## 0.1.60-beta.1 - YYYY-MM-DD`.
- Each subsequent beta updates that same top entry in place — bump the heading (`0.1.60-beta.1` → `0.1.60-beta.2`) and fold in whatever else landed.
- Stable promotion updates that same entry in place one last time: heading to `0.1.60`, date to the promotion day.
- One entry per version line. The `-beta.N` heading is intermediary — overwrite it, never append. Don't leave stale `-beta.N` entries behind and don't create a duplicate entry per beta.
- It always covers the full diff from the previous stable tag, regardless of how many betas were cut in between.
+- `CHANGELOG.md` only lists stable releases. Betas are silent.
+- The changelog entry is authored once, at stable promotion time, with the date set to the promotion day.
+- It covers the full diff from the previous stable tag, regardless of how many betas were cut in between.

 ## Changelog ownership

- **The agent running the release writes the changelog entry — beta or stable.** Do not hand the changelog to another model or agent. The release agent has the release context and owns the final wording.
- Draft the entry from the previous-stable-to-`HEAD` diff, review it against the changelog policy below, show it to the user, and wait for approval before committing it. Each beta refreshes the same entry; promotion refreshes it one last time from the full previous-stable-to-`HEAD` diff.
+- **Only Claude should write changelog entries.**
+- If you are Codex and a stable release needs a changelog entry, launch a Claude agent with Paseo to draft it, then review and commit the result.

 ## Changelog voice

@@ -410,50 +380,42 @@ Entries within each section (Added, Improved, Fixed) are ordered by user impact:

 ## Pre-release sanity check

-Before cutting a **stable** release, the release agent reviews the diff as a last line of defence against shipping bugs. Skip this for betas — the beta itself is the smoke test, and gating each beta on a code review defeats the point of using betas as fast release candidates.
+Before cutting a **stable** release, run a Codex review of the diff as a last line of defence against shipping bugs. Skip this for betas — the beta itself is the smoke test, and gating each beta on a code review defeats the point of using betas as fast release candidates.

-Review the diff between the latest release tag and `HEAD`. Focus on:
+Load the `paseo` skill and launch a **Codex 5.4** agent with a prompt like:

-1. **Breaking changes** — especially in the WebSocket protocol, agent lifecycle, and any server↔client contract.
-2. **Backward compatibility** — the important direction is old app clients talking to newly updated daemons. Users update desktop and daemon first, then keep running the old app for a while. Flag anything that breaks old clients against new daemons or requires both sides to update in lockstep.
-3. **Regressions** — anything that looks like it could break existing functionality.
+> Review the diff between the latest release tag and HEAD. Focus on:
+>
+> 1. **Breaking changes** — especially in the WebSocket protocol, agent lifecycle, and any server↔client contract.
+> 2. **Backward compatibility** — the important direction is old app clients talking to newly updated daemons. Users update desktop and daemon first, then keep running the old app for a while. Flag anything that breaks old clients against new daemons or requires both sides to update in lockstep.
+> 3. **Regressions** — anything that looks like it could break existing functionality.
+>
+> Diff: `git diff <latest-release-tag>..HEAD`

-Use `git diff <latest-release-tag>..HEAD` as the review input. This is a deep sanity check, not a full code review. If anything looks risky, investigate before proceeding and surface the finding to the user.
+The agent's job is a deep sanity check, not a full code review. If it flags anything, investigate before proceeding.

 ## Changelog scope

-The changelog always covers **previous-stable-to-`HEAD`**, beta and stable alike:
-
- **Beta release**: the entry covers `previous stable tag → HEAD`. Update the current in-place beta entry; don't start a fresh one per beta.
- **Stable promotion**: the same entry is promoted in place. It still captures the full delta from the previous stable release, not just what changed since the last beta.
-
-Betas are checkpoints along the way; the entry is the single record for the jump from one stable version to the next, and beta users read it in the meantime.
+The changelog covers **stable-to-stable**. Betas are not represented. When you promote, draft the entry from the diff between the previous stable tag and `HEAD`, ignoring beta tag boundaries — they're just checkpoints along the way.

 ## Completion checklist

 ### Beta release

 - [ ] Working tree is clean and the intended commit is on `main`
- [ ] Update the in-place beta entry in `CHANGELOG.md` (heading `## X.Y.Z-beta.N - YYYY-MM-DD`), review it against the changelog policy, get approval, and commit it before cutting the release
 - [ ] `npm run release:beta:patch` (or `:next`) completes successfully
- [ ] npm shows the version under the `beta` dist-tag, not `latest`
 - [ ] GitHub `Desktop Release` workflow for the `v*-beta.N` tag is green
 - [ ] GitHub `Android APK Release` workflow for the same tag is green
- [ ] GitHub `Release Notes Sync` mirrored the beta entry into the prerelease body

 ### Stable release (or promotion)

 - [ ] Run the pre-release sanity check (see above) and address any findings
 - [ ] Ensure the intended release commit is already committed and the git worktree is clean before running any `release:*` patch/promote command
 - [ ] Ensure local `npm run typecheck` passes on that exact commit before running any `release:*` patch/promote command
- [ ] Update `CHANGELOG.md` with user-facing release notes (features, fixes — not refactors). When promoting from beta, overwrite the existing `## X.Y.Z-beta.N` heading in place (heading → `X.Y.Z`, date → promotion day) — do not add a new entry on top of the beta one
+- [ ] Update `CHANGELOG.md` with user-facing release notes (features, fixes — not refactors)
 - [ ] Verify the changelog heading follows strict `## X.Y.Z - YYYY-MM-DD` format
 - [ ] `npm run release:patch` or `npm run release:promote` completes successfully
 - [ ] GitHub `Desktop Release` workflow for the `v*` tag is green
 - [ ] GitHub `Android APK Release` workflow for the same tag is green
- [ ] EAS `Release Mobile` workflow for the same tag is green
- [ ] EAS iOS `build_ios` completes for the same tag
- [ ] EAS iOS `submit_ios` succeeds, uploading the build to App Store Connect/TestFlight
- [ ] EAS iOS `submit_ios_for_review` succeeds, putting the build into App Store review
- [ ] EAS Android `build_android` completes for the same tag
- [ ] EAS Android `submit_android` succeeds, putting the build on its Play Store track
+- [ ] EAS iOS production build for the same tag completes and submits via Fastlane
+- [ ] EAS Android production build for the same tag completes and auto-submits to the Play Store
--- a/docs/service-proxy.md
+++ b/docs/service-proxy.md
@@ -1,92 +0,0 @@
-# Service Proxy
-
-Paseo proxies HTTP traffic to services running inside your workspaces. Localhost service URLs are always enabled; optional public aliases and a separate service-only listener can be layered on through config.
-
-## How it works
-
-When a `paseo.json` script of `"type": "service"` starts, Paseo assigns it a local port and registers a route in the service proxy. Incoming requests whose `Host` header matches the script's generated hostname are forwarded to that port.
-
-The generated hostname is built from the script name, branch, and project:
-
-```
-<script>--<branch>--<project>.localhost
-```
-
-If the branch is `main` or `master`, the branch segment is omitted:
-
-```
-<script>--<project>.localhost
-```
-
-**Example:** a script named `dev` in the `miniweb` project on branch `feature/auth` would be reachable at:
-
-```
-dev--feature-auth--miniweb.localhost
-```
-
-Local and public routes use one combined leftmost label (`script--branch--project`). This keeps the hostname compatible with normal single-level wildcard DNS and TLS. If the combined label would exceed DNS's 63-character label limit, Paseo truncates it with a deterministic hash suffix to avoid collisions.
-
-## Configuration
-
-Add a `serviceProxy` block under `daemon` in `~/.paseo/config.json`:
-
-```json
-{
-  "version": 1,
-  "daemon": {
-    "serviceProxy": {
-      "listen": "0.0.0.0:8080",
-      "publicBaseUrl": "https://paseoapps.my.domain.com"
-    }
-  }
-}
-```
-
-| Field           | Required | Description                                                                                                                                   |
-| --------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `listen`        | No       | Starts a separate service-only listener at this address. If omitted, services are still reachable on the daemon listener via localhost hosts. |
-| `publicBaseUrl` | No       | Adds public service host aliases and public service links. If omitted, links use localhost addresses only.                                    |
-
-`enabled` is accepted for old configs but no longer enables a mode. `enabled: false` suppresses optional `listen`/`publicBaseUrl` layers only; localhost service proxying remains always enabled.
-
-## DNS and reverse proxy setup
-
-For generated URLs to be reachable, you need wildcard DNS pointing to the machine running the Paseo daemon.
-
-**Example:** to expose services at `https://dev--miniweb.paseoapps.my.domain.com` where the daemon host is `10.1.1.1`:
-
-1. Configure a wildcard DNS record:
-
-   ```
-   *.paseoapps.my.domain.com  →  10.1.1.1
-   ```
-
-2. Set `publicBaseUrl` to `https://paseoapps.my.domain.com` in your config.
-
-3. If you put a reverse proxy (nginx, Caddy, Traefik, etc.) in front of Paseo, point it at either the daemon listener or the optional service-only listener and ensure it forwards the `Host` header unchanged. The proxy uses the `Host` header to route requests to the correct service — rewriting it will break routing.
-
-Public service URLs expose the workspace service itself. Daemon password authentication protects daemon APIs; it does not protect proxied dev services.
-
-Nginx example:
-
-```nginx
-server {
-    listen 443 ssl;
-    server_name *.paseoapps.my.domain.com;
-
-    location / {
-        proxy_pass http://10.1.1.1:8080;
-        proxy_set_header Host $host;
-    }
-}
-```
-
-## Environment variables
-
-The listen address and public base URL can also be set via environment variables, which take precedence over `config.json`:
-
-| Variable                              | Description                                                               |
-| ------------------------------------- | ------------------------------------------------------------------------- |
-| `PASEO_SERVICE_PROXY_ENABLED`         | Compatibility shim; `false` suppresses optional public/listen layers only |
-| `PASEO_SERVICE_PROXY_LISTEN`          | Starts the optional service-only listener, e.g. `0.0.0.0:8080`            |
-| `PASEO_SERVICE_PROXY_PUBLIC_BASE_URL` | Adds public service aliases and links                                     |
--- a/docs/terminal-activity.md
+++ b/docs/terminal-activity.md
@@ -1,112 +0,0 @@
-# Terminal Activity Indicators
-
-Paseo surfaces terminal activity as a tab indicator (the same "running" dot used by agents).
-
-## Current state
-
-Terminal activity is source-agnostic plumbing. `TerminalActivityTracker` holds the current per-terminal state and emits transitions to the manager, worker protocol, websocket subscription, app buckets, dots, and notifications.
-
-The tracker defaults to unknown (`null`). Activity production lives outside terminal stream parsing: agent hook commands report coarse activity to the daemon's local `/api/terminal-activity` endpoint.
-
-## Architecture
-
-```
-TerminalSession
-  ├── TerminalActivityTracker               one per session
-  │     ├── set(state)                      records the latest state
-  │     └── onChange(snapshot, previous)    fires only on resolved-state transitions
-  │
-  └── onActivityChange({ activity, previous })   subscribed in TerminalManager
-        ├── emits terminalsChanged          terminal list/tab indicators only
-        └── subscribeTerminalActivity       per-transition stream for notification policy
-        └── subscribeTerminalWorkspaceContributionChanged  workspace status rollup only
-```
-
-`TerminalActivityTracker` is the single stateful object per session. It holds `{ state, changedAt }`, starts at unknown (`null`), and fires `onChange` only when the state actually changes.
-
-Terminal directory snapshots (`terminalsChanged`) and workspace contribution changes are separate concerns. A title-only change produces a terminal list snapshot but never touches workspace descriptors. A transition that changes the derived workspace bucket (e.g. idle -> working, working -> idle, attention cleared) emits both a terminal list snapshot and a server-internal `TerminalWorkspaceContributionChanged` event, which Session consumes to invalidate every active workspace sharing the owning workspace's `cwd`.
-
-### Transitions carry their own history
-
-Each `onChange` delivers both the new snapshot and the `previous` one (`{ state, changedAt }`). The transition flows unchanged up through `TerminalSession.onActivityChange` (as `{ activity, previous }`), the worker protocol's `terminalActivityChange` event, and the manager-level `subscribeTerminalActivity(listener)` stream (`{ terminalId, name, cwd, activity, previous }`).
-
-The daemon consumes these transitions, not snapshots. When a transition moves from `working` to `idle`, the tracker records finished attention, so the terminal shows the same green finished dot as an idle agent that needs review. The websocket layer also fires a "Terminal finished" attention notification. A terminal that exits while still working emits no turn-end notification.
-
-Terminal list visibility is `workspaceId`-scoped: a terminal belongs to the workspace that created it, and same-`cwd` sibling workspaces do not see it in their terminal lists. Terminal status routing starts from that owning workspace, uses the owning workspace's `cwd`, then fans the status bucket out to every active workspace with the same `cwd`.
-
-Path-prefix routing is only a legacy fallback for unowned terminal activity contribution. If a live terminal has no `workspaceId`, the daemon resolves the deepest active parent workspace from the terminal `cwd`, then fans status out to active same-`cwd` siblings of that owner. That fallback contributes status, but it does not make the terminal visible in workspace-scoped terminal lists.
-
-## Hook reporting
-
-Terminals receive four environment variables when the daemon creates the shell:
-
- `PASEO_TERMINAL_ID`
- `PASEO_ACTIVITY_TOKEN`
- `PASEO_TERMINAL_ACTIVITY_URL`
- `PASEO_HOOK_CLI` — absolute path to the current `paseo` CLI executable.
-
-The generated shell command uses `PASEO_HOOK_CLI` to run the current CLI. `paseo hooks <agent> <event>` then reads the terminal id, token, and activity URL, asks the agent hook provider registry to resolve the event to a coarse activity state, and silently posts `{ terminalId, token, state }` to the activity URL. Missing env, unsupported agents/events, malformed hook input, and daemon/network failures are no-ops so agent hooks never break the user's terminal session.
-
-Claude hook mapping:
-
- `UserPromptSubmit` → `running`
- `Stop`, `StopFailure`, `SessionEnd` → `idle`
- `Notification` with `reason` or `matcher` equal to `idle_prompt` → `needs-input`
-
-Codex hook mapping:
-
- `UserPromptSubmit` → `running`
- `PreToolUse`, `PostToolUse` → `running`
- `PermissionRequest` → `needs-input`
- `Stop` → `idle`
-
-OpenCode uses a server plugin instead of command hooks. The plugin listens to OpenCode bus events and emits these Paseo hook events:
-
- `session.status` with `busy` or `retry` → `running`
- `session.status` with `idle` → `idle`
- `permission.asked` → `needs-input`
- `permission.replied` → `running`
-
-The daemon maps hook states onto terminal activity like an agent lifecycle plus unread attention: `running` → `state: working`, `idle` → `state: idle`, and `needs-input` → `state: idle` with `attentionReason: needs_input`. A `working` → `idle` transition records `state: idle` with `attentionReason: finished` until the user focuses that terminal; plain idle terminals still contribute no workspace status.
-
-## Focus clearing
-
-Client heartbeats include the focused terminal id. When a visible client focuses a terminal with an `attentionReason`, the daemon clears the attention and leaves the terminal idle. Plain idle terminal activity does not contribute to workspace status, so a workspace whose only attention source was that terminal rolls up from `needs_input` or `attention` back to `done`.
-
-### Agent hook installation
-
-Installing hooks edits the user's real agent config files, so it is opt-in. The daemon setting
-`enableTerminalAgentHooks` (persisted under `daemon.enableTerminalAgentHooks`, default `false`)
-gates installation. It is surfaced in the app under a host's **Terminals** settings as "Enable
-terminal agent hooks" — "Get notifications and status from terminal agents. This installs hooks in
-your agent config files." `applyTerminalAgentHookSetting` reconciles the installed hooks with the
-setting: at startup it installs only when enabled; toggling the setting live installs on enable and
-removes Paseo's marker-matched hooks on disable. `paseo hooks` keeps working regardless — the gate
-only controls whether the daemon writes hooks into agent configs, not whether the CLI can post
-activity when the env is present.
-
-When enabled, Paseo installs provider hooks globally:
-
- Claude hooks are written to `~/.claude/settings.json` (or `CLAUDE_CONFIG_DIR/settings.json` when that override is set).
- Codex hooks are written to `~/.codex/hooks.json` (or `CODEX_HOME/hooks.json` when that override is set). Codex supports a native `commandWindows`, so each Paseo hook includes both POSIX and Windows commands. Non-managed Codex hooks are trust-gated by Codex; users may see Codex's hook review prompt before the hook runs.
- OpenCode gets a self-contained plugin at `$XDG_CONFIG_HOME/opencode/plugins/paseo-terminal-activity.js` (or `~/.config/opencode/plugins/paseo-terminal-activity.js` when XDG is unset; `OPENCODE_CONFIG_DIR` still wins when set).
-
-Installation is marker-based/idempotent for config hooks and exact-file/idempotent for the OpenCode plugin. Paseo preserves user hooks, removes only its own marker-matched command hooks, and leaves hooks installed across daemon shutdown. Outside a Paseo terminal they are inert because the command or plugin is gated on `PASEO_TERMINAL_ID`.
-
-Provider variation lives in `AGENT_HOOK_PROVIDERS`: provider id, installed events, config install metadata, and runtime event-to-activity resolution. The daemon calls `installRegisteredAgentHooks()` once; the CLI calls `resolveHookActivity(provider, event, input)`. Adding a provider should add one provider entry and register it in `AGENT_HOOK_PROVIDERS`, without editing the generic CLI command or daemon bootstrap.
-
-The installed hook command keeps the config portable and resolves the CLI at runtime:
-
-```sh
-[ -n "$PASEO_TERMINAL_ID" ] && "${PASEO_HOOK_CLI:-paseo}" hooks claude <event>
-```
-
-Codex also receives the Windows equivalent:
-
-```bat
-if defined PASEO_TERMINAL_ID (if defined PASEO_HOOK_CLI ("%PASEO_HOOK_CLI%" hooks codex <event>) else (paseo hooks codex <event>))
-```
-
-Paseo injects `PASEO_HOOK_CLI` so Codex's hook shell cannot pick up a stale global `paseo` before the current one. The command still falls back to bare `paseo` if the env is missing, and it still no-ops outside Paseo terminals because the `PASEO_TERMINAL_ID` gate remains first. Paseo also prepends the CLI binary directory to each terminal `PATH` as a secondary fallback. All other behavior lives in `paseo hooks`: read the env, map the event, POST activity, and no-op/fail-open when anything is missing or unavailable.
-
-If config installation fails, daemon startup and terminal spawn continue without terminal activity hooks.
--- a/docs/terminal-performance.md
+++ b/docs/terminal-performance.md
@@ -1,40 +0,0 @@
-# Terminal performance
-
-How terminal output stays low-latency, what the invariants are, and how to measure before/after any change to the pipeline. Read this before touching anything under `packages/server/src/terminal/` or `packages/app/src/terminal/runtime/`.
-
-## The pipeline
-
-```
-pty (node-pty, forked worker process)
-  → headless xterm parse (worker, snapshot fidelity)
-  → TerminalOutputCoalescer (worker, ≤1 IPC message per 5ms per terminal)
-  → process.send IPC → daemon main process
-  → TerminalOutputCoalescer (per client stream, terminal-session-controller.ts)
-  → binary ws frame (2-byte header + raw bytes)
-  → client decode (daemon-client.ts) → stream router → emulator runtime
-  → xterm.write (back-to-back; xterm batches internally)
-```
-
-Terminal frames share the daemon main event loop with all agent traffic. The `eventLoopDelay` block in the `ws_runtime_metrics` log line (every 30s in `daemon.log`) is the ground truth for "the daemon is busy" — p99/max there directly bound worst-case terminal frame delay.
-
-## Invariants (the easy-to-break ones)
-
- **Coalescers are leading+trailing throttles.** The first chunk after an idle window flushes immediately (synchronously); only sustained bursts wait for the trailing timer. Reverting to trailing-only adds a full window (~5ms) to every keystroke echo.
- **Output coalescing happens in the worker, before IPC.** One `process.send` per pty chunk was a main-loop flood under build output. Non-output messages (snapshot/snapshotReady/titleChange/exit) must flush the coalescer first so ordering is preserved.
- **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.
- **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.
-
-## Measuring
-
- **Node-only benchmark (fast iteration, server pipeline):** `npx tsx scripts/benchmark-terminal-latency.ts`. Boots an isolated daemon (fresh `PASEO_HOME`, random port — never 6767), measures echo latency percentiles, burst jitter, and snapshot counts under ramped mock-agent load. Writes JSON to `/tmp/paseo-terminal-bench/`. Healthy numbers (2026-06): echo p50 ~2.3ms, p95 ~3.3ms, a 2MB burst fully streamed with `snap=0`.
- **Browser perf specs (user-perceived path):** gated behind `PASEO_TERMINAL_PERF_E2E=1` —
-  `packages/app/e2e/terminal-performance.spec.ts` and `packages/app/e2e/terminal-keystroke-stress.spec.ts` (per-stage keydown→xterm-commit breakdown under mock-agent load). Healthy: keydown→commit p50 ~18ms under 600-key burst.
- **Production:** grep `daemon.log` for `ws_runtime_metrics` and read `eventLoopDelay` + `bufferedAmount`.
-
-## 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.
- Relay-attached clients pay pure-JS tweetnacl encryption + base64 per frame on the daemon main loop (`packages/relay/src/encrypted-channel.ts`).
- `sendToClient` re-stringifies session messages per socket; only matters for multi-socket connections.
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -130,7 +130,6 @@ Test suites in this repo are heavy. Running them in bulk freezes the machine, es
 - Never re-run a suite another agent already reported green.
 - For full-suite confidence, push to CI and check GitHub Actions.
 - Never run the full Playwright E2E suite locally — defer whole-suite verification to CI. Targeted Playwright specs are allowed when you changed or need to prove that specific flow.
- App Playwright specs share one isolated daemon per run. Helpers that create projects or workspaces must remove the daemon project record during cleanup, not only delete the temp directory. Agent helpers must pass the intended `workspaceId` through to agent creation; never infer ownership from `cwd`.

 ## Agent authentication in tests

--- a/docs/timeline-sync.md
+++ b/docs/timeline-sync.md
@@ -2,8 +2,8 @@

 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.
+1. **Live stream** — `agent_stream` WebSocket messages for immediacy.
+2. **Authoritative history** — `fetch_agent_timeline_request` for correctness.

 The invariant is:

@@ -24,8 +24,6 @@ Heartbeat is used for notification routing. It must not be used as a correctness

 Large unbounded timeline responses can exceed relay frame limits, so catch-up uses bounded pages. Bounded does not mean partial.

-Page limits are projected-item targets. A tool call lifecycle is one projected item even if it spans many source sequence numbers, and assistant/reasoning chunks are merged before counting. The response carries `seqStart`, `seqEnd`, `sourceSeqRanges`, and `collapsed` so clients can advance sequence cursors without rendering delta rows.
-
 When the app fetches `direction: "after"` and the daemon responds with `hasNewer: true`, the app must immediately fetch the next page from `endCursor`. The catch-up is complete only when `hasNewer: false`.

 The first load of an agent without a local cursor is different: it fetches a bounded latest tail page. Older history remains user-driven by scrolling upward.
--- a/docs/unistyles.md
+++ b/docs/unistyles.md
@@ -88,8 +88,6 @@ Do not split a component into plain and Unistyles variants just to handle one hi

 When a reusable component has a prop whose whole job is dynamic geometry, make that prop the seam. For example, `FloatingSurface.frameStyle` and `FloatingScrollView.style` own their own escape hatch so menu, tooltip, hover-card, and combobox callers can stay declarative instead of knowing about Unistyles internals.

-Do not flatten a caller-provided style array and pass the flattened object back to a React Native component. Unistyles style entries carry `unistyles_*` metadata; flattening two entries produces one object with multiple metadata keys and triggers the runtime warning: "use array syntax instead of object syntax." Preserve caller styles as arrays, and only flatten the dynamic geometry value you explicitly own. If that owned value was flattened from a mixed style prop, strip `unistyles_*` metadata before sending it through `inlineUnistylesStyle`.
-
 ## Main Gotcha: `contentContainerStyle`

 `ScrollView.contentContainerStyle` is the canonical trap. It looks like a style prop, but it is not the same prop that Unistyles' remapped native component registers by default. The upstream tutorial calls this out directly in its [ScrollView Background Issue](https://www.unistyl.es/v3/tutorial/settings-screen#scrollview-background-issue) section.
@@ -291,21 +289,6 @@ That brief transition is expected with the current storage model. It makes track

 If we ever need to avoid the transition entirely, store at least the theme preference in synchronous storage and configure Unistyles with `initialTheme`.

-## 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 }`.
-
-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.
- **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.
- **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.
- **Mounted parsed content uses `AppearanceStyleBoundary`.** Markdown, syntax-highlighted code, and tool-call detail bodies can contain memoized/custom renderer trees that do not naturally re-run when runtime-patched appearance tokens change. Wrap the parsed surface once with `packages/app/src/components/appearance-style-boundary.tsx`; do not add local "appearance key" props at each callsite.
- **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`.
-
 ## Debugging

 To inspect what the Babel plugin sees, temporarily enable [`debug: true`](https://www.unistyl.es/v3/other/babel-plugin#debug) in `packages/app/babel.config.js`:
@@ -335,7 +318,7 @@ For paint-layer bugs, use high-contrast probes:
 3. Screenshot the simulator and sample pixels to see which color fills the area.
 4. Remove the probes before committing.

-The welcome-screen investigation used this approach to prove the white layer was the `ScrollView` content container.
+The welcome-screen investigation used this approach to prove the white layer was the `ScrollView` content container. Deep-dive evidence is in [welcome-theme-split-research.md](/Users/moboudra/.paseo/notes/welcome-theme-split-research.md).

 ## References

@@ -349,3 +332,4 @@ The welcome-screen investigation used this approach to prove the white layer was
 - [GitHub issue #550: ScrollView sticky-header theme updates](https://github.com/jpudysz/react-native-unistyles/issues/550)
 - [GitHub issue #817: `UnistylesRuntime.themeName` does not re-render](https://github.com/jpudysz/react-native-unistyles/issues/817)
 - [GitHub issue #1030: `Image.tintColor` and native style update edge case](https://github.com/jpudysz/react-native-unistyles/issues/1030)
+- [Local research note: welcome theme split](/Users/moboudra/.paseo/notes/welcome-theme-split-research.md)
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-c3FItM+qFwZ/B21jOJ0W33LFZn1LUk4qNRbBekVT5vU=
+sha256-ngMXsN0UDo4ldTMQgDQ4r6XfAvwnwh4hzglIcmGYu9E=
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.100",
+  "version": "0.1.87",
  "private": true,
  "description": "Paseo: voice-controlled development environment with OpenAI Realtime API",
  "keywords": [
@@ -34,30 +34,22 @@
    "packages/cli"
  ],
  "scripts": {
-    "dev": "npm run dev:server",
+    "dev": "./scripts/dev.sh",
    "dev:win": "powershell ./scripts/dev.ps1",
-    "dev:server": "cross-env PASEO_LISTEN=127.0.0.1:6768 ./scripts/dev-daemon.sh",
-    "dev:server:watch": "concurrently --kill-others --names protocol,client,server --prefix-colors yellow,blue,cyan \"npm run watch:protocol\" \"npm run watch:client\" \"npm run dev:server:raw\"",
+    "dev:server": "npm run build:server-deps && concurrently --kill-others --names protocol,client,server --prefix-colors yellow,blue,cyan \"npm run watch:protocol\" \"npm run watch:client\" \"npm run dev:server:raw\"",
    "dev:server:raw": "npm run dev --workspace=@getpaseo/server",
-    "dev:app": "cross-env PASEO_LISTEN=127.0.0.1:6768 EXPO_PORT=8081 ./scripts/dev-app.sh",
+    "dev:app": "npm run start --workspace=@getpaseo/app",
    "dev:website": "npm run dev --workspace=@getpaseo/website",
    "postinstall": "node scripts/postinstall-patches.mjs",
    "prepare": "lefthook install --force",
    "build": "npm run build --workspaces --if-present",
    "build:highlight": "npm run build --workspace=@getpaseo/highlight",
-    "build:highlight:clean": "npm run build:clean --workspace=@getpaseo/highlight",
    "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:protocol && npm run build --workspace=@getpaseo/client",
-    "build:client:clean": "npm run build:protocol:clean && npm run build:clean --workspace=@getpaseo/client",
    "build:server-deps": "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": "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: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",
    "watch:protocol": "tsc -p packages/protocol/tsconfig.json --watch --preserveWatchOutput",
    "watch:client": "tsc -p packages/client/tsconfig.json --watch --preserveWatchOutput",
    "typecheck": "npm run typecheck --workspaces --if-present",
@@ -70,9 +62,6 @@
    "lint": "oxlint",
    "lint:fix": "oxlint --fix",
    "knip": "knip",
-    "acp:version-drift": "node scripts/check-acp-catalog-version-drift.mjs",
-    "acp:version-drift:check": "node scripts/check-acp-catalog-version-drift.mjs --fail-on-drift",
-    "acp:version-drift:update": "node scripts/check-acp-catalog-version-drift.mjs --update",
    "start": "npm run start --workspace=@getpaseo/server",
    "android": "npm run android --workspace=@getpaseo/app",
    "android:development": "npm run android:development --workspace=@getpaseo/app",
@@ -82,11 +71,11 @@
    "android:clean": "npm run android:clean --workspace=@getpaseo/app",
    "ios": "npm run ios --workspace=@getpaseo/app",
    "web": "npm run web --workspace=@getpaseo/app",
-    "dev:desktop": "cross-env PASEO_LISTEN=127.0.0.1:6768 npm run dev --workspace=@getpaseo/desktop",
+    "dev:desktop": "npm run dev --workspace=@getpaseo/desktop",
    "dev:win:desktop": "npm run dev:win --workspace=@getpaseo/desktop",
-    "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 --",
+    "build:desktop": "npm run build:app-deps && npm run build:server-deps && npm run build --workspace=@getpaseo/server && 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",
+    "cli": "npx tsx packages/cli/src/index.js",
    "version": "npm run version:sync-internal && npm run release:prepare && git add -A",
    "version:sync-internal": "node scripts/sync-workspace-versions.mjs",
    "release:prepare": "npm install --workspaces --include-workspace-root",
@@ -98,16 +87,14 @@
    "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: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 && npm run typecheck --workspace=@getpaseo/client && npm run build:server && 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: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",
-    "release:beta:major": "npm run release:check && npm run version:all:beta:major && npm run release:publish:beta && npm run release:push",
-    "release:beta:next": "npm run release:check && npm run version:all:beta:next && npm run release:publish:beta && npm run release:push",
+    "release:beta:patch": "npm run release:check && npm run version:all:beta:patch && npm run release:push",
+    "release:beta:minor": "npm run release:check && npm run version:all:beta:minor && npm run release:push",
+    "release:beta:major": "npm run release:check && npm run version:all:beta:major && npm run release:push",
+    "release:beta:next": "npm run release:check && npm run version:all:beta:next && npm run release:push",
    "release:promote": "npm run release:check && npm run version:all:promote && npm run release:publish && npm run release:push",
    "release:patch": "npm run release:check && npm run version:all:patch && npm run release:publish && npm run release:push",
    "release:minor": "npm run release:check && npm run version:all:minor && npm run release:publish && npm run release:push",
--- a/packages/app/Gemfile
+++ b/packages/app/Gemfile
@@ -1,4 +1,3 @@
 source "https://rubygems.org"

 gem "fastlane", "~> 2.234"
-gem "multi_json"
--- a/packages/app/assets/images/editor-apps/antigravity.png
+++ b/packages/app/assets/images/editor-apps/antigravity.png
--- a/packages/app/e2e/acp-provider-catalog.spec.ts
+++ b/packages/app/e2e/acp-provider-catalog.spec.ts
@@ -4,9 +4,8 @@ import { getServerId } from "./helpers/server-id";
 import {
  expectProviderInstalledInSettings,
  installAcpCatalogProvider,
-  openAddProviderArea,
+  openAddProviderModal,
  openSettingsHost,
-  openSettingsHostSection,
 } from "./helpers/settings";

 const ACP_PROVIDER = {
@@ -19,9 +18,7 @@ test.describe("ACP provider catalog", () => {
    await gotoAppShell(page);
    await openSettings(page);
    await openSettingsHost(page, getServerId());
-    // Providers moved to their own host section; add-provider lives there now.
-    await openSettingsHostSection(page, getServerId(), "providers");
-    await openAddProviderArea(page);
+    await openAddProviderModal(page);

    await installAcpCatalogProvider(page, ACP_PROVIDER.name);
    await expectProviderInstalledInSettings(page, ACP_PROVIDER.name);
--- a/packages/app/e2e/agent-stream-ui.spec.ts
+++ b/packages/app/e2e/agent-stream-ui.spec.ts
@@ -12,7 +12,7 @@ import { startRunningMockAgent } from "./helpers/composer";
 test.describe("Agent stream UI", () => {
  test("auto-scroll sticks to bottom across token bursts", async ({ page }) => {
    test.setTimeout(120_000);
-    const agent = await startRunningMockAgent(page, {
+    const { client, repo } = await startRunningMockAgent(page, {
      prefix: "stream-scroll-",
      model: "one-minute-stream",
      prompt: "Stream for auto-scroll test.",
@@ -21,13 +21,14 @@ test.describe("Agent stream UI", () => {
      await awaitAssistantMessage(page);
      await expectScrollFollowsNewContent(page);
    } finally {
-      await agent.cleanup();
+      await client.close();
+      await repo.cleanup();
    }
  });

  test("working-indicator transitions to copy-button when stream ends", async ({ page }) => {
    test.setTimeout(60_000);
-    const agent = await startRunningMockAgent(page, {
+    const { client, repo } = await startRunningMockAgent(page, {
      prefix: "stream-indicator-",
      model: "ten-second-stream",
      prompt: "Stream briefly for indicator transition test.",
@@ -38,7 +39,8 @@ test.describe("Agent stream UI", () => {
      await expectAgentIdle(page, 30_000);
      await expectTurnCopyButton(page);
    } finally {
-      await agent.cleanup();
+      await client.close();
+      await repo.cleanup();
    }
  });

--- a/packages/app/e2e/agent-timeline-pagination.spec.ts
+++ b/packages/app/e2e/agent-timeline-pagination.spec.ts
@@ -1,28 +0,0 @@
-import { test } from "./fixtures";
-import {
-  expectTimelinePromptNotMounted,
-  expectTimelinePromptVisible,
-  openAgentTimeline,
-  scrollTimelineUntilOlderHistoryIsReachable,
-  seedLongMockAgentTimeline,
-} from "./helpers/timeline-pagination";
-
-test.describe("Agent timeline pagination", () => {
-  test("loads older history when the user scrolls to the top of a long agent timeline", async ({
-    page,
-  }) => {
-    test.setTimeout(120_000);
-    const agent = await seedLongMockAgentTimeline({ turns: 80 });
-    try {
-      await openAgentTimeline(page, agent);
-      await expectTimelinePromptVisible(page, agent.newestPrompt);
-      await expectTimelinePromptNotMounted(page, agent.oldestPrompt);
-
-      await scrollTimelineUntilOlderHistoryIsReachable(page);
-
-      await expectTimelinePromptVisible(page, agent.oldestPrompt);
-    } finally {
-      await agent.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/archive-tab.spec.ts
+++ b/packages/app/e2e/archive-tab.spec.ts
@@ -1,21 +1,18 @@
 import { randomUUID } from "node:crypto";
-import { expect } from "@playwright/test";
 import { test } from "./fixtures";
-import { getServerId } from "./helpers/server-id";
 import { connectSeedClient } from "./helpers/seed-client";
 import { createTempGitRepo } from "./helpers/workspace";
-import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import {
  archiveAgentFromDaemon,
  archiveAgentFromSessions,
  clickSessionRow,
+  closeWorkspaceAgentTab,
  createIdleAgent,
+  expectArchivedAgentFocused,
  expectSessionRowArchived,
  expectSessionRowVisible,
  expectWorkspaceArchiveOutcome,
  expectWorkspaceTabHidden,
-  fetchAgentArchivedAt,
-  expectWorkspaceTabVisible,
  openSessions,
  openWorkspaceWithAgents,
  primeAdditionalPage,
@@ -26,26 +23,15 @@ import {
 test.describe("Archive tab reconciliation", () => {
  let client: Awaited<ReturnType<typeof connectSeedClient>>;
  let tempRepo: { path: string; cleanup: () => Promise<void> };
-  let projectId: string;
-  let workspaceId: string;

  test.describe.configure({ timeout: 300_000 });

  test.beforeAll(async () => {
    tempRepo = await createTempGitRepo("archive-tab-");
    client = await connectSeedClient();
-    const created = await client.createWorkspace({
-      source: { kind: "directory", path: tempRepo.path },
-    });
-    if (!created.workspace) {
-      throw new Error(created.error ?? `Failed to create workspace ${tempRepo.path}`);
-    }
-    projectId = created.workspace.projectId;
-    workspaceId = created.workspace.id;
  });

  test.afterAll(async () => {
-    await client?.removeProject(projectId).catch(() => undefined);
    await client?.close().catch(() => undefined);
    await tempRepo?.cleanup();
  });
@@ -53,12 +39,10 @@ test.describe("Archive tab reconciliation", () => {
  test("non-UI archive prunes the archived tab across open pages and reload", async ({ page }) => {
    const archived = await createIdleAgent(client, {
      cwd: tempRepo.path,
-      workspaceId,
      title: `cli-archive-${randomUUID().slice(0, 8)}`,
    });
    const surviving = await createIdleAgent(client, {
      cwd: tempRepo.path,
-      workspaceId,
      title: `cli-control-${randomUUID().slice(0, 8)}`,
    });
    const passivePage = await page.context().newPage();
@@ -84,7 +68,7 @@ test.describe("Archive tab reconciliation", () => {
        archivedAgentId: archived.id,
        survivingAgentId: surviving.id,
      });
-      await reloadWorkspace(passivePage, surviving.workspaceId);
+      await reloadWorkspace(passivePage, tempRepo.path);
      await expectWorkspaceTabHidden(passivePage, archived.id);
    } finally {
      await passivePage.close();
@@ -94,12 +78,10 @@ test.describe("Archive tab reconciliation", () => {
  test("Sessions archive prunes the archived tab across open pages", async ({ page }) => {
    const archived = await createIdleAgent(client, {
      cwd: tempRepo.path,
-      workspaceId,
      title: `ui-archive-${randomUUID().slice(0, 8)}`,
    });
    const surviving = await createIdleAgent(client, {
      cwd: tempRepo.path,
-      workspaceId,
      title: `ui-control-${randomUUID().slice(0, 8)}`,
    });
    const passivePage = await page.context().newPage();
@@ -112,7 +94,7 @@ test.describe("Archive tab reconciliation", () => {
      await openWorkspaceWithAgents(passivePage, [archived, surviving]);
      await openSessions(page);
      await archiveAgentFromSessions(page, { agentId: archived.id, title: archived.title });
-      await reloadWorkspace(page, surviving.workspaceId);
+      await reloadWorkspace(page, tempRepo.path);
      await expectWorkspaceTabHidden(page, archived.id);
      await expectWorkspaceArchiveOutcome(passivePage, {
        archivedAgentId: archived.id,
@@ -123,33 +105,25 @@ test.describe("Archive tab reconciliation", () => {
    }
  });

-  test("clicking an archived session unarchives it and opens the agent", async ({ page }) => {
+  test("clicking an archived session reopens its closed tab focused", async ({ page }) => {
    const archived = await createIdleAgent(client, {
      cwd: tempRepo.path,
-      workspaceId,
-      title: `unarchive-archived-${randomUUID().slice(0, 8)}`,
+      title: `reopen-archived-${randomUUID().slice(0, 8)}`,
    });
    const surviving = await createIdleAgent(client, {
      cwd: tempRepo.path,
-      workspaceId,
-      title: `unarchive-control-${randomUUID().slice(0, 8)}`,
+      title: `reopen-control-${randomUUID().slice(0, 8)}`,
    });

    await resetSeededPageState(page);
    await openWorkspaceWithAgents(page, [archived, surviving]);
+    await closeWorkspaceAgentTab(page, archived.id);
    await archiveAgentFromDaemon(client, archived.id);
    await openSessions(page);
    await expectSessionRowArchived(page, archived.title);

    await clickSessionRow(page, archived.title);

-    await expect
-      .poll(() => fetchAgentArchivedAt(client, archived.id), { timeout: 30_000 })
-      .toBeNull();
-
-    await expect(page).toHaveURL(buildHostWorkspaceRoute(getServerId(), archived.workspaceId), {
-      timeout: 30_000,
-    });
-    await expectWorkspaceTabVisible(page, archived.id);
+    await expectArchivedAgentFocused(page, archived.id);
  });
 });
--- a/packages/app/e2e/branch-switcher.spec.ts
+++ b/packages/app/e2e/branch-switcher.spec.ts
@@ -1,131 +0,0 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import {
-  expectNoBranchSwitcherInWorkspaceHeader,
-  expectWorkspaceBranch,
-  openChangesPanel,
-  switchBranchFromChangesPanel,
-} from "./helpers/branch-switcher";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { readWorktreeBranchInfo } from "./helpers/workspace";
-import { switchWorkspaceViaSidebar, waitForSidebarHydration } from "./helpers/workspace-ui";
-
-async function renameWorkspaceViaSidebar(
-  page: Page,
-  input: { workspaceId: string; title: string },
-): Promise<void> {
-  const serverId = getServerId();
-  const row = page.getByTestId(`sidebar-workspace-row-${serverId}:${input.workspaceId}`);
-  await expect(row).toBeVisible({ timeout: 30_000 });
-  await row.hover();
-
-  const kebab = page.getByTestId(`sidebar-workspace-kebab-${serverId}:${input.workspaceId}`);
-  await expect(kebab).toBeVisible({ timeout: 10_000 });
-  await kebab.click();
-
-  const renameItem = page.getByTestId(
-    `sidebar-workspace-menu-rename-${serverId}:${input.workspaceId}`,
-  );
-  await expect(renameItem).toBeVisible({ timeout: 10_000 });
-  await renameItem.click();
-
-  const modalPrefix = `sidebar-workspace-rename-modal-${serverId}:${input.workspaceId}`;
-  const renameInput = page.getByTestId(`${modalPrefix}-input`);
-  await expect(renameInput).toBeVisible({ timeout: 10_000 });
-  await renameInput.fill(input.title);
-  await page.getByTestId(`${modalPrefix}-submit`).click();
-  await expect(renameInput).toHaveCount(0, { timeout: 15_000 });
-}
-
-test.describe("Branch switcher", () => {
-  // The first test after a spec-file switch can fail while the shared daemon
-  // releases stale sessions from the previous spec; one retry stabilizes it.
-  test.describe.configure({ retries: 1 });
-
-  test("switches the workspace branch from the git diff panel for an opaque workspace id", async ({
-    page,
-  }) => {
-    test.setTimeout(90_000);
-    const serverId = getServerId();
-    const workspace = await seedWorkspace({
-      repoPrefix: "branch-switch-",
-      repo: { branches: ["main", "dev"] },
-    });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await switchWorkspaceViaSidebar({ page, serverId, workspaceId: workspace.workspaceId });
-
-      await openChangesPanel(page);
-      await expectWorkspaceBranch(page, "main");
-      await switchBranchFromChangesPanel(page, { from: "main", to: "dev" });
-      await expectWorkspaceBranch(page, "dev");
-
-      await expect
-        .poll(
-          async () =>
-            (await readWorktreeBranchInfo({ worktreePath: workspace.repoPath })).currentBranch,
-          { timeout: 30_000 },
-        )
-        .toBe("dev");
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("a custom workspace title stays in the header while the diff panel switches the real branch", async ({
-    page,
-  }) => {
-    test.setTimeout(90_000);
-    const serverId = getServerId();
-    const workspace = await seedWorkspace({
-      repoPrefix: "branch-coherence-",
-      repo: { branches: ["main", "dev"] },
-    });
-
-    try {
-      expect(workspace.workspaceName).toBe("main");
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await switchWorkspaceViaSidebar({ page, serverId, workspaceId: workspace.workspaceId });
-
-      const customTitle = "Payments Refactor";
-      await renameWorkspaceViaSidebar(page, {
-        workspaceId: workspace.workspaceId,
-        title: customTitle,
-      });
-
-      // The header shows the custom title verbatim (a plain static title), never a
-      // branch name, and the branch switcher does not live in the header.
-      const headerTitle = page
-        .getByTestId("workspace-header-title")
-        .filter({ visible: true })
-        .first();
-      await expect(headerTitle).toHaveText(customTitle, { timeout: 30_000 });
-      await expectNoBranchSwitcherInWorkspaceHeader(page);
-
-      // The diff panel's switcher tracks the real branch ("main"), not the title,
-      // and switching it checks out the real branch on disk.
-      await openChangesPanel(page);
-      await expectWorkspaceBranch(page, "main");
-      await switchBranchFromChangesPanel(page, { from: "main", to: "dev" });
-      await expectWorkspaceBranch(page, "dev");
-
-      // The custom title is unaffected by the branch switch.
-      await expect(headerTitle).toHaveText(customTitle, { timeout: 30_000 });
-
-      await expect
-        .poll(
-          async () =>
-            (await readWorktreeBranchInfo({ worktreePath: workspace.repoPath })).currentBranch,
-          { timeout: 30_000 },
-        )
-        .toBe("dev");
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/composer-attachments.spec.ts
+++ b/packages/app/e2e/composer-attachments.spec.ts
@@ -193,7 +193,7 @@ test.describe("Composer attachments", () => {
    page,
  }) => {
    test.setTimeout(120_000);
-    const agent = await startRunningMockAgent(page, {
+    const { client, repo } = await startRunningMockAgent(page, {
      prefix: "attach-queue-",
      model: "one-minute-stream",
      prompt: "Stay running for queue test.",
@@ -205,7 +205,8 @@ test.describe("Composer attachments", () => {
      await expectQueuedMessageButton(page);
      await expectComposerDraft(page, "");
    } finally {
-      await agent.cleanup();
+      await client.close();
+      await repo.cleanup();
    }
  });

@@ -213,7 +214,7 @@ test.describe("Composer attachments", () => {
    page,
  }) => {
    test.setTimeout(120_000);
-    const agent = await startRunningMockAgent(page, {
+    const { client, repo } = await startRunningMockAgent(page, {
      prefix: "attach-interrupt-",
      model: "ten-second-stream",
      prompt: "Stay running for interrupt test.",
@@ -225,7 +226,8 @@ test.describe("Composer attachments", () => {
      await expectAgentIdle(page, 15_000);
      await expectComposerDraft(page, "preserve me");
    } finally {
-      await agent.cleanup();
+      await client.close();
+      await repo.cleanup();
    }
  });

@@ -242,7 +244,7 @@ test.describe("Composer attachments", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: workspace.workspaceId,
+        targetWorkspacePath: workspace.workspaceId,
      });

      await openNewWorkspaceComposer(page, {
--- a/packages/app/e2e/diff-row-alignment.spec.ts
+++ b/packages/app/e2e/diff-row-alignment.spec.ts
@@ -1,530 +0,0 @@
-import { writeFile } from "node:fs/promises";
-import path from "node:path";
-import { type Page } from "@playwright/test";
-import { buildHostWorkspaceRoute, buildSettingsSectionRoute } from "../src/utils/host-routes";
-import { test, expect } from "./fixtures";
-import { getServerId } from "./helpers/server-id";
-import { connectSeedClient } from "./helpers/seed-client";
-import { createTempGitRepo } from "./helpers/workspace";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-
-interface DirtyWorkspace {
-  id: string;
-}
-
-interface CleanupTask {
-  run: () => Promise<void>;
-}
-
-const cleanupTasks: CleanupTask[] = [];
-const APP_SETTINGS_KEY = "@paseo:app-settings";
-const CHANGES_PREFERENCES_KEY = "@paseo:changes-preferences";
-
-const BEFORE = `import { useLayoutEffect, useMemo, useRef, useState } from "react";
-
-interface UseMountedTabSetInput {
-  activeTabId: string | null;
-  allTabIds: string[];
-  cap: number;
-}
-
-interface UseMountedTabSetResult {
-  mountedTabIds: Set<string>;
-}
-
-function createInitialMountedTabIds(input: UseMountedTabSetInput): Set<string> {
-  if (!input.activeTabId || !input.allTabIds.includes(input.activeTabId)) {
-    return new Set<string>();
-  }
-  return new Set<string>([input.activeTabId]);
-}
-
-function setsEqual(left: Set<string>, right: Set<string>): boolean {
-  if (left.size !== right.size) {
-    return false;
-  }
-  for (const value of left) {
-    if (!right.has(value)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-export function useMountedTabSet(input: UseMountedTabSetInput): UseMountedTabSetResult {
-  const { activeTabId, allTabIds, cap } = input;
-  const allTabIdsKey = allTabIds.join("\\u0000");
-  const availableTabIds = useMemo(() => {
-    void allTabIdsKey;
-    return new Set(allTabIds);
-  }, [allTabIds, allTabIdsKey]);
-  const [mountedTabIds, setMountedTabIds] = useState(() => createInitialMountedTabIds(input));
-  const lruRef = useRef(activeTabId && allTabIds.includes(activeTabId) ? [activeTabId] : []);
-
-  useLayoutEffect(() => {
-    const nextLru = lruRef.current.filter((tabId) => availableTabIds.has(tabId));
-    if (activeTabId && availableTabIds.has(activeTabId)) {
-      const existingIndex = nextLru.indexOf(activeTabId);
-      if (existingIndex >= 0) {
-        nextLru.splice(existingIndex, 1);
-      }
-      nextLru.unshift(activeTabId);
-    }
-    if (nextLru.length > cap) {
-      nextLru.length = cap;
-    }
-
-    lruRef.current = nextLru;
-    setMountedTabIds((previousMountedTabIds) => {
-      const nextMountedTabIds = new Set(nextLru);
-      return setsEqual(previousMountedTabIds, nextMountedTabIds)
-        ? previousMountedTabIds
-        : nextMountedTabIds;
-    });
-  }, [activeTabId, availableTabIds, cap]);
-
-  return { mountedTabIds };
-}
-`;
-
-const AFTER = `import { useLayoutEffect, useMemo, useRef, useState } from "react";
-
-interface UseMountedTabSetInput {
-  activeTabId: string | null;
-  allTabIds: string[];
-  cap: number;
-}
-
-interface UseMountedTabSetResult {
-  mountedTabIds: Set<string>;
-}
-
-interface DeriveRenderMountedTabIdsInput {
-  activeTabId: string | null;
-  availableTabIds: Set<string>;
-  cap: number;
-  mountedTabIds: Set<string>;
-}
-
-function createInitialMountedTabIds(input: UseMountedTabSetInput): Set<string> {
-  if (!input.activeTabId || !input.allTabIds.includes(input.activeTabId)) {
-    return new Set<string>();
-  }
-  return new Set<string>([input.activeTabId]);
-}
-
-function setsEqual(left: Set<string>, right: Set<string>): boolean {
-  if (left.size !== right.size) {
-    return false;
-  }
-  for (const value of left) {
-    if (!right.has(value)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function deriveRenderMountedTabIds(input: DeriveRenderMountedTabIdsInput): Set<string> {
-  const { activeTabId, availableTabIds, cap, mountedTabIds } = input;
-  if (!activeTabId || !availableTabIds.has(activeTabId) || mountedTabIds.has(activeTabId)) {
-    return mountedTabIds;
-  }
-
-  const next = new Set<string>([activeTabId]);
-  const maxSize = Math.max(1, cap);
-  for (const tabId of mountedTabIds) {
-    if (next.size >= maxSize) {
-      break;
-    }
-    if (availableTabIds.has(tabId)) {
-      next.add(tabId);
-    }
-  }
-  return next;
-}
-
-export function useMountedTabSet(input: UseMountedTabSetInput): UseMountedTabSetResult {
-  const { activeTabId, allTabIds, cap } = input;
-  const allTabIdsKey = allTabIds.join("\\u0000");
-  const availableTabIds = useMemo(() => {
-    void allTabIdsKey;
-    return new Set(allTabIds);
-  }, [allTabIds, allTabIdsKey]);
-  const [mountedTabIds, setMountedTabIds] = useState(() => createInitialMountedTabIds(input));
-  const lruRef = useRef(activeTabId && allTabIds.includes(activeTabId) ? [activeTabId] : []);
-  const renderMountedTabIds = useMemo(
-    () =>
-      deriveRenderMountedTabIds({
-        activeTabId,
-        availableTabIds,
-        cap,
-        mountedTabIds,
-      }),
-    [activeTabId, availableTabIds, cap, mountedTabIds],
-  );
-
-  useLayoutEffect(() => {
-    const nextLru = lruRef.current.filter((tabId) => availableTabIds.has(tabId));
-    if (activeTabId && availableTabIds.has(activeTabId)) {
-      const existingIndex = nextLru.indexOf(activeTabId);
-      if (existingIndex >= 0) {
-        nextLru.splice(existingIndex, 1);
-      }
-      nextLru.unshift(activeTabId);
-    }
-    if (nextLru.length > cap) {
-      nextLru.length = cap;
-    }
-
-    lruRef.current = nextLru;
-    setMountedTabIds((previousMountedTabIds) => {
-      const nextMountedTabIds = new Set(nextLru);
-      return setsEqual(previousMountedTabIds, nextMountedTabIds)
-        ? previousMountedTabIds
-        : nextMountedTabIds;
-    });
-  }, [activeTabId, availableTabIds, cap]);
-
-  return { mountedTabIds: renderMountedTabIds };
-}
-`;
-
-test.afterEach(async () => {
-  for (const task of cleanupTasks.splice(0)) {
-    await task.run();
-  }
-});
-
-test("changes diff keeps code rows aligned with the gutter", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useCodeFont(page, 9);
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  await expectDiffCodeFontSize(page, 9);
-  await expectVisibleDiffRowsAligned(page);
-  await expectDiffCodeTextAlignedWithGutterText(page, [
-    {
-      codeText: "function createInitialMountedTabIds(input: UseMountedTabSetInput)",
-      lineNumber: "20",
-    },
-    { codeText: "return next;", lineNumber: "55" },
-    { codeText: "useLayoutEffect(() => {", lineNumber: "78" },
-  ]);
-  await expectHoverCommentButtonAlignedWithCodeLine(page, {
-    codeText: "function createInitialMountedTabIds(input: UseMountedTabSetInput)",
-    lineNumber: "20",
-  });
-});
-
-test("changes diff keeps unwrapped gutter and code rows aligned after code size changes", async ({
-  page,
-}) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useCodeFont(page, 12);
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  await changeCodeFontSizeFromSettings(page, 18);
-  await returnToWorkspaceChanges(page);
-  await expectStoredCodeFontSize(page, 18);
-  await scrollToLowerUnwrappedDiffRows(page);
-
-  await expectDiffCodeFontSize(page, 18);
-  await expectVisibleDiffRowsShareTypography(page);
-  await expectVisibleDiffRowsAligned(page);
-});
-
-async function useCodeFont(page: Page, codeFontSize: number): Promise<void> {
-  await page.addInitScript(
-    ({ settingsKey, fontSize }) => {
-      if (localStorage.getItem(settingsKey)) {
-        return;
-      }
-      localStorage.setItem(
-        settingsKey,
-        JSON.stringify({
-          theme: "dark",
-          sendBehavior: "interrupt",
-          serviceUrlBehavior: "ask",
-          terminalScrollbackLines: 10_000,
-          uiFontFamily: "",
-          monoFontFamily: "",
-          uiFontSize: 16,
-          codeFontSize: fontSize,
-          syntaxTheme: "one",
-        }),
-      );
-    },
-    { settingsKey: APP_SETTINGS_KEY, fontSize: codeFontSize },
-  );
-}
-
-async function useUnwrappedDiffLines(page: Page): Promise<void> {
-  await page.addInitScript(
-    ({ preferencesKey }) => {
-      localStorage.setItem(
-        preferencesKey,
-        JSON.stringify({ layout: "unified", wrapLines: false, hideWhitespace: false }),
-      );
-    },
-    { preferencesKey: CHANGES_PREFERENCES_KEY },
-  );
-}
-
-async function expectDiffCodeFontSize(page: Page, fontSize: number): Promise<void> {
-  await expect
-    .poll(async () => {
-      return page
-        .getByTestId("diff-code-text-1")
-        .evaluate((text) => Number.parseFloat(getComputedStyle(text).fontSize));
-    })
-    .toBe(fontSize);
-}
-
-async function expectVisibleDiffRowsAligned(page: Page): Promise<void> {
-  const geometry = await readVisibleDiffRowGeometry(page);
-  expect(geometry.maxDelta, JSON.stringify(geometry.rows, null, 2)).toBeLessThanOrEqual(1);
-}
-
-async function expectVisibleDiffRowsShareTypography(page: Page): Promise<void> {
-  const geometry = await readVisibleDiffRowGeometry(page);
-  expect(geometry.mismatchedTypography, JSON.stringify(geometry, null, 2)).toEqual([]);
-}
-
-async function readVisibleDiffRowGeometry(page: Page): Promise<{
-  maxDelta: number;
-  mismatchedTypography: { index: number; gutterLineHeight: number; codeLineHeight: number }[];
-  rows: {
-    index: number;
-    gutterTop: number;
-    codeTop: number;
-    delta: number;
-    gutterLineHeight: number;
-    codeLineHeight: number;
-  }[];
-}> {
-  return page.locator("body").evaluate(({ ownerDocument }) => {
-    const root = ownerDocument.querySelector('[data-testid="diff-file-0-body"]');
-    if (!root) {
-      throw new Error("Expanded diff body is not mounted");
-    }
-
-    const readRows = (prefix: string, textPrefix: string) =>
-      Array.from(root.querySelectorAll<HTMLElement>(`[data-testid^="${prefix}"]`)).map((row) => {
-        const testId = row.getAttribute("data-testid") ?? "";
-        const index = Number(testId.slice(prefix.length));
-        const rect = row.getBoundingClientRect();
-        const text = root.querySelector<HTMLElement>(`[data-testid="${textPrefix}${index}"]`);
-        const lineHeight = text ? Number.parseFloat(getComputedStyle(text).lineHeight) : 0;
-        return { index, top: rect.top, height: rect.height, lineHeight };
-      });
-
-    const gutters = new Map(
-      readRows("diff-gutter-row-", "diff-gutter-text-").map((row) => [row.index, row]),
-    );
-    const codes = readRows("diff-code-row-", "diff-code-text-");
-    const rows = codes
-      .map((code) => {
-        const gutter = gutters.get(code.index);
-        if (!gutter) {
-          throw new Error(`Missing gutter row ${code.index}`);
-        }
-        return {
-          index: code.index,
-          gutterTop: gutter.top,
-          codeTop: code.top,
-          delta: Math.abs(code.top - gutter.top),
-          gutterLineHeight: gutter.lineHeight,
-          codeLineHeight: code.lineHeight,
-        };
-      })
-      .filter((row) => row.gutterTop >= 0 && row.codeTop >= 0);
-
-    return {
-      maxDelta: Math.max(...rows.map((row) => row.delta)),
-      mismatchedTypography: rows
-        .filter((row) => Math.abs(row.gutterLineHeight - row.codeLineHeight) > 0.5)
-        .map((row) => ({
-          index: row.index,
-          gutterLineHeight: row.gutterLineHeight,
-          codeLineHeight: row.codeLineHeight,
-        })),
-      rows,
-    };
-  });
-}
-
-async function createWorkspaceWithMountedTabDiff(): Promise<DirtyWorkspace> {
-  const repo = await createTempGitRepo("diff-row-alignment-", {
-    files: [{ path: "src/use-mounted-tab-set.ts", content: BEFORE }],
-  });
-  const client = await connectSeedClient();
-  cleanupTasks.push({
-    run: async () => {
-      await client.close().catch(() => undefined);
-      await repo.cleanup().catch(() => undefined);
-    },
-  });
-
-  await writeFile(path.join(repo.path, "src/use-mounted-tab-set.ts"), AFTER);
-  const createdWorkspace = await client.createWorkspace({
-    source: { kind: "directory", path: repo.path },
-  });
-  if (!createdWorkspace.workspace) {
-    throw new Error(createdWorkspace.error ?? `Failed to create workspace ${repo.path}`);
-  }
-  return { id: createdWorkspace.workspace.id };
-}
-
-async function openWorkspaceChanges(page: Page, workspace: DirtyWorkspace): Promise<void> {
-  await page.setViewportSize({ width: 1400, height: 900 });
-  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
-  await waitForWorkspaceTabsVisible(page);
-  await page.getByRole("button", { name: "Open explorer" }).click();
-  await openChangesInVisibleExplorer(page);
-  await page.getByTestId("diff-file-0").click();
-  await expectExpandedMountedTabDiff(page);
-}
-
-async function openChangesInVisibleExplorer(page: Page): Promise<void> {
-  await expect(page.getByTestId("explorer-tab-changes")).toBeVisible({ timeout: 30_000 });
-  await expect(page.getByText("use-mounted-tab-set.ts")).toBeVisible({ timeout: 30_000 });
-}
-
-async function expectExpandedMountedTabDiff(page: Page): Promise<void> {
-  await expect(page.getByTestId("diff-file-0-body")).toBeVisible({ timeout: 30_000 });
-  await expect(page.getByText("function createInitialMountedTabIds")).toBeVisible({
-    timeout: 30_000,
-  });
-}
-
-async function changeCodeFontSizeFromSettings(page: Page, codeFontSize: number): Promise<void> {
-  await page.getByTestId("sidebar-settings").click();
-  await expect(page).toHaveURL(new RegExp(`${buildSettingsSectionRoute("general")}|/settings$`));
-  await page.getByRole("button", { name: "Appearance" }).click();
-  await page.getByLabel("Code font size").fill(String(codeFontSize));
-  await page.getByLabel("Code font size").press("Enter");
-  await expect(page.getByLabel("Code font size")).toHaveValue(String(codeFontSize));
-  await expectStoredCodeFontSize(page, codeFontSize);
-}
-
-async function expectStoredCodeFontSize(page: Page, codeFontSize: number): Promise<void> {
-  await expect
-    .poll(async () => {
-      const raw = await page.evaluate(
-        (settingsKey) => localStorage.getItem(settingsKey),
-        APP_SETTINGS_KEY,
-      );
-      if (!raw) {
-        return null;
-      }
-      return (JSON.parse(raw) as { codeFontSize?: number }).codeFontSize ?? null;
-    })
-    .toBe(codeFontSize);
-}
-
-async function returnToWorkspaceChanges(page: Page): Promise<void> {
-  await page.getByTestId("settings-back-to-workspace").click();
-  await waitForWorkspaceTabsVisible(page);
-  await openChangesInVisibleExplorer(page);
-  await expectExpandedMountedTabDiff(page);
-}
-
-async function scrollToLowerUnwrappedDiffRows(page: Page): Promise<void> {
-  const lastRowIndex = await page.getByTestId("diff-file-0-body").evaluate((root) => {
-    const rows = Array.from(root.querySelectorAll<HTMLElement>('[data-testid^="diff-code-row-"]'));
-    if (rows.length === 0) {
-      throw new Error("No unwrapped code rows are mounted");
-    }
-    return Math.max(
-      ...rows.map((row) => Number((row.getAttribute("data-testid") ?? "").slice(14))),
-    );
-  });
-  await page.getByTestId(`diff-code-row-${lastRowIndex}`).scrollIntoViewIfNeeded();
-  await expect(page.getByTestId(`diff-code-row-${lastRowIndex}`)).toBeVisible();
-}
-
-async function expectDiffCodeTextAlignedWithGutterText(
-  page: Page,
-  lines: { codeText: string; lineNumber: string }[],
-): Promise<void> {
-  const geometries = await readDiffTextGeometry(page, lines);
-  for (const geometry of geometries) {
-    expect(geometry.codeTop, geometry.codeText).toBeCloseTo(geometry.gutterTop, 0);
-  }
-}
-
-async function expectHoverCommentButtonAlignedWithCodeLine(
-  page: Page,
-  line: { codeText: string; lineNumber: string },
-): Promise<void> {
-  const target = await readDiffTextGeometry(page, [line]).then((rows) => rows[0]);
-  if (!target) {
-    throw new Error(`Could not find target line ${line.lineNumber}`);
-  }
-  await page.getByTestId(`diff-code-row-${target.index}`).hover();
-  const geometry = await page
-    .getByTestId(`diff-gutter-action-${target.index}`)
-    .evaluate((action, expectedCodeCenterY) => {
-      const rect = action.getBoundingClientRect();
-      return {
-        actionCenterY: rect.top + rect.height / 2,
-        codeCenterY: expectedCodeCenterY,
-      };
-    }, target.codeCenterY);
-  expect(geometry.actionCenterY).toBeCloseTo(geometry.codeCenterY, 0);
-}
-
-async function readDiffTextGeometry(
-  page: Page,
-  lines: { codeText: string; lineNumber: string }[],
-): Promise<
-  { index: number; codeText: string; codeTop: number; gutterTop: number; codeCenterY: number }[]
-> {
-  return page.locator("body").evaluate(({ ownerDocument }, targets) => {
-    const root = ownerDocument.querySelector('[data-testid="explorer-content-area"]');
-    if (!root) {
-      throw new Error("Changes panel is not mounted");
-    }
-
-    const readIndexedElements = (prefix: string) =>
-      Array.from(root.querySelectorAll<HTMLElement>(`[data-testid^="${prefix}"]`)).map(
-        (element) => {
-          const testId = element.getAttribute("data-testid") ?? "";
-          return { index: Number(testId.slice(prefix.length)), element };
-        },
-      );
-
-    const gutterTexts = readIndexedElements("diff-gutter-text-");
-    const codeTexts = readIndexedElements("diff-code-text-");
-
-    return targets.map((target) => {
-      const gutter = gutterTexts.find(
-        ({ element }) => (element.textContent ?? "").trim() === target.lineNumber,
-      );
-      if (!gutter) {
-        throw new Error(`Could not find gutter line ${target.lineNumber}`);
-      }
-      const code = codeTexts.find(
-        ({ index, element }) =>
-          index === gutter.index && (element.textContent ?? "").includes(target.codeText),
-      );
-      if (!code) {
-        throw new Error(`Could not find code row ${target.codeText}`);
-      }
-
-      const codeRect = code.element.getBoundingClientRect();
-      const gutterRect = gutter.element.getBoundingClientRect();
-
-      return {
-        index: gutter.index,
-        codeText: target.codeText,
-        codeTop: codeRect.top,
-        gutterTop: gutterRect.top,
-        codeCenterY: codeRect.top + codeRect.height / 2,
-      };
-    });
-  }, lines);
-}
--- a/packages/app/e2e/empty-project-persists.spec.ts
+++ b/packages/app/e2e/empty-project-persists.spec.ts
@@ -1,192 +0,0 @@
-import path from "node:path";
-import { test, expect, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { connectSeedClient, seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { createTempGitRepo } from "./helpers/workspace";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-
-function workspaceRowTestId(workspaceId: string): string {
-  return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
-}
-
-async function hideWorkspaceFromSidebar(page: Page, workspaceId: string): Promise<void> {
-  const serverId = getServerId();
-  const row = page.getByTestId(workspaceRowTestId(workspaceId));
-  await expect(row).toBeVisible({ timeout: 30_000 });
-  await row.hover();
-
-  const kebab = page.getByTestId(`sidebar-workspace-kebab-${serverId}:${workspaceId}`);
-  await expect(kebab).toBeVisible({ timeout: 10_000 });
-  await kebab.click();
-
-  // Hiding a checkout from the sidebar raises a browser confirm; accept it so the
-  // user-confirmed archive proceeds deterministically.
-  page.once("dialog", (dialog) => void dialog.accept());
-
-  const archiveItem = page.getByTestId(`sidebar-workspace-menu-archive-${serverId}:${workspaceId}`);
-  await expect(archiveItem).toBeVisible({ timeout: 10_000 });
-  await archiveItem.click();
-}
-
-async function removeProjectFromSidebar(page: Page, projectId: string): Promise<void> {
-  const projectRow = page.getByTestId(`sidebar-project-row-${projectId}`);
-  await expect(projectRow).toBeVisible({ timeout: 30_000 });
-  await projectRow.hover();
-
-  const kebab = page.getByTestId(`sidebar-project-kebab-${projectId}`);
-  await expect(kebab).toBeVisible({ timeout: 10_000 });
-  await kebab.click();
-
-  // Removing a project raises a browser confirm; accept it so the
-  // user-confirmed removal proceeds deterministically.
-  page.once("dialog", (dialog) => void dialog.accept());
-
-  const removeItem = page.getByTestId(`sidebar-project-menu-remove-${projectId}`);
-  await expect(removeItem).toBeVisible({ timeout: 10_000 });
-  await removeItem.click();
-}
-
-async function addProjectFromPicker(page: Page, projectPath: string): Promise<string> {
-  await page.getByTestId("sidebar-add-project").click();
-
-  const input = page.getByPlaceholder("Type a directory path...");
-  await expect(input).toBeVisible({ timeout: 30_000 });
-  await input.fill(projectPath);
-  await page.keyboard.press("Enter");
-
-  const projectRow = page
-    .locator('[data-testid^="sidebar-project-row-"]')
-    .filter({ hasText: path.basename(projectPath) })
-    .first();
-  await expect(projectRow).toBeVisible({ timeout: 30_000 });
-
-  const testId = await projectRow.getAttribute("data-testid");
-  expect(testId).not.toBeNull();
-  return testId!.replace("sidebar-project-row-", "");
-}
-
-async function waitForSidebarProjectListReady(page: Page): Promise<void> {
-  await page
-    .locator('[data-testid="sidebar-project-empty-state"], [data-testid^="sidebar-project-row-"]')
-    .first()
-    .waitFor({ state: "visible", timeout: 60_000 });
-}
-
-// Projects are parents in the sidebar. Archiving the last workspace leaves the
-// project row in place with a ghost "+ New workspace" child row.
-test.describe("Project with no workspaces persists", () => {
-  test("adding a project starts with only a new-workspace child row", async ({ page }) => {
-    const repo = await createTempGitRepo("empty-project-add-");
-    const client = await connectSeedClient();
-    let projectId: string | null = null;
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarProjectListReady(page);
-
-      projectId = await addProjectFromPicker(page, repo.path);
-      const projectRow = page.getByTestId(`sidebar-project-row-${projectId}`);
-      await expect(projectRow).toBeVisible({ timeout: 30_000 });
-      await expect(projectRow).toContainText(path.basename(repo.path));
-      await expect(page.getByTestId(`sidebar-workspace-list-${projectId}`)).toHaveCount(0);
-
-      const newWorkspaceRow = page.getByTestId(`sidebar-project-new-workspace-row-${projectId}`);
-      await expect(newWorkspaceRow).toBeVisible({ timeout: 30_000 });
-      await expect(newWorkspaceRow).toContainText("New workspace");
-
-      const workspaces = await client.fetchWorkspaces({ filter: { projectId } });
-      expect(workspaces.entries).toEqual([]);
-    } finally {
-      if (projectId) {
-        await client.removeProject(projectId).catch(() => undefined);
-      }
-      await client.close().catch(() => undefined);
-      await repo.cleanup().catch(() => undefined);
-    }
-  });
-
-  test("archiving the only workspace keeps the project row with creation still reachable", async ({
-    page,
-  }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "empty-project-persists-" });
-
-    try {
-      const projectRow = page.getByTestId(`sidebar-project-row-${workspace.projectId}`);
-      const newWorkspaceRow = page.getByTestId(
-        `sidebar-project-new-workspace-row-${workspace.projectId}`,
-      );
-      const globalNewWorkspace = page.getByTestId("sidebar-global-new-workspace");
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await expect(projectRow).toBeVisible({ timeout: 30_000 });
-      await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toBeVisible({
-        timeout: 30_000,
-      });
-
-      await hideWorkspaceFromSidebar(page, workspace.workspaceId);
-
-      // The workspace row goes away, but its project parent stays and exposes a
-      // child row for creating the next workspace.
-      await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toHaveCount(0, {
-        timeout: 30_000,
-      });
-      await expect(projectRow).toBeVisible({ timeout: 30_000 });
-      await expect(newWorkspaceRow).toBeVisible({ timeout: 30_000 });
-      await expect(newWorkspaceRow).toContainText("New workspace");
-      await expect(globalNewWorkspace).toBeVisible({ timeout: 30_000 });
-
-      // The project survives a reload after its last workspace is archived.
-      await page.reload();
-      await waitForSidebarHydration(page);
-      await expect(projectRow).toBeVisible({ timeout: 30_000 });
-      await expect(newWorkspaceRow).toBeVisible({ timeout: 30_000 });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-});
-
-test.describe("Project remove", () => {
-  test("removing a project from project actions removes it from the sidebar", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "project-remove-sidebar-" });
-
-    try {
-      const projectRow = page.getByTestId(`sidebar-project-row-${workspace.projectId}`);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await expect(projectRow).toBeVisible({ timeout: 30_000 });
-      await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toBeVisible({
-        timeout: 30_000,
-      });
-
-      await removeProjectFromSidebar(page, workspace.projectId);
-
-      await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toHaveCount(0, {
-        timeout: 30_000,
-      });
-      await expect(projectRow).toHaveCount(0, { timeout: 30_000 });
-
-      await page.reload();
-      await waitForSidebarProjectListReady(page);
-      await expect(projectRow).toHaveCount(0, { timeout: 30_000 });
-
-      const readded = await workspace.client.addProject(workspace.repoPath);
-      expect(readded.error).toBeNull();
-      expect(readded.project?.projectDisplayName).toBe(workspace.projectDisplayName);
-
-      await page.reload();
-      await waitForSidebarHydration(page);
-      await expect(projectRow).toBeVisible({ timeout: 30_000 });
-      await expect(projectRow).toContainText(workspace.projectDisplayName);
-      await expect(projectRow).not.toContainText(workspace.repoPath);
-      await expect(
-        page.getByTestId(`sidebar-project-new-workspace-row-${workspace.projectId}`),
-      ).toBeVisible({ timeout: 30_000 });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/global-setup.ts
+++ b/packages/app/e2e/global-setup.ts
@@ -1,14 +1,11 @@
-import { randomUUID } from "node:crypto";
-import { spawn, type ChildProcess, execSync } from "node:child_process";
+import { spawn, type ChildProcess, execFileSync, execSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { chmod, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { chmod, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import net from "node:net";
 import { Buffer } from "node:buffer";
 import dotenv from "dotenv";
-import { loadDaemonClientConstructor } from "./helpers/daemon-client-loader";
-import { createNodeWebSocketFactory, type NodeWebSocketFactory } from "./helpers/node-ws-factory";
 import { forkPaseoHomeMetadata, resolvePaseoHomePath } from "./helpers/paseo-home-fork";

 interface WaitForServerOptions {
@@ -23,7 +20,7 @@ async function getAvailablePort(): Promise<number> {
  return new Promise((resolve, reject) => {
    const server = net.createServer();
    server.once("error", reject);
-    server.listen(0, "127.0.0.1", () => {
+    server.listen(0, () => {
      const address = server.address();
      if (!address || typeof address === "string") {
        server.close(() => reject(new Error("Failed to acquire port")));
@@ -34,14 +31,6 @@ async function getAvailablePort(): Promise<number> {
  });
 }

-const RESERVED_LOCAL_PORTS = new Set([
-  // Default developer daemon.
-  6767,
-  // OpenCode's default local server port. Some provider probes can spawn it
-  // during daemon startup, so the E2E daemon must not choose the same port.
-  61680,
-]);
-
 function createLineBuffer(maxLines = 120): { add: (line: string) => void; dump: () => string } {
  const lines: string[] = [];
  return {
@@ -154,67 +143,6 @@ async function stopProcess(child: ChildProcess | null): Promise<void> {
  });
 }

-function isProcessRunning(pid: number): boolean {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-async function readSupervisorPidLock(home: string): Promise<number | null> {
-  try {
-    const content = await readFile(path.join(home, "paseo.pid"), "utf8");
-    const parsed = JSON.parse(content) as { pid?: unknown };
-    return typeof parsed.pid === "number" ? parsed.pid : null;
-  } catch {
-    return null;
-  }
-}
-
-async function stopProcessByPid(pid: number): Promise<void> {
-  if (!isProcessRunning(pid)) {
-    return;
-  }
-
-  try {
-    process.kill(pid, "SIGTERM");
-  } catch {
-    return;
-  }
-  const deadline = Date.now() + 5000;
-  while (Date.now() < deadline) {
-    if (!isProcessRunning(pid)) {
-      return;
-    }
-    await sleep(100);
-  }
-
-  if (isProcessRunning(pid)) {
-    try {
-      process.kill(pid, "SIGKILL");
-    } catch {
-      return;
-    }
-  }
-}
-
-async function stopCurrentDaemonFromPidLock(): Promise<void> {
-  if (!paseoHome) {
-    return;
-  }
-  if (process.env.E2E_DAEMON_PORT === "6767") {
-    throw new Error("Refusing to clean up daemon PID lock for developer daemon port 6767.");
-  }
-
-  const pid = await readSupervisorPidLock(paseoHome);
-  if (pid === null) {
-    return;
-  }
-  await stopProcessByPid(pid);
-}
-
 function summarizeOpenAiErrorBody(body: string): string {
  const trimmed = body.trim();
  if (!trimmed) {
@@ -260,7 +188,7 @@ async function isOpenAiApiKeyUsable(apiKey: string | undefined): Promise<boolean
 let daemonProcess: ChildProcess | null = null;
 let metroProcess: ChildProcess | null = null;
 let paseoHome: string | null = null;
-let fakeEditorBinDir: string | null = null;
+let fakeToolBinDir: string | null = null;
 let relayProcess: ChildProcess | null = null;

 function resolveOptionalPaseoHomeEnv(value: string | undefined): string | null {
@@ -281,24 +209,81 @@ interface OfferPayload {
  relay: { endpoint: string };
 }

-interface DaemonClientConfig {
-  url: string;
-  clientId: string;
-  clientType: "cli";
-  webSocketFactory: NodeWebSocketFactory;
+async function createFakeToolBin(): Promise<string> {
+  const binDir = await mkdtemp(path.join(tmpdir(), "paseo-e2e-tool-bin-"));
+  const ghPath = path.join(binDir, "gh");
+  await writeFile(
+    ghPath,
+    `#!/usr/bin/env node
+const { spawnSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const args = process.argv.slice(2);
+
+function findRealGh() {
+  const fakeBinDir = __dirname;
+  for (const dir of (process.env.PATH || "").split(path.delimiter)) {
+    if (dir === fakeBinDir) continue;
+    const candidate = path.join(dir, "gh");
+    try { fs.accessSync(candidate, fs.constants.X_OK); return candidate; } catch {}
+  }
+  return null;
 }

-interface PairingDaemonClient {
-  connect(): Promise<void>;
-  close(): Promise<void>;
-  getDaemonPairingOffer(): Promise<{
-    relayEnabled: boolean;
-    url: string;
-  }>;
+function forwardToRealGh() {
+  const realGh = findRealGh();
+  if (!realGh) { console.error("[fake-gh] real gh not found in PATH"); process.exit(1); }
+  const result = spawnSync(realGh, process.argv.slice(2), { stdio: "inherit", env: process.env });
+  process.exit(result.status ?? 1);
 }

-async function createFakeEditorBin(): Promise<string> {
-  const binDir = await mkdtemp(path.join(tmpdir(), "paseo-e2e-editor-bin-"));
+if (args[0] === "auth" && args[1] === "status") {
+  process.exit(0);
+}
+
+if (args[0] === "pr" && args[1] === "list") {
+  console.log(JSON.stringify([
+    {
+      number: 515,
+      title: "Review selected start ref",
+      url: "https://github.com/getpaseo/paseo/pull/515",
+      state: "OPEN",
+      body: "Fixture pull request for app e2e.",
+      labels: [],
+      baseRefName: "main",
+      headRefName: "feature/start-from-pr"
+    }
+  ]));
+  process.exit(0);
+}
+
+if (args[0] === "pr" && args[1] === "view" && args[2] === "--json" && args[3]) {
+  const fixture = path.join(process.cwd(), ".paseo-e2e-pr.json");
+  if (fs.existsSync(fixture)) {
+    console.log(fs.readFileSync(fixture, "utf8"));
+    process.exit(0);
+  }
+  forwardToRealGh();
+}
+
+if (args[0] === "api" && args[1] === "graphql") {
+  const fixture = path.join(process.cwd(), ".paseo-e2e-timeline.json");
+  if (fs.existsSync(fixture)) {
+    console.log(fs.readFileSync(fixture, "utf8"));
+    process.exit(0);
+  }
+  forwardToRealGh();
+}
+
+if (args[0] === "issue" && args[1] === "list") {
+  console.log("[]");
+  process.exit(0);
+}
+
+forwardToRealGh();
+`,
+  );
+  await chmod(ghPath, 0o755);

  const fakeEditorSource = `#!/usr/bin/env node
 const fs = require("fs");
@@ -358,29 +343,29 @@ function decodeOfferFromFragmentUrl(url: string): OfferPayload {
  return offer as OfferPayload;
 }

-async function loadPairingOfferFromDaemon(port: number): Promise<OfferPayload> {
-  const DaemonClient = await loadDaemonClientConstructor<DaemonClientConfig, PairingDaemonClient>();
-  const client = new DaemonClient({
-    url: `ws://127.0.0.1:${port}/ws`,
-    clientId: `playwright-global-setup-${randomUUID()}`,
-    clientType: "cli",
-    webSocketFactory: createNodeWebSocketFactory(),
-  });
-
-  await client.connect();
-  try {
-    const pairing = await client.getDaemonPairingOffer();
-    if (!pairing.relayEnabled || !pairing.url) {
-      throw new Error("Daemon returned a disabled pairing offer");
-    }
-    return decodeOfferFromFragmentUrl(pairing.url);
-  } finally {
-    await client.close().catch(() => {});
+function loadPairingOfferFromCli(repoRoot: string, paseoHomePath: string): OfferPayload {
+  const stdout = execFileSync(
+    process.execPath,
+    ["--import", "tsx", "packages/cli/src/index.ts", "daemon", "pair", "--json"],
+    {
+      cwd: repoRoot,
+      env: {
+        ...process.env,
+        PASEO_HOME: paseoHomePath,
+      },
+      encoding: "utf8",
+    },
+  );
+  const payload = JSON.parse(stdout) as { relayEnabled?: boolean; url?: string | null };
+  if (payload.relayEnabled !== true || typeof payload.url !== "string") {
+    throw new Error(`Unexpected daemon pair response: ${stdout}`);
  }
+  return decodeOfferFromFragmentUrl(payload.url);
 }

-async function waitForPairingOfferFromDaemon(args: {
-  port: number;
+async function waitForPairingOfferFromCli(args: {
+  repoRoot: string;
+  paseoHome: string;
  timeoutMs?: number;
 }): Promise<OfferPayload> {
  const timeoutMs = args.timeoutMs ?? 15000;
@@ -389,7 +374,7 @@ async function waitForPairingOfferFromDaemon(args: {

  while (Date.now() - start < timeoutMs) {
    try {
-      return await loadPairingOfferFromDaemon(args.port);
+      return loadPairingOfferFromCli(args.repoRoot, args.paseoHome);
    } catch (error) {
      lastError = error;
      await sleep(100);
@@ -397,7 +382,7 @@ async function waitForPairingOfferFromDaemon(args: {
  }

  throw new Error(
-    `Timed out waiting for daemon pairing offer: ${
+    `Timed out waiting for \`paseo daemon pair --json\` to produce a pairing offer: ${
      lastError instanceof Error ? lastError.message : String(lastError)
    }`,
  );
@@ -555,7 +540,7 @@ async function awaitRelayReady(
 async function getAvailablePortExcluding(excludedPorts: Set<number>): Promise<number> {
  for (;;) {
    const port = await getAvailablePort();
-    if (!excludedPorts.has(port) && !RESERVED_LOCAL_PORTS.has(port)) {
+    if (!excludedPorts.has(port)) {
      return port;
    }
  }
@@ -602,23 +587,13 @@ async function startRelay(excludedPorts: Set<number>): Promise<number> {
  );
 }

-function startMetro(input: {
-  metroPort: number;
-  daemonPort: number;
-  buffer: ReturnType<typeof createLineBuffer>;
-}): ChildProcess {
+function startMetro(metroPort: number, buffer: ReturnType<typeof createLineBuffer>): ChildProcess {
  const appDir = path.resolve(__dirname, "..");
-  const child = spawn("npx", ["expo", "start", "--web", "--port", String(input.metroPort)], {
+  const child = spawn("npx", ["expo", "start", "--web", "--port", String(metroPort)], {
    cwd: appDir,
    env: {
      ...process.env,
      BROWSER: "none",
-      ...(process.env.E2E_DESKTOP_RUNTIME === "1"
-        ? {
-            PASEO_WEB_PLATFORM: "electron",
-            EXPO_PUBLIC_LOCAL_DAEMON: `127.0.0.1:${input.daemonPort}`,
-          }
-        : {}),
    },
    stdio: ["ignore", "pipe", "pipe"],
    detached: false,
@@ -630,7 +605,7 @@ function startMetro(input: {
      .split("\n")
      .filter((line) => line.trim());
    for (const line of lines) {
-      input.buffer.add(`[stdout] ${line}`);
+      buffer.add(`[stdout] ${line}`);
      console.log(`[metro] ${line}`);
    }
  });
@@ -641,7 +616,7 @@ function startMetro(input: {
      .split("\n")
      .filter((line) => line.trim());
    for (const line of lines) {
-      input.buffer.add(`[stderr] ${line}`);
+      buffer.add(`[stderr] ${line}`);
      console.error(`[metro] ${line}`);
    }
  });
@@ -654,7 +629,7 @@ interface DaemonSpawnArgs {
  relayPort: number;
  metroPort: number;
  paseoHome: string;
-  fakeEditorBinDir: string;
+  fakeToolBinDir: string;
  editorRecordPath: string;
  dictation: DictationConfig;
  buffer: ReturnType<typeof createLineBuffer>;
@@ -669,7 +644,7 @@ function startDaemon(args: DaemonSpawnArgs): ChildProcess {
    cwd: serverDir,
    env: {
      ...process.env,
-      PATH: `${args.fakeEditorBinDir}${path.delimiter}${process.env.PATH ?? ""}`,
+      PATH: `${args.fakeToolBinDir}${path.delimiter}${process.env.PATH ?? ""}`,
      PASEO_HOME: args.paseoHome,
      PASEO_E2E_EDITOR_RECORD_PATH: args.editorRecordPath,
      PASEO_SERVER_ID: "srv_e2e_test_daemon",
@@ -726,7 +701,6 @@ async function performCleanup(shouldRemovePaseoHome: boolean): Promise<void> {
    stopProcess(metroProcess),
    stopProcess(relayProcess),
  ]);
-  await stopCurrentDaemonFromPidLock();
  daemonProcess = null;
  metroProcess = null;
  relayProcess = null;
@@ -736,9 +710,9 @@ async function performCleanup(shouldRemovePaseoHome: boolean): Promise<void> {
  } else if (paseoHome) {
    console.log(`[e2e] Preserving PASEO_HOME: ${paseoHome}`);
  }
-  if (fakeEditorBinDir) {
-    await rm(fakeEditorBinDir, { recursive: true, force: true });
-    fakeEditorBinDir = null;
+  if (fakeToolBinDir) {
+    await rm(fakeToolBinDir, { recursive: true, force: true });
+    fakeToolBinDir = null;
  }
 }

@@ -747,13 +721,13 @@ export default async function globalSetup() {
  ensureRelayBuildArtifact(repoRoot);
  await loadEnvTestFile(repoRoot);

-  const port = await getAvailablePortExcluding(new Set());
-  const metroPort = await getAvailablePortExcluding(new Set([port]));
+  const port = await getAvailablePort();
+  const metroPort = await getAvailablePort();
  const requestedPaseoHome = resolveOptionalPaseoHomeEnv(process.env.E2E_PASEO_HOME);
  const shouldRemovePaseoHome = !requestedPaseoHome && process.env.E2E_KEEP_PASEO_HOME !== "1";
  paseoHome = requestedPaseoHome ?? (await mkdtemp(path.join(tmpdir(), "paseo-e2e-home-")));
  const editorRecordPath = path.join(paseoHome, "editor-open-records.jsonl");
-  fakeEditorBinDir = await createFakeEditorBin();
+  fakeToolBinDir = await createFakeToolBin();
  const metroLineBuffer = createLineBuffer();
  const daemonLineBuffer = createLineBuffer();

@@ -765,17 +739,13 @@ export default async function globalSetup() {

  try {
    const relayPort = await startRelay(new Set([port, metroPort]));
-    metroProcess = startMetro({
-      metroPort,
-      daemonPort: port,
-      buffer: metroLineBuffer,
-    });
+    metroProcess = startMetro(metroPort, metroLineBuffer);
    daemonProcess = startDaemon({
      port,
      relayPort,
      metroPort,
      paseoHome,
-      fakeEditorBinDir,
+      fakeToolBinDir,
      editorRecordPath,
      dictation,
      buffer: daemonLineBuffer,
@@ -795,8 +765,9 @@ export default async function globalSetup() {
      }),
    ]);

-    const offer = await waitForPairingOfferFromDaemon({
-      port,
+    const offer = await waitForPairingOfferFromCli({
+      repoRoot,
+      paseoHome,
    });

    process.env.E2E_DAEMON_PORT = String(port);
--- a/packages/app/e2e/helpers/archive-tab.ts
+++ b/packages/app/e2e/helpers/archive-tab.ts
@@ -14,7 +14,6 @@ export interface ArchiveTabAgent {
  id: string;
  title: string;
  cwd: string;
-  workspaceId: string;
 }

 function buildSeededStoragePayload() {
@@ -40,7 +39,6 @@ export interface IdleAgentSeedClient {
    model: string;
    modeId: string;
    cwd: string;
-    workspaceId: string;
    title: string;
  }): Promise<{ id: string }>;
  waitForAgentUpsert(
@@ -52,14 +50,13 @@ export interface IdleAgentSeedClient {

 export async function createIdleAgent(
  client: IdleAgentSeedClient,
-  input: { cwd: string; workspaceId: string; title: string },
+  input: { cwd: string; title: string },
 ): Promise<ArchiveTabAgent> {
  const created = await client.createAgent({
    provider: "opencode",
    model: "opencode/gpt-5-nano",
    modeId: "bypassPermissions",
    cwd: input.cwd,
-    workspaceId: input.workspaceId,
    title: input.title,
  });
  const snapshot = await client.waitForAgentUpsert(
@@ -74,7 +71,6 @@ export async function createIdleAgent(
    id: created.id,
    title: input.title,
    cwd: input.cwd,
-    workspaceId: input.workspaceId,
  };
 }

@@ -85,22 +81,6 @@ export async function archiveAgentFromDaemon(
  await client.archiveAgent(agentId);
 }

-export async function fetchAgentArchivedAt(
-  client: {
-    fetchAgent(agentId: string): Promise<{ agent: { archivedAt?: string | null } } | null>;
-  },
-  agentId: string,
-): Promise<string | null> {
-  const result = await client.fetchAgent(agentId);
-  return result?.agent.archivedAt ?? null;
-}
-
-export function getWorktreeRestoreFeature(client: {
-  getLastServerInfoMessage(): { features?: { worktreeRestore?: boolean } | null } | null;
-}): boolean {
-  return client.getLastServerInfoMessage()?.features?.worktreeRestore === true;
-}
-
 export async function primeAdditionalPage(page: Page): Promise<void> {
  const seedNonce = randomUUID();
  const { daemon, preferences } = buildSeededStoragePayload();
@@ -153,7 +133,7 @@ export async function openWorkspaceWithAgents(
 ): Promise<void> {
  const serverId = getServerId();
  for (const agent of agents) {
-    await page.goto(buildHostAgentDetailRoute(serverId, agent.id, agent.workspaceId));
+    await page.goto(buildHostAgentDetailRoute(serverId, agent.id, agent.cwd));

    // The workspace layout consumes `?open=agent:xxx`, returns null during the effect,
    // then replaces the URL with the clean workspace route after preparing the tab.
@@ -222,7 +202,7 @@ export async function openSessions(page: Page): Promise<void> {
  await expect(page).toHaveURL(new RegExp(`${buildHostSessionsRoute(getServerId())}$`), {
    timeout: 30_000,
  });
-  await expect(page.getByText("History", { exact: true }).last()).toBeVisible({
+  await expect(page.getByText("Sessions", { exact: true }).last()).toBeVisible({
    timeout: 30_000,
  });
 }
@@ -241,12 +221,6 @@ export async function expectSessionRowArchived(page: Page, title: string): Promi
  await expect(getSessionRowByTitle(page, title)).toContainText("Archived", { timeout: 30_000 });
 }

-export async function expectSessionRowNotArchived(page: Page, title: string): Promise<void> {
-  await expect(getSessionRowByTitle(page, title)).not.toContainText("Archived", {
-    timeout: 30_000,
-  });
-}
-
 export async function clickSessionRow(page: Page, title: string): Promise<void> {
  const row = getSessionRowByTitle(page, title);
  await expect(row).toBeVisible({ timeout: 30_000 });
--- a/packages/app/e2e/helpers/branch-switcher.ts
+++ b/packages/app/e2e/helpers/branch-switcher.ts
@@ -1,67 +0,0 @@
-import { expect, type Page } from "@playwright/test";
-import { escapeRegex } from "./regex";
-
-// The branch switcher lives in the git diff panel's Changes header (right-side
-// ExplorerSidebar), not in the workspace header. It renders as a button whose
-// accessible name carries the current branch ("Current branch: <name>. Press to
-// switch branch."). Matching on the accessible name keeps these helpers tied to
-// what a screen reader user hears, and it proves the panel resolved a real
-// checkout directory from the opaque workspace id. Scoping to the changes header
-// keeps the matcher unambiguous even when the header is shared with diff actions.
-function branchSwitcherTrigger(page: Page, branchName: string) {
-  return page
-    .getByTestId("changes-header")
-    .getByRole("button", { name: new RegExp(`Current branch: ${escapeRegex(branchName)}\\b`) })
-    .filter({ visible: true })
-    .first();
-}
-
-// Opens the right-side explorer and lands on the Changes tab, where the branch
-// switcher and diff live. Git checkouts default to the Changes tab when the
-// explorer opens, so this is enough to reveal the switcher on desktop and mobile.
-export async function openChangesPanel(page: Page): Promise<void> {
-  await expect(page.getByTestId("workspace-explorer-toggle").first()).toBeVisible({
-    timeout: 30_000,
-  });
-  await page.getByTestId("workspace-explorer-toggle").first().click();
-  const changesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true }).first();
-  await expect(changesTab).toBeVisible({ timeout: 30_000 });
-  await changesTab.click();
-  await expect(page.getByTestId("changes-header").filter({ visible: true }).first()).toBeVisible({
-    timeout: 30_000,
-  });
-}
-
-export async function expectWorkspaceBranch(page: Page, branchName: string): Promise<void> {
-  await expect(branchSwitcherTrigger(page, branchName)).toBeVisible({ timeout: 30_000 });
-}
-
-export async function switchBranchFromChangesPanel(
-  page: Page,
-  input: { from: string; to: string },
-): Promise<void> {
-  await branchSwitcherTrigger(page, input.from).click();
-
-  const picker = page.getByTestId("combobox-desktop-container");
-  await expect(picker).toBeVisible({ timeout: 30_000 });
-
-  // The branch switcher combobox renders its options as plain text rows with no ARIA
-  // role, so filter by the visible branch name and click the matching row. Filtering
-  // first guarantees a single, unambiguous match.
-  const search = page.getByPlaceholder("Filter branches...");
-  await expect(search).toBeVisible({ timeout: 30_000 });
-  await search.fill(input.to);
-
-  const option = picker.getByText(input.to, { exact: true });
-  await expect(option).toBeVisible({ timeout: 30_000 });
-  await option.click();
-
-  await expect(picker).not.toBeVisible({ timeout: 30_000 });
-}
-
-// The workspace header title is a plain static title in Model B; the branch
-// switcher must never appear there. Asserting on the header testID keeps this
-// honest even as the switcher continues to exist inside the Changes panel.
-export async function expectNoBranchSwitcherInWorkspaceHeader(page: Page): Promise<void> {
-  await expect(page.getByTestId("workspace-header-branch-switcher")).toHaveCount(0);
-}
--- a/packages/app/e2e/helpers/composer.ts
+++ b/packages/app/e2e/helpers/composer.ts
@@ -2,8 +2,7 @@ import { expect, type Page } from "@playwright/test";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import { createTempGitRepo } from "./workspace";
 import { connectSeedClient, type SeedDaemonClient } from "./seed-client";
-import { gotoAppShell } from "./app";
-import { connectWorkspaceSetupClient } from "./workspace-setup";
+import { connectWorkspaceSetupClient, openHomeWithProject } from "./workspace-setup";
 import { selectWorkspaceInSidebar } from "./sidebar";
 import { getServerId } from "./server-id";
 import { waitForTabBar } from "./launcher";
@@ -149,7 +148,6 @@ export async function selectGithubOption(
 export interface MockAgentSetup {
  client: SeedDaemonClient;
  repo: Awaited<ReturnType<typeof createTempGitRepo>>;
-  cleanup: () => Promise<void>;
 }

 /** Create a temp repo, start a mock agent, navigate to it, and wait for it to be running. */
@@ -161,35 +159,21 @@ export async function startRunningMockAgent(

  const repo = await createTempGitRepo(opts.prefix);
  const client = await connectSeedClient();
-  const createdWorkspace = await client.createWorkspace({
-    source: { kind: "directory", path: repo.path },
-  });
-  if (!createdWorkspace.workspace) {
-    throw new Error(createdWorkspace.error ?? "Failed to create workspace");
-  }
-  const workspace = createdWorkspace.workspace;
+  const opened = await client.openProject(repo.path);
+  if (!opened.workspace) throw new Error(opened.error ?? "Failed to open project");
  const agent = await client.createAgent({
    provider: "mock",
    cwd: repo.path,
-    workspaceId: workspace.id,
    model: opts.model,
+    initialPrompt: opts.prompt,
  });
-  const agentUrl = `${buildHostWorkspaceRoute(serverId, workspace.id)}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
+  const agentUrl = `${buildHostWorkspaceRoute(serverId, repo.path)}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
  await page.goto(agentUrl);
-  await expectComposerVisible(page);
-  await client.sendAgentMessage(agent.id, opts.prompt);
  await expect(page.getByRole("button", { name: /stop|cancel/i }).first()).toBeVisible({
    timeout: 30_000,
  });
-  return {
-    client,
-    repo,
-    cleanup: async () => {
-      await client.removeProject(workspace.projectId).catch(() => undefined);
-      await client.close().catch(() => undefined);
-      await repo.cleanup().catch(() => undefined);
-    },
-  };
+  await expectComposerVisible(page);
+  return { client, repo };
 }

 export interface GithubWorkspaceHandle {
@@ -202,20 +186,10 @@ export async function openGithubWorkspace(
  repoPath: string,
 ): Promise<GithubWorkspaceHandle> {
  const client = await connectWorkspaceSetupClient();
-  const createdWorkspace = await client.createWorkspace({
-    source: { kind: "directory", path: repoPath },
-  });
-  if (!createdWorkspace.workspace) {
-    throw new Error(createdWorkspace.error ?? `Failed to create workspace ${repoPath}`);
-  }
-  const workspace = createdWorkspace.workspace;
-  await gotoAppShell(page);
-  await selectWorkspaceInSidebar(page, workspace.id);
+  const opened = await client.openProject(repoPath);
+  if (!opened.workspace) throw new Error(opened.error ?? `Failed to open project ${repoPath}`);
+  await openHomeWithProject(page, repoPath);
+  await selectWorkspaceInSidebar(page, opened.workspace.id);
  await waitForTabBar(page);
-  return {
-    cleanup: async () => {
-      await client.removeProject(workspace.projectId).catch(() => undefined);
-      await client.close().catch(() => undefined);
-    },
-  };
+  return { cleanup: () => client.close().catch(() => undefined) };
 }
--- a/packages/app/e2e/helpers/daemon-client-loader.ts
+++ b/packages/app/e2e/helpers/daemon-client-loader.ts
@@ -1,5 +1,4 @@
 import { randomUUID } from "node:crypto";
-import { readFileSync } from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { getE2EDaemonPort } from "./daemon-port";
@@ -48,18 +47,9 @@ export async function connectDaemonClient<ClientInstance extends { connect(): Pr
    url: resolveDaemonWsUrl(),
    clientId: `${options.clientIdPrefix}-${randomUUID()}`,
    clientType: "cli",
-    appVersion: options.appVersion ?? loadAppVersion(),
+    appVersion: options.appVersion,
    webSocketFactory: createNodeWebSocketFactory(),
  });
  await client.connect();
  return client;
 }
-
-function loadAppVersion(): string {
-  const packageJsonPath = path.resolve(__dirname, "../../package.json");
-  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8")) as { version?: unknown };
-  if (typeof packageJson.version !== "string" || packageJson.version.length === 0) {
-    throw new Error(`Missing app version in ${packageJsonPath}`);
-  }
-  return packageJson.version;
-}
--- a/packages/app/e2e/helpers/daemon-restart.ts
+++ b/packages/app/e2e/helpers/daemon-restart.ts
@@ -1,157 +0,0 @@
-import { spawn, type ChildProcess } from "node:child_process";
-import { createRequire } from "node:module";
-import { readFile } from "node:fs/promises";
-import net from "node:net";
-import path from "node:path";
-
-import { getE2EDaemonPort } from "./daemon-port";
-
-/**
- * Restarts the isolated E2E daemon against the SAME PASEO_HOME and SAME port so
- * persisted state reloads and existing clients can reconnect. This exercises the
- * post-restart rehydration path (the daemon rebuilding workspace/agent links
- * from disk), which is where the worktree-branch regression lives.
- *
- * The daemon is owned by Playwright's `globalSetup`, which keeps its child
- * handle in module scope we can't reach from a spec. Instead we drive it the
- * same way an operator would: read the supervisor PID from
- * `$PASEO_HOME/paseo.pid`, SIGTERM it (the supervisor forwards the signal to its
- * worker and releases the lock), wait for the port to free, then re-spawn the
- * supervisor with the identical environment globalSetup used. The relay and
- * Metro processes are untouched, so we reuse their already-published ports.
- *
- * This NEVER targets the developer daemon: the port comes from
- * `getE2EDaemonPort()`, which refuses 6767, and PASEO_HOME is the isolated E2E
- * home globalSetup created.
- */
-
-function getEnvOrThrow(name: string): string {
-  const value = process.env[name];
-  if (!value) {
-    throw new Error(`${name} is not set (expected from Playwright globalSetup).`);
-  }
-  return value;
-}
-
-async function readSupervisorPid(paseoHome: string): Promise<number> {
-  const pidPath = path.join(paseoHome, "paseo.pid");
-  const content = await readFile(pidPath, "utf8");
-  const parsed = JSON.parse(content) as { pid?: unknown };
-  if (typeof parsed.pid !== "number") {
-    throw new Error(`Malformed PID lock at ${pidPath}: ${content}`);
-  }
-  return parsed.pid;
-}
-
-function isPidRunning(pid: number): boolean {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function isPortListening(port: number, host = "127.0.0.1"): Promise<boolean> {
-  return new Promise((resolve) => {
-    const socket = net.connect(port, host, () => {
-      socket.end();
-      resolve(true);
-    });
-    socket.setTimeout(1000, () => {
-      socket.destroy();
-      resolve(false);
-    });
-    socket.on("error", () => resolve(false));
-  });
-}
-
-async function waitUntil(
-  predicate: () => Promise<boolean> | boolean,
-  options: { timeoutMs: number; label: string },
-): Promise<void> {
-  const deadline = Date.now() + options.timeoutMs;
-  while (Date.now() < deadline) {
-    if (await predicate()) {
-      return;
-    }
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-  throw new Error(`Timed out after ${options.timeoutMs}ms waiting for ${options.label}.`);
-}
-
-function spawnSupervisor(args: {
-  paseoHome: string;
-  port: string;
-  relayPort: string;
-  metroPort: string;
-  editorRecordPath: string;
-}): ChildProcess {
-  const serverDir = path.resolve(__dirname, "../../../..", "packages/server");
-  // Run the supervisor through the resolved tsx CLI under the current node
-  // binary. Spawning the `node_modules/.bin/tsx` shim directly is unreliable
-  // inside the Playwright worker (the shim is a .mjs symlink, not an executable),
-  // so resolve the CLI module and load it with node.
-  const tsxCli = createRequire(path.join(serverDir, "package.json")).resolve("tsx/cli");
-
-  const child = spawn(process.execPath, [tsxCli, "scripts/supervisor-entrypoint.ts", "--dev"], {
-    cwd: serverDir,
-    env: {
-      ...process.env,
-      PASEO_HOME: args.paseoHome,
-      PASEO_E2E_EDITOR_RECORD_PATH: args.editorRecordPath,
-      PASEO_SERVER_ID: "srv_e2e_test_daemon",
-      PASEO_LISTEN: `0.0.0.0:${args.port}`,
-      PASEO_RELAY_ENDPOINT: `127.0.0.1:${args.relayPort}`,
-      PASEO_CORS_ORIGINS: `http://localhost:${args.metroPort}`,
-      PASEO_NODE_ENV: "development",
-      NODE_ENV: "development",
-    },
-    stdio: ["ignore", "pipe", "pipe"],
-    detached: false,
-  });
-
-  child.stdout?.on("data", (data: Buffer) => {
-    for (const line of data.toString().split("\n")) {
-      if (line.trim()) console.log(`[daemon:restart] ${line.trim()}`);
-    }
-  });
-  child.stderr?.on("data", (data: Buffer) => {
-    for (const line of data.toString().split("\n")) {
-      if (line.trim()) console.error(`[daemon:restart] ${line.trim()}`);
-    }
-  });
-
-  // Detach our handles so the spawned supervisor outlives this spec process and
-  // is reaped by globalSetup's cleanup (the original process tree), not us.
-  child.unref();
-  return child;
-}
-
-export async function restartTestDaemon(): Promise<void> {
-  const port = getE2EDaemonPort();
-  const paseoHome = getEnvOrThrow("E2E_PASEO_HOME");
-  const relayPort = getEnvOrThrow("E2E_RELAY_PORT");
-  const metroPort = getEnvOrThrow("E2E_METRO_PORT");
-  const editorRecordPath =
-    process.env.E2E_EDITOR_RECORD_PATH ?? path.join(paseoHome, "editor-open-records.jsonl");
-
-  const pid = await readSupervisorPid(paseoHome);
-  process.kill(pid, "SIGTERM");
-
-  await waitUntil(() => !isPidRunning(pid), {
-    timeoutMs: 15_000,
-    label: `supervisor PID ${pid} to exit`,
-  });
-  await waitUntil(async () => !(await isPortListening(Number(port))), {
-    timeoutMs: 15_000,
-    label: `port ${port} to free`,
-  });
-
-  spawnSupervisor({ paseoHome, port, relayPort, metroPort, editorRecordPath });
-
-  await waitUntil(async () => isPortListening(Number(port)), {
-    timeoutMs: 30_000,
-    label: `restarted daemon to listen on port ${port}`,
-  });
-}
--- a/packages/app/e2e/helpers/desktop-updates.ts
+++ b/packages/app/e2e/helpers/desktop-updates.ts
@@ -1,9 +1,8 @@
 import { readFileSync } from "node:fs";
-import { appendFile } from "node:fs/promises";
 import { expect, type Page } from "@playwright/test";
 import { openSettings } from "./app";
 import { getE2EDaemonPort } from "./daemon-port";
-import { openSettingsHost, openSettingsHostSection } from "./settings";
+import { openSettingsHost } from "./settings";

 interface DaemonApiStatus {
  version: string;
@@ -59,31 +58,12 @@ export interface DesktopBridgeConfig {
  daemonLogPath?: string;
  /** Initial manageBuiltInDaemon setting. Defaults to false. */
  manageBuiltInDaemon?: boolean;
-  /** Daemon listen address reported by desktop_daemon_status. Defaults to 127.0.0.1:6767. */
-  daemonListen?: string;
-  /** Keep start_desktop_daemon pending to hold the desktop startup blocker open. */
-  hangDaemonStart?: boolean;
  /**
   * Controls what dialog.ask returns when the daemon management confirm dialog
   * fires. True = confirm (proceed with the action), false = cancel. Defaults to
   * false so tests that only assert copy don't inadvertently trigger state changes.
   */
  confirmShouldAccept?: boolean;
-  editorTargets?: DesktopEditorTargetConfig[];
-  editorRecordPath?: string;
-}
-
-interface DesktopEditorTargetConfig {
-  id: string;
-  label: string;
-  kind: "editor" | "file-manager";
-}
-
-interface DesktopEditorOpenRecord {
-  editorId: string;
-  path: string;
-  cwd?: string;
-  mode?: "open" | "reveal";
 }

 export interface ConfirmDialogCall {
@@ -94,7 +74,6 @@ export interface ConfirmDialogCall {
 declare global {
  interface Window {
    __capturedDialogCall: ConfirmDialogCall | undefined;
-    __recordDesktopEditorOpen?: (input: DesktopEditorOpenRecord) => Promise<void>;
  }
 }

@@ -108,15 +87,6 @@ declare global {
 * can assert dialog copy without depending on window.confirm concatenation.
 */
 export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfig): Promise<void> {
-  if (config.editorRecordPath) {
-    await page.exposeFunction(
-      "__recordDesktopEditorOpen",
-      async (input: DesktopEditorOpenRecord) => {
-        await appendFile(config.editorRecordPath as string, `${JSON.stringify(input)}\n`, "utf8");
-      },
-    );
-  }
-
  await page.addInitScript((cfg) => {
    // Mutable state shared across IPC calls within this page
    let manageDaemon = cfg.manageBuiltInDaemon ?? false;
@@ -128,7 +98,7 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
      return {
        serverId: cfg.serverId,
        status: daemonRunning ? "running" : "stopped",
-        listen: cfg.daemonListen ?? "127.0.0.1:6767",
+        listen: null,
        hostname: null,
        pid: currentPid,
        home: "",
@@ -138,31 +108,7 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
      };
    }

-    function startDesktopDaemon() {
-      if (cfg.hangDaemonStart) {
-        return new Promise(() => undefined);
-      }
-      startCount += 1;
-      daemonRunning = true;
-      // First start (bootstrap) returns the configured PID; subsequent starts
-      // (after a stop) get a fresh PID so tests can observe the change.
-      currentPid = (cfg.daemonPid ?? 10000) + (startCount - 1) * 1000;
-      return buildDaemonStatus();
-    }
-
-    const desktopBridge: {
-      platform: string;
-      invoke: (command: string, args?: Record<string, unknown>) => Promise<unknown>;
-      dialog: {
-        ask: (message: string, options?: Record<string, unknown>) => Promise<boolean>;
-      };
-      getPendingOpenProject: () => Promise<string | null>;
-      events: { on: () => Promise<() => void> };
-      editor?: {
-        listTargets: () => Promise<DesktopEditorTargetConfig[]>;
-        openTarget: (input: DesktopEditorOpenRecord) => Promise<void>;
-      };
-    } = {
+    (window as unknown as { paseoDesktop: unknown }).paseoDesktop = {
      platform: "darwin",
      invoke: async (command: string, args?: Record<string, unknown>) => {
        if (command === "check_app_update") {
@@ -234,7 +180,12 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
        }

        if (command === "start_desktop_daemon") {
-          return startDesktopDaemon();
+          startCount += 1;
+          daemonRunning = true;
+          // First start (bootstrap) returns the configured PID; subsequent starts
+          // (after a stop) get a fresh PID so tests can observe the change.
+          currentPid = (cfg.daemonPid ?? 10000) + (startCount - 1) * 1000;
+          return buildDaemonStatus();
        }

        return null;
@@ -251,26 +202,12 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
      getPendingOpenProject: async () => null,
      events: { on: async () => () => undefined },
    };
-
-    if (cfg.editorTargets) {
-      desktopBridge.editor = {
-        listTargets: async () => cfg.editorTargets ?? [],
-        openTarget: async (input: DesktopEditorOpenRecord) => {
-          await window.__recordDesktopEditorOpen?.(input);
-        },
-      };
-    }
-
-    (window as unknown as { paseoDesktop: unknown }).paseoDesktop = desktopBridge;
  }, config);
 }

 export async function openDesktopSettings(page: Page, serverId: string): Promise<void> {
  await openSettings(page);
  await openSettingsHost(page, serverId);
-  // The daemon-lifecycle card moved to the Host section in the flat-settings
-  // layout; navigate there before asserting it.
-  await openSettingsHostSection(page, serverId, "host");
  await expect(page.getByTestId("host-page-daemon-lifecycle-card")).toBeVisible({
    timeout: 15_000,
  });
--- a/packages/app/e2e/helpers/github-fixtures.ts
+++ b/packages/app/e2e/helpers/github-fixtures.ts
@@ -48,17 +48,11 @@ export interface GhRepoFixture {
  owner: string;
  name: string;
  fullName: string;
-  defaultBranch: string;
  prs: GhPrFixture[];
  issues: GhIssueFixture[];
  cleanup(): Promise<void>;
 }

-export interface GhDefaultBranchClone {
-  path: string;
-  cleanup(): Promise<void>;
-}
-
 function gh(args: string[], opts?: { cwd?: string }): string {
  return execFileSync("gh", args, {
    cwd: opts?.cwd,
@@ -83,9 +77,8 @@ async function seedPr(args: {
  authedUrl: string;
  fullName: string;
  repoName: string;
-  defaultBranch: string;
 }): Promise<{ fixture: GhPrFixture; localPath: string }> {
-  const { spec, branch, index, basePath, authedUrl, fullName, repoName, defaultBranch } = args;
+  const { spec, branch, index, basePath, authedUrl, fullName, repoName } = args;

  const createArgs = [
    "pr",
@@ -93,7 +86,7 @@ async function seedPr(args: {
    "--title",
    spec.title,
    "--base",
-    defaultBranch,
+    "main",
    "--head",
    branch,
    "--body",
@@ -173,11 +166,10 @@ export async function createTempGithubRepo(options: {
  const { category, prs = [], issues = [] } = options;
  const uniqueSuffix = `${Date.now()}-${Math.random().toString(36).slice(2, 7)}`;
  const repoName = `${TEMP_GITHUB_REPO_PREFIX}${category}-${uniqueSuffix}`;
-  const defaultBranch = "main";

  // Bootstrap local git repo
  const basePath = await mkdtemp(path.join("/tmp", `${repoName}-base-`));
-  git(["init", "-b", defaultBranch], basePath);
+  git(["init", "-b", "main"], basePath);
  git(["config", "user.email", "e2e@paseo.test"], basePath);
  git(["config", "user.name", "Paseo E2E"], basePath);
  git(["config", "commit.gpgsign", "false"], basePath);
@@ -205,7 +197,7 @@ export async function createTempGithubRepo(options: {
    await writeFile(path.join(basePath, `pr-${i + 1}.txt`), `PR ${i + 1}\n`);
    git(["add", `pr-${i + 1}.txt`], basePath);
    git(["commit", "-m", `Add PR ${i + 1}`], basePath);
-    git(["checkout", defaultBranch], basePath);
+    git(["checkout", "main"], basePath);
  }

  if (branches.length > 0) {
@@ -225,7 +217,6 @@ export async function createTempGithubRepo(options: {
      authedUrl,
      fullName,
      repoName,
-      defaultBranch,
    });
    localPaths.push(localPath);
    prFixtures.push(fixture);
@@ -241,7 +232,6 @@ export async function createTempGithubRepo(options: {
    owner,
    name: repoName,
    fullName,
-    defaultBranch,
    prs: prFixtures,
    issues: issueFixtures,
    cleanup: async () => {
@@ -257,27 +247,3 @@ export async function createTempGithubRepo(options: {
    },
  };
 }
-
-export async function cloneGithubRepoDefaultBranchOnly(
-  repo: Pick<GhRepoFixture, "fullName" | "name" | "defaultBranch">,
-): Promise<GhDefaultBranchClone> {
-  const token = gh(["auth", "token"]);
-  const authedUrl = `https://x-access-token:${token}@github.com/${repo.fullName}.git`;
-  const clonePath = await mkdtemp(path.join("/tmp", `${repo.name}-${repo.defaultBranch}-only-`));
-
-  execFileSync(
-    "git",
-    ["clone", "--quiet", "--single-branch", "--branch", repo.defaultBranch, authedUrl, clonePath],
-    { stdio: ["ignore", "pipe", "pipe"] },
-  );
-  git(["config", "user.email", "e2e@paseo.test"], clonePath);
-  git(["config", "user.name", "Paseo E2E"], clonePath);
-  git(["config", "commit.gpgsign", "false"], clonePath);
-
-  return {
-    path: clonePath,
-    cleanup: async () => {
-      await rm(clonePath, { recursive: true, force: true });
-    },
-  };
-}
--- a/packages/app/e2e/helpers/launcher.ts
+++ b/packages/app/e2e/helpers/launcher.ts
@@ -6,8 +6,8 @@ import { getServerId } from "./server-id";
 // ─── Navigation ────────────────────────────────────────────────────────────

 /** Navigate to a workspace and wait for the tab bar to appear. */
-export async function gotoWorkspace(page: Page, workspaceId: string): Promise<void> {
-  const route = buildHostWorkspaceRoute(getServerId(), workspaceId);
+export async function gotoWorkspace(page: Page, cwd: string): Promise<void> {
+  const route = buildHostWorkspaceRoute(getServerId(), cwd);
  await page.goto(route);
  await waitForTabBar(page);
 }
@@ -69,46 +69,34 @@ export async function pressNewTabShortcut(page: Page): Promise<void> {

 // ─── Tab bar assertions ───────────────────────────────────────────────────

-/** Assert the inline new-agent plus button is visible in the tab bar. */
+/** Assert the new agent tab button is visible in the tab bar. */
 export async function assertNewChatTileVisible(page: Page): Promise<void> {
  await expect(
-    page.getByTestId("workspace-new-agent-tab-inline").filter({ visible: true }).first(),
+    page.getByTestId("workspace-new-agent-tab").filter({ visible: true }).first(),
  ).toBeVisible();
 }

-/** Assert the new-tab dropdown trigger is visible in the tab bar. */
-export async function assertNewTabMenuTriggerVisible(page: Page): Promise<void> {
+/** Assert the new terminal button is visible in the tab bar. */
+export async function assertTerminalTileVisible(page: Page): Promise<void> {
  await expect(
-    page.getByTestId("workspace-new-tab-menu-trigger").filter({ visible: true }).first(),
+    page.getByTestId("workspace-new-terminal").filter({ visible: true }).first(),
  ).toBeVisible();
 }

 // ─── Tab creation actions ─────────────────────────────────────────────────

-/** Click the inline plus button to create a draft/chat tab. */
+/** Click the new agent tab button to create a draft/chat tab. */
 export async function clickNewChat(page: Page): Promise<void> {
-  const button = page
-    .getByTestId("workspace-new-agent-tab-inline")
-    .filter({ visible: true })
-    .first();
+  const button = page.getByTestId("workspace-new-agent-tab").filter({ visible: true }).first();
  await expect(button).toBeVisible({ timeout: 10_000 });
  await button.click();
 }

-/** Open the new-tab menu and click "New terminal". */
+/** Click the new terminal button to create a terminal tab. */
 export async function clickNewTerminal(page: Page): Promise<void> {
-  const trigger = page
-    .getByTestId("workspace-new-tab-menu-trigger")
-    .filter({ visible: true })
-    .first();
-  await expect(trigger).toBeVisible({ timeout: 10_000 });
-  await trigger.click();
-  const item = page
-    .getByTestId("workspace-new-tab-menu-terminal")
-    .filter({ visible: true })
-    .first();
-  await expect(item).toBeVisible({ timeout: 10_000 });
-  await item.click();
+  const button = page.getByTestId("workspace-new-terminal").filter({ visible: true }).first();
+  await expect(button).toBeVisible({ timeout: 10_000 });
+  await button.click();
 }

 // ─── Tab title assertions ──────────────────────────────────────────────────
@@ -129,9 +117,9 @@ export async function waitForTabWithTitle(
  ).toBeVisible({ timeout });
 }

-/** Assert the inline new-agent plus button is visible in the tab bar. */
+/** Assert the new agent tab button is visible in the tab bar. */
 export async function assertSingleNewTabButton(page: Page): Promise<void> {
-  const buttons = page.getByTestId("workspace-new-agent-tab-inline").filter({ visible: true });
+  const buttons = page.getByTestId("workspace-new-agent-tab").filter({ visible: true });
  const count = await buttons.count();
  expect(count).toBeGreaterThanOrEqual(1);
 }
--- a/packages/app/e2e/helpers/mock-agent.ts
+++ b/packages/app/e2e/helpers/mock-agent.ts
@@ -5,7 +5,6 @@ import { getServerId } from "./server-id";

 export interface MockAgentWorkspace {
  agentId: string;
-  workspaceId: string;
  cwd: string;
  client: SeedDaemonClient;
  cleanup(): Promise<void>;
@@ -33,7 +32,6 @@ export async function seedMockAgentWorkspace(
    const agent = await workspace.client.createAgent({
      provider: "mock",
      cwd: workspace.repoPath,
-      workspaceId: workspace.workspaceId,
      title: options.title,
      modeId: options.modeId ?? "load-test",
      model: options.model ?? "ten-second-stream",
@@ -42,7 +40,6 @@ export async function seedMockAgentWorkspace(
    });
    return {
      agentId: agent.id,
-      workspaceId: workspace.workspaceId,
      cwd: workspace.repoPath,
      client: workspace.client,
      cleanup: workspace.cleanup,
@@ -53,8 +50,8 @@ export async function seedMockAgentWorkspace(
  }
 }

-export function buildAgentRoute(workspaceId: string, agentId: string): string {
-  return `${buildHostWorkspaceRoute(getServerId(), workspaceId)}?open=${encodeURIComponent(
+export function buildAgentRoute(cwd: string, agentId: string): string {
+  return `${buildHostWorkspaceRoute(getServerId(), cwd)}?open=${encodeURIComponent(
    `agent:${agentId}`,
  )}`;
 }
@@ -62,9 +59,9 @@ export function buildAgentRoute(workspaceId: string, agentId: string): string {
 /** Boots the app directly at the agent's workspace route and waits for the open intent to settle. */
 export async function openAgentRoute(
  page: Page,
-  input: { workspaceId: string; agentId: string },
+  input: { cwd: string; agentId: string },
 ): Promise<void> {
-  await page.goto(buildAgentRoute(input.workspaceId, input.agentId));
+  await page.goto(buildAgentRoute(input.cwd, input.agentId));
  await page.waitForURL(
    (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
    { timeout: 60_000 },
--- a/packages/app/e2e/helpers/new-workspace.ts
+++ b/packages/app/e2e/helpers/new-workspace.ts
@@ -3,79 +3,37 @@ import type { DaemonClient as InternalDaemonClient } from "@getpaseo/client/inte
 import { decodeWorkspaceIdFromPathSegment } from "@/utils/host-routes";
 import { connectDaemonClient } from "./daemon-client-loader";
 import { daemonWsRoutePattern } from "./daemon-port";
-import { expectWorkspaceHeader } from "./workspace-ui";
+import { expectWorkspaceHeader, workspaceLabelFromPath } from "./workspace-ui";

 type NewWorkspaceDaemonClient = Pick<
  InternalDaemonClient,
  | "archivePaseoWorktree"
  | "archiveWorkspace"
-  | "checkoutRefresh"
  | "close"
  | "connect"
  | "createPaseoWorktree"
-  | "createWorkspace"
-  | "fetchWorkspaces"
-  | "getPaseoWorktreeList"
-  | "getDaemonConfig"
-  | "patchDaemonConfig"
-  | "removeProject"
+  | "openProject"
 >;

-type CreateWorkspacePayload = Awaited<ReturnType<NewWorkspaceDaemonClient["createWorkspace"]>>;
-type WorkspacePayload = Pick<CreateWorkspacePayload, "error" | "workspace">;
-type WorkspaceDescriptor = NonNullable<CreateWorkspacePayload["workspace"]>;
+type OpenProjectPayload = Awaited<ReturnType<NewWorkspaceDaemonClient["openProject"]>>;

 export interface OpenedProject {
  workspaceId: string;
  projectKey: string;
  projectDisplayName: string;
  workspaceName: string;
-  workspaceDirectory: string;
 }

-function requireWorkspace(payload: WorkspacePayload) {
+function requireWorkspace(payload: OpenProjectPayload) {
  if (payload.error) {
    throw new Error(payload.error);
  }
  if (!payload.workspace) {
-    throw new Error("workspace.create returned no workspace.");
+    throw new Error("openProject returned no workspace.");
  }
  return payload.workspace;
 }

-function openedProjectFromWorkspace(workspace: WorkspaceDescriptor): OpenedProject {
-  return {
-    workspaceId: workspace.id,
-    projectKey: workspace.projectId,
-    projectDisplayName: workspace.projectDisplayName,
-    workspaceName: workspace.name,
-    workspaceDirectory: workspace.workspaceDirectory,
-  };
-}
-
-async function fetchWorkspaceById(
-  client: NewWorkspaceDaemonClient,
-  workspaceId: string,
-): Promise<WorkspaceDescriptor | null> {
-  const payload = await client.fetchWorkspaces();
-  return payload.entries.find((entry) => entry.id === workspaceId) ?? null;
-}
-
-async function waitForWorkspaceDescriptor(
-  client: NewWorkspaceDaemonClient,
-  workspaceId: string,
-): Promise<WorkspaceDescriptor> {
-  const deadline = Date.now() + 30_000;
-  while (Date.now() < deadline) {
-    const workspace = await fetchWorkspaceById(client, workspaceId);
-    if (workspace) {
-      return workspace;
-    }
-    await new Promise((resolve) => setTimeout(resolve, 250));
-  }
-  throw new Error(`Workspace descriptor not found: ${workspaceId}`);
-}
-
 function parseWorkspaceIdFromPageUrl(page: Page, serverId: string): string | null {
  const pathname = new URL(page.url()).pathname;
  const match = pathname.match(
@@ -97,28 +55,25 @@ export async function openProjectViaDaemon(
  client: NewWorkspaceDaemonClient,
  repoPath: string,
 ): Promise<OpenedProject> {
-  const workspace = requireWorkspace(
-    await client.createWorkspace({
-      source: { kind: "directory", path: repoPath },
-    }),
-  );
-  return openedProjectFromWorkspace(workspace);
+  const workspace = requireWorkspace(await client.openProject(repoPath));
+  return {
+    workspaceId: workspace.id,
+    projectKey: workspace.projectId,
+    projectDisplayName: workspace.projectDisplayName,
+    workspaceName: workspace.name,
+  };
 }

 export async function archiveWorkspaceFromDaemon(
  client: NewWorkspaceDaemonClient,
-  workspaceDirectory: string,
-  options?: { scope?: "workspace" | "worktree" },
+  workspaceId: string,
 ): Promise<void> {
-  const payload = await client.archivePaseoWorktree({
-    worktreePath: workspaceDirectory,
-    ...(options?.scope !== undefined ? { scope: options.scope } : {}),
-  });
+  const payload = await client.archivePaseoWorktree({ worktreePath: workspaceId });
  if (payload.error) {
    throw new Error(payload.error.message);
  }
  if (!payload.success) {
-    throw new Error(`Failed to archive workspace: ${workspaceDirectory}`);
+    throw new Error(`Failed to archive workspace: ${workspaceId}`);
  }
 }

@@ -144,7 +99,12 @@ export async function createWorktreeViaDaemon(
    worktreeSlug: input.slug,
  });
  const workspace = requireWorkspace(payload);
-  return openedProjectFromWorkspace(workspace);
+  return {
+    workspaceId: workspace.id,
+    projectKey: workspace.projectId,
+    projectDisplayName: workspace.projectDisplayName,
+    workspaceName: workspace.name,
+  };
 }

 export async function openNewWorkspaceComposer(
@@ -164,93 +124,14 @@ export async function openNewWorkspaceComposer(
  });
 }

-export async function openGlobalNewWorkspaceComposer(page: Page): Promise<void> {
-  await page.getByTestId("sidebar-global-new-workspace").click();
-
-  await expect(page).toHaveURL(/\/h\/[^/]+\/new(?:\?.*)?$/, {
-    timeout: 30_000,
-  });
-}
-
-export async function expectNewWorkspaceProjectSelected(
-  page: Page,
-  projectDisplayName: string,
-): Promise<void> {
-  const projectPicker = page.getByRole("button", { name: "Workspace project" });
-  await expect(projectPicker).toBeVisible({ timeout: 30_000 });
-  await expect(projectPicker).toContainText(projectDisplayName);
-}
-
-export async function submitNewWorkspacePrompt(
-  page: Page,
-  prompt = "Hello from e2e",
-): Promise<void> {
-  const composer = page.getByRole("textbox", { name: "Message agent..." });
-  await expect(composer).toBeVisible({ timeout: 30_000 });
-  await composer.fill(prompt);
-  const createButton = page
-    .getByTestId("message-input-root")
-    .getByRole("button", { name: "Create" });
-  await expect(createButton).toBeVisible({ timeout: 30_000 });
-  await createButton.click();
-}
-
 export async function clickNewWorkspaceButton(
  page: Page,
  input: { projectKey: string; projectDisplayName: string; prompt?: string },
 ): Promise<void> {
  await openNewWorkspaceComposer(page, input);
-  await submitNewWorkspacePrompt(page, input.prompt);
-}
-
-export async function selectNewWorkspaceProject(
-  page: Page,
-  input: { projectKey: string; projectDisplayName: string },
-): Promise<void> {
-  const trigger = page.getByTestId("new-workspace-project-picker-trigger");
-  await expect(trigger).toBeVisible({ timeout: 30_000 });
-  await trigger.click();
-
-  const option = page.getByTestId(`new-workspace-project-picker-option-${input.projectKey}`);
-  await expect(option).toBeVisible({ timeout: 30_000 });
-  await option.click();
-
-  await expectNewWorkspaceProjectSelected(page, input.projectDisplayName);
-}
-
-// The isolation trigger renders the active isolation's label ("Local" / "New
-// worktree"), so asserting its text proves what the screen currently remembers.
-const ISOLATION_TRIGGER_LABEL: Record<"local" | "worktree", string> = {
-  local: "Local",
-  worktree: "New worktree",
-};
-
-export async function expectWorkspaceIsolationSelected(
-  page: Page,
-  isolation: "local" | "worktree",
-): Promise<void> {
-  const trigger = page.getByRole("button", { name: "Workspace isolation" });
-  await expect(trigger).toBeVisible({ timeout: 30_000 });
-  await expect(trigger).toContainText(ISOLATION_TRIGGER_LABEL[isolation]);
-}
-
-export async function selectWorkspaceIsolation(
-  page: Page,
-  isolation: "local" | "worktree",
-): Promise<void> {
-  const trigger = page.getByTestId("workspace-create-isolation-trigger");
-  await expect(trigger).toBeVisible({ timeout: 30_000 });
-  await trigger.click();
-
-  // "New worktree" is only listed once the checkout status query confirms the
-  // selected project is a git repo, so wait for the option to appear before
-  // clicking it.
-  const option = page.getByTestId(`workspace-create-isolation-${isolation}`);
-  await expect(option).toBeVisible({ timeout: 30_000 });
-  await option.click();
-}
-
-export async function submitNewWorkspaceEmpty(page: Page): Promise<void> {
+  const composer = page.getByRole("textbox", { name: "Message agent..." });
+  await expect(composer).toBeVisible({ timeout: 30_000 });
+  await composer.fill(input.prompt ?? "Hello from e2e");
  const createButton = page
    .getByTestId("message-input-root")
    .getByRole("button", { name: "Create" });
@@ -296,9 +177,7 @@ export async function selectPickerOptionByKeyboard(page: Page, label: string): P
  const searchInput = page.getByPlaceholder("Search branches and PRs");
  await expect(searchInput).toBeVisible({ timeout: 30_000 });
  await page.keyboard.type(label);
-  await expect(page.getByTestId(`new-workspace-ref-picker-branch-${label}`)).toBeVisible({
-    timeout: 10_000,
-  });
+  await page.keyboard.press("ArrowDown");
  await page.keyboard.press("Enter");
 }

@@ -333,52 +212,35 @@ export async function expectComposerGithubAttachmentPill(

 export async function assertNewWorkspaceSidebarAndHeader(
  page: Page,
-  input: {
-    serverId: string;
-    client: NewWorkspaceDaemonClient;
-    previousWorkspaceId: string;
-    projectDisplayName: string;
-    assertSidebarRow?: boolean;
-    assertHeader?: boolean;
-  },
-): Promise<{ workspaceId: string; workspaceName: string; workspaceDirectory: string }> {
-  // URL is the source of truth so concurrent sidebar rows cannot satisfy this.
-  await expect
-    .poll(
-      () => {
-        const workspaceId = parseWorkspaceIdFromPageUrl(page, input.serverId);
-        return workspaceId && workspaceId !== input.previousWorkspaceId ? workspaceId : null;
-      },
-      { timeout: 60_000 },
-    )
-    .not.toBeNull();
+  input: { serverId: string; previousWorkspaceId: string; projectDisplayName: string },
+): Promise<{ workspaceId: string }> {
+  // Wait for URL to redirect to the newly created workspace.
+  // Uses URL as source of truth to avoid picking up sidebar rows from concurrent tests.
+  let workspaceId: string | null = null;
+  const deadline = Date.now() + 60_000;
+  while (Date.now() < deadline) {
+    workspaceId = parseWorkspaceIdFromPageUrl(page, input.serverId);
+    if (workspaceId && workspaceId !== input.previousWorkspaceId) {
+      break;
+    }
+    await page.waitForTimeout(250);
+  }

-  const workspaceId = parseWorkspaceIdFromPageUrl(page, input.serverId);
  if (!workspaceId || workspaceId === input.previousWorkspaceId) {
    throw new Error(`Expected URL to redirect to a new workspace.\nCurrent URL: ${page.url()}`);
  }

-  const workspace = await waitForWorkspaceDescriptor(input.client, workspaceId);
+  const createdWorkspaceRow = page.getByTestId(
+    `sidebar-workspace-row-${input.serverId}:${workspaceId}`,
+  );
+  await expect(createdWorkspaceRow.first()).toBeVisible({ timeout: 30_000 });

-  if (input.assertSidebarRow !== false) {
-    const createdWorkspaceRow = page.getByTestId(
-      `sidebar-workspace-row-${input.serverId}:${workspace.id}`,
-    );
-    await expect(createdWorkspaceRow.first()).toBeVisible({ timeout: 30_000 });
-  }
+  await expectWorkspaceHeader(page, {
+    title: workspaceLabelFromPath(workspaceId),
+    subtitle: input.projectDisplayName,
+  });

-  if (input.assertHeader !== false) {
-    await expectWorkspaceHeader(page, {
-      title: workspace.name,
-      subtitle: input.projectDisplayName,
-    });
-  }
-
-  return {
-    workspaceId: workspace.id,
-    workspaceName: workspace.name,
-    workspaceDirectory: workspace.workspaceDirectory,
-  };
+  return { workspaceId };
 }

 type WebSocketMessage = string | Buffer;
--- a/packages/app/e2e/helpers/pins.ts
+++ b/packages/app/e2e/helpers/pins.ts
@@ -1,45 +0,0 @@
-import { expect, type Page } from "@playwright/test";
-import type { PinnedTabTarget } from "../../src/workspace-pins/target";
-import { pinnedTargetKey } from "../../src/workspace-pins/target";
-
-// The new-tab dropdown menu items carry no stable web ARIA role for the inline
-// pin toggle (it lives inside a reveal-on-hover slot), so the pins flow is
-// addressed through the test ids the feature assigns per target key — the same
-// escape-hatch convention the sidebar kebab and tab context menus use.
-
-function pinToggle(page: Page, target: PinnedTabTarget) {
-  return page.getByTestId(`workspace-pin-toggle-${pinnedTargetKey(target)}`);
-}
-
-function menuItemFor(page: Page, target: PinnedTabTarget) {
-  if (target.kind === "draft") {
-    return page.getByTestId("workspace-new-tab-menu-agent");
-  }
-  return page.getByTestId(`workspace-new-tab-menu-${target.kind}`);
-}
-
-export function tabRowPin(page: Page, target: PinnedTabTarget) {
-  return page.getByTestId(`workspace-pinned-target-${pinnedTargetKey(target)}`);
-}
-
-export async function openNewTabMenu(page: Page): Promise<void> {
-  const trigger = page
-    .getByTestId("workspace-new-tab-menu-trigger")
-    .filter({ visible: true })
-    .first();
-  await expect(trigger).toBeVisible({ timeout: 10_000 });
-  await trigger.click();
-}
-
-// The pin toggle is hidden behind reveal-on-hover (opacity + pointerEvents) on
-// desktop web, so the menu item must be hovered before the toggle is clickable.
-export async function togglePinFromMenu(page: Page, target: PinnedTabTarget): Promise<void> {
-  await openNewTabMenu(page);
-  const item = menuItemFor(page, target);
-  await expect(item).toBeVisible({ timeout: 10_000 });
-  await item.hover();
-  const toggle = pinToggle(page, target);
-  await expect(toggle).toBeVisible({ timeout: 10_000 });
-  await toggle.click();
-  await page.keyboard.press("Escape");
-}
--- a/packages/app/e2e/helpers/pr-pane.ts
+++ b/packages/app/e2e/helpers/pr-pane.ts
@@ -1,5 +1,5 @@
 import { expect, type Page } from "@playwright/test";
-import { getStateLabel } from "@/git/pull-request-panel/data";
+import { getStateLabel } from "@/git/pr-pane-data";

 export async function openPrPane(page: Page): Promise<void> {
  await page.getByRole("button", { name: "Open explorer" }).click();
--- a/packages/app/e2e/helpers/project-settings.ts
+++ b/packages/app/e2e/helpers/project-settings.ts
@@ -34,7 +34,7 @@ export async function editWorktreeSetup(page: Page, setupCommands: string[]): Pr
 }

 export async function clickSaveProjectSettings(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Save" }).click();
+  await page.getByRole("button", { name: "Save project config" }).click();
 }

 export async function clickRetryProjectSettingsSave(page: Page): Promise<void> {
@@ -79,7 +79,7 @@ export async function expectWriteFailedCalloutActions(page: Page): Promise<void>
 }

 export async function expectSaveButtonDisabled(page: Page): Promise<void> {
-  await expect(page.getByRole("button", { name: "Save" })).toBeDisabled();
+  await expect(page.getByRole("button", { name: "Save project config" })).toBeDisabled();
 }

 // --- Form-state assertions ---
--- a/packages/app/e2e/helpers/provider-usage.ts
+++ b/packages/app/e2e/helpers/provider-usage.ts
@@ -1,154 +0,0 @@
-import type { Page } from "@playwright/test";
-import type { ProviderUsage } from "@getpaseo/protocol/messages";
-import { daemonWsRoutePattern } from "./daemon-port";
-
-interface ProviderUsageFixturePayload {
-  fetchedAt: string;
-  providers: ProviderUsage[];
-}
-
-export interface ProviderUsageFixture {
-  requestCount(): number;
-  waitForRequestCount(count: number): Promise<void>;
-}
-
-type WebSocketMessage = string | Buffer;
-
-function parseJson(message: WebSocketMessage): unknown {
-  const raw = typeof message === "string" ? message : message.toString("utf8");
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-
-function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
-  const envelope = parseJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
-  if (maybeEnvelope.type !== "session" || !maybeEnvelope.message) {
-    return null;
-  }
-  if (typeof maybeEnvelope.message !== "object") {
-    return null;
-  }
-  return maybeEnvelope.message as Record<string, unknown>;
-}
-
-function withProviderUsageFeature(message: WebSocketMessage): string | null {
-  const envelope = parseJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as {
-    type?: unknown;
-    message?: {
-      type?: unknown;
-      payload?: Record<string, unknown>;
-    };
-  };
-  const payload = maybeEnvelope.message?.payload;
-  if (
-    maybeEnvelope.type !== "session" ||
-    maybeEnvelope.message?.type !== "status" ||
-    payload?.status !== "server_info"
-  ) {
-    return null;
-  }
-  return JSON.stringify({
-    ...maybeEnvelope,
-    message: {
-      ...maybeEnvelope.message,
-      payload: {
-        ...payload,
-        features: {
-          ...(typeof payload.features === "object" && payload.features !== null
-            ? payload.features
-            : {}),
-          providerUsageList: true,
-        },
-      },
-    },
-  });
-}
-
-export async function installProviderUsageFixture(
-  page: Page,
-  payloads: ProviderUsageFixturePayload[],
-): Promise<ProviderUsageFixture> {
-  let requests = 0;
-  const waiters: Array<{ count: number; resolve: () => void }> = [];
-
-  function notifyWaiters() {
-    for (const waiter of waiters.splice(0)) {
-      if (requests >= waiter.count) {
-        waiter.resolve();
-      } else {
-        waiters.push(waiter);
-      }
-    }
-  }
-
-  function payloadForRequest(): ProviderUsageFixturePayload {
-    const index = Math.min(requests - 1, payloads.length - 1);
-    const payload = payloads[index];
-    if (!payload) {
-      throw new Error("Provider usage fixture requires at least one payload.");
-    }
-    return payload;
-  }
-
-  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
-    const server = ws.connectToServer();
-
-    ws.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      if (sessionMessage?.type === "provider.usage.list.request") {
-        requests += 1;
-        const requestId = sessionMessage.requestId;
-        if (typeof requestId !== "string") {
-          throw new Error("provider.usage.list.request missing requestId");
-        }
-        const payload = payloadForRequest();
-        notifyWaiters();
-        ws.send(
-          JSON.stringify({
-            type: "session",
-            message: {
-              type: "provider.usage.list.response",
-              payload: {
-                requestId,
-                fetchedAt: payload.fetchedAt,
-                providers: payload.providers,
-              },
-            },
-          }),
-        );
-        return;
-      }
-      server.send(message);
-    });
-
-    server.onMessage((message) => {
-      const serverInfo = typeof message === "string" ? withProviderUsageFeature(message) : null;
-      ws.send(serverInfo ?? message);
-    });
-  });
-
-  return {
-    requestCount() {
-      return requests;
-    },
-    waitForRequestCount(count: number) {
-      if (requests >= count) {
-        return Promise.resolve();
-      }
-      return new Promise<void>((resolve) => {
-        waiters.push({ count, resolve });
-      });
-    },
-  };
-}
--- a/packages/app/e2e/helpers/questions.ts
+++ b/packages/app/e2e/helpers/questions.ts
@@ -1,102 +0,0 @@
-import { expect, type Page } from "@playwright/test";
-
-export async function waitForQuestionPrompt(page: Page, timeout = 30_000): Promise<void> {
-  await expect(page.getByTestId("question-form-card").first()).toBeVisible({ timeout });
-}
-
-export async function expectCurrentQuestion(
-  page: Page,
-  input: { index: number; total: number; question: string },
-): Promise<void> {
-  const card = page.getByTestId("question-form-card").first();
-  await expect(card.getByTestId("question-form-current-question")).toHaveText(input.question);
-  await expect(
-    card.getByRole("button", { name: `Question ${input.index} of ${input.total}` }),
-  ).toHaveAttribute("aria-selected", "true");
-}
-
-export async function expectQuestionHidden(page: Page, question: string): Promise<void> {
-  await expect(page.getByText(question, { exact: true })).toHaveCount(0);
-}
-
-export async function chooseQuestionOption(page: Page, option: string): Promise<void> {
-  await page
-    .getByTestId("question-form-card")
-    .first()
-    .getByRole("button", { name: option })
-    .click();
-}
-
-export async function expectQuestionOptionSelected(page: Page, option: string): Promise<void> {
-  await expect(
-    page.getByTestId("question-form-card").first().getByRole("button", { name: option }),
-  ).toHaveAttribute("aria-selected", "true");
-}
-
-export async function openQuestion(
-  page: Page,
-  input: { index: number; total: number },
-): Promise<void> {
-  await page
-    .getByTestId("question-form-card")
-    .first()
-    .getByRole("button", { name: `Question ${input.index} of ${input.total}` })
-    .click();
-}
-
-export async function expectQuestionNavigationEnabled(
-  page: Page,
-  input: { index: number; total: number },
-): Promise<void> {
-  await expect(
-    page
-      .getByTestId("question-form-card")
-      .first()
-      .getByRole("button", { name: `Question ${input.index} of ${input.total}` }),
-  ).toBeEnabled();
-}
-
-export async function fillQuestionAnswer(
-  page: Page,
-  input: { question: string; answer: string },
-): Promise<void> {
-  await page
-    .getByTestId("question-form-card")
-    .first()
-    .getByRole("textbox", { name: input.question })
-    .fill(input.answer);
-}
-
-export async function submitQuestionAnswers(page: Page): Promise<void> {
-  await page.getByTestId("question-form-primary-action").click();
-  await expect(page.getByTestId("question-form-card")).toHaveCount(0, { timeout: 30_000 });
-}
-
-export async function expectQuestionPrimaryActionEnabled(page: Page, label: string): Promise<void> {
-  await expect(
-    page.getByTestId("question-form-card").first().getByRole("button", { name: label }),
-  ).toBeEnabled();
-}
-
-export async function expectQuestionPrimaryActionDisabled(
-  page: Page,
-  label: string,
-): Promise<void> {
-  await expect(
-    page.getByTestId("question-form-card").first().getByRole("button", { name: label }),
-  ).toBeDisabled();
-}
-
-export async function expectQuestionDismissEnabled(page: Page): Promise<void> {
-  await expect(
-    page.getByTestId("question-form-card").first().getByRole("button", { name: "Dismiss" }),
-  ).toBeEnabled();
-}
-
-export async function continueToNextQuestion(page: Page): Promise<void> {
-  await page
-    .getByTestId("question-form-card")
-    .first()
-    .getByRole("button", { name: "Next" })
-    .click();
-}
--- a/packages/app/e2e/helpers/rename.ts
+++ b/packages/app/e2e/helpers/rename.ts
@@ -1,5 +1,32 @@
 import { type Page } from "@playwright/test";

+/**
+ * Listens for outbound WebSocket "session" frames of a given inner message type
+ * and accumulates them. The returned array is populated in-place as frames arrive.
+ */
+export function captureWsSessionFrames<T extends Record<string, unknown>>(
+  page: Page,
+  messageType: string,
+  extract: (inner: Record<string, unknown>) => T,
+): T[] {
+  const captured: T[] = [];
+  page.on("websocket", (ws) => {
+    ws.on("framesent", (frame) => {
+      const raw = frame.payload;
+      const text = typeof raw === "string" ? raw : raw.toString("utf8");
+      try {
+        const outer = JSON.parse(text) as { type?: string; message?: Record<string, unknown> };
+        if (outer.type === "session" && outer.message?.type === messageType) {
+          captured.push(extract(outer.message));
+        }
+      } catch {
+        // Ignore non-JSON and binary frames.
+      }
+    });
+  });
+  return captured;
+}
+
 export function renameModalInput(page: Page, testIdPrefix: string) {
  return page.getByTestId(`${testIdPrefix}-input`);
 }
--- a/packages/app/e2e/helpers/rewind-flow.ts
+++ b/packages/app/e2e/helpers/rewind-flow.ts
@@ -14,8 +14,6 @@ export interface AgentHandle {
  page: Page;
  client: SeedDaemonClient;
  agentId: string;
-  projectId: string;
-  workspaceId: string;
  cwd: string;
  provider: RewindFlowProvider;
 }
@@ -63,17 +61,14 @@ function fullAccessConfig(provider: RewindFlowProvider): ProviderLaunchConfig {
  }
 }

-function agentRoute(workspaceId: string, agentId: string): string {
-  return `${buildHostWorkspaceRoute(getServerId(), workspaceId)}?open=${encodeURIComponent(
+function agentRoute(cwd: string, agentId: string): string {
+  return `${buildHostWorkspaceRoute(getServerId(), cwd)}?open=${encodeURIComponent(
    `agent:${agentId}`,
  )}`;
 }

-async function openAgent(
-  page: Page,
-  input: { workspaceId: string; agentId: string },
-): Promise<void> {
-  await page.goto(agentRoute(input.workspaceId, input.agentId));
+async function openAgent(page: Page, input: { cwd: string; agentId: string }): Promise<void> {
+  await page.goto(agentRoute(input.cwd, input.agentId));
  await page.waitForURL(
    (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
    { timeout: 60_000 },
@@ -172,33 +167,27 @@ export async function launchAgent(input: {
  execFileSync("git", ["add", "README.md"], { cwd: input.cwd, stdio: "ignore" });
  execFileSync("git", ["commit", "-m", "Initial commit"], { cwd: input.cwd, stdio: "ignore" });
  const client = await connectSeedClient();
-  const createdWorkspace = await client.createWorkspace({
-    source: { kind: "directory", path: input.cwd },
-  });
-  if (!createdWorkspace.workspace) {
-    throw new Error(createdWorkspace.error ?? `Failed to create workspace ${input.cwd}`);
+  const opened = await client.openProject(input.cwd);
+  if (!opened.workspace) {
+    throw new Error(opened.error ?? `Failed to open project ${input.cwd}`);
  }
  const agent = await client.createAgent({
    ...fullAccessConfig(input.provider),
    cwd: input.cwd,
-    workspaceId: createdWorkspace.workspace.id,
    title: `rewind-flow-${input.provider}-${randomUUID()}`,
  });
  const handle = {
    page: input.page,
    client,
    agentId: agent.id,
-    projectId: createdWorkspace.workspace.projectId,
-    workspaceId: createdWorkspace.workspace.id,
    cwd: input.cwd,
    provider: input.provider,
  };
-  await openAgent(input.page, { workspaceId: createdWorkspace.workspace.id, agentId: agent.id });
+  await openAgent(input.page, { cwd: input.cwd, agentId: agent.id });
  return handle;
 }

 export async function closeAgent(handle: AgentHandle): Promise<void> {
-  await handle.client.removeProject(handle.projectId).catch(() => undefined);
  await handle.client.close().catch(() => undefined);
 }

@@ -331,12 +320,12 @@ async function fetchTimelineEpoch(handle: AgentHandle): Promise<string | undefin
  const client = handle.client as SeedDaemonClient & {
    fetchAgentTimeline: (
      agentId: string,
-      options?: { direction?: "head" | "tail"; projection?: "projected"; limit?: number },
+      options?: { direction?: "head" | "tail"; projection?: "canonical"; limit?: number },
    ) => Promise<{ epoch?: string }>;
  };
  const timeline = await client.fetchAgentTimeline(handle.agentId, {
    direction: "tail",
-    projection: "projected",
+    projection: "canonical",
    limit: 0,
  });
  return timeline.epoch;
--- a/packages/app/e2e/helpers/seed-client.ts
+++ b/packages/app/e2e/helpers/seed-client.ts
@@ -1,18 +1,8 @@
 import path from "node:path";
 import { readFileSync } from "node:fs";
-import type { TerminalActivity } from "@getpaseo/protocol/terminal-activity";
 import { connectDaemonClient } from "./daemon-client-loader";
 import { createTempDirectory, createTempGitRepo } from "./workspace";

-export interface SeedWorkspaceDescriptor {
-  id: string;
-  name: string;
-  projectId: string;
-  projectDisplayName: string;
-  projectRootPath: string;
-  workspaceDirectory: string;
-}
-
 /**
 * The general-purpose E2E daemon client used to seed and drive state out of
 * band (workspaces, agents, terminals) while the UI is exercised through the
@@ -22,103 +12,36 @@ export interface SeedWorkspaceDescriptor {
 export interface SeedDaemonClient {
  connect(): Promise<void>;
  close(): Promise<void>;
-  addProject(cwd: string): Promise<{
-    project: {
+  openProject(cwd: string): Promise<{
+    workspace: {
+      id: string;
+      name: string;
      projectId: string;
      projectDisplayName: string;
      projectRootPath: string;
+      workspaceDirectory: string;
    } | null;
    error: string | null;
  }>;
-  removeProject(projectId: string): Promise<{ removedWorkspaceIds: string[] }>;
-  fetchWorkspaces(options?: { filter?: { projectId?: string } }): Promise<{
-    entries: SeedWorkspaceDescriptor[];
-  }>;
-  createWorkspace(input: {
-    source:
-      | { kind: "directory"; path: string; projectId?: string }
-      | {
-          kind: "worktree";
-          cwd?: string;
-          projectId?: string;
-          action?: "branch-off" | "checkout";
-          refName?: string;
-          baseBranch?: string;
-          githubPrNumber?: number;
-          worktreeSlug?: string;
-        };
-    title?: string;
-  }): Promise<{
-    workspace: SeedWorkspaceDescriptor | null;
-    error: string | null;
-  }>;
-  /**
-   * Force the daemon to recompute its git snapshot and diff for a checkout,
-   * mirroring the UI's manual refresh. Tests use this to make an out-of-band
-   * working-tree write authoritative before asserting on it in the UI, instead
-   * of racing the filesystem watcher's debounce.
-   */
-  checkoutRefresh(cwd: string): Promise<{ success: boolean; error: unknown }>;
  createTerminal(
    cwd: string,
    name?: string,
-    requestId?: string,
-    options?: { agentId?: string; command?: string; args?: string[]; workspaceId?: string },
  ): Promise<{
-    terminal: { id: string; name: string; cwd: string; activity?: TerminalActivity | null } | null;
+    terminal: { id: string; name: string; cwd: string } | null;
    error: string | null;
  }>;
-  listTerminals(
-    cwd?: string,
-    requestId?: string,
-    options?: { workspaceId?: string },
-  ): Promise<{
-    terminals: Array<{
-      id: string;
-      name: string;
-      cwd: string;
-      title?: string;
-      activity?: TerminalActivity | null;
-    }>;
-    error?: string | null;
-  }>;
  createAgent(options: {
    provider: string;
    cwd: string;
-    workspaceId?: string;
    title?: string;
    modeId?: string;
    model?: string;
    thinkingOptionId?: string;
    featureValues?: Record<string, unknown>;
    initialPrompt?: string;
-    labels?: Record<string, string>;
  }): Promise<{ id: string; status: string }>;
  fetchAgents(options?: { scope?: "active" }): Promise<{
-    entries: Array<{
-      agent: {
-        id: string;
-        provider: string;
-        cwd: string;
-        workspaceId?: string;
-        model: string | null;
-        currentModeId: string | null;
-        status: string;
-        title?: string | null;
-      };
-    }>;
-  }>;
-  fetchRecentProviderSessions(options: {
-    cwd: string;
-    providers: string[];
-    limit: number;
-  }): Promise<{
-    entries: Array<{
-      providerId: string;
-      providerHandleId: string;
-      cwd: string;
-      firstPromptPreview?: string | null;
-    }>;
+    entries: Array<{ agent: { id: string; cwd: string; title?: string | null } }>;
  }>;
  updateAgent(agentId: string, updates: { name?: string }): Promise<void>;
  waitForAgentUpsert(
@@ -132,12 +55,6 @@ export interface SeedDaemonClient {
    timeout?: number,
  ): Promise<{ status: string; final?: { lastError?: string | null } | null }>;
  archiveAgent(agentId: string): Promise<{ archivedAt: string }>;
-  fetchAgent(
-    agentId: string,
-  ): Promise<{ agent: { id: string; archivedAt?: string | null } } | null>;
-  getLastServerInfoMessage(): {
-    features?: { projectAdd?: boolean; worktreeRestore?: boolean } | null;
-  } | null;
  fetchAgentHistory(options?: {
    page?: { limit: number };
  }): Promise<{ entries: Array<{ id: string }> }>;
@@ -194,23 +111,19 @@ export async function seedWorkspace(options: {
      : await createTempGitRepo(options.repoPrefix, options.repo);
  const client = await connectSeedClient();
  try {
-    const created = await client.createWorkspace({
-      source: { kind: "directory", path: project.path },
-    });
-    if (!created.workspace) {
-      throw new Error(created.error ?? `Failed to create workspace ${project.path}`);
+    const opened = await client.openProject(project.path);
+    if (!opened.workspace) {
+      throw new Error(opened.error ?? `Failed to open project ${project.path}`);
    }
-    const workspace = created.workspace;
    return {
      client,
      repoPath: project.path,
-      workspaceId: workspace.id,
-      workspaceName: workspace.name,
-      workspaceDirectory: workspace.workspaceDirectory,
-      projectId: workspace.projectId,
-      projectDisplayName: workspace.projectDisplayName,
+      workspaceId: opened.workspace.id,
+      workspaceName: opened.workspace.name,
+      workspaceDirectory: opened.workspace.workspaceDirectory,
+      projectId: opened.workspace.projectId,
+      projectDisplayName: opened.workspace.projectDisplayName,
      cleanup: async () => {
-        await client.removeProject(workspace.projectId).catch(() => undefined);
        await client.close().catch(() => undefined);
        await project.cleanup().catch(() => undefined);
      },
--- a/packages/app/e2e/helpers/settings.ts
+++ b/packages/app/e2e/helpers/settings.ts
@@ -1,21 +1,9 @@
 import { expect, type Page } from "@playwright/test";
-import { buildCreateAgentPreferences, buildSeededHost, TEST_HOST_LABEL } from "./daemon-registry";
 import { escapeRegex } from "./regex";
 import { getServerId } from "./server-id";

-const DISABLE_DEFAULT_SEED_ONCE_KEY = "@paseo:e2e-disable-default-seed-once";
-const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
-const REGISTRY_KEY = "@paseo:daemon-registry";
-
-interface SavedSettingsHostInput {
-  serverId: string;
-  label: string;
-  endpoint: string;
-}
-
 const SECTION_LABELS = {
  general: "General",
-  appearance: "Appearance",
  shortcuts: "Shortcuts",
  integrations: "Integrations",
  permissions: "Permissions",
@@ -25,8 +13,6 @@ const SECTION_LABELS = {

 export type SettingsSection = keyof typeof SECTION_LABELS | "projects";

-type HostSection = "connections" | "agents" | "workspaces" | "providers" | "usage" | "host";
-
 export async function openSettingsSection(page: Page, section: SettingsSection): Promise<void> {
  const sidebar = page.getByTestId("settings-sidebar");
  await expect(sidebar).toBeVisible();
@@ -42,22 +28,8 @@ export async function openSettingsSection(page: Page, section: SettingsSection):
 }

 export async function openSettingsHost(page: Page, serverId: string): Promise<void> {
-  // Host sections are now flat top-level rows under the Host group. Navigate by
-  // clicking the Connections section row; the picker only matters when >1 host.
-  await page.getByTestId("settings-host-section-connections").click();
-  await expectHostSettingsUrl(page, serverId);
-  await expect(page.getByTestId("host-page-connections-card")).toBeVisible();
-}
-
-export async function openSettingsHostSection(
-  page: Page,
-  serverId: string,
-  section: HostSection,
-): Promise<void> {
-  await page.getByTestId(`settings-host-section-${section}`).click();
-  await expect(page).toHaveURL(
-    new RegExp(`/settings/hosts/${escapeRegex(encodeURIComponent(serverId))}/${section}$`),
-  );
+  await page.getByTestId(`settings-host-entry-${serverId}`).click();
+  await expect(page.getByTestId(`settings-host-page-${serverId}`)).toBeVisible();
 }

 export async function expectSettingsHeader(page: Page, title: string): Promise<void> {
@@ -65,9 +37,6 @@ export async function expectSettingsHeader(page: Page, title: string): Promise<v
 }

 export async function openAddHostFlow(page: Page): Promise<void> {
-  // "Add host" is now an item inside the host picker (a Combobox); open the
-  // picker first, then pick it. The picker renders whenever a host exists.
-  await page.getByTestId("settings-host-picker").click();
  await page.getByTestId("settings-add-host").click();
  await expect(page.getByText("Add connection", { exact: true })).toBeVisible();
 }
@@ -94,66 +63,12 @@ export async function openCompactSettings(page: Page): Promise<void> {
  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
 }

-export async function seedSavedSettingsHosts(
-  page: Page,
-  hosts: SavedSettingsHostInput[],
-): Promise<void> {
-  await page.goto("/");
-  const nowIso = new Date().toISOString();
-  const registry = hosts.map((host) =>
-    buildSeededHost({
-      serverId: host.serverId,
-      label: host.label,
-      endpoint: host.endpoint,
-      nowIso,
-    }),
-  );
-  const firstHost = registry[0];
-  if (!firstHost) {
-    throw new Error("Expected at least one settings host fixture.");
-  }
-  const preferences = buildCreateAgentPreferences(firstHost.serverId);
-
-  await page.evaluate(
-    ({ keys, storedRegistry, storedPreferences }) => {
-      const nonce = localStorage.getItem(keys.seedNonce);
-      if (!nonce) {
-        throw new Error("Expected e2e seed nonce before overriding settings host registry.");
-      }
-
-      localStorage.setItem(keys.registry, JSON.stringify(storedRegistry));
-      localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(storedPreferences));
-      localStorage.setItem(keys.disableDefaultSeedOnce, nonce);
-    },
-    {
-      keys: {
-        disableDefaultSeedOnce: DISABLE_DEFAULT_SEED_ONCE_KEY,
-        registry: REGISTRY_KEY,
-        seedNonce: SEED_NONCE_KEY,
-      },
-      storedRegistry: registry,
-      storedPreferences: preferences,
-    },
-  );
-}
-
-export async function selectSettingsHost(page: Page, serverId: string): Promise<void> {
-  await page.getByTestId("settings-host-picker").click();
-  await page.getByTestId(`settings-host-picker-item-${serverId}`).click();
-}
-
-export async function expectSettingsHostPickerLabel(page: Page, label: string): Promise<void> {
-  await expect(
-    page.getByTestId("settings-host-picker").getByText(label, { exact: true }),
-  ).toBeVisible();
-}
-
 export async function expectCompactSettingsList(page: Page): Promise<void> {
  await expect(page).toHaveURL(/\/settings$/);
  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
  await expect(page.getByText("Theme", { exact: true })).toHaveCount(0);
  await expect(page.getByRole("button", { name: "Play test" })).toHaveCount(0);
-  await expect(page.getByTestId("host-page-connections-card")).toHaveCount(0);
+  await expect(page.locator('[data-testid^="settings-host-page-"]')).toHaveCount(0);
 }

 export async function expectSettingsSidebarVisible(page: Page): Promise<void> {
@@ -180,18 +95,6 @@ export async function goBackInSettings(page: Page): Promise<void> {
  await page.getByRole("button", { name: "Back", exact: true }).click();
 }

-export async function closeCompactSettings(page: Page): Promise<void> {
-  await goBackInSettings(page);
-  await expect(page).not.toHaveURL(/\/settings(\/|$)/);
-}
-
-export async function removeCurrentHostFromSettings(page: Page): Promise<void> {
-  await page.getByTestId("host-page-remove-host-button").click();
-  await expect(page.getByTestId("remove-host-confirm-modal")).toBeVisible();
-  await page.getByTestId("remove-host-confirm").click();
-  await expect(page).toHaveURL(/\/settings$/);
-}
-
 export async function expectSettingsBackButton(page: Page): Promise<void> {
  await expect(page.getByRole("button", { name: "Back", exact: true })).toBeVisible();
 }
@@ -202,7 +105,7 @@ export async function clickSettingsBackToWorkspace(page: Page): Promise<void> {

 export async function expectHostSettingsUrl(page: Page, serverId: string): Promise<void> {
  await expect(page).toHaveURL(
-    new RegExp(`/settings/hosts/${escapeRegex(encodeURIComponent(serverId))}/connections$`),
+    new RegExp(`/settings/hosts/${escapeRegex(encodeURIComponent(serverId))}$`),
  );
 }

@@ -257,11 +160,7 @@ export async function expectAboutContent(page: Page): Promise<void> {
 }

 export async function expectGeneralContent(page: Page): Promise<void> {
-  await expect(page.getByText("Default send", { exact: true }).first()).toBeVisible();
-}
-
-export async function expectAppearanceContent(page: Page): Promise<void> {
-  await expect(page.getByText("Highlight theme", { exact: true }).first()).toBeVisible();
+  await expect(page.getByText("Theme", { exact: true }).first()).toBeVisible();
 }

 export async function expectHostLabelDisplayed(page: Page): Promise<void> {
@@ -282,11 +181,7 @@ export async function expectHostLabelEditMode(page: Page, expectedLabel: string)
 export async function expectHostConnectionsCard(page: Page, port: string): Promise<void> {
  const card = page.getByTestId("host-page-connections-card");
  await expect(card).toBeVisible();
-  // "Connections" appears three times on this page: the sidebar section row, the
-  // detail header title, and the SettingsSection heading above the card. Match
-  // the first to keep the heading assertion without tripping Playwright strict
-  // mode.
-  await expect(page.getByText("Connections", { exact: true }).first()).toBeVisible();
+  await expect(page.getByText("Connections", { exact: true })).toBeVisible();
  await expect(
    card.getByText(new RegExp(`TCP \\((localhost|127\\.0\\.0\\.1):${port}\\)`)),
  ).toBeVisible();
@@ -298,29 +193,14 @@ export async function expectHostInjectMcpCard(page: Page): Promise<void> {
  await expect(card.getByRole("switch", { name: "Inject Paseo tools" })).toBeVisible();
 }

-export async function openHostSection(
-  page: Page,
-  serverId: string,
-  section: HostSection,
-): Promise<void> {
-  await openSettingsHostSection(page, serverId, section);
-}
-
-export async function expectHostActionCards(page: Page, serverId: string): Promise<void> {
-  // Restart + remove cards live on the Host section; providers moved to its
-  // own Providers section (asserted via expectHostProvidersCard).
-  await openSettingsHostSection(page, serverId, "host");
+export async function expectHostActionCards(page: Page): Promise<void> {
  await expect(page.getByTestId("host-page-restart-card")).toBeVisible();
  await expect(page.getByTestId("host-page-restart-button")).toBeVisible();
+  await expect(page.getByTestId("host-page-providers-card")).toBeVisible();
  await expect(page.getByTestId("host-page-remove-host-card")).toBeVisible();
  await expect(page.getByTestId("host-page-remove-host-button")).toBeVisible();
 }

-export async function expectHostProvidersCard(page: Page, serverId: string): Promise<void> {
-  await openSettingsHostSection(page, serverId, "providers");
-  await expect(page.getByTestId("host-page-providers-card")).toBeVisible();
-}
-
 export async function serveJson(page: Page, url: string, body: unknown): Promise<void> {
  await page.route(url, async (route) => {
    await route.fulfill({
@@ -331,8 +211,8 @@ export async function serveJson(page: Page, url: string, body: unknown): Promise
  });
 }

-export async function openAddProviderArea(page: Page): Promise<void> {
-  await page.getByTestId("host-page-add-provider-card").scrollIntoViewIfNeeded();
+export async function openAddProviderModal(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Add provider", exact: true }).click();
  await expect(page.getByRole("textbox", { name: "Search providers" })).toBeVisible();
 }

@@ -344,6 +224,7 @@ export async function findAcpCatalogProvider(page: Page, providerName: string):
 export async function installAcpCatalogProvider(page: Page, providerName: string): Promise<void> {
  await findAcpCatalogProvider(page, providerName);
  await page.getByRole("button", { name: "Add", exact: true }).click();
+  await expect(page.getByRole("textbox", { name: "Search providers" })).toHaveCount(0);
 }

 export async function expectProviderInstalledInSettings(
@@ -363,37 +244,27 @@ export async function expectHostNoLocalOnlyRows(page: Page): Promise<void> {
 export async function expectRetiredSidebarSectionsAbsent(page: Page): Promise<void> {
  const sidebar = page.getByTestId("settings-sidebar");
  await expect(sidebar).toBeVisible();
-
-  // App group rows remain top-level.
+  await expect(sidebar.getByRole("button", { name: "Hosts", exact: true })).toHaveCount(0);
+  await expect(sidebar.getByRole("button", { name: "Providers", exact: true })).toHaveCount(0);
+  await expect(sidebar.getByRole("button", { name: "Pair device", exact: true })).toHaveCount(0);
+  await expect(sidebar.getByRole("button", { name: "Daemon", exact: true })).toHaveCount(0);
  await expect(sidebar.getByRole("button", { name: "General", exact: true })).toBeVisible();
  await expect(sidebar.getByRole("button", { name: "Diagnostics", exact: true })).toBeVisible();
  await expect(sidebar.getByRole("button", { name: "About", exact: true })).toBeVisible();
-
-  // Host group rows are now flat top-level sections (no drill-in).
-  await expect(sidebar.getByTestId("settings-host-section-connections")).toBeVisible();
-  await expect(sidebar.getByTestId("settings-host-section-agents")).toBeVisible();
-  await expect(sidebar.getByTestId("settings-host-section-workspaces")).toBeVisible();
-  await expect(sidebar.getByTestId("settings-host-section-providers")).toBeVisible();
-  await expect(sidebar.getByTestId("settings-host-section-usage")).toBeVisible();
-  await expect(sidebar.getByTestId("settings-host-section-host")).toBeVisible();
-
-  // The old per-host entry rows are replaced by the host picker.
-  await expect(sidebar.locator('[data-testid^="settings-host-entry-"]')).toHaveCount(0);
 }

-export async function expectHostPageVisible(page: Page, _serverId: string): Promise<void> {
-  await expect(page.getByTestId("host-page-connections-card")).toBeVisible();
+export async function expectHostPageVisible(page: Page, serverId: string): Promise<void> {
+  await expect(page.getByTestId(`settings-host-page-${serverId}`)).toBeVisible();
 }

-export async function expectLocalHostEntryFirst(page: Page, _serverId: string): Promise<void> {
+export async function expectLocalHostEntryFirst(page: Page, serverId: string): Promise<void> {
  const sidebar = page.getByTestId("settings-sidebar");
  await expect(sidebar).toBeVisible({ timeout: 15_000 });
-
-  // Single-host fixture: the picker is a non-interactive chip (no dropdown to
-  // open) that surfaces the local host by its label. The "Local" marker only
-  // appears on dropdown rows in the multi-host case, which this fixture does not
-  // exercise.
-  const picker = sidebar.getByTestId("settings-host-picker");
-  await expect(picker).toBeVisible();
-  await expect(picker.getByText(TEST_HOST_LABEL, { exact: true })).toBeVisible();
+  await expect(sidebar.locator('[data-testid^="settings-host-entry-"]').first()).toHaveAttribute(
+    "data-testid",
+    `settings-host-entry-${serverId}`,
+  );
+  const localHostEntry = page.getByTestId(`settings-host-entry-${serverId}`);
+  await expect(localHostEntry.getByTestId("settings-host-local-marker")).toBeVisible();
+  await expect(localHostEntry.getByText("Local", { exact: true })).toBeVisible();
 }
--- a/packages/app/e2e/helpers/sidebar.ts
+++ b/packages/app/e2e/helpers/sidebar.ts
@@ -7,55 +7,12 @@ export async function selectWorkspaceInSidebar(page: Page, workspaceId: string):
  await row.click();
 }

-async function openWorkspaceSidebarKebab(page: Page, workspaceId: string) {
-  const serverId = getServerId();
-  const row = page.getByTestId(`sidebar-workspace-row-${serverId}:${workspaceId}`);
-  await expect(row).toBeVisible({ timeout: 30_000 });
-  await row.hover();
-
-  const kebab = page.getByTestId(`sidebar-workspace-kebab-${serverId}:${workspaceId}`);
-  await expect(kebab).toBeVisible({ timeout: 10_000 });
-  await kebab.click();
-
-  return serverId;
-}
-
 export async function expectWorkspaceListed(page: Page, name: string): Promise<void> {
  await expect(
    page.locator('[data-testid^="sidebar-workspace-row-"]').filter({ hasText: name }).first(),
  ).toBeVisible({ timeout: 30_000 });
 }

-// The workspace row kebab and its menu items carry no web ARIA role, so the sidebar
-// suite addresses them by the stable test ids the app assigns per workspace — the same
-// convention the rename flow uses. The kebab only reveals on hover.
-export async function clickArchiveWorkspaceMenuItem(
-  page: Page,
-  workspaceId: string,
-): Promise<void> {
-  const serverId = await openWorkspaceSidebarKebab(page, workspaceId);
-  const archiveItem = page.getByTestId(`sidebar-workspace-menu-archive-${serverId}:${workspaceId}`);
-  await expect(archiveItem).toBeVisible({ timeout: 10_000 });
-  await archiveItem.click();
-}
-
-export async function archiveWorktreeFromSidebar(page: Page, workspaceId: string): Promise<void> {
-  // A clean worktree archives with no prompt; if the host reports unsynced work the app
-  // raises a browser confirm. Accept it so the user-confirmed archive stays deterministic
-  // either way.
-  page.once("dialog", (dialog) => void dialog.accept());
-  await clickArchiveWorkspaceMenuItem(page, workspaceId);
-}
-
-export async function expectWorkspaceAbsentFromSidebar(
-  page: Page,
-  workspaceId: string,
-): Promise<void> {
-  await expect(
-    page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspaceId}`),
-  ).toHaveCount(0, { timeout: 30_000 });
-}
-
 export async function openMobileAgentSidebar(page: Page): Promise<void> {
  await page.getByRole("button", { name: "Open menu" }).click();
 }
--- a/packages/app/e2e/helpers/startup-dsl.ts
+++ b/packages/app/e2e/helpers/startup-dsl.ts
@@ -1,4 +1,3 @@
-import type { Route } from "@playwright/test";
 import { expect, type Page } from "../fixtures";
 import { buildCreateAgentPreferences, buildSeededHost } from "./daemon-registry";
 import { wsRoutePatternForPort } from "./daemon-port";
@@ -7,7 +6,6 @@ const DISABLE_DEFAULT_SEED_ONCE_KEY = "@paseo:e2e-disable-default-seed-once";
 const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
 const REGISTRY_KEY = "@paseo:daemon-registry";
 const E2E_KEY = "@paseo:e2e";
-const STORAGE_SEED_HTML = "<!doctype html><html><body>storage seed</body></html>";

 interface SavedHostInput {
  serverId: string;
@@ -90,9 +88,9 @@ class StartupScenario {
      return;
    }

-    // Create same-origin storage without booting the app. If the default host runtime
-    // starts first, it can race this scenario's registry override during CI.
-    await openStorageSeedDocument(this.page);
+    // Let the shared fixture create its seed nonce, then opt out of that seed for
+    // the next navigation so this scenario owns the stored host registry.
+    await this.page.goto("/");
    const nowIso = new Date().toISOString();
    const registry = this.savedHosts.map((host) =>
      buildStoredHost({
@@ -134,21 +132,6 @@ class StartupScenario {
  }
 }

-async function openStorageSeedDocument(page: Page): Promise<void> {
-  await page.route(
-    "**/*",
-    async (route: Route) => {
-      await route.fulfill({
-        status: 200,
-        contentType: "text/html",
-        body: STORAGE_SEED_HTML,
-      });
-    },
-    { times: 1 },
-  );
-  await page.goto("/");
-}
-
 class StartupAssertions {
  private readonly page: Page;

@@ -156,19 +139,17 @@ class StartupAssertions {
    this.page = page;
  }

-  async expectsSavedHostShell(input: { label: string }): Promise<this> {
-    await this.page.getByRole("button", { name: "Open menu", exact: true }).click();
-    await expect(this.page.getByText(input.label, { exact: true })).toBeVisible({
-      timeout: 15_000,
-    });
-    await expect(this.page.getByRole("button", { name: "Add project" })).toBeVisible();
-    await expect(this.page.getByRole("button", { name: "Home" })).toBeVisible();
-    await expect(this.page.getByRole("button", { name: "Settings" })).toBeVisible();
-    await expect(this.page.getByTestId("welcome-screen")).toHaveCount(0);
+  async expectsReconnectWelcome(): Promise<this> {
+    await expect(this.page.getByTestId("welcome-screen")).toBeVisible({ timeout: 15_000 });
+    await expect(this.page.getByTestId("welcome-open-settings")).toBeVisible();
+    await expect(this.page.getByTestId("welcome-direct-connection")).toBeVisible();
+    await expect(this.page.getByTestId("welcome-paste-pairing-link")).toBeVisible();
+    await expect(this.page.getByTestId("welcome-scan-qr")).toHaveCount(0);
    return this;
  }

-  async expectsNoSavedHostErrorStatus(): Promise<this> {
+  async expectsNoSavedHostStatus(input: { label: string }): Promise<this> {
+    await expect(this.page.getByText(input.label, { exact: true })).toHaveCount(0);
    await expect(this.page.getByText("Connection error", { exact: true })).toHaveCount(0);
    await expect(this.page.getByText("Offline", { exact: true })).toHaveCount(0);
    return this;
--- a/packages/app/e2e/helpers/subagents.ts
+++ b/packages/app/e2e/helpers/subagents.ts
@@ -1,83 +0,0 @@
-import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
-import { expect, type Page } from "@playwright/test";
-import type { SeededWorkspace } from "./seed-client";
-
-export interface SeededSubagentPair {
-  parent: {
-    id: string;
-    title: string;
-  };
-  child: {
-    id: string;
-    title: string;
-  };
-  workspaceId: string;
-}
-
-export async function seedParentWithSubagent(
-  workspace: Pick<SeededWorkspace, "client" | "repoPath" | "workspaceId">,
-  input: { parentTitle: string; childTitle: string },
-): Promise<SeededSubagentPair> {
-  const parent = await workspace.client.createAgent({
-    provider: "mock",
-    cwd: workspace.repoPath,
-    workspaceId: workspace.workspaceId,
-    title: input.parentTitle,
-    modeId: "load-test",
-    model: "ten-second-stream",
-  });
-  const child = await workspace.client.createAgent({
-    provider: "mock",
-    cwd: workspace.repoPath,
-    workspaceId: workspace.workspaceId,
-    title: input.childTitle,
-    modeId: "load-test",
-    model: "ten-second-stream",
-    labels: {
-      [PARENT_AGENT_ID_LABEL]: parent.id,
-    },
-  });
-
-  return {
-    parent: {
-      id: parent.id,
-      title: input.parentTitle,
-    },
-    child: {
-      id: child.id,
-      title: input.childTitle,
-    },
-    workspaceId: workspace.workspaceId,
-  };
-}
-
-export async function openSubagentsTrack(page: Page): Promise<void> {
-  await page.getByTestId("subagents-track-header").click();
-}
-
-export async function expectSubagentRowVisible(page: Page, childId: string): Promise<void> {
-  await expect(page.getByTestId(`subagents-track-row-${childId}`)).toBeVisible({
-    timeout: 30_000,
-  });
-}
-
-export async function expectSubagentRowGone(page: Page, childId: string): Promise<void> {
-  await expect(page.getByTestId(`subagents-track-row-${childId}`)).toHaveCount(0, {
-    timeout: 30_000,
-  });
-}
-
-export async function detachSubagentFromTrack(page: Page, childId: string): Promise<void> {
-  const row = page.getByTestId(`subagents-track-row-${childId}`);
-  await expect(row).toBeVisible({ timeout: 30_000 });
-  await row.hover();
-
-  page.once("dialog", (dialog) => {
-    expect(dialog.message()).toContain("Detach subagent?");
-    void dialog.accept();
-  });
-
-  const detachButton = page.getByTestId(`subagents-track-detach-${childId}`);
-  await expect(detachButton).toBeVisible({ timeout: 30_000 });
-  await detachButton.click();
-}
--- a/packages/app/e2e/helpers/terminal-dsl.ts
+++ b/packages/app/e2e/helpers/terminal-dsl.ts
@@ -1,5 +1,4 @@
 import type { Page } from "@playwright/test";
-import type { TerminalActivity, TerminalActivityState } from "@getpaseo/protocol/terminal-activity";
 import { createTempGitRepo } from "./workspace";
 import { navigateToTerminal, setupDeterministicPrompt } from "./terminal-perf";
 import { connectSeedClient, type SeedDaemonClient } from "./seed-client";
@@ -15,40 +14,25 @@ export interface TerminalInstance {
  cwd: string;
 }

-interface CreateTerminalInput {
-  name: string;
-  command?: string;
-  args?: string[];
-}
-
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 export class TerminalE2EHarness {
  readonly client: SeedDaemonClient;
  readonly tempRepo: TempRepo;
-  readonly projectId: string;
  readonly workspaceId: string;

  private constructor(input: {
    client: SeedDaemonClient;
    tempRepo: TempRepo;
-    projectId: string;
    workspaceId: string;
  }) {
    this.client = input.client;
    this.tempRepo = input.tempRepo;
-    this.projectId = input.projectId;
    this.workspaceId = input.workspaceId;
  }

  static async create(input: { tempPrefix: string }): Promise<TerminalE2EHarness> {
    const tempRepo = await createTempGitRepo(input.tempPrefix);
    const client = await connectSeedClient();
-    const seedResult = await client.createWorkspace({
-      source: { kind: "directory", path: tempRepo.path },
-    });
+    const seedResult = await client.openProject(tempRepo.path);
    if (!seedResult.workspace) {
      await client.close().catch(() => {});
      await tempRepo.cleanup().catch(() => {});
@@ -57,69 +41,23 @@ export class TerminalE2EHarness {
    return new TerminalE2EHarness({
      client,
      tempRepo,
-      projectId: seedResult.workspace.projectId,
      workspaceId: seedResult.workspace.id,
    });
  }

  async cleanup(): Promise<void> {
-    await this.client.removeProject(this.projectId).catch(() => {});
    await this.client.close().catch(() => {});
    await this.tempRepo.cleanup().catch(() => {});
  }

-  async createTerminal(input: CreateTerminalInput): Promise<TerminalInstance> {
-    const options =
-      input.command || input.args
-        ? {
-            command: input.command,
-            args: input.args,
-            workspaceId: this.workspaceId,
-          }
-        : { workspaceId: this.workspaceId };
-    const result = await this.client.createTerminal(
-      this.tempRepo.path,
-      input.name,
-      undefined,
-      options,
-    );
+  async createTerminal(input: { name: string }): Promise<TerminalInstance> {
+    const result = await this.client.createTerminal(this.tempRepo.path, input.name);
    if (!result.terminal) {
      throw new Error(`Failed to create terminal: ${result.error}`);
    }
    return result.terminal;
  }

-  async waitForTerminalActivity(input: {
-    terminalId: string;
-    state: TerminalActivityState | null;
-    attentionReason?: TerminalActivity["attentionReason"] | null;
-    timeoutMs?: number;
-  }): Promise<void> {
-    const timeoutMs = input.timeoutMs ?? 10_000;
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-      const result = await this.client.listTerminals(this.tempRepo.path, undefined, {
-        workspaceId: this.workspaceId,
-      });
-      const terminal = result.terminals.find((entry) => entry.id === input.terminalId);
-      const activity = terminal?.activity ?? null;
-      const attentionMatches =
-        input.attentionReason === undefined ||
-        (activity?.attentionReason ?? null) === input.attentionReason;
-      if ((activity?.state ?? null) === input.state && attentionMatches) {
-        return;
-      }
-      await sleep(50);
-    }
-    const attentionSuffix =
-      input.attentionReason === undefined
-        ? ""
-        : ` with attention ${input.attentionReason ?? "none"}`;
-    throw new Error(
-      `Timed out waiting for terminal ${input.terminalId} activity state ${input.state ?? "unknown"}${attentionSuffix}`,
-    );
-  }
-
  async killTerminal(terminalId: string): Promise<void> {
    await this.client.killTerminal(terminalId).catch(() => {});
  }
--- a/packages/app/e2e/helpers/timeline-pagination.ts
+++ b/packages/app/e2e/helpers/timeline-pagination.ts
@@ -1,102 +0,0 @@
-import { expect, type Page } from "@playwright/test";
-import { buildAgentRoute, seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
-
-interface LongTimelineAgentOptions {
-  turns: number;
-}
-
-interface LongTimelineAgent extends MockAgentWorkspace {
-  oldestPrompt: string;
-  newestPrompt: string;
-}
-
-const PROMPT_PREFIX = "timeline-pagination-turn";
-
-function promptForTurn(index: number): string {
-  return `${PROMPT_PREFIX}-${index}: emit 1 coalesced agent stream updates`;
-}
-
-export async function seedLongMockAgentTimeline(
-  options: LongTimelineAgentOptions,
-): Promise<LongTimelineAgent> {
-  const agent = await seedMockAgentWorkspace({
-    repoPrefix: "timeline-pagination-",
-    title: "Timeline pagination regression",
-    model: "ten-second-stream",
-  });
-
-  for (let index = 0; index < options.turns; index += 1) {
-    await agent.client.sendAgentMessage(agent.agentId, promptForTurn(index));
-    await agent.client.waitForFinish(agent.agentId, 15_000);
-  }
-
-  return {
-    ...agent,
-    oldestPrompt: promptForTurn(0),
-    newestPrompt: promptForTurn(options.turns - 1),
-  };
-}
-
-export async function openAgentTimeline(page: Page, agent: LongTimelineAgent): Promise<void> {
-  await page.goto(buildAgentRoute(agent.workspaceId, agent.agentId));
-  await page.waitForURL(
-    (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
-    { timeout: 60_000 },
-  );
-}
-
-export async function expectTimelinePromptVisible(page: Page, prompt: string): Promise<void> {
-  await expect(page.getByText(prompt, { exact: true })).toBeVisible({ timeout: 30_000 });
-}
-
-export async function expectTimelinePromptNotMounted(page: Page, prompt: string): Promise<void> {
-  await expect(page.getByText(prompt, { exact: true })).toHaveCount(0);
-}
-
-export async function scrollTimelineToOldestLoadedEdge(page: Page): Promise<void> {
-  const scroll = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
-  await scroll.hover();
-  await page.mouse.wheel(0, -20_000);
-  await page.evaluate(
-    () =>
-      new Promise<void>((resolve) => {
-        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
-      }),
-  );
-  await scroll.evaluate((element) => {
-    if (!(element instanceof HTMLElement)) {
-      throw new Error("Agent chat scroll element is not an HTMLElement");
-    }
-    element.scrollTop = 0;
-    element.dispatchEvent(new Event("scroll", { bubbles: true }));
-  });
-}
-
-export async function scrollTimelineUntilOlderHistoryIsReachable(page: Page): Promise<void> {
-  const scroll = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
-  const previousHeight = await scroll.evaluate((element) => {
-    if (!(element instanceof HTMLElement)) {
-      throw new Error("Agent chat scroll element is not an HTMLElement");
-    }
-    return element.scrollHeight;
-  });
-
-  await page.evaluate(
-    () =>
-      new Promise<void>((resolve) => {
-        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
-      }),
-  );
-  await scrollTimelineToOldestLoadedEdge(page);
-  await expect
-    .poll(async () =>
-      scroll.evaluate((element) => {
-        if (!(element instanceof HTMLElement)) {
-          throw new Error("Agent chat scroll element is not an HTMLElement");
-        }
-        return element.scrollHeight;
-      }),
-    )
-    .toBeGreaterThan(previousHeight);
-  await scrollTimelineToOldestLoadedEdge(page);
-}
--- a/packages/app/e2e/helpers/with-workspace.ts
+++ b/packages/app/e2e/helpers/with-workspace.ts
@@ -37,7 +37,6 @@ export function createWithWorkspace(page: Page): WithWorkspaceHandle {
  let client: WorkspaceSetupDaemonClient | null = null;
  const repos: Array<{ cleanup: () => Promise<void> }> = [];
  const worktrees: WorktreeRecord[] = [];
-  const projectIds = new Set<string>();

  const withWorkspace: WithWorkspace = async (options) => {
    if (!client) {
@@ -61,21 +60,14 @@ export function createWithWorkspace(page: Page): WithWorkspaceHandle {
      );
      worktrees.push({ repoPath: repo.path, worktreePath: workspacePath });
      // Register the parent project so the sidebar lists it before we navigate.
-      const added = await client.addProject(repo.path);
-      if (!added.project) {
-        throw new Error(added.error ?? `Failed to add project ${repo.path}`);
-      }
-      projectIds.add(added.project.projectId);
+      await client.openProject(repo.path);
    }

-    const created = await client.createWorkspace({
-      source: { kind: "directory", path: workspacePath },
-    });
-    if (!created.workspace) {
-      throw new Error(created.error ?? `Failed to create workspace ${workspacePath}`);
+    const opened = await client.openProject(workspacePath);
+    if (!opened.workspace) {
+      throw new Error(opened.error ?? `Failed to open project ${workspacePath}`);
    }
-    const workspaceId = created.workspace.id;
-    projectIds.add(created.workspace.projectId);
+    const workspaceId = opened.workspace.id;

    return {
      workspaceId,
@@ -91,11 +83,6 @@ export function createWithWorkspace(page: Page): WithWorkspaceHandle {
  return {
    withWorkspace,
    cleanup: async () => {
-      if (client) {
-        for (const projectId of projectIds) {
-          await client.removeProject(projectId).catch(() => undefined);
-        }
-      }
      for (const { repoPath, worktreePath } of worktrees) {
        try {
          execSync(`git worktree remove ${JSON.stringify(worktreePath)} --force`, {
--- a/packages/app/e2e/helpers/workspace-setup.ts
+++ b/packages/app/e2e/helpers/workspace-setup.ts
@@ -11,15 +11,13 @@ import type { SessionOutboundMessage } from "@getpaseo/protocol/messages";
 type WorkspaceSetupDaemonClient = Pick<
  InternalDaemonClient,
  | "close"
-  | "addProject"
  | "connect"
  | "createPaseoWorktree"
-  | "createWorkspace"
  | "fetchAgent"
  | "fetchAgents"
  | "fetchWorkspaces"
  | "listTerminals"
-  | "removeProject"
+  | "openProject"
  | "subscribeRawMessages"
 >;

@@ -38,11 +36,9 @@ export async function openProjectViaDaemon(
  client: WorkspaceSetupDaemonClient,
  repoPath: string,
 ): Promise<{ id: string; name: string; workspaceDirectory: string }> {
-  const result = await client.createWorkspace({
-    source: { kind: "directory", path: repoPath },
-  });
+  const result = await client.openProject(repoPath);
  if (!result.workspace || result.error) {
-    throw new Error(result.error ?? `Failed to create workspace ${repoPath}`);
+    throw new Error(result.error ?? `Failed to open project ${repoPath}`);
  }
  return {
    id: result.workspace.id,
@@ -55,10 +51,7 @@ export async function seedProjectForWorkspaceSetup(
  client: WorkspaceSetupDaemonClient,
  repoPath: string,
 ): Promise<void> {
-  const result = await client.addProject(repoPath);
-  if (!result.project || result.error) {
-    throw new Error(result.error ?? `Failed to add project ${repoPath}`);
-  }
+  await openProjectViaDaemon(client, repoPath);
 }

 export function projectNameFromPath(repoPath: string): string {
@@ -268,7 +261,7 @@ export async function navigateToWorkspaceViaSidebar(
  await switchWorkspaceViaSidebar({
    page,
    serverId: getServerId(),
-    workspaceId,
+    targetWorkspacePath: workspaceId,
  });
 }

--- a/packages/app/e2e/helpers/workspace-tabs.ts
+++ b/packages/app/e2e/helpers/workspace-tabs.ts
@@ -21,7 +21,7 @@ export async function waitForWorkspaceTabsVisible(page: Page): Promise<void> {
  await expect(visibleTestId(page, "workspace-tabs-row").first()).toBeVisible({
    timeout: 30_000,
  });
-  await expect(visibleTestId(page, "workspace-new-agent-tab-inline").first()).toBeVisible({
+  await expect(visibleTestId(page, "workspace-new-agent-tab").first()).toBeVisible({
    timeout: 30_000,
  });
 }
@@ -93,15 +93,6 @@ export async function expectFirstTerminalTabContains(page: Page, text: string):
  );
 }

-export async function expectTerminalTabOpen(
-  page: Page,
-  options?: { timeout?: number },
-): Promise<void> {
-  await expect(
-    page.locator('[data-testid^="workspace-tab-terminal_"]').filter({ visible: true }).first(),
-  ).toBeVisible({ timeout: options?.timeout ?? 30_000 });
-}
-
 export async function sampleWorkspaceTabIds(
  page: Page,
  options: { durationMs?: number; intervalMs?: number } = {},
--- a/packages/app/e2e/helpers/workspace-ui.ts
+++ b/packages/app/e2e/helpers/workspace-ui.ts
@@ -8,8 +8,8 @@ export async function openNewAgentComposer(page: Page): Promise<void> {
 }

 /**
- * Wait for the sidebar to show at least one project row. Use this after a spec
- * seeds a workspace/project; zero-project flows need their own assertion.
+ * Wait for the sidebar to show at least one project row, indicating that the
+ * WebSocket connection is up and workspace hydration has completed.
 */
 export async function waitForSidebarHydration(page: Page, timeout = 60_000): Promise<void> {
  await page
@@ -18,12 +18,29 @@ export async function waitForSidebarHydration(page: Page, timeout = 60_000): Pro
    .waitFor({ state: "visible", timeout });
 }

-export async function waitForNoProjectsInSidebar(page: Page, timeout = 60_000): Promise<void> {
-  await page.getByTestId("sidebar-project-empty-state").waitFor({ state: "visible", timeout });
+export function workspaceLabelFromPath(value: string): string {
+  const normalized = value.replace(/\\/g, "/").replace(/\/+$/, "");
+  const parts = normalized.split("/").filter(Boolean);
+  return parts[parts.length - 1] ?? normalized;
 }

-function workspaceRowLocator(page: Page, serverId: string, workspaceId: string) {
-  return page.getByTestId(`sidebar-workspace-row-${serverId}:${workspaceId}`).first();
+function candidateWorkspaceIds(inputPath: string): string[] {
+  const trimmed = inputPath.replace(/\/+$/, "");
+  const candidates = new Set<string>([trimmed]);
+  if (trimmed.startsWith("/var/")) {
+    candidates.add(`/private${trimmed}`);
+  }
+  if (trimmed.startsWith("/private/var/")) {
+    candidates.add(trimmed.replace(/^\/private/, ""));
+  }
+  return Array.from(candidates);
+}
+
+function workspaceRowLocator(page: Page, serverId: string, workspacePath: string) {
+  const ids = candidateWorkspaceIds(workspacePath).map(
+    (id) => `[data-testid="sidebar-workspace-row-${serverId}:${id}"]`,
+  );
+  return page.locator(ids.join(",")).first();
 }

 export async function expectSidebarWorkspaceSelected(input: {
@@ -52,13 +69,13 @@ export async function expectSidebarWorkspaceSelected(input: {
 export async function switchWorkspaceViaSidebar(input: {
  page: Page;
  serverId: string;
-  workspaceId: string;
+  targetWorkspacePath: string;
 }): Promise<void> {
-  const row = workspaceRowLocator(input.page, input.serverId, input.workspaceId);
+  const row = workspaceRowLocator(input.page, input.serverId, input.targetWorkspacePath);
  await expect(row).toBeVisible({ timeout: 30_000 });
  await row.click();

-  const targetWorkspaceRoute = buildHostWorkspaceRoute(input.serverId, input.workspaceId);
+  const targetWorkspaceRoute = buildHostWorkspaceRoute(input.serverId, input.targetWorkspacePath);
  await expect(input.page).toHaveURL(new RegExp(escapeRegex(targetWorkspaceRoute)), {
    timeout: 30_000,
  });
@@ -72,10 +89,11 @@ export async function waitForWorkspaceInSidebar(
  page: Page,
  input: { serverId: string; workspaceId: string },
 ): Promise<void> {
-  await workspaceRowLocator(page, input.serverId, input.workspaceId).waitFor({
-    state: "visible",
-    timeout: 60_000,
-  });
+  const candidates = candidateWorkspaceIds(input.workspaceId);
+  const selector = candidates
+    .map((id) => `[data-testid="sidebar-workspace-row-${input.serverId}:${id}"]`)
+    .join(",");
+  await page.locator(selector).first().waitFor({ state: "visible", timeout: 60_000 });
 }

 export async function expectWorkspaceHeader(
--- a/packages/app/e2e/import-session.opencode.real.spec.ts
+++ b/packages/app/e2e/import-session.opencode.real.spec.ts
@@ -1,232 +0,0 @@
-import { randomUUID } from "node:crypto";
-import path from "node:path";
-import { spawn } from "node:child_process";
-import { buildHostWorkspaceRoute } from "@/utils/host-routes";
-import { expect, test, type Page } from "./fixtures";
-import { connectSeedClient, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-
-const OPENCODE_REAL_MODEL = "openrouter/google/gemini-2.5-flash-lite";
-const OPENCODE_SEED_TIMEOUT_MS = 45_000;
-const PASEO_REPO_PATH = path.resolve(__dirname, "../../..");
-
-interface OpenCodeSeedResult {
-  stdout: string;
-  stderr: string;
-  code: number | null;
-  signal: NodeJS.Signals | null;
-  timedOut: boolean;
-}
-
-interface ImportableOpenCodeSession {
-  providerHandleId: string;
-}
-
-interface OpenCodeImportScenario {
-  workspace: SeededWorkspace;
-  prompt: string;
-  promptPreview: string;
-  response: string;
-}
-
-let workspace: SeededWorkspace | null = null;
-
-test.setTimeout(150_000);
-
-test.afterEach(async () => {
-  await workspace?.cleanup().catch(() => undefined);
-  workspace = null;
-});
-
-test("imports a real OpenCode session from the workspace import sheet", async ({ page }) => {
-  const scenario = await seedPaseoWorkspaceWithOpenCodeSession();
-  workspace = scenario.workspace;
-  const importableSession = await waitForImportableOpenCodeSession(scenario);
-  await openWorkspace(page, scenario.workspace);
-
-  await importOpenCodeSession(page, importableSession);
-
-  await expectImportSheetClosed(page);
-  await expectImportedSessionOpen(page, scenario);
-});
-
-async function seedPaseoWorkspaceWithOpenCodeSession(): Promise<OpenCodeImportScenario> {
-  const response = `PASEO_OPENCODE_IMPORT_E2E_OK_${randomUUID().slice(0, 8)}`;
-  const prompt = `Do not use tools. Reply with exactly: ${response}`;
-  const promptPreview = JSON.stringify(prompt);
-  await launchOpenCodeSessionInWorkspace(PASEO_REPO_PATH, prompt);
-  const client = await connectSeedClient();
-  try {
-    const createdWorkspace = await client.createWorkspace({
-      source: { kind: "directory", path: PASEO_REPO_PATH },
-    });
-    if (!createdWorkspace.workspace) {
-      throw new Error(createdWorkspace.error ?? `Failed to create workspace ${PASEO_REPO_PATH}`);
-    }
-    return {
-      prompt,
-      promptPreview,
-      response,
-      workspace: {
-        client,
-        repoPath: PASEO_REPO_PATH,
-        workspaceId: createdWorkspace.workspace.id,
-        workspaceName: createdWorkspace.workspace.name,
-        workspaceDirectory: createdWorkspace.workspace.workspaceDirectory,
-        projectId: createdWorkspace.workspace.projectId,
-        projectDisplayName: createdWorkspace.workspace.projectDisplayName,
-        cleanup: async () => {
-          await client.close().catch(() => undefined);
-        },
-      },
-    };
-  } catch (error) {
-    await client.close().catch(() => undefined);
-    throw error;
-  }
-}
-
-async function launchOpenCodeSessionInWorkspace(repoPath: string, prompt: string): Promise<void> {
-  const result = await runOpenCodeSeed(repoPath, prompt);
-  if (result.code !== 0 || result.timedOut) {
-    throw new Error(formatOpenCodeLaunchError(result, prompt));
-  }
-}
-
-function openCodeSeedArgs(repoPath: string, prompt: string): string[] {
-  return [
-    "run",
-    "--print-logs",
-    "--log-level",
-    "INFO",
-    "--dir",
-    repoPath,
-    "--model",
-    OPENCODE_REAL_MODEL,
-    "--format",
-    "json",
-    prompt,
-  ];
-}
-
-function runOpenCodeSeed(repoPath: string, prompt: string): Promise<OpenCodeSeedResult> {
-  return new Promise((resolve, reject) => {
-    const child = spawn("opencode", openCodeSeedArgs(repoPath, prompt), {
-      cwd: repoPath,
-      env: process.env,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-    let stdout = "";
-    let stderr = "";
-    let timedOut = false;
-    const timeout = setTimeout(() => {
-      timedOut = true;
-      child.kill("SIGTERM");
-    }, OPENCODE_SEED_TIMEOUT_MS);
-
-    child.stdout.on("data", (chunk) => {
-      stdout += String(chunk);
-    });
-    child.stderr.on("data", (chunk) => {
-      stderr += String(chunk);
-    });
-    child.on("error", (error) => {
-      clearTimeout(timeout);
-      reject(error);
-    });
-    child.on("close", (code, signal) => {
-      clearTimeout(timeout);
-      resolve({ stdout, stderr, code, signal, timedOut });
-    });
-  });
-}
-
-function formatOpenCodeLaunchError(result: OpenCodeSeedResult, prompt: string): string {
-  return [
-    "OpenCode launch failed",
-    `command: ${["opencode", ...openCodeSeedArgs(PASEO_REPO_PATH, prompt)].join(" ")}`,
-    `exit: ${result.code ?? "null"}`,
-    result.signal ? `signal: ${result.signal}` : null,
-    result.timedOut ? `timed out after ${OPENCODE_SEED_TIMEOUT_MS}ms` : null,
-    result.stdout.trim() ? `stdout:\n${result.stdout.trim()}` : null,
-    result.stderr.trim() ? `stderr:\n${result.stderr.trim()}` : null,
-  ]
-    .filter((part): part is string => part !== null)
-    .join("\n\n");
-}
-
-async function openWorkspace(page: Page, seed: SeededWorkspace): Promise<void> {
-  await page.setViewportSize({ width: 1440, height: 900 });
-  await page.goto(buildHostWorkspaceRoute(getServerId(), seed.workspaceId));
-  await waitForWorkspaceTabsVisible(page);
-}
-
-async function waitForImportableOpenCodeSession(
-  scenario: OpenCodeImportScenario,
-): Promise<ImportableOpenCodeSession> {
-  let importableSession: ImportableOpenCodeSession | null = null;
-  await expect
-    .poll(
-      async () => {
-        importableSession = await findImportableOpenCodeSession(scenario);
-        return importableSession?.providerHandleId ?? "";
-      },
-      {
-        timeout: 15_000,
-        intervals: [500, 1_000],
-      },
-    )
-    .not.toBe("");
-  return importableSession!;
-}
-
-async function findImportableOpenCodeSession(
-  scenario: OpenCodeImportScenario,
-): Promise<ImportableOpenCodeSession | null> {
-  const sessions = await scenario.workspace.client.fetchRecentProviderSessions({
-    cwd: scenario.workspace.repoPath,
-    providers: ["opencode"],
-    limit: 5,
-  });
-  const entry = sessions.entries.find(
-    (session) =>
-      session.providerId === "opencode" && session.firstPromptPreview === scenario.promptPreview,
-  );
-  if (!entry) {
-    return null;
-  }
-  return { providerHandleId: entry.providerHandleId };
-}
-
-async function importOpenCodeSession(
-  page: Page,
-  session: ImportableOpenCodeSession,
-): Promise<void> {
-  await page.getByRole("button", { name: "Workspace actions" }).click();
-  await page.getByTestId("workspace-header-import-agent").click();
-  await expect(page.getByTestId("import-session-sheet")).toBeVisible({ timeout: 15_000 });
-
-  const importSheet = page.getByTestId("import-session-sheet");
-  const sessionRow = importSheet.getByTestId(
-    `import-session-session-opencode-${session.providerHandleId}`,
-  );
-  await expect(sessionRow).toBeVisible({ timeout: 60_000 });
-  await sessionRow.click();
-}
-
-async function expectImportSheetClosed(page: Page): Promise<void> {
-  await expect(page.getByTestId("import-session-sheet")).toHaveCount(0, { timeout: 15_000 });
-}
-
-async function expectImportedSessionOpen(
-  page: Page,
-  scenario: OpenCodeImportScenario,
-): Promise<void> {
-  await expect(
-    page.locator('[data-testid="user-message"]', { hasText: scenario.promptPreview }),
-  ).toBeVisible({ timeout: 30_000 });
-  await expect(
-    page.locator('[data-testid="assistant-message"]', { hasText: scenario.response }),
-  ).toBeVisible({ timeout: 30_000 });
-}
--- a/packages/app/e2e/launcher-tab.spec.ts
+++ b/packages/app/e2e/launcher-tab.spec.ts
@@ -2,7 +2,7 @@ import { test, expect } from "./fixtures";
 import {
  gotoWorkspace,
  assertNewChatTileVisible,
-  assertNewTabMenuTriggerVisible,
+  assertTerminalTileVisible,
  assertSingleNewTabButton,
  pressNewTabShortcut,
  clickNewChat,
@@ -91,7 +91,7 @@ test.describe("Tab creation", () => {
    await gotoWorkspace(page, workspace.workspaceId);
    await assertSingleNewTabButton(page);
    await assertNewChatTileVisible(page);
-    await assertNewTabMenuTriggerVisible(page);
+    await assertTerminalTileVisible(page);
  });
 });

@@ -108,14 +108,7 @@ test.describe("Terminal title propagation", () => {
  test.skip("terminal tab title updates from OSC title escape sequence", async ({ page }) => {
    test.setTimeout(60_000);

-    const result = await workspace.client.createTerminal(
-      workspace.repoPath,
-      "title-test",
-      undefined,
-      {
-        workspaceId: workspace.workspaceId,
-      },
-    );
+    const result = await workspace.client.createTerminal(workspace.repoPath, "title-test");
    if (!result.terminal) throw new Error(`Failed to create terminal: ${result.error}`);
    const terminalId = result.terminal.id;

@@ -145,14 +138,7 @@ test.describe("Terminal title propagation", () => {
  test.skip("title debouncing coalesces rapid changes", async ({ page }) => {
    test.setTimeout(60_000);

-    const result = await workspace.client.createTerminal(
-      workspace.repoPath,
-      "debounce-test",
-      undefined,
-      {
-        workspaceId: workspace.workspaceId,
-      },
-    );
+    const result = await workspace.client.createTerminal(workspace.repoPath, "debounce-test");
    if (!result.terminal) throw new Error(`Failed to create terminal: ${result.error}`);
    const terminalId = result.terminal.id;

--- a/packages/app/e2e/new-workspace-codex-mode-preferences.spec.ts
+++ b/packages/app/e2e/new-workspace-codex-mode-preferences.spec.ts
@@ -1,220 +0,0 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { daemonWsRoutePattern } from "./helpers/daemon-port";
-import { openAgentRoute } from "./helpers/mock-agent";
-import {
-  openGlobalNewWorkspaceComposer,
-  selectNewWorkspaceProject,
-  submitNewWorkspacePrompt,
-} from "./helpers/new-workspace";
-import { escapeRegex } from "./helpers/regex";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-
-const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";
-
-type WebSocketMessage = string | Buffer;
-
-interface CreateAgentRequestMessage {
-  type: "create_agent_request";
-  config?: {
-    provider?: unknown;
-    modeId?: unknown;
-  };
-}
-
-function parseWebSocketJson(message: WebSocketMessage): unknown {
-  const rawMessage = typeof message === "string" ? message : message.toString("utf8");
-  try {
-    return JSON.parse(rawMessage);
-  } catch {
-    return null;
-  }
-}
-
-function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
-  const envelope = parseWebSocketJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
-  if (maybeEnvelope.type !== "session" || !maybeEnvelope.message) {
-    return null;
-  }
-  if (typeof maybeEnvelope.message !== "object") {
-    return null;
-  }
-  return maybeEnvelope.message as Record<string, unknown>;
-}
-
-async function seedCodexDefaultPermissionPreferences(page: Page, serverId: string): Promise<void> {
-  await page.addInitScript(
-    ({ preferencesKey, serverId: seededServerId }) => {
-      localStorage.setItem(
-        preferencesKey,
-        JSON.stringify({
-          serverId: seededServerId,
-          provider: "codex",
-          providerPreferences: {
-            codex: {
-              model: "gpt-5.4-mini",
-              mode: "auto",
-              thinkingByModel: {
-                "gpt-5.4-mini": "low",
-              },
-            },
-            mock: {
-              model: "ten-second-stream",
-            },
-          },
-        }),
-      );
-    },
-    { preferencesKey: CREATE_AGENT_PREFERENCES_KEY, serverId },
-  );
-}
-
-async function readCodexModePreference(page: Page): Promise<unknown> {
-  return page.evaluate((preferencesKey) => {
-    const raw = localStorage.getItem(preferencesKey);
-    if (!raw) return null;
-    const parsed = JSON.parse(raw) as {
-      providerPreferences?: Record<string, { mode?: unknown }>;
-    };
-    return parsed.providerPreferences?.codex?.mode ?? null;
-  }, CREATE_AGENT_PREFERENCES_KEY);
-}
-
-async function selectMode(page: Page, label: string): Promise<void> {
-  const modeControl = page.getByTestId("mode-control").first();
-  await expect(modeControl).toBeVisible({ timeout: 30_000 });
-  await modeControl.click();
-
-  const searchInput = page.getByRole("textbox", { name: /search mode/i });
-  await expect(searchInput).toBeVisible({ timeout: 10_000 });
-  await searchInput.fill(label);
-
-  const option = page
-    .getByRole("dialog")
-    .last()
-    .getByText(new RegExp(`^${escapeRegex(label)}$`, "i"))
-    .first();
-  await expect(option).toBeVisible({ timeout: 10_000 });
-  await option.click({ force: true });
-  await expect(searchInput).not.toBeVisible({ timeout: 5_000 });
-}
-
-async function recordAndBlockCreateAgentRequests(page: Page): Promise<{
-  waitForCreateAgentRequest(): Promise<CreateAgentRequestMessage>;
-}> {
-  let resolveRequest: ((message: CreateAgentRequestMessage) => void) | null = null;
-  const createAgentSeen = new Promise<CreateAgentRequestMessage>((resolve) => {
-    resolveRequest = resolve;
-  });
-
-  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
-    const server = ws.connectToServer();
-
-    ws.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
-      if (sessionMessage?.type === "create_agent_request") {
-        resolveRequest?.(sessionMessage as unknown as CreateAgentRequestMessage);
-        return;
-      }
-      server.send(message);
-    });
-
-    server.onMessage((message) => {
-      ws.send(message);
-    });
-  });
-
-  return {
-    waitForCreateAgentRequest: () => createAgentSeen,
-  };
-}
-
-test.describe("New workspace Codex mode preferences", () => {
-  test.describe.configure({ timeout: 240_000 });
-
-  test("keeps Full Access as the global Codex mode after the workspace draft auto-submit handoff", async ({
-    page,
-  }) => {
-    const serverId = getServerId();
-    const seeded = await seedWorkspace({ repoPrefix: "codex-mode-preferences-" });
-    const createAgentRecorder = await recordAndBlockCreateAgentRequests(page);
-    await seedCodexDefaultPermissionPreferences(page, serverId);
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await openGlobalNewWorkspaceComposer(page);
-      await selectNewWorkspaceProject(page, {
-        projectKey: seeded.projectId,
-        projectDisplayName: seeded.projectDisplayName,
-      });
-
-      await expect(page.getByTestId("mode-control").first()).toContainText("Default permissions", {
-        timeout: 30_000,
-      });
-      await selectMode(page, "Full access");
-      await expect(page.getByTestId("mode-control").first()).toContainText("Full access");
-
-      await submitNewWorkspacePrompt(page, "Keep Codex full access selected globally.");
-      const createAgentRequest = await createAgentRecorder.waitForCreateAgentRequest();
-
-      expect(createAgentRequest.config).toMatchObject({
-        provider: "codex",
-        modeId: "full-access",
-      });
-      await expect
-        .poll(() => readCodexModePreference(page), { timeout: 10_000 })
-        .toBe("full-access");
-    } finally {
-      await seeded.cleanup();
-    }
-  });
-
-  test("uses the live Codex agent mode as the next New Workspace default", async ({ page }) => {
-    const serverId = getServerId();
-    const seeded = await seedWorkspace({ repoPrefix: "codex-live-mode-preferences-" });
-    await seedCodexDefaultPermissionPreferences(page, serverId);
-
-    try {
-      const agent = await seeded.client.createAgent({
-        provider: "codex",
-        cwd: seeded.repoPath,
-        workspaceId: seeded.workspaceId,
-        title: "Codex live mode preference e2e",
-        modeId: "auto",
-        model: "gpt-5.4-mini",
-      });
-
-      await openAgentRoute(page, {
-        workspaceId: seeded.workspaceId,
-        agentId: agent.id,
-      });
-      await expect(page.getByTestId("mode-control").first()).toContainText("Default permissions", {
-        timeout: 30_000,
-      });
-
-      await selectMode(page, "Full access");
-      await expect(page.getByTestId("mode-control").first()).toContainText("Full access", {
-        timeout: 30_000,
-      });
-
-      await openGlobalNewWorkspaceComposer(page);
-      await selectNewWorkspaceProject(page, {
-        projectKey: seeded.projectId,
-        projectDisplayName: seeded.projectDisplayName,
-      });
-
-      await expect(page.getByTestId("mode-control").first()).toContainText("Full access", {
-        timeout: 30_000,
-      });
-    } finally {
-      await seeded.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/new-workspace-entry.spec.ts
+++ b/packages/app/e2e/new-workspace-entry.spec.ts
@@ -1,155 +0,0 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import {
-  connectNewWorkspaceDaemonClient,
-  expectNewWorkspaceProjectSelected,
-  openGlobalNewWorkspaceComposer,
-  openNewWorkspaceComposer,
-} from "./helpers/new-workspace";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-
-// Model B entry points into the New Workspace screen. The per-project
-// "+ New workspace" sidebar row is gone; the surviving entries are the global
-// button (universal) and each git project's own new-worktree icon (preselects
-// that project). These specs prove the global entry opens the screen, the
-// project icon preselects the right project across the reused 'new' screen, and
-// non-git projects never offer the worktree Isolation control.
-
-function projectRow(page: import("@playwright/test").Page, projectKey: string) {
-  return page.getByTestId(`sidebar-project-row-${projectKey}`);
-}
-
-test.describe("New workspace entry points", () => {
-  let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
-
-  test.describe.configure({ timeout: 240_000 });
-
-  test.beforeEach(async () => {
-    client = await connectNewWorkspaceDaemonClient();
-  });
-
-  test.afterEach(async () => {
-    await client?.close().catch(() => undefined);
-  });
-
-  test("the global new-workspace button opens the New Workspace screen", async ({ page }) => {
-    const seeded: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-global-button-" });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await expect(
-        page.getByTestId(`sidebar-workspace-row-${getServerId()}:${seeded.workspaceId}`),
-      ).toBeVisible({ timeout: 30_000 });
-
-      const globalButton = page.getByTestId("sidebar-global-new-workspace");
-      await expect(globalButton).toBeVisible({ timeout: 30_000 });
-
-      await openGlobalNewWorkspaceComposer(page);
-
-      // The screen is up: its project picker trigger is the canonical landmark.
-      await expect(page.getByTestId("new-workspace-project-picker-trigger")).toBeVisible({
-        timeout: 30_000,
-      });
-    } finally {
-      await seeded.cleanup();
-    }
-  });
-
-  test("each project's row icon preselects that project, and the reused screen resets a stale manual choice across projects", async ({
-    page,
-  }) => {
-    const projectA: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-preselect-a-" });
-    const projectB: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-preselect-b-" });
-    const projectC: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-preselect-c-" });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await expect(projectRow(page, projectA.projectId)).toBeVisible({ timeout: 30_000 });
-      await expect(projectRow(page, projectB.projectId)).toBeVisible({ timeout: 30_000 });
-      await expect(projectRow(page, projectC.projectId)).toBeVisible({ timeout: 30_000 });
-
-      // Project A's row icon opens New Workspace with A preselected.
-      await openNewWorkspaceComposer(page, {
-        projectKey: projectA.projectId,
-        projectDisplayName: projectA.projectDisplayName,
-      });
-      await expectNewWorkspaceProjectSelected(page, projectA.projectDisplayName);
-
-      // Manually override the selection to C from inside A's screen. This stale
-      // manualProjectKey is what the reused 'new' screen must reset when the next
-      // route-driven navigation targets a different project.
-      await page.getByTestId("new-workspace-project-picker-trigger").click();
-      const optionC = page.getByTestId(`new-workspace-project-picker-option-${projectC.projectId}`);
-      await expect(optionC).toBeVisible({ timeout: 30_000 });
-      await optionC.click();
-      await expectNewWorkspaceProjectSelected(page, projectC.projectDisplayName);
-
-      // Navigate via B's row icon. B must be preselected — the route project wins
-      // because the stale manual choice (C) was reset on the route change. If the
-      // reset were missing, the trigger would still read C.
-      await openNewWorkspaceComposer(page, {
-        projectKey: projectB.projectId,
-        projectDisplayName: projectB.projectDisplayName,
-      });
-      await expectNewWorkspaceProjectSelected(page, projectB.projectDisplayName);
-    } finally {
-      await projectA.cleanup();
-      await projectB.cleanup();
-      await projectC.cleanup();
-    }
-  });
-
-  test("the Isolation control is hidden for a non-git project and shown for a git project", async ({
-    page,
-  }) => {
-    const gitProject: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-iso-git-" });
-    const nonGitProject: SeededWorkspace = await seedWorkspace({
-      repoPrefix: "entry-iso-nongit-",
-      git: false,
-    });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await expect(projectRow(page, gitProject.projectId)).toBeVisible({ timeout: 30_000 });
-      await expect(projectRow(page, nonGitProject.projectId)).toBeVisible({ timeout: 30_000 });
-
-      // Open New Workspace for the non-git project via the global button, then
-      // select it in the picker (its row has no new-worktree icon).
-      await openGlobalNewWorkspaceComposer(page);
-      const trigger = page.getByTestId("new-workspace-project-picker-trigger");
-      await expect(trigger).toBeVisible({ timeout: 30_000 });
-      await trigger.click();
-      const nonGitOption = page.getByTestId(
-        `new-workspace-project-picker-option-${nonGitProject.projectId}`,
-      );
-      await expect(nonGitOption).toBeVisible({ timeout: 30_000 });
-      await nonGitOption.click();
-      await expectNewWorkspaceProjectSelected(page, nonGitProject.projectDisplayName);
-
-      // No git checkout means no worktree isolation choice: the Isolation row is
-      // absent entirely.
-      await expect(page.getByTestId("workspace-create-isolation-trigger")).toHaveCount(0);
-
-      // Switching to the git project on the same screen reveals the Isolation row.
-      await trigger.click();
-      const gitOption = page.getByTestId(
-        `new-workspace-project-picker-option-${gitProject.projectId}`,
-      );
-      await expect(gitOption).toBeVisible({ timeout: 30_000 });
-      await gitOption.click();
-      await expectNewWorkspaceProjectSelected(page, gitProject.projectDisplayName);
-
-      await expect(page.getByTestId("workspace-create-isolation-trigger")).toBeVisible({
-        timeout: 30_000,
-      });
-    } finally {
-      await gitProject.cleanup();
-      await nonGitProject.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/new-workspace-isolation-memory.spec.ts
+++ b/packages/app/e2e/new-workspace-isolation-memory.spec.ts
@@ -1,96 +0,0 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import {
-  archiveLocalWorkspaceFromDaemon,
-  archiveWorkspaceFromDaemon,
-  assertNewWorkspaceSidebarAndHeader,
-  connectNewWorkspaceDaemonClient,
-  expectWorkspaceIsolationSelected,
-  openNewWorkspaceComposer,
-  openProjectViaDaemon,
-  openStartingRefPicker,
-  selectBranchInPicker,
-  selectWorkspaceIsolation,
-} from "./helpers/new-workspace";
-import { createTempGitRepo } from "./helpers/workspace";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-
-// Regression for "the local / worktree selection in the new workspace is not
-// remembered." The isolation choice persists in the create-form preferences
-// (FormPreferences.isolation), so it must survive the create→reopen remount:
-// creating a worktree workspace navigates away from /new and unmounts it, and
-// reopening New Workspace has to still show "New worktree".
-test.describe("New workspace isolation memory", () => {
-  let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
-  const localWorkspaceIds = new Set<string>();
-  const createdWorktreeDirectories = new Set<string>();
-
-  test.describe.configure({ timeout: 240_000 });
-
-  test.beforeEach(async () => {
-    client = await connectNewWorkspaceDaemonClient();
-  });
-
-  test.afterEach(async () => {
-    if (client) {
-      for (const workspaceDirectory of createdWorktreeDirectories) {
-        await archiveWorkspaceFromDaemon(client, workspaceDirectory).catch(() => undefined);
-      }
-      for (const workspaceId of localWorkspaceIds) {
-        await archiveLocalWorkspaceFromDaemon(client, workspaceId).catch(() => undefined);
-      }
-    }
-    createdWorktreeDirectories.clear();
-    localWorkspaceIds.clear();
-    await client?.close().catch(() => undefined);
-  });
-
-  test("remembers the worktree isolation choice after creating a workspace", async ({ page }) => {
-    const serverId = getServerId();
-    const tempRepo = await createTempGitRepo("isolation-memory-", { branches: ["main", "dev"] });
-
-    try {
-      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
-      localWorkspaceIds.add(openedProject.workspaceId);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-
-      // First visit: the screen opens on Local, switch it to New worktree and create.
-      await openNewWorkspaceComposer(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      await expectWorkspaceIsolationSelected(page, "local");
-      await selectWorkspaceIsolation(page, "worktree");
-      await expectWorkspaceIsolationSelected(page, "worktree");
-
-      await openStartingRefPicker(page);
-      await selectBranchInPicker(page, "dev");
-
-      const createButton = page
-        .getByTestId("message-input-root")
-        .getByRole("button", { name: "Create" });
-      await expect(createButton).toBeVisible({ timeout: 30_000 });
-      await createButton.click();
-
-      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
-        serverId,
-        client,
-        previousWorkspaceId: openedProject.workspaceId,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
-
-      // Second visit (fresh mount of /new): the worktree choice must stick.
-      await openNewWorkspaceComposer(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      await expectWorkspaceIsolationSelected(page, "worktree");
-    } finally {
-      await tempRepo.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/new-workspace.spec.ts
+++ b/packages/app/e2e/new-workspace.spec.ts
@@ -7,17 +7,16 @@ import {
  archiveWorkspaceFromDaemon,
  archiveLocalWorkspaceFromDaemon,
  assertNewWorkspaceSidebarAndHeader,
+  clickNewWorkspaceButton,
  closeBranchPicker,
  connectNewWorkspaceDaemonClient,
  createWorktreeViaDaemon,
  delayBrowserAgentCreatedStatus,
  expectComposerGithubAttachmentPill,
-  expectNewWorkspaceProjectSelected,
  expectPickerClosed,
  expectPickerOpen,
  expectPickerSelected,
  expectStartingRefPickerTriggerPr,
-  openGlobalNewWorkspaceComposer,
  openBranchPicker,
  openNewWorkspaceComposer,
  openProjectViaDaemon,
@@ -25,15 +24,8 @@ import {
  selectBranchInPicker,
  selectGitHubPrInPicker,
  selectPickerOptionByKeyboard,
-  selectWorkspaceIsolation,
-  submitNewWorkspacePrompt,
 } from "./helpers/new-workspace";
 import { createTempGitRepo, readWorktreeBranchInfo } from "./helpers/workspace";
-import {
-  cloneGithubRepoDefaultBranchOnly,
-  createTempGithubRepo,
-  hasGithubAuth,
-} from "./helpers/github-fixtures";
 import { getServerId } from "./helpers/server-id";
 import {
  expectSidebarWorkspaceSelected,
@@ -41,153 +33,13 @@ import {
  switchWorkspaceViaSidebar,
  waitForSidebarHydration,
  waitForWorkspaceInSidebar,
+  workspaceLabelFromPath,
 } from "./helpers/workspace-ui";

-interface WorkspaceStatusGroupEvent {
-  rowTestId: string;
-  bucket: string;
-  indicatorTestId: string | null;
-  label: string;
-  at: number;
-}
-
-async function switchSidebarToStatusGrouping(page: import("@playwright/test").Page) {
-  await page.getByTestId("sidebar-display-preferences-menu").click();
-  await page.getByTestId("sidebar-grouping-status").click();
-  await expect(page.getByTestId("sidebar-status-group-done")).toBeVisible({ timeout: 30_000 });
-}
-
-async function startTrackingSidebarStatusGroups(page: import("@playwright/test").Page) {
-  await page.evaluate(() => {
-    interface StatusGroupEvent {
-      rowTestId: string;
-      bucket: string;
-      indicatorTestId: string | null;
-      label: string;
-      at: number;
-    }
-    const win = window as typeof window & {
-      __workspaceStatusGroupEvents?: StatusGroupEvent[];
-      __workspaceStatusGroupObserver?: MutationObserver;
-    };
-    win.__workspaceStatusGroupEvents = [];
-    win.__workspaceStatusGroupObserver?.disconnect();
-
-    const capture = () => {
-      const events = win.__workspaceStatusGroupEvents;
-      if (!events) return;
-      const groups = document.querySelectorAll<HTMLElement>(
-        '[data-testid^="sidebar-status-group-"]',
-      );
-      for (const group of groups) {
-        const groupTestId = group.getAttribute("data-testid") ?? "";
-        const bucket = groupTestId.replace("sidebar-status-group-", "");
-        const label = group.textContent ?? "";
-        const block = group.parentElement?.parentElement;
-        if (!block) continue;
-        const rows = block.querySelectorAll<HTMLElement>('[data-testid^="sidebar-workspace-row-"]');
-        for (const row of rows) {
-          const rowTestId = row.getAttribute("data-testid");
-          if (!rowTestId) continue;
-          const indicatorTestId =
-            row
-              .querySelector<HTMLElement>('[data-testid^="workspace-status-indicator-"]')
-              ?.getAttribute("data-testid") ?? null;
-          const last = events.at(-1);
-          if (
-            last?.rowTestId === rowTestId &&
-            last.bucket === bucket &&
-            last.indicatorTestId === indicatorTestId
-          ) {
-            continue;
-          }
-          events.push({ rowTestId, bucket, indicatorTestId, label, at: performance.now() });
-        }
-      }
-    };
-
-    capture();
-    const observer = new MutationObserver(capture);
-    observer.observe(document.body, { childList: true, subtree: true, characterData: true });
-    win.__workspaceStatusGroupObserver = observer;
-  });
-}
-
-async function getTrackedSidebarStatusGroups(
-  page: import("@playwright/test").Page,
-): Promise<WorkspaceStatusGroupEvent[]> {
-  return page.evaluate(() => {
-    const win = window as typeof window & {
-      __workspaceStatusGroupEvents?: WorkspaceStatusGroupEvent[];
-    };
-    return win.__workspaceStatusGroupEvents ?? [];
-  });
-}
-
-async function waitForWorkspaceStatusGroupEvent(input: {
-  page: import("@playwright/test").Page;
-  rowTestId: string;
-  bucket: string;
-}) {
-  await input.page.waitForFunction(
-    ({ expectedRowTestId, expectedBucket }) => {
-      const win = window as typeof window & {
-        __workspaceStatusGroupEvents?: WorkspaceStatusGroupEvent[];
-      };
-      for (const event of win.__workspaceStatusGroupEvents ?? []) {
-        if (event.rowTestId === expectedRowTestId && event.bucket === expectedBucket) {
-          return true;
-        }
-      }
-      return false;
-    },
-    { expectedRowTestId: input.rowTestId, expectedBucket: input.bucket },
-    { timeout: 30_000 },
-  );
-}
-
-async function expectWorkspaceStatusGroupEvents(input: {
-  page: import("@playwright/test").Page;
-  rowTestId: string;
-  includes: string;
-  excludes: string;
-  includesIndicator?: string;
-  excludesIndicator?: string;
-}) {
-  await waitForWorkspaceStatusGroupEvent({
-    page: input.page,
-    rowTestId: input.rowTestId,
-    bucket: input.includes,
-  });
-  const createdWorkspaceEvents = (await getTrackedSidebarStatusGroups(input.page)).filter(
-    (event) => event.rowTestId === input.rowTestId,
-  );
-  expect(createdWorkspaceEvents.map((event) => event.bucket)).toContain(input.includes);
-  expect(createdWorkspaceEvents.filter((event) => event.bucket === input.excludes)).toEqual([]);
-  if (input.includesIndicator) {
-    expect(createdWorkspaceEvents.map((event) => event.indicatorTestId)).toContain(
-      input.includesIndicator,
-    );
-  }
-  if (input.excludesIndicator) {
-    expect(
-      createdWorkspaceEvents.filter((event) => event.indicatorTestId === input.excludesIndicator),
-    ).toEqual([]);
-  }
-}
-
-async function submitNewWorkspaceWithoutPrompt(page: import("@playwright/test").Page) {
-  const createButton = page
-    .getByTestId("message-input-root")
-    .getByRole("button", { name: "Create" });
-  await expect(createButton).toBeVisible({ timeout: 30_000 });
-  await createButton.click();
-}
-
 test.describe("New workspace flow", () => {
  let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
  const localWorkspaceIds = new Set<string>();
-  const createdWorktreeDirectories = new Set<string>();
+  const createdWorktreeIds = new Set<string>();

  test.describe.configure({ timeout: 240_000 });

@@ -197,14 +49,14 @@ test.describe("New workspace flow", () => {

  test.afterEach(async () => {
    if (client) {
-      for (const workspaceDirectory of createdWorktreeDirectories) {
-        await archiveWorkspaceFromDaemon(client, workspaceDirectory).catch(() => undefined);
+      for (const workspaceId of createdWorktreeIds) {
+        await archiveWorkspaceFromDaemon(client, workspaceId).catch(() => undefined);
      }
      for (const workspaceId of localWorkspaceIds) {
        await archiveLocalWorkspaceFromDaemon(client, workspaceId).catch(() => undefined);
      }
    }
-    createdWorktreeDirectories.clear();
+    createdWorktreeIds.clear();
    localWorkspaceIds.clear();
    await client?.close().catch(() => undefined);
  });
@@ -227,7 +79,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: firstWorkspace.workspaceId,
+        targetWorkspacePath: firstWorkspace.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: firstWorkspace.workspaceName,
@@ -237,7 +89,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: secondWorkspace.workspaceId,
+        targetWorkspacePath: secondWorkspace.workspaceId,
      });
      await waitForWorkspaceInSidebar(page, {
        serverId,
@@ -251,7 +103,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: firstWorkspace.workspaceId,
+        targetWorkspacePath: firstWorkspace.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: firstWorkspace.workspaceName,
@@ -275,7 +127,7 @@ test.describe("New workspace flow", () => {
        slug: `nav-${Date.now()}`,
      });
      localWorkspaceIds.add(rootWorkspace.workspaceId);
-      createdWorktreeDirectories.add(worktreeWorkspace.workspaceDirectory);
+      createdWorktreeIds.add(worktreeWorkspace.workspaceId);

      await gotoAppShell(page);
      await waitForSidebarHydration(page);
@@ -283,7 +135,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: rootWorkspace.workspaceId,
+        targetWorkspacePath: rootWorkspace.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: rootWorkspace.workspaceName,
@@ -298,7 +150,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: worktreeWorkspace.workspaceId,
+        targetWorkspacePath: worktreeWorkspace.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: worktreeWorkspace.workspaceName,
@@ -319,7 +171,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: rootWorkspace.workspaceId,
+        targetWorkspacePath: rootWorkspace.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: rootWorkspace.workspaceName,
@@ -341,7 +193,7 @@ test.describe("New workspace flow", () => {
    }
  });

-  test("global new workspace uses the last active project and creates one agent tab", async ({
+  test("clicking new workspace redirects, renders header, shows sidebar row, and keeps one agent tab", async ({
    page,
  }) => {
    const serverId = getServerId();
@@ -358,26 +210,24 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: openedProject.workspaceId,
+        targetWorkspacePath: openedProject.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: openedProject.workspaceName,
        subtitle: openedProject.projectDisplayName,
      });

-      await openGlobalNewWorkspaceComposer(page);
-      await expectNewWorkspaceProjectSelected(page, openedProject.projectDisplayName);
-      await submitNewWorkspacePrompt(page);
+      await clickNewWorkspaceButton(page, {
+        projectKey: openedProject.projectKey,
+        projectDisplayName: openedProject.projectDisplayName,
+      });

      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
        serverId,
-        client,
        previousWorkspaceId: openedProject.workspaceId,
        projectDisplayName: openedProject.projectDisplayName,
-        assertSidebarRow: false,
-        assertHeader: false,
      });
-      createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
+      createdWorktreeIds.add(createdWorkspace.workspaceId);

      expect(createdWorkspace.workspaceId).not.toBe(openedProject.workspaceId);
      await expect(page).toHaveURL(
@@ -393,7 +243,7 @@ test.describe("New workspace flow", () => {
      await expect(createdWorkspaceRow).toBeVisible({ timeout: 30_000 });

      await expectWorkspaceHeader(page, {
-        title: createdWorkspace.workspaceName,
+        title: workspaceLabelFromPath(createdWorkspace.workspaceId),
        subtitle: openedProject.projectDisplayName,
      });

@@ -433,7 +283,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: openedProject.workspaceId,
+        targetWorkspacePath: openedProject.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: openedProject.workspaceName,
@@ -460,13 +310,10 @@ test.describe("New workspace flow", () => {

      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
        serverId,
-        client,
        previousWorkspaceId: openedProject.workspaceId,
        projectDisplayName: openedProject.projectDisplayName,
-        assertSidebarRow: false,
-        assertHeader: false,
      });
-      createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
+      createdWorktreeIds.add(createdWorkspace.workspaceId);

      await expect(page).toHaveURL(
        buildHostWorkspaceRoute(serverId, createdWorkspace.workspaceId),
@@ -496,119 +343,6 @@ test.describe("New workspace flow", () => {
    }
  });

-  test("new workspace with initial agent never appears in the Done status group", async ({
-    page,
-  }) => {
-    const serverId = getServerId();
-
-    const tempRepo = await createTempGitRepo("new-workspace-status-optimistic-");
-
-    try {
-      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
-      localWorkspaceIds.add(openedProject.workspaceId);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-
-      await switchWorkspaceViaSidebar({
-        page,
-        serverId,
-        workspaceId: openedProject.workspaceId,
-      });
-      await expectWorkspaceHeader(page, {
-        title: openedProject.workspaceName,
-        subtitle: openedProject.projectDisplayName,
-      });
-
-      await switchSidebarToStatusGrouping(page);
-      await startTrackingSidebarStatusGroups(page);
-
-      await openGlobalNewWorkspaceComposer(page);
-      await expectNewWorkspaceProjectSelected(page, openedProject.projectDisplayName);
-      await submitNewWorkspacePrompt(page);
-
-      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
-        serverId,
-        client,
-        previousWorkspaceId: openedProject.workspaceId,
-        projectDisplayName: openedProject.projectDisplayName,
-        assertSidebarRow: false,
-        assertHeader: false,
-      });
-      createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
-
-      const rowTestId = `sidebar-workspace-row-${serverId}:${createdWorkspace.workspaceId}`;
-      await expectWorkspaceStatusGroupEvents({
-        page,
-        rowTestId,
-        includes: "running",
-        excludes: "done",
-        includesIndicator: "workspace-status-indicator-running",
-      });
-    } finally {
-      await tempRepo.cleanup();
-    }
-  });
-
-  test("new workspace without an initial agent appears in the Done status group", async ({
-    page,
-  }) => {
-    const serverId = getServerId();
-
-    const tempRepo = await createTempGitRepo("new-workspace-status-empty-");
-
-    try {
-      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
-      localWorkspaceIds.add(openedProject.workspaceId);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-
-      await switchWorkspaceViaSidebar({
-        page,
-        serverId,
-        workspaceId: openedProject.workspaceId,
-      });
-      await expectWorkspaceHeader(page, {
-        title: openedProject.workspaceName,
-        subtitle: openedProject.projectDisplayName,
-      });
-
-      await switchSidebarToStatusGrouping(page);
-      await startTrackingSidebarStatusGroups(page);
-
-      await openGlobalNewWorkspaceComposer(page);
-      await expectNewWorkspaceProjectSelected(page, openedProject.projectDisplayName);
-      await submitNewWorkspaceWithoutPrompt(page);
-
-      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
-        serverId,
-        client,
-        previousWorkspaceId: openedProject.workspaceId,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
-
-      const rowTestId = `sidebar-workspace-row-${serverId}:${createdWorkspace.workspaceId}`;
-      await expectWorkspaceStatusGroupEvents({
-        page,
-        rowTestId,
-        includes: "done",
-        excludes: "running",
-        excludesIndicator: "workspace-status-indicator-loading",
-      });
-      await expectWorkspaceStatusGroupEvents({
-        page,
-        rowTestId,
-        includes: "done",
-        excludes: "running",
-        excludesIndicator: "workspace-status-indicator-running",
-      });
-    } finally {
-      await tempRepo.cleanup();
-    }
-  });
-
  test("selected branch becomes the base of a new workspace worktree", async ({ page }) => {
    const serverId = getServerId();

@@ -626,7 +360,7 @@ test.describe("New workspace flow", () => {
      await switchWorkspaceViaSidebar({
        page,
        serverId,
-        workspaceId: openedProject.workspaceId,
+        targetWorkspacePath: openedProject.workspaceId,
      });
      await expectWorkspaceHeader(page, {
        title: openedProject.workspaceName,
@@ -637,7 +371,6 @@ test.describe("New workspace flow", () => {
        projectKey: openedProject.projectKey,
        projectDisplayName: openedProject.projectDisplayName,
      });
-      await selectWorkspaceIsolation(page, "worktree");
      await openStartingRefPicker(page);
      await selectBranchInPicker(page, "dev");

@@ -649,18 +382,17 @@ test.describe("New workspace flow", () => {

      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
        serverId,
-        client,
        previousWorkspaceId: openedProject.workspaceId,
        projectDisplayName: openedProject.projectDisplayName,
      });
-      createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
+      createdWorktreeIds.add(createdWorkspace.workspaceId);

-      expect(existsSync(createdWorkspace.workspaceDirectory)).toBe(true);
+      expect(existsSync(createdWorkspace.workspaceId)).toBe(true);

      const branchInfo = await readWorktreeBranchInfo({
-        worktreePath: createdWorkspace.workspaceDirectory,
+        worktreePath: createdWorkspace.workspaceId,
      });
-      expect(branchInfo.currentBranch).toBe(path.basename(createdWorkspace.workspaceDirectory));
+      expect(branchInfo.currentBranch).toBe(path.basename(createdWorkspace.workspaceId));
      expect(branchInfo.hasAncestor(tempRepo.branchHeads.main)).toBe(true);
      expect(branchInfo.hasAncestor(tempRepo.branchHeads.dev)).toBe(true);
    } finally {
@@ -668,7 +400,7 @@ test.describe("New workspace flow", () => {
    }
  });

-  test("branch picker opens via keyboard and selects the filtered option on Enter", async ({
+  test("branch picker opens via keyboard, navigates options, and selects on Enter", async ({
    page,
  }) => {
    const tempRepo = await createTempGitRepo("picker-keyboard-", { branches: ["main", "dev"] });
@@ -683,7 +415,6 @@ test.describe("New workspace flow", () => {
        projectKey: openedProject.projectKey,
        projectDisplayName: openedProject.projectDisplayName,
      });
-      await selectWorkspaceIsolation(page, "worktree");

      await openBranchPicker(page);
      await expectPickerOpen(page);
@@ -708,7 +439,6 @@ test.describe("New workspace flow", () => {
        projectKey: openedProject.projectKey,
        projectDisplayName: openedProject.projectDisplayName,
      });
-      await selectWorkspaceIsolation(page, "worktree");

      await openBranchPicker(page);
      await expectPickerOpen(page);
@@ -720,16 +450,10 @@ test.describe("New workspace flow", () => {
  });

  test("selected GitHub PR shows PR context in the trigger and composer", async ({ page }) => {
-    test.skip(!hasGithubAuth(), "Requires GitHub authentication (gh auth login)");
-
-    const ghRepo = await createTempGithubRepo({
-      category: "new-workspace-pr-ref",
-      prs: [{ title: "Review selected start ref", state: "open" }],
-    });
-    const pr = ghRepo.prs[0]!;
+    const tempRepo = await createTempGitRepo("new-workspace-pr-ref-");

    try {
-      const openedProject = await openProjectViaDaemon(client, pr.localPath);
+      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
      localWorkspaceIds.add(openedProject.workspaceId);

      await gotoAppShell(page);
@@ -738,67 +462,20 @@ test.describe("New workspace flow", () => {
        projectKey: openedProject.projectKey,
        projectDisplayName: openedProject.projectDisplayName,
      });
-      await selectWorkspaceIsolation(page, "worktree");
      await openStartingRefPicker(page);
-      await selectGitHubPrInPicker(page, pr.number);
+      await selectGitHubPrInPicker(page, 515);

      await expectStartingRefPickerTriggerPr(page, {
-        number: pr.number,
-        title: pr.title,
-        headRef: pr.branch,
+        number: 515,
+        title: "Review selected start ref",
+        headRef: "feature/start-from-pr",
      });
      await expectComposerGithubAttachmentPill(page, {
-        number: pr.number,
-        title: pr.title,
+        number: 515,
+        title: "Review selected start ref",
      });
    } finally {
-      await ghRepo.cleanup();
-    }
-  });
-
-  test("selected GitHub PR creates the worktree from the PR head even when the head branch is not fetched", async ({
-    page,
-  }) => {
-    test.skip(!hasGithubAuth(), "Requires GitHub authentication (gh auth login)");
-
-    const ghRepo = await createTempGithubRepo({
-      category: "new-workspace-pr-worktree",
-      prs: [{ title: "Checkout PR worktree", state: "open" }],
-    });
-    const pr = ghRepo.prs[0]!;
-    const mainCheckout = await cloneGithubRepoDefaultBranchOnly(ghRepo);
-
-    try {
-      const openedProject = await openProjectViaDaemon(client, mainCheckout.path);
-      localWorkspaceIds.add(openedProject.workspaceId);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await openNewWorkspaceComposer(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      await selectWorkspaceIsolation(page, "worktree");
-      await openStartingRefPicker(page);
-      await selectGitHubPrInPicker(page, pr.number);
-      await submitNewWorkspaceWithoutPrompt(page);
-
-      const worktree = await assertNewWorkspaceSidebarAndHeader(page, {
-        serverId: getServerId(),
-        client,
-        previousWorkspaceId: openedProject.workspaceId,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      createdWorktreeDirectories.add(worktree.workspaceDirectory);
-
-      const branchInfo = await readWorktreeBranchInfo({
-        worktreePath: worktree.workspaceDirectory,
-      });
-      expect(branchInfo.currentBranch).toBe(pr.branch);
-      expect(existsSync(path.join(worktree.workspaceDirectory, "pr-1.txt"))).toBe(true);
-    } finally {
-      await mainCheckout.cleanup();
-      await ghRepo.cleanup();
+      await tempRepo.cleanup();
    }
  });
 });
--- a/packages/app/e2e/provider-settings-refresh.spec.ts
+++ b/packages/app/e2e/provider-settings-refresh.spec.ts
@@ -1,117 +0,0 @@
-import { expect, test, type Page } from "./fixtures";
-import { expectComposerVisible } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-
-const MOBILE_VIEWPORT = { width: 390, height: 844 };
-
-async function openMockAgentAtMobileBreakpoint(page: Page) {
-  await page.setViewportSize(MOBILE_VIEWPORT);
-  const session = await seedMockAgentWorkspace({
-    repoPrefix: "provider-sheet-stack-",
-    title: "Provider sheet stack e2e",
-  });
-  await openAgentRoute(page, session);
-  await expectComposerVisible(page);
-  await expect(page.getByRole("button", { name: /Select model/ })).toBeVisible({
-    timeout: 30_000,
-  });
-  return session;
-}
-
-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 openCodeRow = page.getByText("OpenCode", { exact: true }).first();
-  if (await openCodeRow.isVisible().catch(() => false)) {
-    await openCodeRow.click();
-  }
-
-  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({
-    timeout: 10_000,
-  });
-}
-
-async function closeTopSheet(page: Page) {
-  const closeTarget = page.getByLabel("Close", { exact: true }).last();
-  if (await closeTarget.isVisible().catch(() => false)) {
-    await closeTarget.click({ force: true });
-    return;
-  }
-
-  const handle = page.getByRole("slider", { name: "Bottom sheet handle" }).last();
-  const handleBox = await handle.boundingBox();
-  if (!handleBox) {
-    throw new Error("Bottom sheet handle was not measurable");
-  }
-  const startX = handleBox.x + handleBox.width / 2;
-  const startY = handleBox.y + handleBox.height / 2;
-  await page.mouse.move(startX, startY);
-  await page.mouse.down();
-  await page.mouse.move(startX, startY + 400, { steps: 8 });
-  await page.mouse.up();
-}
-
-async function closeSheetByHeaderButton(page: Page, testId: string) {
-  const sheet = page.getByTestId(testId);
-  await sheet.getByLabel("Close", { exact: true }).click({ force: true });
-  await expect(sheet).not.toBeVisible({ timeout: 10_000 });
-}
-
-async function expectProviderSettingsVisible(page: Page) {
-  await expect(page.getByTestId("provider-settings-sheet")).toBeVisible({ timeout: 10_000 });
-  await expect(page.getByRole("button", { name: "Add model" })).toBeVisible();
-  await expect(page.getByRole("button", { name: "Diagnostic", exact: true })).toBeVisible();
-}
-
-async function exerciseProviderSettingsStack(page: Page) {
-  await expectProviderSettingsVisible(page);
-
-  await page.getByRole("button", { name: "Add model" }).click();
-  await expect(page.getByTestId("add-custom-model-sheet")).toBeVisible({ timeout: 10_000 });
-  await closeSheetByHeaderButton(page, "add-custom-model-sheet");
-  await expect(page.getByPlaceholder("e.g. openai/gpt-5")).not.toBeVisible({ timeout: 10_000 });
-  await expectProviderSettingsVisible(page);
-
-  await page.getByRole("button", { name: "Diagnostic", exact: true }).click();
-  await expect(page.getByTestId("provider-diagnostic-sheet")).toBeVisible({ timeout: 10_000 });
-  await page.getByRole("button", { name: /Refresh diagnostic/ }).click();
-  await expect(page.getByTestId("provider-diagnostic-sheet")).toBeVisible({ timeout: 10_000 });
-  await closeSheetByHeaderButton(page, "provider-diagnostic-sheet");
-  await expectProviderSettingsVisible(page);
-
-  await page.getByRole("button", { name: "Refresh", exact: true }).click();
-  await expectProviderSettingsVisible(page);
-}
-
-test.describe("provider settings bottom-sheet stack", () => {
-  test("provider settings and children close back through the model selector stack", async ({
-    page,
-  }) => {
-    test.setTimeout(180_000);
-
-    const session = await openMockAgentAtMobileBreakpoint(page);
-
-    try {
-      await openProviderSettingsFromModelSelector(page);
-      await exerciseProviderSettingsStack(page);
-      await closeSheetByHeaderButton(page, "provider-settings-sheet");
-
-      await expectModelSelectorVisible(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 closeTopSheet(page);
-    } finally {
-      await session.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/provider-usage-settings.spec.ts
+++ b/packages/app/e2e/provider-usage-settings.spec.ts
@@ -1,152 +0,0 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { installProviderUsageFixture } from "./helpers/provider-usage";
-import { getServerId } from "./helpers/server-id";
-import { openSettingsHostSection } from "./helpers/settings";
-
-test.describe("provider usage settings", () => {
-  test("renders every provider returned by the daemon usage RPC", async ({ page }) => {
-    test.setTimeout(120_000);
-    const serverId = getServerId();
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "claude",
-            displayName: "Claude",
-            status: "available",
-            planLabel: "Max 20x",
-            windows: [{ id: "session", label: "Session", usedPct: 7 }],
-          },
-          {
-            providerId: "codex",
-            displayName: "Codex",
-            status: "available",
-            planLabel: "Pro 20x",
-            windows: [{ id: "weekly", label: "Weekly", usedPct: 29 }],
-          },
-          {
-            providerId: "glm",
-            displayName: "GLM coding plan",
-            status: "available",
-            planLabel: "GLM coding plan",
-            sourceLabel: "OpenUsage 0.6.27",
-            windows: [
-              { id: "biweekly", label: "Biweekly", usedPct: 23 },
-              { id: "daily", label: "Daily", remainingPct: 30 },
-            ],
-            balances: [
-              { id: "credits", label: "Credits", remaining: 1234, unit: "credits" },
-              { id: "extra", label: "Extra usage", used: 5, limit: 20, unit: "usd" },
-            ],
-            details: [{ id: "valid", label: "Valid until", value: "2026-12-31" }],
-          },
-        ],
-      },
-    ]);
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    expect(usageFixture.requestCount()).toBe(0);
-    await openSettingsHostSection(page, serverId, "usage");
-    await usageFixture.waitForRequestCount(1);
-
-    const card = page.getByTestId("provider-usage-card");
-    await expect(card).toBeVisible({ timeout: 10_000 });
-    await expect(card.getByText("Claude", { exact: true })).toBeVisible();
-    await expect(card.getByText("Codex", { exact: true })).toBeVisible();
-    await expect(card.getByText("GLM coding plan", { exact: true }).first()).toBeVisible();
-    await expect(card.getByText("Biweekly", { exact: true })).toBeVisible();
-    await expect(card.getByText("Daily", { exact: true })).toBeVisible();
-    await expect(card.getByText("70%")).toBeVisible();
-    await expect(card.getByText("Credits", { exact: true })).toBeVisible();
-    await expect(card.getByText("1,234 left", { exact: true })).toBeVisible();
-    await expect(card.getByText("Extra usage", { exact: true })).toBeVisible();
-    await expect(card.getByText("$5.00 / $20.00", { exact: true })).toBeVisible();
-    await expect(card.getByText("Valid until", { exact: true })).toBeVisible();
-    await expect(card.getByText("2026-12-31", { exact: true })).toBeVisible();
-    await expect(card.getByText(/OpenUsage 0\.6\.27/)).toBeVisible();
-  });
-
-  test("refresh invalidates and refetches usage", async ({ page }) => {
-    test.setTimeout(120_000);
-    const serverId = getServerId();
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "glm",
-            displayName: "GLM coding plan",
-            status: "available",
-            planLabel: "GLM coding plan",
-            windows: [{ id: "biweekly", label: "Biweekly", usedPct: 23 }],
-          },
-        ],
-      },
-      {
-        fetchedAt: "2026-06-19T00:01:00.000Z",
-        providers: [
-          {
-            providerId: "glm",
-            displayName: "GLM coding plan",
-            status: "available",
-            planLabel: "GLM coding plan",
-            windows: [{ id: "biweekly", label: "Biweekly", usedPct: 64 }],
-          },
-        ],
-      },
-    ]);
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHostSection(page, serverId, "usage");
-    await usageFixture.waitForRequestCount(1);
-    await expect(page.getByText("23%")).toBeVisible({ timeout: 10_000 });
-
-    await page.getByRole("button", { name: "Refresh", exact: true }).click();
-    await usageFixture.waitForRequestCount(2);
-
-    expect(usageFixture.requestCount()).toBe(2);
-    await expect(page.getByText("64%")).toBeVisible();
-  });
-
-  test("one provider error does not collapse the usage list", async ({ page }) => {
-    test.setTimeout(120_000);
-    const serverId = getServerId();
-    await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "claude",
-            displayName: "Claude",
-            status: "error",
-            planLabel: null,
-            windows: [],
-            error: "Claude auth expired",
-          },
-          {
-            providerId: "codex",
-            displayName: "Codex",
-            status: "available",
-            planLabel: "Pro 20x",
-            windows: [{ id: "weekly", label: "Weekly", usedPct: 71 }],
-          },
-        ],
-      },
-    ]);
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHostSection(page, serverId, "usage");
-
-    const card = page.getByTestId("provider-usage-card");
-    await expect(card).toBeVisible({ timeout: 10_000 });
-    await expect(card.getByText("Error", { exact: true })).toBeVisible();
-    await expect(card.getByText("Claude auth expired", { exact: true })).toBeVisible();
-    await expect(card.getByText("Codex", { exact: true })).toBeVisible();
-    await expect(card.getByText("71%")).toBeVisible();
-  });
-});
--- a/packages/app/e2e/provider-usage-tooltip.spec.ts
+++ b/packages/app/e2e/provider-usage-tooltip.spec.ts
@@ -1,113 +0,0 @@
-import { expect, test, type Page } from "./fixtures";
-import { expectComposerVisible } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { installProviderUsageFixture } from "./helpers/provider-usage";
-
-const MOBILE_VIEWPORT = { width: 390, height: 844 };
-
-async function openMockAgent(page: Page) {
-  await page.setViewportSize(MOBILE_VIEWPORT);
-  const session = await seedMockAgentWorkspace({
-    repoPrefix: "provider-usage-tooltip-",
-    title: "Provider usage tooltip e2e",
-    initialPrompt: "emit 1 coalesced agent stream update for provider usage tooltip.",
-  });
-  await openAgentRoute(page, session);
-  await expectComposerVisible(page);
-  await expect(page.getByTestId("context-window-meter")).toBeVisible({ timeout: 30_000 });
-  return session;
-}
-
-test.describe("provider usage tooltip", () => {
-  test("fetches usage when the context tooltip opens and renders the active provider", async ({
-    page,
-  }) => {
-    test.setTimeout(180_000);
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "mock",
-            displayName: "Mock provider",
-            status: "available",
-            planLabel: "Test plan",
-            windows: [
-              {
-                id: "session",
-                label: "Session",
-                usedPct: 42,
-                remainingPct: 58,
-                resetsAt: "2026-06-19T05:00:00.000Z",
-              },
-            ],
-          },
-        ],
-      },
-    ]);
-    const session = await openMockAgent(page);
-    try {
-      expect(usageFixture.requestCount()).toBe(0);
-
-      await page.getByTestId("context-window-meter").hover();
-      await usageFixture.waitForRequestCount(1);
-
-      await expect(page.getByText("Mock provider", { exact: true })).toBeVisible({
-        timeout: 10_000,
-      });
-      await expect(page.getByText("Test plan")).toBeVisible();
-      await expect(page.getByText("Session", { exact: true })).toBeVisible();
-      await expect(page.getByText("42%")).toBeVisible();
-    } finally {
-      await session.cleanup();
-    }
-  });
-
-  test("refreshes usage again each time the tooltip is shown", async ({ page }) => {
-    test.setTimeout(180_000);
-    const usageFixture = await installProviderUsageFixture(page, [
-      {
-        fetchedAt: "2026-06-19T00:00:00.000Z",
-        providers: [
-          {
-            providerId: "mock",
-            displayName: "Mock provider",
-            status: "available",
-            planLabel: "Test plan",
-            windows: [{ id: "session", label: "Session", usedPct: 41 }],
-          },
-        ],
-      },
-      {
-        fetchedAt: "2026-06-19T00:01:00.000Z",
-        providers: [
-          {
-            providerId: "mock",
-            displayName: "Mock provider",
-            status: "available",
-            planLabel: "Test plan",
-            windows: [{ id: "session", label: "Session", usedPct: 64 }],
-          },
-        ],
-      },
-    ]);
-    const session = await openMockAgent(page);
-    try {
-      const meter = page.getByTestId("context-window-meter");
-
-      await meter.hover();
-      await usageFixture.waitForRequestCount(1);
-      await expect(page.getByText("41%")).toBeVisible({ timeout: 10_000 });
-
-      await page.mouse.move(0, 0);
-      await expect(page.getByText("Mock provider", { exact: true })).toHaveCount(0);
-
-      await meter.hover();
-      await usageFixture.waitForRequestCount(2);
-      expect(usageFixture.requestCount()).toBe(2);
-      await expect(page.getByText("64%")).toBeVisible();
-    } finally {
-      await session.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/question-prompt-pagination.spec.ts
+++ b/packages/app/e2e/question-prompt-pagination.spec.ts
@@ -1,127 +0,0 @@
-import { test } from "./fixtures";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-import {
-  chooseQuestionOption,
-  continueToNextQuestion,
-  expectCurrentQuestion,
-  expectQuestionDismissEnabled,
-  expectQuestionHidden,
-  expectQuestionNavigationEnabled,
-  expectQuestionOptionSelected,
-  expectQuestionPrimaryActionDisabled,
-  expectQuestionPrimaryActionEnabled,
-  fillQuestionAnswer,
-  openQuestion,
-  submitQuestionAnswers,
-  waitForQuestionPrompt,
-} from "./helpers/questions";
-
-const TOTAL_QUESTIONS = 3;
-const SURFACE_QUESTION = "Which surface should this apply to?";
-const ROLLOUT_QUESTION = "Which rollout should we use?";
-const SUCCESS_QUESTION = "What success criteria should we use?";
-const REPO_URL_QUESTION = "What is the GitHub private repo URL to push to?";
-const COMMIT_MESSAGE_QUESTION = "What should the first commit message be?";
-
-test.describe("Question prompt pagination", () => {
-  test("shows one question at a time with numbered navigation", async ({ page }) => {
-    test.setTimeout(180_000);
-
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "question-pagination-",
-      title: "Question pagination e2e",
-      initialPrompt: "Emit synthetic questions.",
-    });
-
-    try {
-      await openAgentRoute(page, session);
-      await waitForQuestionPrompt(page, 120_000);
-
-      await expectCurrentQuestion(page, {
-        index: 1,
-        total: TOTAL_QUESTIONS,
-        question: SURFACE_QUESTION,
-      });
-      await expectQuestionHidden(page, ROLLOUT_QUESTION);
-      await expectQuestionHidden(page, SUCCESS_QUESTION);
-
-      await chooseQuestionOption(page, "App");
-      await expectCurrentQuestion(page, {
-        index: 2,
-        total: TOTAL_QUESTIONS,
-        question: ROLLOUT_QUESTION,
-      });
-
-      await openQuestion(page, { index: 1, total: TOTAL_QUESTIONS });
-      await expectCurrentQuestion(page, {
-        index: 1,
-        total: TOTAL_QUESTIONS,
-        question: SURFACE_QUESTION,
-      });
-      await expectQuestionOptionSelected(page, "App");
-
-      await openQuestion(page, { index: 2, total: TOTAL_QUESTIONS });
-      await chooseQuestionOption(page, "Behind feature flag");
-      await expectCurrentQuestion(page, {
-        index: 3,
-        total: TOTAL_QUESTIONS,
-        question: SUCCESS_QUESTION,
-      });
-
-      await fillQuestionAnswer(page, {
-        question: SUCCESS_QUESTION,
-        answer: "Only one prompt is visible at a time.",
-      });
-      await submitQuestionAnswers(page);
-    } finally {
-      await session.cleanup();
-    }
-  });
-
-  test("free-write questions use Next before final Submit", async ({ page }) => {
-    test.setTimeout(180_000);
-
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "question-free-write-",
-      title: "Question free-write e2e",
-      initialPrompt: "Emit synthetic questions: two free-write questions.",
-    });
-
-    try {
-      await openAgentRoute(page, session);
-      await waitForQuestionPrompt(page, 120_000);
-
-      await expectCurrentQuestion(page, {
-        index: 1,
-        total: 2,
-        question: REPO_URL_QUESTION,
-      });
-
-      await fillQuestionAnswer(page, {
-        question: REPO_URL_QUESTION,
-        answer: "git@github.com:user/private-repo.git",
-      });
-
-      await expectQuestionPrimaryActionEnabled(page, "Next");
-      await expectQuestionDismissEnabled(page);
-      await expectQuestionNavigationEnabled(page, { index: 2, total: 2 });
-
-      await continueToNextQuestion(page);
-      await expectCurrentQuestion(page, {
-        index: 2,
-        total: 2,
-        question: COMMIT_MESSAGE_QUESTION,
-      });
-      await expectQuestionPrimaryActionDisabled(page, "Submit");
-
-      await fillQuestionAnswer(page, {
-        question: COMMIT_MESSAGE_QUESTION,
-        answer: "Initialize private repo",
-      });
-      await expectQuestionPrimaryActionEnabled(page, "Submit");
-      await submitQuestionAnswers(page);
-    } finally {
-      await session.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/rewind-menu.ui-contract.spec.ts
+++ b/packages/app/e2e/rewind-menu.ui-contract.spec.ts
@@ -1,4 +1,3 @@
-import type { Locator } from "@playwright/test";
 import { expect, test, type Page } from "./fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
 import {
@@ -15,14 +14,6 @@ async function expectUserMessageCount(page: Page, expected: number): Promise<voi
  await expect(page.getByTestId("user-message")).toHaveCount(expected);
 }

-function userMessage(page: Page, text: string): Locator {
-  return page.getByTestId("user-message").filter({ hasText: text });
-}
-
-async function expectUserMessageVisible(page: Page, text: string): Promise<void> {
-  await expect(userMessage(page, text)).toBeVisible();
-}
-
 test.describe("Rewind sheet", () => {
  test("rewinds from a user message sheet option", async ({ page }) => {
    const firstPrompt = "emit 1 coalesced agent stream updates for first rewind turn.";
@@ -38,14 +29,14 @@ test.describe("Rewind sheet", () => {
      await openAgentRoute(page, session);
      await expectComposerVisible(page);

-      await expectUserMessageVisible(page, firstPrompt);
+      await expect(page.getByText(firstPrompt, { exact: true })).toBeVisible();
      await expectUserMessageCount(page, 1);
      await submitMessage(page, secondPrompt);
-      await expectUserMessageVisible(page, secondPrompt);
+      await expect(page.getByText(secondPrompt, { exact: true })).toBeVisible();
      await expect(page.getByText("Cycle 1", { exact: true })).toBeVisible();
      await expectUserMessageCount(page, 2);

-      await userMessage(page, firstPrompt).hover();
+      await page.getByText(firstPrompt, { exact: true }).hover();
      await page.getByTestId("rewind-menu-trigger").first().click();
      const rewindSheet = page.getByTestId("rewind-menu-content");
      await expect(rewindSheet).toBeVisible();
@@ -55,20 +46,20 @@ test.describe("Rewind sheet", () => {
      await page.getByTestId("rewind-menu-conversation").click();

      await expect(page.getByTestId("rewind-menu-content")).toHaveCount(0);
-      await expect(userMessage(page, secondPrompt)).toHaveCount(0);
+      await expect(page.getByText(secondPrompt, { exact: true })).toHaveCount(0);
      await expect(page.getByText("Cycle 1", { exact: true })).toHaveCount(0);
      await expectUserMessageCount(page, 1);
      await expectComposerDraft(page, firstPrompt);

      await submitMessage(page, replacementPrompt);
-      await expectUserMessageVisible(page, replacementPrompt);
-      await expect(userMessage(page, secondPrompt)).toHaveCount(0);
+      await expect(page.getByText(replacementPrompt, { exact: true })).toBeVisible();
+      await expect(page.getByText(secondPrompt, { exact: true })).toHaveCount(0);
      await expect(page.getByText("Cycle 1", { exact: true })).toHaveCount(0);
      await expectUserMessageCount(page, 2);

      await fillComposerDraft(page, "");
      await composerLocator(page).evaluate((element) => element.blur());
-      await userMessage(page, replacementPrompt).hover();
+      await page.getByText(replacementPrompt, { exact: true }).hover();
      await page.getByTestId("rewind-menu-trigger").last().click();
      await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
      await page.getByTestId("rewind-menu-files").click();
@@ -79,7 +70,7 @@ test.describe("Rewind sheet", () => {
      const preservedDraft = "Keep this human draft after rewind.";
      await fillComposerDraft(page, preservedDraft);
      await composerLocator(page).evaluate((element) => element.blur());
-      await userMessage(page, replacementPrompt).hover();
+      await page.getByText(replacementPrompt, { exact: true }).hover();
      await page.getByTestId("rewind-menu-trigger").last().click();
      await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
      await page.getByTestId("rewind-menu-files").click();
@@ -89,7 +80,7 @@ test.describe("Rewind sheet", () => {

      await fillComposerDraft(page, "");
      await composerLocator(page).evaluate((element) => element.blur());
-      await userMessage(page, replacementPrompt).hover();
+      await page.getByText(replacementPrompt, { exact: true }).hover();
      await page.getByTestId("rewind-menu-trigger").last().click();
      await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
      await page.getByTestId("rewind-menu-both").click();
@@ -117,9 +108,9 @@ test.describe("Rewind sheet", () => {
      await openAgentRoute(page, session);
      await expectComposerVisible(page);

-      await expectUserMessageVisible(page, firstPrompt);
+      await expect(page.getByText(firstPrompt, { exact: true })).toBeVisible();

-      await userMessage(page, firstPrompt).hover();
+      await page.getByText(firstPrompt, { exact: true }).hover();
      await page.getByTestId("rewind-menu-trigger").first().click();
      const rewindSheet = page.getByTestId("rewind-menu-content");
      await expect(rewindSheet).toBeVisible();
@@ -131,7 +122,7 @@ test.describe("Rewind sheet", () => {
      await expect(page.getByTestId("app-toast-message")).toHaveText(rewindError);
      await expect(page.getByText("Uncaught Error")).toHaveCount(0);

-      await userMessage(page, firstPrompt).hover();
+      await page.getByText(firstPrompt, { exact: true }).hover();
      await page.getByTestId("rewind-menu-trigger").first().click();
      await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
    } finally {
--- a/packages/app/e2e/same-directory-workspaces.spec.ts
+++ b/packages/app/e2e/same-directory-workspaces.spec.ts
@@ -1,120 +0,0 @@
-import { writeFile } from "node:fs/promises";
-import path from "node:path";
-import { test, expect, type Page } from "./fixtures";
-import { gotoWorkspace, clickNewTerminal } from "./helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { expectExplorerEntryVisible } from "./helpers/file-explorer";
-import { expectNoTerminalTabs, clickFirstTerminalTab } from "./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.
-//   - 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,
-): Promise<string> {
-  const created = await seeded.client.createWorkspace({
-    source: { kind: "directory", path: seeded.repoPath, projectId: seeded.projectId },
-    title,
-  });
-  if (!created.workspace) {
-    throw new Error(created.error ?? `Failed to create second workspace for ${seeded.projectId}`);
-  }
-  // Both workspaces back the same on-disk checkout.
-  return created.workspace.id;
-}
-
-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 ({
-    page,
-  }) => {
-    const seeded = await seedWorkspace({ repoPrefix: "same-dir-shared-" });
-
-    try {
-      const secondWorkspaceId = await createSecondWorkspaceOnSameDir(seeded, "Second view");
-
-      // Seed an uncommitted change directly in the shared checkout. Because the
-      // file browser and git diff read the directory, both workspaces must see
-      // it — neither owns the directory state.
-      await writeFile(
-        path.join(seeded.workspaceDirectory, "SHARED_CHANGE.md"),
-        "# shared change\n",
-      );
-
-      // Make the write authoritative on the daemon before the UI reads it. The
-      // git status/diff is otherwise refreshed by a debounced filesystem watcher,
-      // and a loaded CI host can lag that debounce past the assertion window —
-      // the source of this spec's flakiness. Forcing a refresh (the same path as
-      // the UI's manual refresh) recomputes the snapshot and diff now, so the
-      // first subscribe on mount already includes SHARED_CHANGE.md.
-      const refreshed = await seeded.client.checkoutRefresh(seeded.repoPath);
-      if (!refreshed.success) {
-        throw new Error(`Failed to refresh checkout: ${JSON.stringify(refreshed.error)}`);
-      }
-
-      // 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 expectExplorerEntryVisible(page, "SHARED_CHANGE.md");
-      await openExplorerTab(page, "changes");
-      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.
-      await gotoWorkspace(page, secondWorkspaceId);
-      await openExplorerTab(page, "files");
-      await expectExplorerEntryVisible(page, "SHARED_CHANGE.md");
-      await openExplorerTab(page, "changes");
-      await expect(
-        page.getByTestId("git-diff-scroll").getByText("SHARED_CHANGE.md", { exact: true }).first(),
-      ).toBeVisible({ timeout: 30_000 });
-    } finally {
-      await seeded.cleanup();
-    }
-  });
-
-  test("workspace state is independent: a terminal opened in A does not appear in B", async ({
-    page,
-  }) => {
-    const seeded = await seedWorkspace({ repoPrefix: "same-dir-independent-" });
-
-    try {
-      const secondWorkspaceId = await createSecondWorkspaceOnSameDir(seeded, "Independent view");
-
-      // Open workspace A and materialize a terminal tab.
-      await gotoWorkspace(page, seeded.workspaceId);
-      await clickNewTerminal(page);
-      await clickFirstTerminalTab(page);
-
-      // Workspace B shares the directory but owns its own tabs: it has no
-      // terminal tab, because the terminal belongs to A.
-      await gotoWorkspace(page, secondWorkspaceId);
-      await expectNoTerminalTabs(page);
-
-      // Back in A, the terminal is still there — B never absorbed it.
-      await gotoWorkspace(page, seeded.workspaceId);
-      await clickFirstTerminalTab(page);
-    } finally {
-      await seeded.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/settings-host-page.spec.ts
+++ b/packages/app/e2e/settings-host-page.spec.ts
@@ -6,14 +6,12 @@ import { getServerId } from "./helpers/server-id";
 import {
  expectSettingsHeader,
  openSettingsHost,
-  openHostSection,
  expectHostLabelDisplayed,
  clickEditHostLabel,
  expectHostLabelEditMode,
  expectHostConnectionsCard,
  expectHostInjectMcpCard,
  expectHostActionCards,
-  expectHostProvidersCard,
  expectHostNoLocalOnlyRows,
  expectRetiredSidebarSectionsAbsent,
  expectHostPageVisible,
@@ -21,7 +19,9 @@ import {
 } from "./helpers/settings";

 test.describe("Settings host page", () => {
-  test("connections section shows the seeded connection endpoint", async ({ page }) => {
+  test("host page shows seeded label, connection endpoint, inject MCP toggle, and all action rows", async ({
+    page,
+  }) => {
    const serverId = getServerId();
    const port = getE2EDaemonPort();

@@ -29,44 +29,11 @@ test.describe("Settings host page", () => {
    await openSettings(page);
    await openSettingsHost(page, serverId);

-    await expectSettingsHeader(page, "Connections");
-    await expectHostConnectionsCard(page, port);
-  });
-
-  test("agents section shows the inject MCP toggle", async ({ page }) => {
-    const serverId = getServerId();
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-
-    await openHostSection(page, serverId, "agents");
-    await expectSettingsHeader(page, "Agents");
-    await expectHostInjectMcpCard(page);
-  });
-
-  test("providers section shows the providers card", async ({ page }) => {
-    const serverId = getServerId();
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-
-    await expectHostProvidersCard(page, serverId);
-    await expectSettingsHeader(page, "Providers");
-  });
-
-  test("host section shows the host label and restart/remove action cards", async ({ page }) => {
-    const serverId = getServerId();
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, serverId);
-
-    await openHostSection(page, serverId, "host");
-    await expectSettingsHeader(page, "Host");
+    await expectSettingsHeader(page, TEST_HOST_LABEL);
    await expectHostLabelDisplayed(page);
-    await expectHostActionCards(page, serverId);
+    await expectHostConnectionsCard(page, port);
+    await expectHostInjectMcpCard(page);
+    await expectHostActionCards(page);
  });

  test("clicking the label pencil reveals the inline editor", async ({ page }) => {
@@ -75,14 +42,13 @@ test.describe("Settings host page", () => {
    await gotoAppShell(page);
    await openSettings(page);
    await openSettingsHost(page, serverId);
-    await openHostSection(page, serverId, "host");

    await expectHostLabelDisplayed(page);
    await clickEditHostLabel(page);
    await expectHostLabelEditMode(page, TEST_HOST_LABEL);
  });

-  test("host section does not render pair-device or daemon-lifecycle rows for a remote daemon", async ({
+  test("host page does not render pair-device or daemon-lifecycle rows for a remote daemon", async ({
    page,
  }) => {
    const serverId = getServerId();
@@ -90,20 +56,19 @@ test.describe("Settings host page", () => {
    await gotoAppShell(page);
    await openSettings(page);
    await openSettingsHost(page, serverId);
-    await openHostSection(page, serverId, "host");

    // TODO: add local-daemon fixture for positive Pair/Daemon coverage.
    await expectHostNoLocalOnlyRows(page);
  });

-  test("settings sidebar exposes the flat App and Host section rows", async ({ page }) => {
+  test("settings sidebar does not expose retired top-level sections", async ({ page }) => {
    await gotoAppShell(page);
    await openSettings(page);

    await expectRetiredSidebarSectionsAbsent(page);
  });

-  test("navigating to /settings/hosts/[serverId] redirects to the connections section", async ({
+  test("navigating to /settings/hosts/[serverId] directly renders the host page", async ({
    page,
  }) => {
    const serverId = getServerId();
@@ -112,10 +77,9 @@ test.describe("Settings host page", () => {
    await page.goto(`/settings/hosts/${encodeURIComponent(serverId)}`);

    await expectHostPageVisible(page, serverId);
-    await expectSettingsHeader(page, "Connections");
-    await openHostSection(page, serverId, "host");
+    await expectSettingsHeader(page, TEST_HOST_LABEL);
    await expectHostLabelDisplayed(page);
-    await expectHostActionCards(page, serverId);
+    await expectHostActionCards(page);
  });

  test("sidebar pins the local daemon host first with a Local marker", async ({ page }) => {
--- a/packages/app/e2e/settings-i18n.spec.ts
+++ b/packages/app/e2e/settings-i18n.spec.ts
@@ -1,23 +0,0 @@
-import { test, expect } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { openSettingsSection } from "./helpers/settings";
-
-test("Settings language selector switches General labels", async ({ page }) => {
-  test.setTimeout(120_000);
-
-  await gotoAppShell(page);
-  await openSettings(page);
-  await openSettingsSection(page, "general");
-
-  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 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 expect(page.getByText("Default send", { exact: true }).first()).toBeVisible();
-});
--- a/packages/app/e2e/settings-navigation.spec.ts
+++ b/packages/app/e2e/settings-navigation.spec.ts
@@ -1,9 +1,6 @@
 import { test, expect } from "./fixtures";
-import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import { gotoAppShell, openSettings } from "./helpers/app";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
 import {
-  closeCompactSettings,
  openSettingsSection,
  expectSettingsHeader,
  openAddHostFlow,
@@ -28,22 +25,7 @@ import {
  expectDiagnosticsContent,
  expectAboutContent,
  expectGeneralContent,
-  expectAppearanceContent,
-  seedSavedSettingsHosts,
-  selectSettingsHost,
-  expectSettingsHostPickerLabel,
-  openSettingsHostSection,
-  removeCurrentHostFromSettings,
 } from "./helpers/settings";
-import { getServerId } from "./helpers/server-id";
-
-async function openWorkspace(
-  page: import("@playwright/test").Page,
-  workspace: { workspaceId: string },
-) {
-  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.workspaceId));
-  await expect(page.getByTestId("menu-button")).toBeVisible();
-}

 test.describe("Settings sidebar navigation", () => {
  test("clicking a sidebar section updates the URL and renders the section", async ({ page }) => {
@@ -61,13 +43,9 @@ test.describe("Settings sidebar navigation", () => {
    await openSettingsSection(page, "general");
    await expectSettingsHeader(page, "General");
    await expectGeneralContent(page);
-
-    await openSettingsSection(page, "appearance");
-    await expectSettingsHeader(page, "Appearance");
-    await expectAppearanceContent(page);
  });

-  test("/h/[serverId]/settings redirects to the host connections section", async ({ page }) => {
+  test("/h/[serverId]/settings redirects to /settings/hosts/[serverId]", async ({ page }) => {
    await gotoAppShell(page);
    await verifyLegacyHostSettingsRedirect(page);
  });
@@ -154,9 +132,7 @@ test.describe("Settings — compact master-detail", () => {
    await expectSettingsBackButton(page);
  });

-  test("tapping a host section row pushes /settings/hosts/[serverId]/connections", async ({
-    page,
-  }) => {
+  test("tapping a host entry pushes /settings/hosts/[serverId]", async ({ page }) => {
    await gotoAppShell(page);
    await openCompactSettings(page);

@@ -174,44 +150,4 @@ test.describe("Settings — compact master-detail", () => {
    await expect(page).toHaveURL(/\/settings$/);
    await expectSettingsSidebarVisible(page);
  });
-
-  test("switching the host picker on the settings list scopes host rows without navigating", async ({
-    page,
-  }) => {
-    const primaryServerId = getServerId();
-    const secondaryServerId = "srv_e2e_settings_secondary";
-    const secondaryHostLabel = "Stable horse";
-    const endpoint = `127.0.0.1:${getE2EDaemonPort()}`;
-
-    await seedSavedSettingsHosts(page, [
-      { serverId: primaryServerId, label: "First horse", endpoint },
-      { serverId: secondaryServerId, label: secondaryHostLabel, endpoint },
-    ]);
-    await gotoAppShell(page);
-    await openCompactSettings(page);
-
-    await selectSettingsHost(page, secondaryServerId);
-
-    await expect(page).toHaveURL(/\/settings$/);
-    await expectSettingsSidebarVisible(page);
-    await expectSettingsHostPickerLabel(page, secondaryHostLabel);
-
-    await openSettingsHostSection(page, secondaryServerId, "connections");
-  });
-
-  test("removing the last active host returns to welcome after settings closes", async ({
-    page,
-    withWorkspace,
-  }) => {
-    const workspace = await withWorkspace({ prefix: "remove-host-compact-" });
-
-    await openWorkspace(page, workspace);
-    await openCompactSettings(page);
-    await openSettingsHostSection(page, getServerId(), "host");
-    await removeCurrentHostFromSettings(page);
-    await closeCompactSettings(page);
-
-    await expect(page).toHaveURL(/\/welcome$/);
-    await expect(page.getByTestId("welcome-direct-connection")).toBeVisible();
-  });
 });
--- a/packages/app/e2e/settings-sidebar-scroll.spec.ts
+++ b/packages/app/e2e/settings-sidebar-scroll.spec.ts
@@ -1,61 +0,0 @@
-import { test, expect } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-
-test.describe("Settings sidebar scrolling", () => {
-  test.use({ viewport: { width: 900, height: 260 } });
-
-  test("desktop drag region does not cover the scroll body", async ({ page }) => {
-    await page.addInitScript(() => {
-      window.paseoDesktop = {
-        platform: "darwin",
-        events: { on: () => () => {} },
-        invoke: async (command: string) => {
-          if (command === "get_desktop_settings") {
-            return {
-              releaseChannel: "stable",
-              daemon: { manageBuiltInDaemon: true, keepRunningAfterQuit: true },
-            };
-          }
-          return null;
-        },
-      };
-    });
-
-    await gotoAppShell(page);
-    await openSettings(page);
-
-    const sidebar = page.getByTestId("settings-sidebar");
-    await expect(sidebar).toBeVisible();
-
-    const geometry = await sidebar.evaluate((node) => {
-      let scroller: HTMLElement | null = null;
-      for (const element of node.querySelectorAll<HTMLElement>("*")) {
-        if (element.scrollHeight > element.clientHeight) {
-          scroller = element;
-          break;
-        }
-      }
-      if (!scroller) return null;
-
-      const scrollerRect = scroller.getBoundingClientRect();
-      const dragRegions = [];
-      for (const element of node.querySelectorAll<HTMLElement>("*")) {
-        if (getComputedStyle(element).getPropertyValue("-webkit-app-region") === "drag") {
-          const rect = element.getBoundingClientRect();
-          dragRegions.push({ bottom: rect.bottom });
-        }
-      }
-
-      return {
-        scrollBodyTop: scrollerRect.top,
-        dragRegions,
-      };
-    });
-
-    expect(geometry).not.toBeNull();
-    expect(geometry!.dragRegions).not.toEqual([]);
-    for (const dragRegion of geometry!.dragRegions) {
-      expect(dragRegion.bottom).toBeLessThanOrEqual(geometry!.scrollBodyTop + 1);
-    }
-  });
-});
--- a/packages/app/e2e/settings-toggle-tab-regression.spec.ts
+++ b/packages/app/e2e/settings-toggle-tab-regression.spec.ts
@@ -54,12 +54,10 @@ test.describe("Settings toggle tab regression", () => {
    try {
      const firstAgent = await createIdleAgent(workspace.client, {
        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
        title: `settings-toggle-a-${Date.now()}`,
      });
      const secondAgent = await createIdleAgent(workspace.client, {
        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
        title: `settings-toggle-b-${Date.now()}`,
      });

@@ -76,7 +74,7 @@ test.describe("Settings toggle tab regression", () => {
      await expectSendBehavior(page, "interrupt");

      await pressSettingsToggleShortcut(page);
-      await expect(page).toHaveURL(buildHostWorkspaceRoute(serverId, workspace.workspaceId));
+      await expect(page).toHaveURL(buildHostWorkspaceRoute(serverId, workspace.repoPath));
      await waitForTabBar(page);
      await expectAgentTabActive(page, secondAgent.id);

@@ -97,25 +95,23 @@ test.describe("Settings toggle tab regression", () => {
    try {
      const firstAgent = await createIdleAgent(workspace.client, {
        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
        title: `agent-route-refresh-a-${Date.now()}`,
      });
      const secondAgent = await createIdleAgent(workspace.client, {
        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
        title: `agent-route-refresh-b-${Date.now()}`,
      });

      await openAgentRouteAndExpectFocused({
        page,
        serverId,
-        workspaceId: workspace.workspaceId,
+        workspaceId: workspace.repoPath,
        agentId: firstAgent.id,
      });
      await openAgentRouteAndExpectFocused({
        page,
        serverId,
-        workspaceId: workspace.workspaceId,
+        workspaceId: workspace.repoPath,
        agentId: secondAgent.id,
      });

--- a/packages/app/e2e/sidebar-model-b.spec.ts
+++ b/packages/app/e2e/sidebar-model-b.spec.ts
@@ -1,172 +0,0 @@
-import { test, expect, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { gotoWorkspace, clickNewTerminal } from "./helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
-
-// Model B sidebar shape: every project — git or non-git, single- or
-// multi-workspace — renders as the same expandable parent, the deepest sidebar
-// level is the workspace row, and tabs/agents/terminals NEVER appear in the
-// sidebar. These specs prove all three invariants end to end.
-
-function workspaceRow(page: Page, workspaceId: string) {
-  return page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspaceId}`);
-}
-
-function projectRow(page: Page, projectKey: string) {
-  return page.getByTestId(`sidebar-project-row-${projectKey}`);
-}
-
-function projectNewWorktreeIcon(page: Page, projectKey: string) {
-  return page.getByTestId(`sidebar-project-new-worktree-${projectKey}`);
-}
-
-async function seedSecondWorkspace(seeded: SeededWorkspace, title: string): Promise<string> {
-  const created = await seeded.client.createWorkspace({
-    source: { kind: "directory", path: seeded.repoPath, projectId: seeded.projectId },
-    title,
-  });
-  if (!created.workspace) {
-    throw new Error(created.error ?? `Failed to create second workspace for ${seeded.projectId}`);
-  }
-  return created.workspace.id;
-}
-
-test.describe("Model B sidebar shape", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  test("git and non-git projects both render as expandable parents; git keeps a per-row new-worktree icon, the global button covers both", async ({
-    page,
-  }) => {
-    const gitProject = await seedWorkspace({ repoPrefix: "model-b-git-" });
-    const nonGitProject = await seedWorkspace({ repoPrefix: "model-b-nongit-", git: false });
-
-    try {
-      const gitSecondId = await seedSecondWorkspace(gitProject, "Git second");
-      const nonGitSecondId = await seedSecondWorkspace(nonGitProject, "Non-git second");
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-
-      // Both projects are expandable parents — the non-git one is NOT flattened
-      // into a bare workspace link.
-      await expect(projectRow(page, gitProject.projectId)).toBeVisible({ timeout: 30_000 });
-      await expect(projectRow(page, nonGitProject.projectId)).toBeVisible({ timeout: 30_000 });
-
-      // Each parent shows both of its workspace rows underneath.
-      await expect(workspaceRow(page, gitProject.workspaceId)).toBeVisible({ timeout: 30_000 });
-      await expect(workspaceRow(page, gitSecondId)).toBeVisible({ timeout: 30_000 });
-      await expect(workspaceRow(page, nonGitProject.workspaceId)).toBeVisible({ timeout: 30_000 });
-      await expect(workspaceRow(page, nonGitSecondId)).toBeVisible({ timeout: 30_000 });
-
-      // The per-project "+ New workspace" row is gone. The git project keeps a
-      // per-row new-worktree icon (revealed on hover); the non-git project has
-      // none, since worktree creation needs a git checkout.
-      await projectRow(page, gitProject.projectId).hover();
-      await expect(projectNewWorktreeIcon(page, gitProject.projectId)).toBeVisible({
-        timeout: 30_000,
-      });
-      await expect(projectNewWorktreeIcon(page, nonGitProject.projectId)).toHaveCount(0);
-
-      // The global new-workspace button is the universal entry — present for both
-      // kinds regardless of their per-row affordance.
-      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible({
-        timeout: 30_000,
-      });
-    } finally {
-      await gitProject.cleanup();
-      await nonGitProject.cleanup();
-    }
-  });
-
-  test("no tab, agent, or terminal ever renders as a sidebar row", async ({ page }) => {
-    const mock = await seedMockAgentWorkspace({
-      repoPrefix: "model-b-leaf-",
-      title: "Leaf workspace",
-    });
-
-    try {
-      // Open the workspace and materialize both an agent tab and a terminal tab.
-      await gotoWorkspace(page, mock.workspaceId);
-      const agentTabs = await getVisibleWorkspaceAgentTabIds(page);
-      expect(agentTabs).toContain(`workspace-tab-agent_${mock.agentId}`);
-
-      await clickNewTerminal(page);
-      await expect(
-        page.locator('[data-testid^="workspace-tab-terminal_"]').filter({ visible: true }).first(),
-      ).toBeVisible({ timeout: 30_000 });
-
-      // The deepest level inside the sidebar is the workspace row: no tab,
-      // agent, or terminal element appears as a sidebar descendant.
-      const sidebar = page.getByTestId("sidebar-sessions").filter({ visible: true }).first();
-      await expect(workspaceRow(page, mock.workspaceId).first()).toBeVisible({ timeout: 30_000 });
-      await expect(sidebar.locator('[data-testid^="workspace-tab-"]')).toHaveCount(0);
-      await expect(sidebar.locator('[data-testid^="sidebar-agent-row-"]')).toHaveCount(0);
-      await expect(sidebar.locator('[data-testid^="sidebar-terminal-row-"]')).toHaveCount(0);
-    } finally {
-      await mock.cleanup();
-    }
-  });
-
-  test("status grouping shows only workspace rows and moves a single row when its status changes", async ({
-    page,
-  }) => {
-    const idleProject = await seedWorkspace({ repoPrefix: "model-b-status-idle-" });
-    const activeMock = await seedMockAgentWorkspace({
-      repoPrefix: "model-b-status-active-",
-      title: "Working workspace",
-      initialPrompt: "stay busy",
-    });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await expect(workspaceRow(page, idleProject.workspaceId)).toBeVisible({ timeout: 30_000 });
-
-      // Switch to status grouping.
-      await page.getByTestId("sidebar-display-preferences-menu").click();
-      await page.getByTestId("sidebar-grouping-status").click();
-
-      const sidebar = page.getByTestId("sidebar-sessions").filter({ visible: true }).first();
-
-      // The idle workspace lands in the Done bucket; the busy mock-agent workspace
-      // lands in the Working bucket. Each workspace is bucketed independently.
-      await expect(page.getByTestId("sidebar-status-group-done")).toBeVisible({ timeout: 30_000 });
-      await expect(page.getByTestId("sidebar-status-group-running")).toBeVisible({
-        timeout: 60_000,
-      });
-      await expect(workspaceRow(page, idleProject.workspaceId).first()).toBeVisible({
-        timeout: 30_000,
-      });
-      await expect(workspaceRow(page, activeMock.workspaceId).first()).toBeVisible({
-        timeout: 60_000,
-      });
-
-      // Only workspace rows are shown — no tab/agent/terminal leaves leak into
-      // the status view.
-      await expect(sidebar.locator('[data-testid^="workspace-tab-"]')).toHaveCount(0);
-
-      // The busy workspace is grouped under Working, the idle one under Done:
-      // changing one workspace's status moved only that row.
-      const workingRows = page.getByTestId("sidebar-status-group-rows-running");
-      const doneRows = page.getByTestId("sidebar-status-group-rows-done");
-      await expect(
-        workingRows.getByTestId(`sidebar-workspace-row-${getServerId()}:${activeMock.workspaceId}`),
-      ).toBeVisible({ timeout: 60_000 });
-      await expect(
-        doneRows.getByTestId(`sidebar-workspace-row-${getServerId()}:${idleProject.workspaceId}`),
-      ).toBeVisible({ timeout: 30_000 });
-      // The busy workspace is NOT also sitting in the Done bucket — only its own
-      // row moved.
-      await expect(
-        doneRows.getByTestId(`sidebar-workspace-row-${getServerId()}:${activeMock.workspaceId}`),
-      ).toHaveCount(0);
-    } finally {
-      await idleProject.cleanup();
-      await activeMock.cleanup();
-    }
-  });
-});
--- a/packages/app/e2e/sidebar-workspace-rename.spec.ts
+++ b/packages/app/e2e/sidebar-workspace-rename.spec.ts
@@ -1,6 +1,8 @@
+import { execSync } from "node:child_process";
 import { test, expect, type Page } from "./fixtures";
 import { gotoAppShell } from "./helpers/app";
 import { seedWorkspace } from "./helpers/seed-client";
+import { captureWsSessionFrames } from "./helpers/rename";
 import { getServerId } from "./helpers/server-id";

 function workspaceRowTestId(workspaceId: string): string {
@@ -30,16 +32,24 @@ async function openRenameModal(page: Page, workspaceId: string) {
  return input;
 }

-// In Model B the workspace title is its identity: renaming sets a custom title
-// layered over the derived branch/directory name, and reconciliation never
-// touches it. The sidebar row shows the title verbatim — no branch mutation.
 test.describe("Sidebar workspace rename", () => {
-  test("renaming via kebab sets a custom title that survives reload", async ({ page }) => {
+  test("renaming via kebab updates the branch name on disk and in the sidebar", async ({
+    page,
+  }) => {
    const workspace = await seedWorkspace({ repoPrefix: "sidebar-rename-" });

    try {
      expect(workspace.workspaceName).toBe("main");

+      const renameRequests = captureWsSessionFrames(
+        page,
+        "checkout.rename_branch.request",
+        (inner) => ({
+          branch: String(inner.branch ?? ""),
+          cwd: String(inner.cwd ?? ""),
+        }),
+      );
+
      await gotoAppShell(page);
      await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toBeVisible({
        timeout: 30_000,
@@ -47,26 +57,56 @@ test.describe("Sidebar workspace rename", () => {

      const input = await openRenameModal(page, workspace.workspaceId);
      await expect(input).toHaveValue("main");
+      await input.fill("Feature Rename 2");

-      const customTitle = "Payments Refactor";
-      await input.fill(customTitle);
      await page.getByTestId(workspaceRenameModalTestId(workspace.workspaceId, "submit")).click();

      await expect(input).toHaveCount(0, { timeout: 15_000 });
-      // The title is shown exactly as typed — not slugified into a branch name.
      await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toContainText(
-        customTitle,
+        "feature-rename-2",
        { timeout: 15_000 },
      );

-      // The custom title is backing metadata on the workspace: a full reload
-      // re-resolves the descriptor from persistence and must not lose it. This
-      // exercises the same descriptor resolution reconciliation re-runs against,
-      // so a reconcile pass cannot overwrite the user's title either.
-      await page.reload();
+      expect(renameRequests.length).toBeGreaterThan(0);
+      expect(renameRequests.at(-1)).toEqual({
+        branch: "feature-rename-2",
+        cwd: workspace.workspaceDirectory,
+      });
+
+      const currentBranchOnDisk = execSync("git branch --show-current", {
+        cwd: workspace.repoPath,
+        stdio: "pipe",
+      })
+        .toString()
+        .trim();
+      expect(currentBranchOnDisk).toBe("feature-rename-2");
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("rename surfaces server errors inline and keeps the modal open", async ({ page }) => {
+    const workspace = await seedWorkspace({
+      repoPrefix: "sidebar-rename-error-",
+      repo: { branches: ["taken"] },
+    });
+
+    try {
+      await gotoAppShell(page);
+      const input = await openRenameModal(page, workspace.workspaceId);
+      await expect(input).toHaveValue("main");
+
+      await input.fill("taken");
+      await page.getByTestId(workspaceRenameModalTestId(workspace.workspaceId, "submit")).click();
+
+      const errorNode = page.getByTestId(
+        workspaceRenameModalTestId(workspace.workspaceId, "error"),
+      );
+      await expect(errorNode).toBeVisible({ timeout: 15_000 });
+      await expect(errorNode).toContainText(/already exists|branch/i);
+      await expect(input).toBeVisible();
      await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toContainText(
-        customTitle,
-        { timeout: 30_000 },
+        "main",
      );
    } finally {
      await workspace.cleanup();
--- a/packages/app/e2e/startup-loading.spec.ts
+++ b/packages/app/e2e/startup-loading.spec.ts
@@ -4,7 +4,7 @@ import { getServerId } from "./helpers/server-id";
 import { startupScenario } from "./helpers/startup-dsl";

 test.describe("Startup loading presentation", () => {
-  test("mobile reconnect preserves the saved host shell", async ({ page }) => {
+  test("mobile reconnect keeps connection recovery actions visible", async ({ page }) => {
    const startup = await startupScenario(page)
      .withMobileViewport()
      .withSavedHost({
@@ -14,8 +14,8 @@ test.describe("Startup loading presentation", () => {
      })
      .openRoot();

-    await startup.expectsSavedHostShell({ label: "Dev" });
-    await startup.expectsNoSavedHostErrorStatus();
+    await startup.expectsReconnectWelcome();
+    await startup.expectsNoSavedHostStatus({ label: "Dev" });
    await startup.expectsNoLocalServerStartupCopy();
  });

--- a/packages/app/e2e/subagent-detach.spec.ts
+++ b/packages/app/e2e/subagent-detach.spec.ts
@@ -1,44 +0,0 @@
-import { test } from "./fixtures";
-import { expectWorkspaceTabVisible } from "./helpers/archive-tab";
-import { expectAgentTabActive } from "./helpers/launcher";
-import { openAgentRoute } from "./helpers/mock-agent";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import {
-  detachSubagentFromTrack,
-  expectSubagentRowGone,
-  expectSubagentRowVisible,
-  openSubagentsTrack,
-  seedParentWithSubagent,
-} from "./helpers/subagents";
-
-test.describe("Subagent detach", () => {
-  let workspace: SeededWorkspace;
-
-  test.beforeAll(async () => {
-    workspace = await seedWorkspace({ repoPrefix: "subagent-detach-" });
-  });
-
-  test.afterAll(async () => {
-    await workspace?.cleanup();
-  });
-
-  test("detaching a subagent focuses it as a workspace tab", async ({ page }) => {
-    const agents = await seedParentWithSubagent(workspace, {
-      parentTitle: "Detach parent",
-      childTitle: "Detached child",
-    });
-
-    await openAgentRoute(page, {
-      workspaceId: agents.workspaceId,
-      agentId: agents.parent.id,
-    });
-    await openSubagentsTrack(page);
-    await expectSubagentRowVisible(page, agents.child.id);
-
-    await detachSubagentFromTrack(page, agents.child.id);
-
-    await expectSubagentRowGone(page, agents.child.id);
-    await expectWorkspaceTabVisible(page, agents.child.id);
-    await expectAgentTabActive(page, agents.child.id);
-  });
-});
--- a/packages/app/e2e/terminal-activity-indicators.spec.ts
+++ b/packages/app/e2e/terminal-activity-indicators.spec.ts
@@ -1,181 +0,0 @@
-import { mkdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { test, expect, type Page } from "./fixtures";
-import { TerminalE2EHarness, type TerminalInstance } from "./helpers/terminal-dsl";
-
-type HookActivityState = "running" | "idle" | "needs-input";
-type TabStatusBucket = "running" | "needs_input" | "attention" | "none";
-
-const TERMINAL_ACTIVITY_REPORTER_SCRIPT = `
-const fs = require("node:fs");
-const path = require("node:path");
-
-const triggerDir = process.argv[1];
-const states = ["running", "idle", "needs-input"];
-
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-async function waitForTrigger(state) {
-  const triggerPath = path.join(triggerDir, state);
-  while (!fs.existsSync(triggerPath)) {
-    await sleep(50);
-  }
-}
-
-async function reportActivity(state) {
-  const response = await fetch(process.env.PASEO_TERMINAL_ACTIVITY_URL, {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify({
-      terminalId: process.env.PASEO_TERMINAL_ID,
-      token: process.env.PASEO_ACTIVITY_TOKEN,
-      state,
-    }),
-  });
-  if (!response.ok) {
-    throw new Error("Activity report failed: " + response.status);
-  }
-  process.stdout.write("PASEO_ACTIVITY_REPORTED:" + state + "\\n");
-}
-
-(async () => {
-  for (const state of states) {
-    await waitForTrigger(state);
-    await reportActivity(state);
-  }
-  setInterval(() => {}, 1000);
-})().catch((error) => {
-  console.error(error && error.stack ? error.stack : error);
-  setInterval(() => {}, 1000);
-});
-`;
-
-function internalActivityState(state: HookActivityState): "working" | "idle" {
-  if (state === "running") return "working";
-  return "idle";
-}
-
-function tabStatusBucket(state: HookActivityState): TabStatusBucket {
-  if (state === "running") return "running";
-  if (state === "needs-input") return "needs_input";
-  return "attention";
-}
-
-function expectedAttentionReason(state: HookActivityState): "finished" | "needs_input" | null {
-  if (state === "idle") return "finished";
-  if (state === "needs-input") return "needs_input";
-  return null;
-}
-
-function terminalTab(page: Page, terminalId: string) {
-  return page.getByTestId(`workspace-tab-terminal_${terminalId}`).first();
-}
-
-async function expectTerminalTabStatus(
-  page: Page,
-  terminalId: string,
-  status: TabStatusBucket,
-): Promise<void> {
-  await expect(
-    terminalTab(page, terminalId).locator(`[data-status-bucket="${status}"]`),
-  ).toBeVisible({
-    timeout: 15_000,
-  });
-}
-
-async function focusTerminalTab(page: Page, terminalId: string): Promise<void> {
-  await terminalTab(page, terminalId).click();
-}
-
-class ControlledActivityTerminal {
-  constructor(
-    readonly terminal: TerminalInstance,
-    private readonly harness: TerminalE2EHarness,
-    private readonly triggerDir: string,
-  ) {}
-
-  async report(state: HookActivityState): Promise<void> {
-    await writeFile(join(this.triggerDir, state), "");
-    await this.harness.waitForTerminalActivity({
-      terminalId: this.terminal.id,
-      state: internalActivityState(state),
-      attentionReason: expectedAttentionReason(state),
-      timeoutMs: 15_000,
-    });
-  }
-}
-
-async function createControlledActivityTerminal(
-  harness: TerminalE2EHarness,
-): Promise<ControlledActivityTerminal> {
-  const triggerDir = join(harness.tempRepo.path, ".activity-triggers");
-  await mkdir(triggerDir, { recursive: true });
-  const terminal = await harness.createTerminal({
-    name: "activity-source",
-    command: process.execPath,
-    args: ["-e", TERMINAL_ACTIVITY_REPORTER_SCRIPT, triggerDir],
-  });
-  return new ControlledActivityTerminal(terminal, harness, triggerDir);
-}
-
-async function withTerminalActivityFixture(
-  harness: TerminalE2EHarness,
-  fn: (input: {
-    activityTerminal: ControlledActivityTerminal;
-    focusTerminal: TerminalInstance;
-  }) => Promise<void>,
-): Promise<void> {
-  const activityTerminal = await createControlledActivityTerminal(harness);
-  const focusTerminal = await harness.createTerminal({ name: "focus-sink" });
-  try {
-    await fn({ activityTerminal, focusTerminal });
-  } finally {
-    await harness.killTerminal(activityTerminal.terminal.id);
-    await harness.killTerminal(focusTerminal.id);
-  }
-}
-
-test.describe("Terminal activity indicators", () => {
-  let harness: TerminalE2EHarness;
-
-  test.beforeAll(async () => {
-    harness = await TerminalE2EHarness.create({ tempPrefix: "terminal-activity-indicators-" });
-  });
-
-  test.afterAll(async () => {
-    await harness?.cleanup();
-  });
-
-  test("terminal activity follows the tab and clears when the terminal is focused", async ({
-    page,
-  }) => {
-    await withTerminalActivityFixture(harness, async ({ activityTerminal, focusTerminal }) => {
-      await harness.openTerminal(page, { terminalId: activityTerminal.terminal.id });
-      await harness.openTerminal(page, { terminalId: focusTerminal.id });
-
-      await activityTerminal.report("running");
-      await expectTerminalTabStatus(page, activityTerminal.terminal.id, tabStatusBucket("running"));
-
-      await activityTerminal.report("idle");
-      await expectTerminalTabStatus(page, activityTerminal.terminal.id, tabStatusBucket("idle"));
-
-      await activityTerminal.report("needs-input");
-      await expectTerminalTabStatus(
-        page,
-        activityTerminal.terminal.id,
-        tabStatusBucket("needs-input"),
-      );
-
-      await focusTerminalTab(page, activityTerminal.terminal.id);
-      await harness.waitForTerminalActivity({
-        terminalId: activityTerminal.terminal.id,
-        state: "idle",
-        attentionReason: null,
-        timeoutMs: 15_000,
-      });
-      await expectTerminalTabStatus(page, activityTerminal.terminal.id, "none");
-    });
-  });
-});
--- a/packages/app/e2e/terminal-keystroke-stress.spec.ts
+++ b/packages/app/e2e/terminal-keystroke-stress.spec.ts
@@ -139,7 +139,6 @@ async function measureAppBurstEcho(input: {
        : await input.harness.client.createAgent({
            provider: "mock",
            cwd: input.harness.tempRepo.path,
-            workspaceId: input.harness.workspaceId,
            title: "Large WebSocket payload",
            modeId: "load-test",
          });
--- a/packages/app/e2e/terminal-split-resize.spec.ts
+++ b/packages/app/e2e/terminal-split-resize.spec.ts
@@ -1,119 +0,0 @@
-import type { Page } from "@playwright/test";
-import { test, expect } from "./fixtures";
-import { TerminalE2EHarness, withTerminalInApp } from "./helpers/terminal-dsl";
-import { getTerminalBufferText, waitForTerminalContent } from "./helpers/terminal-perf";
-
-interface TerminalSize {
-  rows: number | null;
-  cols: number | null;
-}
-
-// The xterm/client view resizes immediately on split, so it is not enough to
-// prove the bug. It is the misleading symptom.
-async function readXtermSize(page: Page): Promise<TerminalSize> {
-  return page.evaluate(() => {
-    const term = (window as Window & { __paseoTerminal?: { rows?: number; cols?: number } })
-      .__paseoTerminal;
-    return {
-      rows: typeof term?.rows === "number" ? term.rows : null,
-      cols: typeof term?.cols === "number" ? term.cols : null,
-    };
-  });
-}
-
-// The PTY's own view of its size, reported by an `stty size` loop running in the
-// shell. This needs no focus or click, so it observes whether the daemon-side PTY
-// actually received the resize frame after the split.
-async function readLatestPtySize(page: Page): Promise<TerminalSize | null> {
-  const text = await getTerminalBufferText(page);
-  const matches = [...text.matchAll(/PTYSIZE (\d+) (\d+)/g)];
-  const last = matches.at(-1);
-  if (!last) {
-    return null;
-  }
-  return { rows: Number(last[1]), cols: Number(last[2]) };
-}
-
-function hasPtySizeReport(text: string): boolean {
-  return /PTYSIZE \d+ \d+/.test(text);
-}
-
-async function readXtermRows(page: Page): Promise<number | null> {
-  return (await readXtermSize(page)).rows;
-}
-
-async function ptyRowsMatchXtermRows(page: Page): Promise<boolean> {
-  const xterm = await readXtermSize(page);
-  const pty = await readLatestPtySize(page);
-  return pty?.rows === xterm.rows;
-}
-
-async function verifySplitDownResizesPty(page: Page, harness: TerminalE2EHarness): Promise<void> {
-  await page.setViewportSize({ width: 1280, height: 900 });
-
-  await withTerminalInApp(page, harness, { name: "split-resize" }, async () => {
-    await harness.setupPrompt(page);
-
-    const terminal = harness.terminalSurface(page);
-    // Continuously echo the PTY's own size. `stty size` prints "rows cols" and
-    // reads the controlling tty, so this keeps reporting the real PTY size
-    // without the test ever clicking the terminal back into focus.
-    await terminal.pressSequentially(
-      'while true; do echo "PTYSIZE $(stty size)"; sleep 0.3; done\n',
-      { delay: 0 },
-    );
-    await waitForTerminalContent(page, hasPtySizeReport, 10_000);
-
-    const beforeXterm = await readXtermSize(page);
-    const beforePty = await readLatestPtySize(page);
-    expect(beforePty, "the PTY should report its size before splitting").not.toBeNull();
-    expect(beforeXterm.rows, "xterm should report its row count before splitting").not.toBeNull();
-    expect(beforePty?.rows, "while focused, the PTY size should already match the xterm size").toBe(
-      beforeXterm.rows,
-    );
-
-    // Split the pane downward. This focuses the new empty pane, so the terminal
-    // pane is unfocused at the exact moment its container shrinks.
-    await page.getByRole("button", { name: "Split pane down" }).first().click();
-
-    // The local xterm renderer shrinks immediately on split - the part of the
-    // behaviour that already works and that makes the bug look like nothing changed.
-    await expect
-      .poll(() => readXtermRows(page), {
-        message: "xterm should shrink after splitting the pane down",
-        timeout: 8_000,
-      })
-      .toBeLessThan(beforeXterm.rows ?? Number.POSITIVE_INFINITY);
-
-    // The PTY must follow the shrunken terminal, even though focus moved to the
-    // new pane. Today it stays stuck at the pre-split size until the terminal is
-    // clicked back into focus. This poll fails without the fix.
-    await expect
-      .poll(() => ptyRowsMatchXtermRows(page), {
-        message: "the PTY rows should match the resized terminal after split-down",
-        timeout: 8_000,
-      })
-      .toBe(true);
-  });
-}
-
-test.describe("Terminal split resize", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  let harness: TerminalE2EHarness;
-
-  test.beforeAll(async () => {
-    harness = await TerminalE2EHarness.create({ tempPrefix: "terminal-split-resize-" });
-  });
-
-  test.afterAll(async () => {
-    await harness?.cleanup();
-  });
-
-  test("splitting the pane down resizes the PTY even though focus moves to the new pane", async ({
-    page,
-  }) => {
-    test.setTimeout(90_000);
-    await verifySplitDownResizesPty(page, harness);
-  });
-});
--- a/packages/app/e2e/workspace-agent-tab-rename.spec.ts
+++ b/packages/app/e2e/workspace-agent-tab-rename.spec.ts
@@ -1,14 +1,14 @@
 import { randomUUID } from "node:crypto";
 import { test, expect, type Page } from "./fixtures";
-import { seedWorkspace, type SeedDaemonClient } from "./helpers/seed-client";
+import { seedWorkspace } from "./helpers/seed-client";
 import { createIdleAgent, expectWorkspaceTabVisible } from "./helpers/archive-tab";
 import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
 import { buildHostAgentDetailRoute } from "@/utils/host-routes";
-import { renameModalInput, renameModalSubmit } from "./helpers/rename";
+import { captureWsSessionFrames, renameModalInput, renameModalSubmit } from "./helpers/rename";
 import { getServerId } from "./helpers/server-id";

-async function openAgentInWorkspace(page: Page, agent: { id: string; workspaceId: string }) {
-  await page.goto(buildHostAgentDetailRoute(getServerId(), agent.id, agent.workspaceId));
+async function openAgentInWorkspace(page: Page, agent: { id: string; cwd: string }) {
+  await page.goto(buildHostAgentDetailRoute(getServerId(), agent.id, agent.cwd));
  await page.waitForURL(
    (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
    { timeout: 60_000 },
@@ -17,13 +17,8 @@ async function openAgentInWorkspace(page: Page, agent: { id: string; workspaceId
  await expectWorkspaceTabVisible(page, agent.id);
 }

-async function fetchAgentTitle(client: SeedDaemonClient, agentId: string): Promise<string | null> {
-  const result = await client.fetchAgents({ scope: "active" });
-  return result.entries.find((entry) => entry.agent.id === agentId)?.agent.title ?? null;
-}
-
 test.describe("Workspace agent tab rename", () => {
-  test("right-click rename persists the agent title and updates the tab label", async ({
+  test("right-click rename sends update_agent_request and updates the tab label", async ({
    page,
  }) => {
    test.setTimeout(120_000);
@@ -34,10 +29,15 @@ test.describe("Workspace agent tab rename", () => {
      const initialTitle = `agent-rename-${randomUUID().slice(0, 8)}`;
      const agent = await createIdleAgent(workspace.client, {
        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
        title: initialTitle,
      });

+      const updateFrames = captureWsSessionFrames(page, "update_agent_request", (inner) => ({
+        agentId: String(inner.agentId ?? ""),
+        name: String(inner.name ?? ""),
+        requestId: String(inner.requestId ?? ""),
+      }));
+
      await openAgentInWorkspace(page, agent);

      const tab = page.getByTestId(`workspace-tab-agent_${agent.id}`).first();
@@ -62,7 +62,12 @@ test.describe("Workspace agent tab rename", () => {

      await expect(input).toHaveCount(0, { timeout: 15_000 });
      await expect(tab).toContainText(renamed, { timeout: 15_000 });
-      await expect.poll(() => fetchAgentTitle(workspace.client, agent.id)).toBe(renamed);
+
+      expect(updateFrames.length).toBeGreaterThan(0);
+      const lastFrame = updateFrames.at(-1)!;
+      expect(lastFrame.agentId).toBe(agent.id);
+      expect(lastFrame.name).toBe(renamed);
+      expect(lastFrame.requestId.length).toBeGreaterThan(0);
    } finally {
      await workspace.cleanup();
    }
--- a/packages/app/e2e/workspace-agent-title-handoff.spec.ts
+++ b/packages/app/e2e/workspace-agent-title-handoff.spec.ts
@@ -1,35 +1,135 @@
-import { test, expect } from "./fixtures";
+import { test, expect, type Page } from "./fixtures";
 import { expectComposerVisible, submitMessage } from "./helpers/composer";
-import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
 import { seedWorkspace, type SeedDaemonClient } from "./helpers/seed-client";
 import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import { captureWsSessionFrames } from "./helpers/rename";
 import { getServerId } from "./helpers/server-id";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";

-async function waitForCreatedAgentId(
-  client: SeedDaemonClient,
-  input: { cwd: string; workspaceId: string },
-): Promise<string> {
+interface WorkspaceTabProbeRecord {
+  at: number;
+  tabs: Array<{
+    testId: string;
+    text: string;
+    ariaLabel: string;
+  }>;
+}
+
+interface CapturedCreateAgentFrame {
+  initialPrompt: string | null;
+  configTitle: string | null;
+}
+
+async function installWorkspaceTabProbe(page: Page): Promise<void> {
+  await page.evaluate(() => {
+    type ProbeRecord = WorkspaceTabProbeRecord;
+    type ProbeWindow = Window & {
+      __workspaceTabTitleProbe?: { records: ProbeRecord[]; stop: () => void };
+    };
+
+    const win = window as ProbeWindow;
+    win.__workspaceTabTitleProbe?.stop();
+
+    const records: ProbeRecord[] = [];
+    const isVisible = (element: Element): element is HTMLElement => {
+      if (!(element instanceof HTMLElement)) {
+        return false;
+      }
+      const rect = element.getBoundingClientRect();
+      const style = window.getComputedStyle(element);
+      return (
+        rect.width > 0 &&
+        rect.height > 0 &&
+        style.display !== "none" &&
+        style.visibility !== "hidden"
+      );
+    };
+    const snapshot = () => {
+      records.push({
+        at: performance.now(),
+        tabs: Array.from(document.querySelectorAll('[data-testid^="workspace-tab-"]'))
+          .filter(isVisible)
+          .map((element) => ({
+            testId: element.getAttribute("data-testid") ?? "",
+            text: (element.textContent ?? "").replace(/\s+/g, " ").trim(),
+            ariaLabel: element.getAttribute("aria-label") ?? "",
+          })),
+      });
+    };
+
+    snapshot();
+    const observer = new MutationObserver(snapshot);
+    observer.observe(document.body, {
+      subtree: true,
+      childList: true,
+      characterData: true,
+      attributes: true,
+      attributeFilter: ["aria-label", "class", "data-testid", "style"],
+    });
+    const interval = window.setInterval(snapshot, 20);
+    win.__workspaceTabTitleProbe = {
+      records,
+      stop: () => {
+        observer.disconnect();
+        window.clearInterval(interval);
+      },
+    };
+  });
+}
+
+async function readWorkspaceTabProbe(page: Page): Promise<WorkspaceTabProbeRecord[]> {
+  return page.evaluate(() => {
+    type ProbeWindow = Window & {
+      __workspaceTabTitleProbe?: { records: WorkspaceTabProbeRecord[]; stop: () => void };
+    };
+    const probe = (window as ProbeWindow).__workspaceTabTitleProbe;
+    probe?.stop();
+    return probe?.records ?? [];
+  });
+}
+
+function recordHasTabLabel(record: WorkspaceTabProbeRecord, label: string): boolean {
+  return record.tabs.some((tab) => tab.text.includes(label) || tab.ariaLabel.includes(label));
+}
+
+function createFrameStartsWithPrompt(
+  frame: CapturedCreateAgentFrame,
+  promptTitle: string,
+): boolean {
+  return frame.initialPrompt?.startsWith(promptTitle) ?? false;
+}
+
+function countCreateFramesForPrompt(
+  frames: CapturedCreateAgentFrame[],
+  promptTitle: string,
+): number {
+  return frames.filter((frame) => createFrameStartsWithPrompt(frame, promptTitle)).length;
+}
+
+function tabHasLoadingTitle(tab: WorkspaceTabProbeRecord["tabs"][number]): boolean {
+  return /Loading agent title|Loading\.\.\./.test(`${tab.text} ${tab.ariaLabel}`);
+}
+
+function recordHasLoadingTitle(record: WorkspaceTabProbeRecord): boolean {
+  return record.tabs.some(tabHasLoadingTitle);
+}
+
+async function waitForCreatedAgentId(client: SeedDaemonClient, cwd: string): Promise<string> {
  await expect
    .poll(
      async () => {
        const result = await client.fetchAgents({ scope: "active" });
        return result.entries
-          .filter(
-            (entry) =>
-              entry.agent.cwd === input.cwd && entry.agent.workspaceId === input.workspaceId,
-          )
+          .filter((entry) => entry.agent.cwd === cwd)
          .map((entry) => entry.agent.id);
      },
      { timeout: 30_000 },
    )
    .toHaveLength(1);
  const result = await client.fetchAgents({ scope: "active" });
-  const agent = result.entries.find(
-    (entry) => entry.agent.cwd === input.cwd && entry.agent.workspaceId === input.workspaceId,
-  );
+  const agent = result.entries.find((entry) => entry.agent.cwd === cwd);
  if (!agent) {
-    throw new Error(`Expected one created agent in ${input.cwd}`);
+    throw new Error(`Expected one created agent in ${cwd}`);
  }
  return agent.agent.id;
 }
@@ -42,57 +142,65 @@ async function fetchActiveAgentTitle(
  return result.entries.find((entry) => entry.agent.id === agentId)?.agent.title ?? null;
 }

+async function waitForPromptTabAgentActions(page: Page, promptTitle: string): Promise<void> {
+  const promptTab = page.getByRole("button", { name: promptTitle }).first();
+  await expect(promptTab).toBeVisible({ timeout: 15_000 });
+
+  const deadline = Date.now() + 15_000;
+  while (Date.now() < deadline) {
+    await promptTab.click({ button: "right" });
+    const renameAction = page.getByText("Rename", { exact: true }).first();
+    if (await renameAction.isVisible().catch(() => false)) {
+      await page.keyboard.press("Escape");
+      return;
+    }
+    await page.keyboard.press("Escape").catch(() => undefined);
+    await page.waitForTimeout(100);
+  }
+
+  throw new Error("Prompt tab did not expose agent tab actions after create handoff");
+}
+
 test.describe("Workspace agent title handoff", () => {
-  test("shows the prompt tab title and replaces it when the daemon title updates", async ({
+  test("keeps the prompt as the optimistic tab title until the generated title arrives", async ({
    page,
  }) => {
    test.setTimeout(120_000);
    await page.setViewportSize({ width: 1440, height: 900 });

-    const agentCreatedDelay = await delayBrowserAgentCreatedStatus(page);
    const workspace = await seedWorkspace({ repoPrefix: "workspace-title-handoff-" });

    try {
+      const createFrames = captureWsSessionFrames(page, "create_agent_request", (inner) => {
+        const config = (inner.config ?? {}) as Record<string, unknown>;
+        return {
+          initialPrompt: typeof inner.initialPrompt === "string" ? inner.initialPrompt : null,
+          configTitle: typeof config.title === "string" ? config.title : null,
+        };
+      });
+
      await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.workspaceId));
      await waitForWorkspaceTabsVisible(page);
-      await page.getByTestId("workspace-new-agent-tab-inline").click();
+      await page.getByTestId("workspace-new-agent-tab").click();
      await expectComposerVisible(page);

      const promptTitle = "Investigate optimistic tab title handoff";
      const generatedTitle = "Generated Handoff Title";
+      await installWorkspaceTabProbe(page);
      await submitMessage(page, `${promptTitle}\n\nMake the UI state deterministic.`);
-      await agentCreatedDelay.waitForCreateRequest();
-      await agentCreatedDelay.waitForDelayedCreatedStatus();

-      await expect(page.getByRole("button", { name: promptTitle }).first()).toBeVisible({
-        timeout: 15_000,
-      });
-      await expect(
-        page.getByText(/Loading agent title|Loading\.\.\./).filter({ visible: true }),
-      ).toHaveCount(0);
-
-      const agentId = await waitForCreatedAgentId(workspace.client, {
-        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
-      });
-
-      await expect(page.getByTestId(`workspace-tab-agent_${agentId}`)).toHaveCount(0);
-      agentCreatedDelay.release();
-
-      const agentTab = page.getByTestId(`workspace-tab-agent_${agentId}`).first();
-      await expect(agentTab).toBeVisible({ timeout: 15_000 });
+      const agentId = await waitForCreatedAgentId(workspace.client, workspace.repoPath);
      await expect
-        .poll(() => fetchActiveAgentTitle(workspace.client, agentId), { timeout: 10_000 })
-        .toBe(promptTitle);
-      await expect(agentTab).toContainText(promptTitle, { timeout: 15_000 });
-      await agentTab.click({ button: "right" });
-      await expect(page.getByTestId(`workspace-tab-context-agent_${agentId}-rename`)).toBeVisible({
-        timeout: 10_000,
+        .poll(() => countCreateFramesForPrompt(createFrames, promptTitle), {
+          timeout: 10_000,
+        })
+        .toBe(1);
+      expect(createFrames.at(-1)).toEqual({
+        initialPrompt: `${promptTitle}\n\nMake the UI state deterministic.`,
+        configTitle: null,
      });
-      await page.keyboard.press("Escape");
-      await expect(
-        page.getByText(/Loading agent title|Loading\.\.\./).filter({ visible: true }),
-      ).toHaveCount(0);
+
+      await waitForPromptTabAgentActions(page, promptTitle);

      await workspace.client.updateAgent(agentId, { name: generatedTitle });
      await expect
@@ -101,8 +209,12 @@ test.describe("Workspace agent title handoff", () => {
      await expect(page.getByRole("button", { name: generatedTitle }).first()).toBeVisible({
        timeout: 15_000,
      });
+
+      const records = await readWorkspaceTabProbe(page);
+      expect(records.some((record) => recordHasTabLabel(record, promptTitle))).toBe(true);
+      expect(records.some((record) => recordHasTabLabel(record, generatedTitle))).toBe(true);
+      expect(records.filter(recordHasLoadingTitle)).toEqual([]);
    } finally {
-      agentCreatedDelay.release();
      await workspace.cleanup();
    }
  });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	71ce3b434e	Normalize plan file ids across platforms	2026-05-31 10:05:24 +07:00
Mohamed Boudra	bcd1f28f9a	Surface plans as first-class timeline items	2026-05-31 10:05:24 +07:00