test(app): stabilize archive descriptor assertions

The test rebuilt expected provider rows with fresh timestamps, so its result depended on both fixture calls landing in the same millisecond. Assert the preserved descriptor identities instead, matching the behavior under test without clock dependence.
Keep large diff reviews responsive (#3422 )
2026-10-14 21:32:40 +00:00 · 2026-08-16 07:48:03 +00:00 · 2026-08-16 15:38:12 +08:00 · 2026-08-14 22:46:32 +02:00 · 2026-08-14 18:16:22 +02:00 · 2026-08-14 17:12:49 +02:00
1845 changed files with 169238 additions and 34718 deletions
@@ -1,13 +1,9 @@
 ---
 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".
 user-invocable: true
 ---

 # Release beta

-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.
-
-During preparation, classify the previous-stable-to-`HEAD` diff as patch or minor and show the target version and rationale to the user. Agents never select a major version autonomously.
-
-Each beta updates an in-place `CHANGELOG.md` entry (`## X.Y.Z-beta.N`) that gets overwritten at promotion, and npm publishes only on the explicit `beta` dist-tag.
+Follow the **Beta flow** and **Beta release** completion checklist in `docs/release.md` end-to-end.
@@ -6,8 +6,4 @@ user-invocable: true

 # Release stable

-Read `docs/release.md` in the Paseo repo and follow the **Standard release (stable)** flow if cutting fresh, or the **Beta flow** promotion step if promoting an existing beta. Run the **Stable release (or promotion)** completion checklist at the bottom of that doc.
-
-For a fresh release, classify the previous-stable-to-`HEAD` diff as patch or minor and show the target version and rationale to the user. Agents never select a major version autonomously.
-
-The doc covers the changelog, pre-release sanity check, and post-release babysit pattern. Don't skip steps.
+Follow the applicable flow and the **Stable release (or promotion)** completion checklist in `docs/release.md` end-to-end.
@@ -6,7 +6,7 @@ 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.
+        Issues are only for bugs. Product discussions go in [GitHub Discussions](https://github.com/getpaseo/paseo/discussions) or `#product` in [Discord](https://discord.gg/jz8T2uahpH) — feature requests opened as issues get closed automatically.

        Before opening, please:

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Discord
+  - name: Product discussion on 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: Product discussion, including feature requests
+  - name: Product discussion on GitHub
+    url: https://github.com/getpaseo/paseo/discussions
+    about: Product discussion, including feature requests
@@ -1,43 +0,0 @@
-name: Feature request
-description: Propose a new feature or a change to existing behavior.
-title: "feat: "
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Paseo is opinionated and maintained by one person. Feature requests are welcome, but they get evaluated against product fit, not just usefulness, and the bar is whether the change keeps the product lean enough for one person to maintain.
-
-        Big ideas are better discussed in [Discord](https://discord.gg/jz8T2uahpH) first. And please don't open a feature request and a PR at the same time, get alignment on the idea before writing code.
-
-  - type: checkboxes
-    id: prior-search
-    attributes:
-      label: Prior search
-      options:
-        - label: I searched existing issues and discussions, and this isn't already proposed.
-          required: true
-
-  - type: textarea
-    id: problem
-    attributes:
-      label: What's the problem
-      description: What are you actually trying to do, and why is the current behavior in the way?
-      placeholder: |
-        When I'm doing X, I want to Y, but Paseo currently Z.
-    validations:
-      required: true
-
-  - type: textarea
-    id: proposal
-    attributes:
-      label: What would solve it
-      description: A rough sketch of the change. Mockups, screenshots from other apps, or a short video are very welcome, especially for UI proposals.
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives you considered
-      description: Optional. What else did you try, and why doesn't it work?
@@ -1,27 +1,34 @@
 <!--
 Please follow this template. The PR template applies whether you opened the PR via the web UI, `gh pr create`, or any other tool.

-If you're fixing an objective bug or a small focused issue, this should be quick. Big PRs without a prior issue or design discussion are likely to be closed or scoped down. See CONTRIBUTING.md.
+You MUST read CONTRIBUTING.md before sending a PR.
 -->

 ### Linked issue

 Closes #

-<!-- Bug fixes and behavior changes should reference an issue. Pure docs and refactors can skip this. -->
-
 ### Type of change

 - [ ] Bug fix
- [ ] New feature (with prior issue + design alignment)
- [ ] Refactor / code improvement
+- [ ] New feature
+- [ ] Enhancement
+- [ ] Refactor
 - [ ] Docs

-### What does this PR do
+### Reasoning

-<!-- A short description of the change in your own words. What was wrong, what you changed, why it works. If you can't explain this briefly, the PR is probably too big. -->
+<!-- A short description of the reasoning of this change in your own words. What was wrong, and how do you hope this PR fixes it. If you can't explain this briefly, the PR is probably too big. This description must be grounded in real user flows and framed as value provided to Paseo users. -->

-### How did you verify it
+### Goals
+
+<!-- A bullet list of what this PR wants to accomplish, include requirements and acceptance criteria. This helps lock down the scope of the PR and prevent expanding scope over the intended goal. -->
+
+### Non-goals
+
+<!-- A bullet list of what this PR does not want to accomplish. Add any intentional trade offs taken. This helps lock down the scope of the PR and prevent expanding scope over the intended goal. -->
+
+### QA

 <!--
 This is the section I read most carefully. I need to see that *you* tested this, not that the diff looks plausible.
@@ -29,15 +36,13 @@ This is the section I read most carefully. I need to see that *you* tested this,
 - For UI changes: a screenshot or short video on every affected platform (mobile, web, desktop). UI claims without visual proof are not enough.
 - For behavior changes: the actual steps you ran, and what you observed.
 - For bug fixes: how you reproduced the bug before, and confirmed it's fixed after.
-
-AI-generated PR descriptions are fine in principle. AI-generated *verification claims* with no actual testing behind them are not, and they're easy to spot.
 -->

 ### Checklist

- [ ] One focused change. Unrelated cleanups split out.
+- [ ] One focused change
 - [ ] `npm run typecheck` passes
 - [ ] `npm run lint` passes
- [ ] `npm run format` ran (Biome)
- [ ] UI changes include screenshots or video for every affected platform
+- [ ] `npm run format` passes
+- [ ] QA evidence
 - [ ] Tests added or updated where it made sense
@@ -0,0 +1,71 @@
+# Pull-request checks are routed by the behavior they prove. Package consumers
+# do not inherit their dependencies' test suites; main and manual runs execute
+# every contract regardless of these paths.
+routing:
+  - ".github/ci-paths.yml"
+
+workspace:
+  - ".mise.toml"
+  - ".tool-versions"
+  - "package.json"
+  - "package-lock.json"
+  - "patches/**"
+  - "scripts/**"
+  - "tsconfig.json"
+  - "tsconfig.base.json"
+  - "vitest.config.ts"
+
+ci:
+  - ".github/actions/**"
+  - ".github/workflows/ci.yml"
+
+format:
+  - ".agents/**/*.{cjs,css,html,js,json,jsonc,jsx,md,mjs,ts,tsx,yaml,yml}"
+  - ".github/**/*.{cjs,css,html,js,json,jsonc,jsx,md,mjs,ts,tsx,yaml,yml}"
+  - "**/*.{cjs,css,html,js,json,jsonc,jsx,md,mjs,ts,tsx,yaml,yml}"
+  - "packages/expo-two-way-audio/**"
+
+quality:
+  - "**/*.{cjs,js,json,jsx,mjs,ts,tsx}"
+  - "packages/expo-two-way-audio/**"
+
+hub:
+  - "packages/cli/src/commands/hub/**"
+  - "packages/server/src/server/hub/**"
+
+server:
+  - "packages/server/**"
+  - "packages/app/e2e/support/fixtures/recording.*"
+
+desktop:
+  - "packages/desktop/**"
+  - "packages/app/src/desktop/**"
+  - "packages/server/src/server/browser-tools/**"
+  - "packages/app/e2e/support/**"
+  - "packages/app/*config.{cjs,js,ts}"
+  - "packages/app/package.json"
+
+app:
+  - "packages/app/**"
+  - "packages/expo-two-way-audio/**"
+
+sdk:
+  - "packages/client/**"
+  - "packages/highlight/**"
+  - "packages/protocol/**"
+
+browser:
+  - "packages/app/src/!(desktop)/**"
+  - "packages/app/e2e/browser/**"
+  - "packages/app/e2e/support/**"
+  - "packages/app/assets/**"
+  - "packages/app/public/**"
+  - "packages/app/index.ts"
+  - "packages/app/*config.{cjs,js,ts}"
+  - "packages/app/package.json"
+
+relay:
+  - "packages/relay/**"
+
+cli:
+  - "packages/cli/**"
@@ -19,110 +19,47 @@ env:

 jobs:
  changes:
+    name: changes
    runs-on: ubuntu-latest
    permissions:
      contents: read
      pull-requests: read
    outputs:
-      quality: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.quality != 'false' }}
-      server: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.server != 'false' }}
-      desktop: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.desktop != 'false' }}
-      desktop_package: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.desktop_package != 'false' }}
-      app: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.app != 'false' }}
-      sdk: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.sdk != 'false' }}
-      playwright: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.playwright != 'false' }}
-      relay: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.relay != 'false' }}
-      cli: ${{ steps.filter.outputs.shared != 'false' || steps.filter.outputs.cli != 'false' }}
+      full: ${{ github.event_name != 'pull_request' || steps.filter.outputs.routing != 'false' || steps.filter.outputs.workspace != 'false' || steps.filter.outputs.ci != 'false' }}
+      format: ${{ steps.filter.outputs.format }}
+      quality: ${{ steps.filter.outputs.quality }}
+      hub: ${{ steps.filter.outputs.hub }}
+      server: ${{ steps.filter.outputs.server }}
+      desktop: ${{ steps.filter.outputs.desktop }}
+      app: ${{ steps.filter.outputs.app }}
+      sdk: ${{ steps.filter.outputs.sdk }}
+      browser: ${{ steps.filter.outputs.browser }}
+      relay: ${{ steps.filter.outputs.relay }}
+      cli: ${{ steps.filter.outputs.cli }}
    steps:
      - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
        with:
          fetch-depth: 0

-      - name: Detect affected CI jobs
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Detect affected CI contracts
        id: filter
        uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3.0.3
        with:
-          filters: |
-            shared:
-              - '.github/workflows/ci.yml'
-              - '.github/actions/**'
-              - '.mise.toml'
-              - '.tool-versions'
-              - 'package.json'
-              - 'package-lock.json'
-              - 'patches/**'
-              - 'scripts/**'
-              - 'tsconfig.json'
-              - 'tsconfig.base.json'
-              - 'vitest.config.ts'
-            quality:
-              - 'packages/**'
-              - '*.cjs'
-              - '*.js'
-              - '*.json'
-              - '*.mjs'
-              - '*.ts'
-            server:
-              - 'packages/app/e2e/fixtures/recording.*'
-              - 'packages/client/**'
-              - 'packages/cli/src/**'
-              - 'packages/highlight/**'
-              - 'packages/protocol/**'
-              - 'packages/relay/**'
-              - 'packages/server/**'
-            desktop:
-              - 'packages/app/**'
-              - 'packages/cli/**'
-              - 'packages/client/**'
-              - 'packages/desktop/**'
-              - 'packages/expo-two-way-audio/**'
-              - 'packages/highlight/**'
-              - 'packages/protocol/**'
-              - 'packages/relay/**'
-              - 'packages/server/**'
-            desktop_package:
-              - '.github/workflows/ci.yml'
-              - 'packages/desktop/**'
-            app:
-              - 'packages/app/**'
-              - 'packages/client/**'
-              - 'packages/expo-two-way-audio/**'
-              - 'packages/highlight/**'
-              - 'packages/protocol/**'
-              - 'packages/relay/**'
-            sdk:
-              - 'packages/client/**'
-              - 'packages/protocol/**'
-              - 'packages/relay/**'
-            playwright:
-              - 'packages/app/**'
-              - 'packages/client/**'
-              - 'packages/expo-two-way-audio/**'
-              - 'packages/highlight/**'
-              - 'packages/protocol/**'
-              - 'packages/relay/**'
-              - 'packages/server/**'
-            relay:
-              - 'packages/relay/**'
-            cli:
-              - 'nix/**'
-              - 'packages/app/e2e/global-setup.ts'
-              - 'packages/cli/**'
-              - 'packages/client/**'
-              - 'packages/desktop/src/daemon/runtime-paths.ts'
-              - 'packages/highlight/**'
-              - 'packages/protocol/**'
-              - 'packages/relay/**'
-              - 'packages/server/**'
+          filters: .github/ci-paths.yml

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

  format:
+    name: format
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false') }}
    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
@@ -136,15 +73,12 @@ jobs:
        run: node scripts/npm-retry.mjs ci

      - name: Check formatting
-        run: npx oxfmt --check .
+        run: npm run format:check

  lint:
+    name: lint
    needs: changes
-    if: >-
-      ${{ !cancelled() &&
-          (github.event_name == 'workflow_dispatch' ||
-           needs.changes.result != 'success' ||
-           needs.changes.outputs.quality != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -169,12 +103,9 @@ jobs:
        run: npm run lint

  typecheck:
+    name: typecheck
    needs: changes
-    if: >-
-      ${{ !cancelled() &&
-          (github.event_name == 'workflow_dispatch' ||
-           needs.changes.result != 'success' ||
-           needs.changes.outputs.quality != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -188,6 +119,7 @@ jobs:

      - name: Install dependencies
        run: node scripts/npm-retry.mjs ci
+
      - name: Build server stack
        run: npm run build:server

@@ -200,130 +132,112 @@ jobs:
          npm pack --dry-run --ignore-scripts --workspace=@getpaseo/client
          npm pack --dry-run --ignore-scripts --workspace=@getpaseo/server

-  server-tests:
+  server-tests-ubuntu:
+    name: server-tests (ubuntu-latest)
    needs: changes
-    if: ${{ !cancelled() }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    name: server-tests (${{ matrix.os }})
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' || needs.changes.outputs.hub != 'false') }}
+    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
-      RUN_TESTS: >-
-        ${{ github.event_name == 'workflow_dispatch' ||
-            needs.changes.result != 'success' ||
-            needs.changes.outputs.server != 'false' }}
-    steps:
-      - name: Skip unaffected server tests
-        if: env.RUN_TESTS != 'true'
-        run: echo "No server changes detected."
-
+    steps: &server_test_steps
      - uses: actions/checkout@v4
-        if: env.RUN_TESTS == 'true'
        with:
          fetch-depth: 0

      - uses: actions/setup-node@v4
-        if: env.RUN_TESTS == 'true'
        with:
          node-version: "22"
          cache: "npm"

      - name: Fetch origin/main (worktree tests)
-        if: env.RUN_TESTS == 'true'
+        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
        run: git fetch --no-tags origin main:refs/remotes/origin/main

      - name: Install dependencies
-        if: env.RUN_TESTS == 'true'
        run: node scripts/npm-retry.mjs ci
+
      - name: Install agent CLIs for provider tests
-        if: env.RUN_TESTS == 'true'
+        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
        run: node scripts/npm-retry.mjs install -g @anthropic-ai/claude-code opencode-ai

      - name: Build server dependencies
-        if: env.RUN_TESTS == 'true'
        run: npm run build:server-deps

      - name: Run server tests
-        if: env.RUN_TESTS == 'true'
+        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
        run: npm run test --workspace=@getpaseo/server
        env:
          CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
          OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}

-  desktop-tests:
+      - name: Run Hub CLI/daemon contract
+        if: ${{ needs.changes.outputs.full == 'false' && needs.changes.outputs.server == 'false' && needs.changes.outputs.hub != 'false' }}
+        run: npm run test:hub-cli-contract --workspace=@getpaseo/server
+
+  server-tests-windows:
+    name: server-tests (windows-latest)
    needs: changes
-    if: ${{ !cancelled() }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' || needs.changes.outputs.hub != 'false') }}
+    runs-on: windows-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
+    steps: *server_test_steps
+
+  desktop-tests-ubuntu:
+    name: desktop-tests (ubuntu-latest)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop != 'false') }}
+    runs-on: ubuntu-latest
    timeout-minutes: 30
    permissions:
      contents: read
-    env:
-      RUN_TESTS: >-
-        ${{ github.event_name == 'workflow_dispatch' ||
-            needs.changes.result != 'success' ||
-            needs.changes.outputs.desktop != 'false' }}
-    steps:
-      - name: Skip unaffected desktop tests
-        if: env.RUN_TESTS != 'true'
-        run: echo "No desktop changes detected."
-
+    steps: &desktop_test_steps
      - uses: actions/checkout@v4
-        if: env.RUN_TESTS == 'true'

      - uses: actions/setup-node@v4
-        if: env.RUN_TESTS == 'true'
        with:
          node-version: "22"
          cache: "npm"

      - name: Install dependencies with retry
-        if: env.RUN_TESTS == 'true'
        run: node scripts/npm-retry.mjs ci
+
      - name: Build server stack
-        if: env.RUN_TESTS == 'true'
        run: npm run build:server

      - name: Run desktop tests
-        if: env.RUN_TESTS == 'true'
        run: npm run test --workspace=@getpaseo/desktop

-      - name: Build app dependencies for desktop E2E
-        if: env.RUN_TESTS == 'true' && matrix.os == 'ubuntu-latest'
-        run: npm run build:app-deps
-
      - name: Install virtual display
-        if: env.RUN_TESTS == 'true' && matrix.os == 'ubuntu-latest'
+        if: ${{ runner.os == 'Linux' }}
        run: sudo apt-get update && sudo apt-get install -y xvfb xauth

-      - name: Run real Electron browser tab bridge E2E
-        if: env.RUN_TESTS == 'true' && matrix.os == 'ubuntu-latest'
-        run: npm run test:e2e:browser-tab-bridge --workspace=@getpaseo/desktop
-        env:
-          PASEO_TAB_BRIDGE_E2E_ARTIFACT_DIR: ${{ runner.temp }}/browser-tab-bridge-e2e
+      - name: Install Playwright browser
+        if: ${{ runner.os == 'Linux' }}
+        run: npx playwright install chromium

-      - name: Upload browser tab bridge diagnostics
+      - name: Run desktop renderer E2E
+        if: ${{ runner.os == 'Linux' }}
+        run: npm run test:e2e:renderer --workspace=@getpaseo/desktop
+
+      - name: Run desktop browser E2E
+        if: ${{ runner.os == 'Linux' }}
+        run: npm run test:e2e:browser-tabs --workspace=@getpaseo/desktop
+        env:
+          PASEO_DESKTOP_BROWSER_E2E_ARTIFACT_DIR: ${{ runner.temp }}/desktop-browser-e2e
+
+      - name: Upload desktop browser diagnostics
        uses: actions/upload-artifact@v4
-        if: env.RUN_TESTS == 'true' && failure() && matrix.os == 'ubuntu-latest'
+        if: ${{ failure() && runner.os == 'Linux' }}
        with:
-          name: browser-tab-bridge-e2e
-          path: ${{ runner.temp }}/browser-tab-bridge-e2e
+          name: desktop-browser-e2e
+          path: ${{ runner.temp }}/desktop-browser-e2e
          if-no-files-found: ignore
          retention-days: 7

      - name: Build and smoke unpacked desktop app
-        if: >-
-          env.RUN_TESTS == 'true' && matrix.os == 'ubuntu-latest' &&
-          (github.event_name == 'workflow_dispatch' ||
-           needs.changes.result != 'success' ||
-           needs.changes.outputs.desktop_package != 'false')
+        if: ${{ runner.os == 'Linux' }}
        run: npm run build:desktop -- --publish never --linux --x64 --dir
        env:
          EP_GH_IGNORE_TIME: true
@@ -331,25 +245,28 @@ jobs:
          PASEO_DESKTOP_SMOKE_ARTIFACT_DIR: ${{ runner.temp }}/desktop-smoke

      - name: Upload packaged smoke diagnostics
-        if: >-
-          env.RUN_TESTS == 'true' && failure() && matrix.os == 'ubuntu-latest' &&
-          (github.event_name == 'workflow_dispatch' ||
-           needs.changes.result != 'success' ||
-           needs.changes.outputs.desktop_package != 'false')
        uses: actions/upload-artifact@v4
+        if: ${{ failure() && runner.os == 'Linux' }}
        with:
          name: desktop-packaged-smoke-linux-x64
          path: ${{ runner.temp }}/desktop-smoke
          if-no-files-found: ignore
          retention-days: 7

-  app-tests:
+  desktop-tests-windows:
+    name: desktop-tests (windows-latest)
    needs: changes
-    if: >-
-      ${{ !cancelled() &&
-          (github.event_name == 'workflow_dispatch' ||
-           needs.changes.result != 'success' ||
-           needs.changes.outputs.app != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop != 'false') }}
+    runs-on: windows-latest
+    timeout-minutes: 30
+    permissions:
+      contents: read
+    steps: *desktop_test_steps
+
+  app-tests:
+    name: app-tests
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.app != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -363,6 +280,7 @@ jobs:

      - name: Install dependencies with retry
        run: node scripts/npm-retry.mjs ci
+
      - name: Install Playwright browsers
        timeout-minutes: 10
        run: npx playwright install chromium
@@ -374,12 +292,9 @@ jobs:
        run: npm run test --workspace=@getpaseo/app

  sdk-tests:
+    name: sdk-tests
    needs: changes
-    if: >-
-      ${{ !cancelled() &&
-          (github.event_name == 'workflow_dispatch' ||
-           needs.changes.result != 'success' ||
-           needs.changes.outputs.sdk != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -393,6 +308,7 @@ jobs:

      - name: Install dependencies
        run: node scripts/npm-retry.mjs ci
+
      - name: Build client dependencies
        run: npm run build:client

@@ -402,90 +318,97 @@ jobs:
      - name: Run client tests
        run: npm run test --workspace=@getpaseo/client

+      - name: Run highlight tests
+        run: npm run test --workspace=@getpaseo/highlight
+
      - name: Typecheck client examples
        run: npm run typecheck:examples --workspace=@getpaseo/client

-  playwright:
+  playwright-1:
+    name: playwright (shard 1/4)
    needs: changes
-    if: ${{ !cancelled() }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { label: "shard 1/4", shard: 1, desktop: false }
-          - { label: "shard 2/4", shard: 2, desktop: false }
-          - { label: "shard 3/4", shard: 3, desktop: false }
-          - { label: "shard 4/4", shard: 4, desktop: false }
-          - { label: "desktop overlay", shard: "desktop", desktop: true }
-    name: playwright (${{ matrix.label }})
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
-      RUN_TESTS: >-
-        ${{ github.event_name == 'workflow_dispatch' ||
-            needs.changes.result != 'success' ||
-            needs.changes.outputs.playwright != 'false' }}
-    steps:
-      - name: Skip unaffected Playwright tests
-        if: env.RUN_TESTS != 'true'
-        run: echo "No Playwright changes detected."
-
+      PLAYWRIGHT_SHARD: "1/4"
+      PLAYWRIGHT_ARTIFACT: "1"
+    steps: &playwright_test_steps
      - uses: actions/checkout@v4
-        if: env.RUN_TESTS == 'true'

      - uses: actions/setup-node@v4
-        if: env.RUN_TESTS == 'true'
        with:
          node-version: "22"
          cache: "npm"

      - name: Install dependencies with retry
-        if: env.RUN_TESTS == 'true'
        run: node scripts/npm-retry.mjs ci
+
      - name: Install Playwright browsers
-        if: env.RUN_TESTS == 'true'
        timeout-minutes: 10
        run: npx playwright install chromium

      - name: Build app dependencies
-        if: env.RUN_TESTS == 'true'
        run: npm run build:app-deps

      - name: Build server stack
-        if: env.RUN_TESTS == 'true'
        run: npm run build:server

      - name: Install agent CLIs for provider tests
-        if: env.RUN_TESTS == 'true' && !matrix.desktop
        run: node scripts/npm-retry.mjs install -g @anthropic-ai/claude-code @openai/codex@0.105.0 opencode-ai

      - name: Run Playwright E2E tests
-        if: env.RUN_TESTS == 'true' && !matrix.desktop
-        run: npm run test:e2e --workspace=@getpaseo/app -- --shard=${{ matrix.shard }}/4
+        run: npm run test:e2e --workspace=@getpaseo/app -- --shard=${{ env.PLAYWRIGHT_SHARD }}
        env:
          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

-      - name: Run desktop-overlay Playwright tests
-        if: env.RUN_TESTS == 'true' && matrix.desktop
-        run: npm run test:e2e:desktop --workspace=@getpaseo/app
-
      - name: Upload test artifacts
        uses: actions/upload-artifact@v4
-        if: env.RUN_TESTS == 'true' && failure()
+        if: failure()
        with:
-          name: playwright-results-${{ matrix.shard }}
+          name: playwright-results-${{ env.PLAYWRIGHT_ARTIFACT }}
          path: |
            packages/app/test-results/
            packages/app/playwright-report/
          retention-days: 7

-  relay-tests:
+  playwright-2:
+    name: playwright (shard 2/4)
    needs: changes
-    if: >-
-      ${{ !cancelled() &&
-          (github.event_name == 'workflow_dispatch' ||
-           needs.changes.result != 'success' ||
-           needs.changes.outputs.relay != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
+      PLAYWRIGHT_SHARD: "2/4"
+      PLAYWRIGHT_ARTIFACT: "2"
+    steps: *playwright_test_steps
+
+  playwright-3:
+    name: playwright (shard 3/4)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
+      PLAYWRIGHT_SHARD: "3/4"
+      PLAYWRIGHT_ARTIFACT: "3"
+    steps: *playwright_test_steps
+
+  playwright-4:
+    name: playwright (shard 4/4)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
+      PLAYWRIGHT_SHARD: "4/4"
+      PLAYWRIGHT_ARTIFACT: "4"
+    steps: *playwright_test_steps
+
+  relay-tests:
+    name: relay-tests
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -506,53 +429,62 @@ jobs:
      - name: Run relay tests
        run: npm run test --workspace=@getpaseo/relay

-  cli-tests:
+  cli-tests-1:
+    name: cli-tests (shard 1/3)
    needs: changes
-    if: ${{ !cancelled() }}
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [1, 2, 3]
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.cli != 'false') }}
    runs-on: ubuntu-latest
-    name: cli-tests (shard ${{ matrix.shard }}/3)
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
-      RUN_TESTS: >-
-        ${{ github.event_name == 'workflow_dispatch' ||
-            needs.changes.result != 'success' ||
-            needs.changes.outputs.cli != 'false' }}
-    steps:
-      - name: Skip unaffected CLI tests
-        if: env.RUN_TESTS != 'true'
-        run: echo "No CLI changes detected."
-
+      PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: "0"
+      PASEO_DICTATION_ENABLED: "0"
+      PASEO_VOICE_MODE_ENABLED: "0"
+      PASEO_CLI_TEST_SHARD: "1"
+      PASEO_CLI_TEST_SHARD_TOTAL: "3"
+    steps: &cli_test_steps
      - uses: actions/checkout@v4
-        if: env.RUN_TESTS == 'true'

      - uses: actions/setup-node@v4
-        if: env.RUN_TESTS == 'true'
        with:
          node-version: "22"
          cache: "npm"

      - name: Install dependencies
-        if: env.RUN_TESTS == 'true'
        run: node scripts/npm-retry.mjs ci

      - name: Build server stack
-        if: env.RUN_TESTS == 'true'
        run: npm run build:server

      - name: Install agent CLIs for provider tests
-        if: env.RUN_TESTS == 'true'
        run: node scripts/npm-retry.mjs install -g @anthropic-ai/claude-code @openai/codex@0.105.0 opencode-ai

      - name: Run CLI tests
-        if: env.RUN_TESTS == 'true'
        run: npm run test --workspace=@getpaseo/cli
-        env:
-          PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: "0"
-          PASEO_DICTATION_ENABLED: "0"
-          PASEO_VOICE_MODE_ENABLED: "0"
-          PASEO_CLI_TEST_SHARD: ${{ matrix.shard }}
-          PASEO_CLI_TEST_SHARD_TOTAL: "3"
+
+  cli-tests-2:
+    name: cli-tests (shard 2/3)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.cli != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
+      PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: "0"
+      PASEO_DICTATION_ENABLED: "0"
+      PASEO_VOICE_MODE_ENABLED: "0"
+      PASEO_CLI_TEST_SHARD: "2"
+      PASEO_CLI_TEST_SHARD_TOTAL: "3"
+    steps: *cli_test_steps
+
+  cli-tests-3:
+    name: cli-tests (shard 3/3)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.cli != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
+      PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: "0"
+      PASEO_DICTATION_ENABLED: "0"
+      PASEO_VOICE_MODE_ENABLED: "0"
+      PASEO_CLI_TEST_SHARD: "3"
+      PASEO_CLI_TEST_SHARD_TOTAL: "3"
+    steps: *cli_test_steps
@@ -18,6 +18,7 @@ on:
      - "packages/client/**"
      - "packages/expo-two-way-audio/**"
      - "packages/highlight/**"
+      - "packages/plugin/**"
      - "packages/protocol/**"
      - "packages/relay/**"
      - "packages/server/**"
@@ -10,6 +10,7 @@ on:
      - "package.json"
      - "package-lock.json"
      - "packages/highlight/**"
+      - "packages/plugin/**"
      - "packages/server/**"
      - "packages/relay/**"
      - "packages/cli/**"
@@ -12,6 +12,7 @@ on:
      - "packages/app/**"
      - "packages/expo-two-way-audio/**"
      - "packages/highlight/**"
+      - "packages/plugin/**"
      - "packages/protocol/**"
      - "packages/client/**"
      - "packages/server/**"
@@ -104,3 +105,27 @@ jobs:

      - name: Build Nix desktop package
        run: nix build .#desktop -o result-desktop
+
+  build-desktop-darwin:
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Build Nix desktop package
+        run: nix build .#desktop -o result-desktop
+
+      - name: Verify macOS application bundle
+        run: |
+          set -euo pipefail
+
+          app="result-desktop/Applications/Paseo.app"
+          test -x "$app/Contents/MacOS/Paseo"
+          test -L result-desktop/bin/paseo-desktop
+          test "$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$app/Contents/Info.plist")" = "sh.paseo.desktop"
+          find "$app" -name Info.plist -print0 | xargs -0 -n 1 plutil -lint
@@ -130,7 +130,7 @@
        ]
      }
    },
-    // Raw query burn-down: 35 files total; the 29 files below still enforce the useUnistyles ban.
+    // Raw query burn-down: 34 files total; the 28 files below still enforce the useUnistyles ban.
    {
      "files": [
        "packages/app/src/assistant-file-links/use-file-link.ts",
@@ -154,10 +154,9 @@
        "packages/app/src/hooks/use-is-local-daemon.ts",
        "packages/app/src/hooks/use-keyboard-shortcut-overrides.ts",
        "packages/app/src/hooks/use-preferred-editor.ts",
-        "packages/app/src/hooks/use-project-icon-query.ts",
        "packages/app/src/hooks/use-settings/index.ts",
        "packages/app/src/panels/terminal-panel.tsx",
-        "packages/app/src/projects/project-icons.ts",
+        "packages/app/src/projects/icons.ts",
        "packages/app/src/provider-usage/use-provider-usage.ts",
        "packages/app/src/screens/project-settings-screen.tsx",
        "packages/app/src/screens/workspace/use-workspace-checkout-status.ts",
@@ -189,9 +188,9 @@
        "packages/app/src/components/agent-list.tsx",
        "packages/app/src/components/agent-status-dot.tsx",
        "packages/app/src/components/attachment-lightbox.tsx",
-        "packages/app/src/components/browser-pane.electron.tsx",
-        "packages/app/src/components/browser-pane.tsx",
-        "packages/app/src/components/browser-pane.web.tsx",
+        "packages/app/src/desktop/browser/pane/index.electron.tsx",
+        "packages/app/src/desktop/browser/pane/index.tsx",
+        "packages/app/src/desktop/browser/pane/index.web.tsx",
        "packages/app/src/components/command-center.tsx",
        "packages/app/src/components/context-window-meter.tsx",
        "packages/app/src/components/dictation-controls.tsx",
@@ -280,7 +279,7 @@
      }
    },
    {
-      "files": ["**/e2e/fixtures.ts"],
+      "files": ["**/e2e/**/fixtures.ts"],
      "rules": {
        "no-empty-pattern": "off"
      }
@@ -1,5 +1,198 @@
 # Changelog

+## 0.4.0 - 2026-08-13
+
+### Breaking
+
+- Removed `paseo chat` and `paseo loop` ([#3053](https://github.com/getpaseo/paseo/pull/3053))
+
+### Added
+
+- Added host-wide agent profiles for reusable provider, model, mode, thinking, and feature settings ([#3208](https://github.com/getpaseo/paseo/pull/3208))
+- Added workspace file search to Cmd/Ctrl+P ([#3059](https://github.com/getpaseo/paseo/pull/3059))
+- Added file and folder actions to Files and Changes ([#3027](https://github.com/getpaseo/paseo/pull/3027) by [@nikuscs](https://github.com/nikuscs))
+- Added interactive Mermaid diagrams to chats and Markdown previews ([#2306](https://github.com/getpaseo/paseo/pull/2306) by [@dmeledon](https://github.com/dmeledon))
+- Added live task progress above the composer and in the timeline ([#3227](https://github.com/getpaseo/paseo/pull/3227))
+- Added a model setting for generated workspace titles, branch names, commits, and pull request drafts ([#3215](https://github.com/getpaseo/paseo/pull/3215))
+- Added the supported `@getpaseo/client` TypeScript SDK ([#3141](https://github.com/getpaseo/paseo/pull/3141))
+- Added provider installation diagnostics to the CLI ([#3243](https://github.com/getpaseo/paseo/pull/3243))
+- Added workspace rename to the CLI ([#3209](https://github.com/getpaseo/paseo/pull/3209) by [@martinhanzik](https://github.com/martinhanzik))
+
+### Improved
+
+- Added a centered reading layout and formatted YAML front matter to Markdown previews ([#3240](https://github.com/getpaseo/paseo/pull/3240))
+- Added sidebar grouping to the Command Center ([#3063](https://github.com/getpaseo/paseo/pull/3063) by [@cleiter](https://github.com/cleiter))
+- Added every built-in theme to theme shortcuts ([#3214](https://github.com/getpaseo/paseo/pull/3214))
+- Removed periodic Git polling for idle workspaces ([#3323](https://github.com/getpaseo/paseo/pull/3323))
+- Set provider catalog refreshes to a configurable two-minute deadline ([#3322](https://github.com/getpaseo/paseo/pull/3322))
+
+### Fixed
+
+- Fixed terminal sessions being lost after host sleep or daemon worker stalls ([#3235](https://github.com/getpaseo/paseo/pull/3235), [#3263](https://github.com/getpaseo/paseo/pull/3263))
+- Fixed daemon hang when archiving a workspace ([#3107](https://github.com/getpaseo/paseo/pull/3107))
+- Fixed New Workspace crash on Android when projects span multiple hosts ([#3241](https://github.com/getpaseo/paseo/pull/3241))
+- Fixed provider cache exhausting Android local storage ([#3234](https://github.com/getpaseo/paseo/pull/3234))
+- Fixed dictation recordings being lost during connection interruptions ([#3159](https://github.com/getpaseo/paseo/pull/3159))
+- Fixed new workspaces reusing an existing worktree ([#3224](https://github.com/getpaseo/paseo/pull/3224))
+- Fixed new worktrees ignoring the setup command saved in Project Settings ([#3233](https://github.com/getpaseo/paseo/pull/3233))
+- Fixed new worktrees becoming dirty when the selected base contained a different `paseo.json` ([#3311](https://github.com/getpaseo/paseo/pull/3311))
+- Fixed removed hosts continuing to receive push notifications ([#3176](https://github.com/getpaseo/paseo/pull/3176))
+- Fixed delegated-agent notifications stopping after permission prompts or workspace closure ([#3177](https://github.com/getpaseo/paseo/pull/3177), [#3192](https://github.com/getpaseo/paseo/pull/3192) by [@thomasvan](https://github.com/thomasvan), [@wilgon456](https://github.com/wilgon456))
+- Fixed OMP agent startup when model catalogs exceed the protocol-v1 frame limit ([#3184](https://github.com/getpaseo/paseo/pull/3184) by [@pi3123](https://github.com/pi3123))
+- Fixed OpenCode models being unable to return to their default variant ([#3281](https://github.com/getpaseo/paseo/pull/3281))
+- Fixed completed Codex subagents remaining marked active ([#3188](https://github.com/getpaseo/paseo/pull/3188) by [@Strainy](https://github.com/Strainy))
+- Fixed Codex compaction leaving turns marked as working ([#3211](https://github.com/getpaseo/paseo/pull/3211) by [@edihasaj](https://github.com/edihasaj))
+- Fixed Cursor usage with current Cursor logins ([#2704](https://github.com/getpaseo/paseo/pull/2704) by [@QuteSaltyFish](https://github.com/QuteSaltyFish))
+- Fixed SVG project icons rendering as blank on mobile ([#2579](https://github.com/getpaseo/paseo/pull/2579) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed crash when persisted cache was incompatible ([#3289](https://github.com/getpaseo/paseo/pull/3289))
+- Fixed open delegated agents being archived with their parent ([#3279](https://github.com/getpaseo/paseo/pull/3279))
+- Fixed agent creation when profiles carried modes unsupported by the selected provider ([#3331](https://github.com/getpaseo/paseo/pull/3331))
+- Fixed Claude agents waiting on Paseo's ten-minute MCP timeout ([#3315](https://github.com/getpaseo/paseo/pull/3315))
+- Fixed Copy resume command for Hermes agents ([#3300](https://github.com/getpaseo/paseo/pull/3300) by [@desmond-rai](https://github.com/desmond-rai))
+
+## 0.3.1 - 2026-08-09
+
+### Added
+
+- Unassign keyboard shortcuts and see the effective bindings in shortcut help ([#2510](https://github.com/getpaseo/paseo/pull/2510) by [@cleiter](https://github.com/cleiter), [#2985](https://github.com/getpaseo/paseo/pull/2985) by [@cleiter](https://github.com/cleiter))
+- Choose a Pure black theme ([#3012](https://github.com/getpaseo/paseo/pull/3012) by [@shrimpwtf](https://github.com/shrimpwtf))
+
+### Improved
+
+- Running agents use a clearer animated status ring ([c0daf8e](https://github.com/getpaseo/paseo/commit/c0daf8e066e0d7379723a2a6ddea20afc71ead20) by [@cleiter](https://github.com/cleiter))
+- Workspace Git updates stay responsive under file-watcher failures, heavy Git activity, and large shared-worktree repositories ([#3056](https://github.com/getpaseo/paseo/pull/3056), [#3033](https://github.com/getpaseo/paseo/pull/3033) by [@dwyanewang](https://github.com/dwyanewang), [#3078](https://github.com/getpaseo/paseo/pull/3078))
+- Kimi usage refreshes correctly and shows five-hour limits and reasoning levels ([#2743](https://github.com/getpaseo/paseo/pull/2743) by [@UnbrokenHunter](https://github.com/UnbrokenHunter))
+- Resize the desktop sidebar with touch ([#2953](https://github.com/getpaseo/paseo/pull/2953) by [@colonelpanic8](https://github.com/colonelpanic8))
+
+### Fixed
+
+- Direct LAN connections work again on macOS ([#3071](https://github.com/getpaseo/paseo/pull/3071))
+- Desktop update checks no longer report an error while platform downloads are still publishing ([#3076](https://github.com/getpaseo/paseo/pull/3076))
+- Copied lists keep their markers across selection boundaries ([#3055](https://github.com/getpaseo/paseo/pull/3055))
+- Switching hosts keeps the active project selected ([#3051](https://github.com/getpaseo/paseo/pull/3051))
+- New Workspace keeps project and isolation controls inside the composer ([#3050](https://github.com/getpaseo/paseo/pull/3050))
+- Session rename is reachable from the mobile sessions menu ([#2924](https://github.com/getpaseo/paseo/pull/2924) by [@kaspesi](https://github.com/kaspesi))
+- Desktop notification sounds play again ([#2582](https://github.com/getpaseo/paseo/pull/2582) by [@gstamp](https://github.com/gstamp))
+- Codex slash commands omit disabled skills ([#2759](https://github.com/getpaseo/paseo/pull/2759) by [@jasonhnd](https://github.com/jasonhnd))
+- Exact ignored file paths resolve correctly ([#3042](https://github.com/getpaseo/paseo/pull/3042) by [@cleiter](https://github.com/cleiter))
+- Claude question notifications summarize the requested input ([#2925](https://github.com/getpaseo/paseo/pull/2925) by [@SihyeonJeon](https://github.com/SihyeonJeon))
+- The crash screen stays readable and keeps its retry action reachable ([#3043](https://github.com/getpaseo/paseo/pull/3043))
+
+## 0.3.0 - 2026-08-08
+
+### Added
+
+- New mobile terminal with text selection, copy, paste, and faster rendering ([#1607](https://github.com/getpaseo/paseo/pull/1607), [#2830](https://github.com/getpaseo/paseo/pull/2830))
+- Redesigned sidebar with clearer status colours and rows that are quicker to scan ([#2340](https://github.com/getpaseo/paseo/pull/2340) by [@kaspesi](https://github.com/kaspesi), [#2335](https://github.com/getpaseo/paseo/pull/2335), [#2416](https://github.com/getpaseo/paseo/pull/2416) by [@nikuscs](https://github.com/nikuscs), [#2711](https://github.com/getpaseo/paseo/pull/2711))
+  - Choose what a sidebar workspace row shows: host, pull request, checks, and scripts
+  - Name each host and give it a colour ([#2790](https://github.com/getpaseo/paseo/pull/2790))
+- Search your history by workspace, agent, and branch ([#2995](https://github.com/getpaseo/paseo/pull/2995))
+- Use Paseo in Korean ([#2895](https://github.com/getpaseo/paseo/pull/2895) by [@himomohi](https://github.com/himomohi), [@Kesta-bos](https://github.com/Kesta-bos))
+- Run git and workspace actions from the Command Center ([#2749](https://github.com/getpaseo/paseo/pull/2749))
+- Change model, reasoning, mode, plan, and fast from the Command Center ([#2274](https://github.com/getpaseo/paseo/pull/2274) by [@kedrzu](https://github.com/kedrzu))
+- Fork an agent while it's running ([#2638](https://github.com/getpaseo/paseo/pull/2638) by [@kaspesi](https://github.com/kaspesi))
+- Launch a terminal directly from New Workspace ([#2941](https://github.com/getpaseo/paseo/pull/2941))
+- Jump between prompts in a chat ([#2792](https://github.com/getpaseo/paseo/pull/2792))
+- Preview HTML files ([#2712](https://github.com/getpaseo/paseo/pull/2712) by [@nicholas-salgueiro-britecore](https://github.com/nicholas-salgueiro-britecore), [@nickmaglowsch](https://github.com/nickmaglowsch))
+- See Claude workflows in the subagent track ([#2933](https://github.com/getpaseo/paseo/pull/2933))
+- Choose which orchestration skills Paseo installs ([#2680](https://github.com/getpaseo/paseo/pull/2680))
+- Approve all ACP tool calls with one setting ([#2752](https://github.com/getpaseo/paseo/pull/2752))
+- Add custom HTTP headers to direct host connections ([#2922](https://github.com/getpaseo/paseo/pull/2922))
+- Pick a local branch or its origin counterpart as the base for a new worktree ([#2328](https://github.com/getpaseo/paseo/pull/2328) by [@mcowger](https://github.com/mcowger))
+- Paste images from the clipboard on mobile ([#2793](https://github.com/getpaseo/paseo/pull/2793))
+
+### Improved
+
+- Provider data is cached in the client for a faster startup
+- Recent chats stay live in the background, so switching back shows current messages right away ([#2842](https://github.com/getpaseo/paseo/pull/2842))
+- Coming back to a workspace from Settings is faster ([#2791](https://github.com/getpaseo/paseo/pull/2791))
+- Workspace Git status stays responsive in large repositories ([#2979](https://github.com/getpaseo/paseo/pull/2979))
+- Paseo runs fewer git processes on busy machines ([#2797](https://github.com/getpaseo/paseo/pull/2797))
+- Copying part of an assistant response keeps its lists, links, and formatting ([#2808](https://github.com/getpaseo/paseo/pull/2808), [#2930](https://github.com/getpaseo/paseo/pull/2930), [#2935](https://github.com/getpaseo/paseo/pull/2935) by [@cleiter](https://github.com/cleiter))
+- See the full conversation from a native Claude subagent ([#2498](https://github.com/getpaseo/paseo/pull/2498) by [@ebg1223](https://github.com/ebg1223), [#2760](https://github.com/getpaseo/paseo/pull/2760))
+- OpenCode subagents show their task, type, model, and token usage ([#2909](https://github.com/getpaseo/paseo/pull/2909) by [@BrianAguilarWasco](https://github.com/BrianAguilarWasco))
+- Pi delegated tasks show their lifecycle status ([#2891](https://github.com/getpaseo/paseo/pull/2891))
+- Claude remembers model and thinking choices for new workspaces ([#2912](https://github.com/getpaseo/paseo/pull/2912))
+- OMP context usage updates while a turn is running ([#2503](https://github.com/getpaseo/paseo/pull/2503) by [@theslava](https://github.com/theslava))
+- OpenCode reports background activity from its own busy status ([#2696](https://github.com/getpaseo/paseo/pull/2696) by [@desflynn](https://github.com/desflynn))
+- Desktop browser tabs keep their state through focus changes and automation ([#2907](https://github.com/getpaseo/paseo/pull/2907))
+- New worktrees start from the tracked upstream branch ([#2848](https://github.com/getpaseo/paseo/pull/2848))
+- Generated workspace titles describe the task ([#2755](https://github.com/getpaseo/paseo/pull/2755))
+- Relay access is opt-in when you pair a device ([#2706](https://github.com/getpaseo/paseo/pull/2706))
+- Voice mode releases the audio session when recording and playback stop ([#2866](https://github.com/getpaseo/paseo/pull/2866) by [@kaspesi](https://github.com/kaspesi))
+- Workspace suggestions skip Git-ignored data ([#2902](https://github.com/getpaseo/paseo/pull/2902))
+- Reconnect messages distinguish daemon restarts from network interruptions ([#2931](https://github.com/getpaseo/paseo/pull/2931))
+- The file viewer shows one accurate status when a file changes or is deleted ([#2670](https://github.com/getpaseo/paseo/pull/2670), [#2694](https://github.com/getpaseo/paseo/pull/2694))
+- The Nix desktop package is smaller ([#2550](https://github.com/getpaseo/paseo/pull/2550) by [@colonelpanic8](https://github.com/colonelpanic8))
+- The Nix desktop app uses the right icon on Linux and macOS ([#2506](https://github.com/getpaseo/paseo/pull/2506), [#2783](https://github.com/getpaseo/paseo/pull/2783) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Paseo Desktop builds from the Nix flake on macOS ([#2556](https://github.com/getpaseo/paseo/pull/2556) by [@colonelpanic8](https://github.com/colonelpanic8))
+
+### Fixed
+
+- Pi 0.84 agents no longer crash-loop on every prompt ([#2978](https://github.com/getpaseo/paseo/pull/2978) by [@dundunHa](https://github.com/dundunHa))
+- Workspace file watching no longer stalls the daemon ([#2858](https://github.com/getpaseo/paseo/pull/2858))
+- Messages no longer duplicate or arrive out of order after a reconnect or resume ([#2789](https://github.com/getpaseo/paseo/pull/2789), [#2718](https://github.com/getpaseo/paseo/pull/2718))
+- Git status and diffs pick up changes in nested folders on every desktop OS ([#2775](https://github.com/getpaseo/paseo/pull/2775))
+- Claude runtime failures report an error instead of leaving the workspace idle ([#2910](https://github.com/getpaseo/paseo/pull/2910) by [@nickmaglowsch](https://github.com/nickmaglowsch))
+- Claude replay no longer leaves stale running subagents ([#2876](https://github.com/getpaseo/paseo/pull/2876) by [@cleiter](https://github.com/cleiter))
+- The Fast toggle appears for Claude Opus 5 ([#2939](https://github.com/getpaseo/paseo/pull/2939) by [@cleiter](https://github.com/cleiter))
+- Agents stop with an error when their provider process exits ([#2757](https://github.com/getpaseo/paseo/pull/2757))
+- Cancelling an OpenCode turn no longer breaks the next one ([#2662](https://github.com/getpaseo/paseo/pull/2662))
+- ACP permission prompts no longer disappear mid-turn ([#2762](https://github.com/getpaseo/paseo/pull/2762))
+- A workspace no longer looks idle while its native subagents run ([#2777](https://github.com/getpaseo/paseo/pull/2777))
+- Terminal activity stops after an interrupted turn ([#2942](https://github.com/getpaseo/paseo/pull/2942))
+- Windows terminals handle deferred startup failures without crashing
+- Recreated workspace folders no longer remain incorrectly archived ([#2987](https://github.com/getpaseo/paseo/pull/2987))
+- Restoring a merged workspace no longer leaves it inactive ([#2714](https://github.com/getpaseo/paseo/pull/2714))
+- Switching workspaces no longer scrolls a chat away from where you were reading ([#2838](https://github.com/getpaseo/paseo/pull/2838))
+- Images stay anchored while a conversation reloads
+- Swipe and drag gestures work in the mobile sidebar ([#2709](https://github.com/getpaseo/paseo/pull/2709))
+- Dictated prompts no longer disappear when you submit them ([#2745](https://github.com/getpaseo/paseo/pull/2745))
+- The composer stays above the keyboard on Android
+- Typing with an IME on mobile no longer loses composed text
+- The composer toolbar no longer flickers when switching tabs ([#2937](https://github.com/getpaseo/paseo/pull/2937))
+- Your selected project stays selected when you switch hosts ([#2700](https://github.com/getpaseo/paseo/pull/2700))
+- Host connection choices stay selected through Settings and desktop refreshes ([#2905](https://github.com/getpaseo/paseo/pull/2905))
+- The pull request panel updates after you switch branches ([#2699](https://github.com/getpaseo/paseo/pull/2699))
+- New Workspace shows its isolation controls right away ([#2702](https://github.com/getpaseo/paseo/pull/2702))
+- Sidebar shortcuts leave focus mode ([#2717](https://github.com/getpaseo/paseo/pull/2717))
+- Agents started by the NixOS service no longer run in production mode ([#2697](https://github.com/getpaseo/paseo/pull/2697) by [@shin-sakata](https://github.com/shin-sakata))
+
+## 0.2.5 - 2026-07-30
+
+### Fixed
+
+- Fixed the Linux Debian package ([#2654](https://github.com/getpaseo/paseo/pull/2654) by [@Neumannzc](https://github.com/Neumannzc))
+
+## 0.2.4 - 2026-07-30
+
+### Added
+
+- Set an agent's thinking level from the CLI ([#2533](https://github.com/getpaseo/paseo/pull/2533))
+- Switch projects while creating a workspace with ⌘P / Ctrl+P ([#2110](https://github.com/getpaseo/paseo/pull/2110) by [@turtleDev](https://github.com/turtleDev))
+- Open a project or workspace folder from the sidebar ([#2491](https://github.com/getpaseo/paseo/pull/2491) by [@PTK030](https://github.com/PTK030))
+- Flick up on the chat to dismiss the keyboard ([#2417](https://github.com/getpaseo/paseo/pull/2417) by [@nllptrx](https://github.com/nllptrx))
+- Custom providers can read the agent's working directory ([#2563](https://github.com/getpaseo/paseo/pull/2563))
+
+### Fixed
+
+- The same repository added on more than one machine appears as one project in the sidebar ([#2565](https://github.com/getpaseo/paseo/pull/2565))
+- Idle agents keep their background work instead of shutting down when unused ([#2590](https://github.com/getpaseo/paseo/pull/2590))
+- Desktop no longer crashes at startup while restoring your file tree ([#2595](https://github.com/getpaseo/paseo/pull/2595))
+- Plan approval only shows the latest proposal ([#2534](https://github.com/getpaseo/paseo/pull/2534))
+- Opus 5 appears once in the model list, with its full 1M context ([#2497](https://github.com/getpaseo/paseo/pull/2497))
+- The context meter no longer blanks out partway through a conversation ([#2494](https://github.com/getpaseo/paseo/pull/2494) by [@theslava](https://github.com/theslava))
+- A very large working diff no longer drops your session ([#2488](https://github.com/getpaseo/paseo/pull/2488) by [@nikuscs](https://github.com/nikuscs))
+- Interrupting Pi no longer surfaces a stream error ([#2311](https://github.com/getpaseo/paseo/pull/2311) by [@mcowger](https://github.com/mcowger))
+- Grok usage shows again in Settings ([#2353](https://github.com/getpaseo/paseo/pull/2353) by [@jasonhnd](https://github.com/jasonhnd))
+- OMP models that report no context window now load ([#2406](https://github.com/getpaseo/paseo/pull/2406) by [@astartsky](https://github.com/astartsky))
+- Paseo's own tools are available directly in OMP ([#2418](https://github.com/getpaseo/paseo/pull/2418) by [@perezd](https://github.com/perezd))
+- Codex finds the skills defined in your project ([#2423](https://github.com/getpaseo/paseo/pull/2423) by [@dwyanewang](https://github.com/dwyanewang))
+- Pull request comments containing HTML render correctly ([#2432](https://github.com/getpaseo/paseo/pull/2432) by [@mcowger](https://github.com/mcowger))
+- Self-hosted forge links keep their port ([#2478](https://github.com/getpaseo/paseo/pull/2478) by [@muzhi1991](https://github.com/muzhi1991))
+- The Linux AppImage launches when opened from your desktop ([#2439](https://github.com/getpaseo/paseo/pull/2439) by [@stonegray](https://github.com/stonegray))
+- Repository search works with older versions of the GitHub CLI ([#2611](https://github.com/getpaseo/paseo/pull/2611))
+
 ## 0.2.3 - 2026-07-27

 ### Added
@@ -19,7 +19,7 @@ This is an npm workspace monorepo:

 `docs/` is the source of truth for system-level and process-level knowledge. **"The docs", "check the docs", or "check the X docs" always mean this directory — not the web.** Look here before fetching anything online; the docs capture gotchas and conventions you cannot derive from the code or external sources.

-At the start of non-trivial work, list `docs/` and skim anything relevant to the task. When you learn something meta worth preserving — a gotcha, a convention, a workflow, a piece of system context that will outlive the current task — update an existing doc or propose a new one. Code-level facts belong in inline comments next to the code; system, process, and gotcha-level facts belong in `docs/`.
+At the start of non-trivial work, list `docs/` and skim anything relevant to the task.

 | Doc                                                                | What's in it                                                                                                                   |
 | ------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------ |
@@ -29,22 +29,27 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/data-model.md](docs/data-model.md)                           | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
 | [docs/glossary.md](docs/glossary.md)                               | Authoritative terminology — UI label wins, no synonyms                                                                         |
 | [docs/coding-standards.md](docs/coding-standards.md)               | Type hygiene, error handling, state design, React patterns, file organization                                                  |
-| [docs/design.md](docs/design.md)                                   | Theme tokens — colors, fonts, spacing, radii, icons                                                                            |
+| [docs/design.md](docs/design.md)                                   | Design system — tokens, buttons, hierarchy, density, alignment rails, states, what's forbidden                                 |
 | [docs/forms.md](docs/forms.md)                                     | Form architecture — non-React form model, form kit, load-state gating; the schedule form is the golden example                 |
 | [docs/hover.md](docs/hover.md)                                     | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
 | [docs/unistyles.md](docs/unistyles.md)                             | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
 | [docs/floating-panels.md](docs/floating-panels.md)                 | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
+| [docs/menus.md](docs/menus.md)                                     | The menu engine — popover vs sheet, submenu pages, hover intent, when a decision earns a submenu                               |
 | [docs/expo-router.md](docs/expo-router.md)                         | Expo Router route ownership, startup restore, and native blank-screen gotchas                                                  |
 | [docs/file-icons.md](docs/file-icons.md)                           | Material icon theme integration for the file explorer                                                                          |
 | [docs/providers.md](docs/providers.md)                             | Adding a new agent provider end-to-end                                                                                         |
 | [docs/forge-providers.md](docs/forge-providers.md)                 | Adding a git forge: registry/manifest, drop-in checklist, self-host/GHES, the two facts tiers                                  |
 | [docs/custom-providers.md](docs/custom-providers.md)               | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
+| [docs/plugins.md](docs/plugins.md)                                 | Local plugin manifest, directory source config, RPCs, native surfaces, and attachment sources                                  |
 | [docs/service-proxy.md](docs/service-proxy.md)                     | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
 | [docs/development.md](docs/development.md)                         | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
 | [docs/rpc-namespacing.md](docs/rpc-namespacing.md)                 | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
+| [docs/protocol-compatibility.md](docs/protocol-compatibility.md)   | Why app/daemon versions drift, protocol vs feature contract, capability gating, COMPAT tagging                                 |
 | [docs/protocol-validation.md](docs/protocol-validation.md)         | zod-aot generated inbound WebSocket validation, patched compiler regressions, schema-purity rules                              |
 | [docs/terminal-performance.md](docs/terminal-performance.md)       | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
+| [docs/file-observation.md](docs/file-observation.md)               | Recursive watcher ownership, Linux constraints, teardown invariants, and Parcel comparison                                     |
 | [docs/testing.md](docs/testing.md)                                 | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
+| [docs/qa.md](docs/qa.md)                                           | QA evidence bar for pull requests — platform matrix, version drift, performance, UI proof                                      |
 | [docs/mobile-testing.md](docs/mobile-testing.md)                   | Maestro and mobile test workflows                                                                                              |
 | [docs/mobile-panels.md](docs/mobile-panels.md)                     | Compact left/center/right panel ownership, worklet motion, gesture revisions, and Fabric constraints                           |
 | [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md)     | Isolated in-process daemon test harness                                                                                        |
@@ -54,6 +59,31 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/release.md](docs/release.md)                                 | Release playbook, draft releases, completion checklist                                                                         |
 | [docs/terminal-activity.md](docs/terminal-activity.md)             | Terminal activity indicators — source-agnostic tracker, agent hook reporting, adding a new hook provider                       |
 | [SECURITY.md](SECURITY.md)                                         | Relay threat model, E2E encryption, DNS rebinding, agent auth                                                                  |
+| [public-docs/hub/security.md](public-docs/hub/security.md)         | Public Hub guide — trust boundaries, untrusted triggers, provider controls, and output authority                               |
+
+### Writing docs
+
+- **Integrate, don't append.** Find the doc that owns the subject and rewrite the part that is now wrong. The standard failure is finishing a task and adding a paragraph to the bottom of the closest-looking doc; ten tasks later the doc is a pile of paragraphs in discovery order. `docs/custom-providers.md` is what that looks like.
+- **Don't document logic.** Prose that restates code drifts from the code and loses. Write down what the code can't tell you: why something is shaped the way it is, the gotcha that cost an afternoon, conventions nothing enforces, constraints that span packages or versions. If a reader could get it in two minutes by opening the file, cut it.
+- **One fact, one doc.** Every other mention is a link. If you are about to write the same paragraph in two docs, one of them is a link.
+- **Respect the layers.** `CONTRIBUTING.md` and this file name things and link out. Activity docs like `docs/qa.md` and `docs/testing.md` set the bar for a kind of work. Subject docs like `docs/unistyles.md` own one thing completely. A layer never re-explains the one below it.
+- **One subject per doc.** If the subject doesn't fit in a sentence, split the doc. A section per provider, vendor, or platform is a table plus one worked example.
+- **Delete.** Obsolete sections go. Prefer a `packages/app/src/thing.ts:120` reference over a pasted block.
+- **New doc?** Add a row to the table above and link it from the docs that should send readers there.
+- Code-level facts belong in comments next to the code, not here.
+
+### Doc voice
+
+Plain and short. Second person. State the rule, then the reason when the reason isn't obvious. Match the doc you're editing.
+
+Do not:
+
+- Write a sentence to land a point. "It's not X, it's Y", "That's not a Z, that's a W", and every other setup-and-punchline shape.
+- Add a clause that only asserts importance: "and that matters", "which is what keeps it working", "this is critical".
+- Use "honest", "robust", "seamless", "powerful", "simply", "just", "delightful".
+- Restate something you already said, in different words, for emphasis.
+- Hedge with "generally", "typically", or "you may want to" when the answer is "do this".
+- Clear your throat: "It's worth noting that", "In order to", "This section covers".

 ## Quick start

@@ -94,23 +124,11 @@ See [docs/development.md](docs/development.md) for full setup, build sync requir
 - **Always use npm scripts for linting and formatting.** Do not run tools directly with `npx eslint`, `npx oxfmt`, `npx oxlint`, or package-local binaries. For targeted checks, pass file paths through the npm script:
  - `npm run lint -- packages/app/src/components/message.tsx`
  - `npm run format:files -- CLAUDE.md packages/app/src/components/message.tsx`
- **The protocol stays backward-compatible. Features don't have to.** Two separate contracts:
-  - **Protocol contract (always):** schema changes must not break parsing in either direction. An old client must still parse messages from a new daemon; a new daemon must still parse messages from an old client.
-    - New fields: `.optional()` with a sensible default.
-    - Never flip optional → required, remove fields, or narrow types (`string` → `enum`, `nullable` → non-null).
-    - Removed fields stay accepted (we stop sending them, not stop reading them).
-    - Test with: "does a 6-month-old client still parse this?" and "does a 6-month-old daemon still send something this client accepts?"
-    - Wire schemas are pure structural declarations. Do not add `.transform()`, `.catch()`, or `.preprocess()` to WebSocket message schemas; put normalization in an explicit post-validation pass.
-    - Plain `z.union()` is forbidden when every branch has a shared literal tag. Use `z.discriminatedUnion()` unless generated-code regression tests prove that specific shape is miscompiled.
-    - `.default()` is acceptable on primitive leaves only. Never put defaults on item schemas for large arrays or big inbound containers.
-  - **Feature contract (per-feature):** a new feature may require a new daemon capability. The client detects whether the capability is present and either runs the feature or shows "Update the host to use this." That's it.
-    - **No fallback paths.** Don't write a degraded version of a new feature that runs on old daemons. Don't fan out across legacy RPCs to simulate a missing capability. The user upgrades or doesn't get the feature.
-    - **No defensive branches scattered through the feature.** Capability detection happens in one place; downstream code reads a clean shape.
-    - **Capability flags live in `server_info.features.*`** with a single `// COMPAT(featureName): added in v0.1.X, drop the gate when floor >= v0.1.X` comment marking the cleanup site.
-    - Existing functionality keeps working across versions — that's the protocol contract doing its job. New-feature degradation is not the goal.
-    - **New RPCs use dotted namespaces with direction suffixes.** Follow [docs/rpc-namespacing.md](docs/rpc-namespacing.md): `domain.provider.operation.request` pairs with `domain.provider.operation.response`. Existing flat RPC names will migrate over time; don't add new ones.
-
- **All back-compat shims are tagged and dated for cleanup.** Every shim that exists for old-client/old-daemon support carries a `COMPAT(name)` comment with the version it was added in and a target removal date (typically 6 months out). One grep — `rg "COMPAT\("` — should produce the full list of cleanup work. Don't bury back-compat in untagged `??`-fallbacks or optional-chain tunnels — that's how it stops being deletable.
+- **The protocol stays backward-compatible. Features don't have to.** Read [docs/protocol-compatibility.md](docs/protocol-compatibility.md) before touching `packages/protocol`. The short version:
+  - **Protocol contract (always):** an old client parses messages from a new daemon, and a new daemon parses messages from an old client. New fields are optional; never narrow, never remove, never require. Wire schemas stay pure — no `.transform()`, `.catch()`, or `.preprocess()`.
+  - **Feature contract (per-feature):** gate the capability once on `server_info.features.*`, then run the feature or tell the user to update the host. No fallback paths, no defensive branches.
+  - **Every shim is tagged.** `// COMPAT(name): added in vX, remove after <date>` at the site that has to be deleted. `rg "COMPAT\("` is the cleanup backlog; untagged back-compat is permanent by accident.
+  - **New RPCs use dotted namespaces with direction suffixes.** Follow [docs/rpc-namespacing.md](docs/rpc-namespacing.md): `domain.provider.operation.request` pairs with `domain.provider.operation.response`. Existing flat RPC names will migrate over time; don't add new ones.

 ## Platform gating

@@ -148,12 +166,12 @@ The app runs on iOS, Android, web (browser), and web (Electron desktop). Code is
  Import as `@/hooks/use-audio-recorder` — Metro picks the right file automatically.
 - **Use `.electron.ts` / `.electron.tsx` for Electron-only web modules.** Electron is still the Metro `web` platform, but desktop dev/build sets `PASEO_WEB_PLATFORM=electron`, so Metro first looks for `.electron.*` files and falls back to normal `.web.*` files. Use this when the implementation depends on Electron-only behavior such as `webviewTag`, desktop preload APIs, or the Electron bridge. Keep plain browser web in `.web.*`, and keep native fallbacks in the base file or `.native.*`.
  ```
-  components/
-    browser-pane.electron.tsx ← Electron <webview> implementation
-    browser-pane.web.tsx      ← plain web fallback
-    browser-pane.tsx          ← native fallback
+  desktop/browser/pane/
+    index.electron.tsx ← Electron <webview> implementation
+    index.web.tsx      ← plain web fallback
+    index.tsx          ← native fallback
  ```
-  Import as `@/components/browser-pane` — Electron desktop gets the `.electron.tsx` file, browser web gets `.web.tsx`, and native gets the native/base implementation.
+  Import as `@/desktop/browser/pane` — Electron desktop gets the `.electron.tsx` file, browser web gets `.web.tsx`, and native gets the native/base implementation.
 - **NEVER use raw DOM APIs without `isWeb` guard.** DOM APIs crash native. Casting a RN ref to `HTMLElement` is a red flag — ensure the block is web-only.
 - **NEVER use `onPointerEnter`/`onPointerLeave`.** They don't fire on native iOS.
 - **Hover only works on web.** React Native's `onHoverIn`/`onHoverOut` on `Pressable` does NOT fire on native iOS/iPad — the underlying W3C pointer events are behind disabled experimental flags. For hover-to-show UI (kebab menus, action buttons), use `isHovered || isNative || isCompact` so the controls are always visible on native and hover-to-show on web.
@@ -1,56 +1,140 @@
 # Contributing to Paseo

-Paseo is an opinionated product maintained by one person right now.
+Thank you for taking the time to contribute to Paseo.

-The product covers a lot of surface: mobile, desktop, web, the daemon, the relay, and both self-hosted and hosted setups.
+## Philosophy

-Contributing takes a lot of context that is very hard to transfer. That's why product, design, architecture, and workflow decisions are currently all made by the maintainer.
+Paseo is an opinionated product, built on freedom and flexibility: any agent provider, any device, running on your own machine. It is meant to be composable, so you can build the workflow you want. Read more about the product vision [here](docs/product.md).

-## Becoming a maintainer
+Given Paseo's scope, contributing to it takes a lot of context that is very hard to transfer. That's why product, design, architecture, and workflow decisions are currently all made by the maintainer.

-There's no formal process to become a maintainer, if you consistently contribute and help out, you'll become one.
+I pick what to build based on whether it fits the product, how many workflows it improves, whether it keeps things composable, whether we can hold the quality bar, and whether I want to build it.

-Here's the progression:
+## Report bugs in GitHub issues or Discord

-1. Get involved in the community: answer questions in Discord and on GitHub
-2. Triage bugs: replicate and help fix them
-3. Work on maintainer-approved features
+Open an [issue](https://github.com/getpaseo/paseo/issues) or post in [Discord](https://discord.gg/jz8T2uahpH).

-The reason for this progression is so that you can gain all the context you need to take on more responsibility, so that I can see if you have what it takes to be a maintainer.
+> [!IMPORTANT]
+> Feature requests opened as issues will get closed automatically

-Learning on the job is fine, I do not care how many years of experience you have, what I care about is that you get the vision and want to contribute.
+If you used an agent to investigate, paste the raw evidence and repro steps it collected, not its diagnosis.
+
+You may submit a PR to fix a bug, please read the PR guidelines below.
+
+## Product discussions go in GitHub Discussions or Discord
+
+There's no feature request backlog. Open a product discussion in [Discussions](https://github.com/getpaseo/paseo/discussions) or `#product` in [Discord](https://discord.gg/jz8T2uahpH), and frame it as a workflow:
+
+- What are you trying to do?
+- How do you do it today?
+- Where does Paseo get in the way?
+- What would the flow look like if it worked for you?
+
+"Can you build X" is not useful because it doesn't tell me about your problem.
+
+A discussion also lets other people add their own version of the same problem, and that's what I read when I decide what to build.
+
+Due to the volume and my limited bandwidth, I may not participate in all the discussions, if something gains interest it will make it's way to me.

 ## Pull requests

-✅ Will be accepted
+Anyone can open a pull request, but there are no guarantees of it getting merged, only submit one if you're okay with it being closed.

- Keep it to one focused change
- Link to an issue
- Explain the problem you're solving
- Include repro steps if it's a bug
- Include QA/testing evidence
- UI changes need screenshots or video for every affected platform: iOS, Android, desktop, and web
- If you only tested one platform, say that clearly
+Open it as a draft if the work isn't ready for review, if you want to run the checks against it, or if you want feedback on the direction before you finish it. Mark it ready when you want it looked at.
+
+Here is the criteria I use to decide:
+
+✅ Likely to be accepted
+
+- Fits the product vision
+- One focused change
+- Links the bug it fixes, or the discussion behind it if there is one
+- Addresses bot reviews
+- Explains the problem you're solving
+- QA evidence
+- Automated tests
+- Screenshots or video for UI changes, on every affected platform
+- Says which platforms you tested and which you didn't
+- Maintainer edits enabled

 ⛔️ Will be rejected

- Bundle unrelated changes
- Fail basic checks like typecheck, formatting or linting
- Add a feature or design change that wasn't discussed first
- Submit no evidence of testing
- Skip the linked issue
+- Bundles unrelated changes
+- Fails checks
+- Ignores bot reviews
+- Takes a feature or the design in a direction I don't want
+- No QA evidence
+- No tests
 - Clearly fully AI-generated PR

-## Requesting features
+### What to expect

-If you need a feature implemented, create a Github issue or a thread in Discord.
+- PRs that were explicitly approved in a discussion are preferred.
+- Unsolicited PR can be closed without a detailed review.
+- Your PR can be narrowed, refactored, or redesigned.
+- Your PR might be accepted but not merged immediately.
+- You will be attributed for your work in the changelog, even if I redesign your PR

-Explain the problem you want to solve: your use case, where Paseo falls short today, and the flow you expect.
+## QA evidence

-## AI assistance
+QA is the main bottleneck of Paseo's product development, and it's not just whether the feature works, it's also whether it meets the quality bar.

-Using AI to help write code is fine, but you must:
+Pull requests without evidence will be closed.

- Ensure your agents read the docs
- Understand the code you submit
- Review and test the code yourself
+What's accepted:
+
+- The shell commands you ran, pasted with their output
+- The tests you added and their results
+- Before and after screenshots
+- A video of the whole interaction
+- Logs, requests, responses
+
+Bugs and features both need automated tests, and the tests have to exercise the real thing. UI changes need a video, or a screenshot if it's static.
+
+The [QA guide](docs/qa.md) covers what to check for each of these and the tooling to do it.
+
+## I want to become a maintainer
+
+There's no formal process to become a maintainer, just consistently get involved with the project by answering questions, testing, reproducing bugs, discussing workflows with the community and offer to implement features when we reach an agreement.
+
+## FAQ
+
+### I'm blocked, where do I go?
+
+Join [Discord](https://discord.gg/jz8T2uahpH), ask your questions there.
+
+### Do you prefer Github or Discord?
+
+I am more active on Discord for general questions.
+
+I prefer Github for bugs because the template helps collect information more efficiently.
+
+### Why was my feature request closed?
+
+Issues are only for bugs. Open it as a product discussion instead, framed as a workflow.
+
+### Why didn't my PR get a detailed review?
+
+Writing a review is very time consuming and Paseo receives a lot of PRs, I cannot give detailed explanations at volume.
+
+### How long until someone looks at my pull request?
+
+It depends on what else is going on. QA takes longer than reading the diff. You are welcome to join Discord to ask.
+
+### Why do you want tests and a video for a small change?
+
+Because it's faster and safer than me checking out and running every PR myself to test it manually.
+
+QA evidence help me take your PR seriously for a deeper review and maintainer QA.
+
+### I only have one platform, can I still contribute?
+
+Yes. Test what you have, and say what you didn't test.
+
+### Can I use an agent to write my contribution?
+
+Yes, as long as you understand what you're submitting and you tested it yourself.
+
+### Is there a roadmap I can read?
+
+[docs/product.md](docs/product.md) covers the direction. There's no public list of what I'm building next.
@@ -7,7 +7,8 @@
 <p align="center">
  <a href="README.md">English</a> ·
  <a href="README.zh-CN.md">简体中文</a> ·
-  <a href="README.ja.md">日本語</a>
+  <a href="README.ja.md">日本語</a> ·
+  <a href="README.ko.md">한국어</a>
 </p>

 <p align="center">
@@ -117,7 +118,6 @@ npx skills add getpaseo/paseo
 どのエージェントとの会話でも使用できます。

 - `/paseo-handoff` — エージェント間で作業を引き継ぎます。私はこれを使って Claude で計画し、Codex に実装を引き継いでいます。
- `/paseo-loop` — 明確な受け入れ基準に沿ってエージェントをループさせます（Ralph loops とも呼ばれます）。検証役を追加することもできます。
 - `/paseo-advisor` — 単一のエージェントをアドバイザーとして起動し、作業を委任せずにセカンドオピニオンを得ます。
 - `/paseo-committee` — 対照的な2つのエージェントで委員会を構成し、一歩引いた視点で根本原因を分析して計画を作成します。

@@ -0,0 +1,172 @@
+<p align="center">
+  <img src="packages/website/public/logo.svg" width="64" height="64" alt="Paseo 로고">
+</p>
+
+<h1 align="center">Paseo</h1>
+
+<p align="center">
+  <a href="README.md">English</a> ·
+  <a href="README.zh-CN.md">简体中文</a> ·
+  <a href="README.ja.md">日本語</a> ·
+  <a href="README.ko.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 에이전트를 위한 하나의 인터페이스</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>
+
+내 컴퓨터에서 에이전트를 병렬로 실행하세요. 데스크톱이나 휴대폰에서 배포하세요.
+
+- **셀프 호스팅:** 에이전트는 완전한 개발 환경이 갖춰진 내 컴퓨터에서 실행됩니다. 평소 쓰던 도구, 설정, 스킬을 그대로 쓸 수 있습니다.
+- **여러 제공자 지원:** Claude Code, Codex, Copilot, OpenCode, Pi를 하나의 인터페이스에서 사용할 수 있습니다. 작업마다 알맞은 모델을 고를 수 있습니다.
+- **음성 제어:** 음성 모드에서 작업을 말로 지시하거나 문제를 음성으로 함께 검토할 수 있습니다. 손을 쓰지 않고 작업해야 할 때 유용합니다.
+- **여러 기기 지원:** iOS, Android, 데스크톱, 웹, CLI를 지원합니다. 데스크톱에서 시작해 휴대폰으로 확인하고 터미널에서 자동화할 수 있습니다.
+- **개인정보 보호 우선:** Paseo는 텔레메트리, 추적, 강제 로그인을 사용하지 않습니다.
+
+## 시작하기
+
+Paseo는 코딩 에이전트를 관리하는 로컬 서버인 데몬을 실행합니다. 데스크톱 앱, 모바일 앱, 웹 앱, CLI 같은 클라이언트가 이 데몬에 연결합니다.
+
+### 준비 사항
+
+아래 에이전트 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)
+
+### 데스크톱 앱(권장)
+
+[paseo.sh/download](https://paseo.sh/download) 또는 [GitHub 릴리스 페이지](https://github.com/getpaseo/paseo/releases)에서 다운로드하세요. 앱을 열면 데몬이 자동으로 시작됩니다. 별도로 설치할 것은 없습니다.
+
+휴대폰에서 연결하려면 **설정 → 호스트 → 기기 페어링**을 여세요.
+
+### CLI / 헤드리스 환경
+
+CLI를 설치하고 Paseo를 시작하세요.
+
+```bash
+npm install -g @getpaseo/cli
+paseo
+```
+
+Paseo가 로컬에서 시작된 뒤 기기 페어링을 위한 종단 간 암호화 릴레이를 켤지 묻습니다. 거절하면 TCP, Tailscale 또는 다른 VPN으로 직접 연결할 수 있습니다. 이 방식은 서버나 원격 머신에서 유용합니다.
+
+자세한 설치와 설정은 아래 문서를 참고하세요.
+
+- [문서](https://paseo.sh/docs)
+- [연결 가이드](https://paseo.sh/docs/connectivity)
+- [설정 레퍼런스](https://paseo.sh/docs/configuration)
+
+### Docker
+
+Docker에서 Paseo 데몬과 셀프 호스팅 웹 UI를 실행하세요:
+
+```bash
+docker run -d --name paseo \
+  -p 6767:6767 \
+  -e PASEO_PASSWORD=change-me \
+  -v "$PWD/paseo-home:/home/paseo" \
+  -v "$PWD:/workspace" \
+  ghcr.io/getpaseo/paseo:latest
+```
+
+컨테이너가 시작되면 `http://localhost:6767`을 여세요. 사용하는 에이전트 CLI를 기본 이미지에 추가한 뒤, 환경 변수나 영구 `/home/paseo` 볼륨으로 인증 정보를 설정하세요. 자세한 내용은 [Docker 문서](docs/docker.md)를 참고하세요.
+
+## CLI
+
+앱에서 할 수 있는 모든 작업은 터미널에서도 할 수 있습니다.
+
+```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                           # 실행 중인 에이전트 목록
+paseo attach abc123                # 실시간 출력 스트리밍
+paseo send abc123 "also add tests" # 후속 작업 전송
+
+# 원격 데몬에서 실행
+paseo --host workstation.local:6767 run "run the full test suite"
+```
+
+자세한 내용은 [전체 CLI 레퍼런스](https://paseo.sh/docs/cli)를 참고하세요.
+
+## 스킬
+
+스킬은 에이전트가 Paseo를 통해 다른 에이전트를 오케스트레이션하는 방법을 알려 줍니다.
+
+```bash
+npx skills add getpaseo/paseo
+```
+
+그런 다음 어떤 에이전트 대화에서든 아래 명령을 사용할 수 있습니다.
+
+- `/paseo-handoff` — 에이전트 간에 작업을 넘깁니다. Claude로 계획을 세운 뒤 Codex에 구현을 넘길 때 이 기능을 씁니다.
+- `/paseo-advisor` — 작업 자체를 넘기지 않고, 에이전트 하나를 조언자로 띄워 두 번째 의견을 받습니다.
+- `/paseo-committee` — 서로 다른 관점의 에이전트 두 개로 위원회를 구성해, 한 발 물러나 근본 원인을 분석하고 계획을 세웁니다.
+
+## 개발
+
+모노레포 패키지 구성은 다음과 같습니다.
+
+- `packages/server`: Paseo 데몬(에이전트 프로세스 오케스트레이션, WebSocket API, MCP 서버 제공)
+- `packages/app`: Expo 클라이언트(iOS, Android, 웹)
+- `packages/cli`: `paseo` CLI(데몬과 에이전트 워크플로)
+- `packages/desktop`: Electron 데스크톱 앱
+- `packages/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
+
+# 서버 스택 빌드
+npm run build:server
+
+# 레포 전체 검사 실행
+npm run typecheck
+```
+
+## 관련 프로젝트
+
+- [getpaseo/paseo-relay](https://github.com/getpaseo/paseo-relay) — Elixir로 작성한 공식 분산형 릴레이
+- [paseo-skins](https://github.com/huangguang1999/paseo-skins) — 커뮤니티 테마와 Agent Skill을 제공하고, 코드 수정 없이 쓸 수 있는 데스크톱 테마 로더
+- [paseo-vscode](https://marketplace.visualstudio.com/items?itemName=hinnes.paseo-vscode) — VS Code 확장 프로그램
+
+## 라이선스
+
+AGPL-3.0
@@ -7,7 +7,8 @@
 <p align="center">
  <a href="README.md">English</a> ·
  <a href="README.zh-CN.md">简体中文</a> ·
-  <a href="README.ja.md">日本語</a>
+  <a href="README.ja.md">日本語</a> ·
+  <a href="README.ko.md">한국어</a>
 </p>

 <p align="center">
@@ -64,7 +65,7 @@ You need at least one agent CLI installed and configured with your credentials:

 Download it from [paseo.sh/download](https://paseo.sh/download) or the [GitHub releases page](https://github.com/getpaseo/paseo/releases). Open the app and the daemon starts automatically. Nothing else to install.

-To connect from your phone, open **Settings → your host → Connections → Pair a device**.
+To connect from your phone, open **Settings → your host → Pair Device**.

 ### CLI / headless

@@ -75,11 +76,12 @@ npm install -g @getpaseo/cli
 paseo
 ```

-This shows a QR code in the terminal. Connect from any client. This path is useful for servers and remote machines.
+Paseo starts locally, then asks whether to enable the end-to-end encrypted relay for device pairing. If you decline, connect directly over TCP, Tailscale, or another VPN. This path is useful for servers and remote machines.

 For full setup and configuration, see:

 - [Docs](https://paseo.sh/docs)
+- [Connectivity guide](https://paseo.sh/docs/connectivity)
 - [Configuration reference](https://paseo.sh/docs/configuration)

 ### Docker
@@ -103,7 +105,7 @@ Everything you can do in the app, you can do from the terminal.

 ```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 run --provider codex/gpt-5.5 --worktree feature-x "implement feature X"

 paseo ls                           # list running agents
 paseo attach abc123                # stream live output
@@ -115,6 +117,30 @@ paseo --host workstation.local:6767 run "run the full test suite"

 See the [full CLI reference](https://paseo.sh/docs/cli) for more.

+## TypeScript SDK
+
+Build issue integrations, dashboards, and orchestration services with `@getpaseo/client`:
+
+```ts
+import { createPaseoClient } from "@getpaseo/client";
+
+const client = createPaseoClient({ url: "ws://127.0.0.1:6767/ws" });
+await client.connect();
+
+const agent = await client.agents.create({
+  config: { provider: "codex/gpt-5.5" },
+  cwd: "/Users/me/dev/storefront",
+  prompt: "Review the current diff and name the riskiest change.",
+});
+
+const result = await agent.waitForFinish();
+console.log(result.lastMessage);
+
+await client.close();
+```
+
+See the [SDK quickstart](https://paseo.sh/docs/sdk/quickstart), [recipes](https://paseo.sh/docs/sdk/recipes), and [API reference](https://paseo.sh/docs/sdk/reference).
+
 ## Skills

 Skills teach your agent to use Paseo to orchestrate other agents.
@@ -126,7 +152,6 @@ npx skills add getpaseo/paseo
 Then use them in any agent conversation:

 - `/paseo-handoff` — hand off work between agents. I use this to plan with Claude and then handoff to Codex to implement.
- `/paseo-loop` — loop an agent against clear acceptance criteria (aka Ralph loops), optionally with a verifier.
 - `/paseo-advisor` — spin up a single agent as an advisor for a second opinion, without delegating the work itself.
 - `/paseo-committee` — form a committee of two contrasting agents to step back, do root cause analysis, and produce a plan.

@@ -7,7 +7,8 @@
 <p align="center">
  <a href="README.md">English</a> ·
  <a href="README.zh-CN.md">简体中文</a> ·
-  <a href="README.ja.md">日本語</a>
+  <a href="README.ja.md">日本語</a> ·
+  <a href="README.ko.md">한국어</a>
 </p>

 <p align="center">
@@ -117,7 +118,6 @@ npx skills add getpaseo/paseo
 然后在任意 agent 对话中使用：

 - `/paseo-handoff` — 在 agents 之间交接工作。我会用它先和 Claude 规划，再交给 Codex 实现。
- `/paseo-loop` — 让 agent 按明确验收标准循环工作（也叫 Ralph loops），也可以加 verifier。
 - `/paseo-advisor` — 启动单个 agent 作为 advisor，提供第二意见，但不把工作委托出去。
 - `/paseo-committee` — 组建两个风格互补的 agents，让它们后退一步做根因分析并产出计划。

@@ -66,6 +66,18 @@ CORS is not a complete security boundary. It controls which browser origins can

 Paseo validates the `Host` header on every HTTP request and every WebSocket upgrade against an allowlist (Vite-style semantics). By default, only `localhost`, `*.localhost`, and any literal IP address (IPv4 or IPv6) are accepted. Additional hostnames can be configured via `hostnames` in `config.json` or the `PASEO_HOSTNAMES` env var (comma-separated; entries beginning with `.` match a domain and its subdomains; the value `true` disables the allowlist entirely). Requests with unrecognized hosts are rejected with `403 Host not allowed`.

+## HTML file preview
+
+Previewing an `.html` file in the file pane renders it as a page, so markup an agent wrote — or markup that arrived with a repo you cloned — executes when you open it. The preview is built to contain that, not to trust it.
+
+The document loads with an opaque origin and a policy that permits inline script and style and refuses everything else: no remote script, font, image, or media; no `fetch`, XHR, WebSocket, or beacon; no form posts; no plugins; no nested frames. It has no access to Paseo's DOM, and storage and cookie APIs throw inside it rather than returning anything. It cannot navigate the top window, and it cannot open popups. It cannot read any file but itself.
+
+One gap remains on web and desktop: a sandboxed document may navigate _itself_, and no CSP directive in current browsers prevents that. `navigate-to` was dropped from CSP Level 3 and is not enforced, and `<meta http-equiv="refresh">` needs no script at all. A hostile page can therefore reach a server by navigating away, carrying data available inside the preview, such as its own contents, browser and device properties, user input inside the page, and your IP address. It cannot read Paseo, another file, storage, or cookies.
+
+Native builds narrow this gap rather than closing it outright. The WebView refuses every navigation after the initial document, but that decision is made in the app's JavaScript, and on Android the WebView falls back to allowing a navigation when the decision doesn't come back in time. Treat it as a strong mitigation, not a guarantee: if the JS thread is stalled at the moment a page navigates, the same leak is possible there too.
+
+If you don't trust a page, read it in `Source`, which executes nothing. Source is available as an editable view on supported web hosts and a read-only view everywhere else.
+
 ## Agent authentication

 Paseo wraps agent CLIs (Claude Code, Codex, OpenCode) but does not manage their authentication. Each agent provider handles its own credentials. Paseo never stores or transmits provider API keys. Agents run in your user context with your existing credentials.
@@ -23,6 +23,7 @@ RUN set -eux; \
    npm pack --workspace=@getpaseo/relay --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/protocol --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/client --pack-destination /tmp/paseo-packs; \
+    npm pack --workspace=@paseo/plugin --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/server --pack-destination /tmp/paseo-packs; \
    npm pack --workspace=@getpaseo/cli --pack-destination /tmp/paseo-packs

@@ -24,6 +24,15 @@ primed.
 Idle agents remain resident indefinitely. Runtime closure happens only through an explicit lifecycle
 action such as archive, replacement, reload, workspace teardown, or daemon shutdown.

+A provider runtime can still die on its own — crash, OOM kill, host suspend. Work the agent parked
+inside that process dies with it: Claude Code's background Bash shells, `Monitor` watches, and
+workflows all live in the CLI process, and the completion notification that would have woken the
+agent never arrives. A runtime that dies mid-turn is reported by whatever is draining its stream, but
+between turns nothing is watching, so the agent sits at `idle` looking healthy while its background
+work is gone. Report that exit as a turn failure so the agent lands in `error` with a timeline entry.
+Only the Claude provider does this today; the others still report a death only when a turn happens to
+be in flight.
+
 ### Cancellation

 Cancellation changes lifecycle state only after the provider acknowledges the interrupt or emits a terminal turn event. If the interrupt is rejected or times out, the agent remains `running` with its active foreground turn intact. Follow-up actions such as replacement, reload, rewind, and Stop must report that failure instead of accepting work they cannot perform. Synthesizing a local cancellation without provider acknowledgment creates a split-brain session: Paseo accepts a new prompt while the provider still owns the previous foreground turn.
@@ -35,11 +44,26 @@ Agents can launch other agents via the agent-scoped `create_agent` MCP tool. Age
 - **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 after an explicit detach transition, do not appear in the former parent's subagent track, and are not archived with it.

+Parent archive detaches a subagent instead of archiving it when either condition holds:
+
+- The child belongs to another workspace.
+- The child is currently open in an agent tab.
+
+All other children archive with the parent. After the workspace layout hydrates, the client marks
+every managed subagent present in its tabs with `paseo.open-agent-tab.<client-id>=true` through the
+generic agent metadata update. This includes background and restored tabs; navigation does not own
+the marker. Closing a tab sets that client's label to `false`. Any `true` client label keeps the child
+open. Detach clears the parent and every open-tab label. The surviving child therefore becomes a
+normal root agent immediately, and closing its still-open tab archives it.
+
 Runtime ownership is resolved from explicit workspace ID and caller context, never from `cwd`. Workspace creation is a separate operation with `local | worktree` isolation; agent creation only selects an existing workspace.

-Users can also detach an existing subagent from the subagents track. Detach is deliberately a manual lifecycle gesture, not an agent-facing MCP tool. It removes the `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.
+Users can also detach an existing subagent from the subagents track. Detach is deliberately a manual lifecycle gesture, not an agent-facing MCP tool. It removes the parent and open-tab lifecycle labels: it does not stop, archive, move, or restart the agent. The agent keeps its current `cwd` and `workspaceId`, leaves the former parent's track, and behaves like a root agent for tab close, workspace activity, and future parent archive.

 `notifyOnFinish` defaults to `true` for agent-scoped creation and 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.
+Permission requests are notification checkpoints, not the end of that subscription. The caller is notified again after a permission response when the child finishes, errors, or requests another permission.
+The permission notification includes the normalized request plus the child and request IDs, so the caller can inspect it and respond without fetching agent status.
+A watched child that closes before its finish event also notifies the caller so delegated work cannot disappear silently during archive or workspace teardown.

 ## Provider-managed child agents

@@ -62,7 +86,7 @@ Archiving runs through `AgentManager.archiveAgent` (`packages/server/src/server/
 2. Set `archivedAt` and normalize `lastStatus` away from `running`/`initializing`
 3. Notify subscribers
 4. Close the runtime (kills the process if still running)
-5. **Cascade-archive children** — any agent whose `paseo.parent-agent-id` label matches the archived agent gets archived too, recursively
+5. **Resolve children** — detach cross-workspace and open-tab children; cascade-archive the rest recursively

 Cascade is what keeps subagent fleets from outliving their orchestrator.

@@ -97,7 +121,7 @@ These are two distinct concepts that used to be conflated:

 Closing a tab on a **root agent** still archives — the tab is the agent's home, so closing it means "I'm done with this agent." A confirm dialog protects against archiving a running agent by accident.

-Closing a tab on a **subagent** (any agent with `parentAgentId`) is **layout-only**. The agent stays unarchived and stays in its parent's track. The user can re-open the tab from the track at any time. This is implemented in `handleCloseAgentTab` (`packages/app/src/screens/workspace/workspace-screen.tsx`).
+Closing a tab on a **subagent** (any agent with `parentAgentId`) is **layout-only**. The app clears the current client's open-tab label before removing the tab. Another client's open tab remains protected. The agent stays unarchived and stays in its parent's track, so a later parent archive cascades to it when no client still has it open. The user can re-open the tab from the track at any time. Single and bulk tab close apply the same policy.

 The asymmetry is intentional: a subagent's persistent relationship lives in the parent's track. Same-workspace subagents are not auto-opened as tabs; the user opens one from that track when needed. A cross-workspace subagent is also auto-opened as a tab in its own workspace so opening that workspace does not appear empty. It remains in the parent's track until it is actually detached.

@@ -107,6 +131,8 @@ Agent lifecycle status stays literal: a parent agent is `idle` when its own turn

 Workspace status is an aggregate activity signal computed **per `workspaceId`**. Ownership is never derived from `cwd` — many workspaces may share one directory, and same-`cwd` siblings do not clump under one status. Root agents and cross-workspace subagents contribute their normal state bucket to their own workspace. Same-workspace descendants contribute `running` to the nearest ancestor in that workspace; their non-running attention, permission, and error states stay in the parent's subagents track. This makes a cross-workspace subagent behave like a detached agent for workspace visibility and status without removing its parent relationship.

+Running provider-native subagents contribute `running` to the workspace owned by their parent agent. Their completed, failed, and canceled states stay in the parent's subagents track.
+
 ## The subagents track

 The collapsible track above the composer in an agent's pane (`packages/app/src/subagents/track.tsx`) combines two kinds of children:
@@ -123,11 +149,25 @@ Clicking either kind opens a workspace tab. A Paseo subagent tab is a normal int

 Provider timelines use the same structural timeline item format but deliberately have a separate lifecycle and transport. A provider thread/session identifier is not a Paseo agent identifier, and closing its tab is always layout-only.

+Provider descriptors may include one compact subtitle. The provider owns its contents and formatting; clients display and truncate it without interpreting provider-specific model, thinking, or usage fields.
+
+### Claude provider subagents: the task protocol
+
+Claude Code announces subagent lifecycle on the SDK stream (`task_started` / `task_updated` / `task_notification` / `task_progress`), and Paseo reads those announcements rather than reconstructing them from sidechain frames. The live source (`subagents/live-source.ts`) and the replay source (`subagents/replay-source.ts`) both translate into one observation vocabulary (`subagents/observation.ts`), so a fact is derived once for both paths instead of once per path. Gotchas that are not obvious from the SDK types:
+
+- **Not every announced task belongs in the track.** Task subagents announce as `local_agent` and workflows as `local_workflow`; a backgrounded shell announces as `local_bash` with the same `tool_use_id` shape, and ambient housekeeping sets `skip_transcript`. The Claude provider normalizes a workflow to a generic provider-subagent descriptor titled `Workflow`, using Claude's summary as its description and timeline opener. Shared storage, protocol, and UI do not distinguish it from another provider subagent.
+- **A task that was never declared gets no descriptor, by any route.** Filtered tasks still emit `task_notification`s carrying a `tool_use_id`, and still emit frames carrying `parent_tool_use_id`. Attributing either produces a descriptor with no identity and a defaulted `running` status — a nameless row that never finishes. Status, presentation updates, and sidechain frames all route through the declaration table.
+- **Task ids are session-scoped, not turn-scoped.** Cancelling a turn must not clear the routing table: a backgrounded child settles after the interrupt and needs its descriptor to still exist. Cancellation instead terminalizes the declared children that were running in the foreground, and a later `task_notification` is free to correct that guess. Backgrounded children are identified by `task_updated.patch.is_backgrounded`.
+- **Effort is only reachable through hooks.** It appears nowhere on the message stream at any depth, and the level Paseo requests is not necessarily the level that runs — a model that does not support it is silently downgraded. A hook firing inside a subagent reports the active post-downgrade level next to its `agent_id`, which is the same id `task_started` calls `task_id`.
+- **Backgrounded subagents emit no frames carrying `parent_tool_use_id` at all.** Everything keyed off that field sees nothing for one; they are visible only because the task protocol announces them.
+- **On replay, `<session>/subagents/` holds every descendant, not just this session's children.** `agent-<id>.meta.json` carries `spawnDepth`: `1` is a direct child, `2+` was spawned by another subagent and its `toolUseId` names a Task call made inside its parent's session, which nothing in this transcript can resolve. Replaying those adds rows the live stream never showed, each with no Task card and no recoverable outcome, so they render as running forever. One recorded session showed 10 subagents live and would have replayed 22.
+- **Replay `totalTokens` is a context-size reading, not cumulative spend.** Claude Code finalizes a subagent by summing the _last_ assistant message's usage block and shipping that as `usage.total_tokens`. Summing per-entry usage instead multiplies the cached prefix by the turn count and reports a number several times larger than the live path.
+
 Archived Paseo subagents disappear from the track, by design. To remove one from the track without closing its tab, use the **archive button** on the row — it opens a confirm dialog and archives the subagent on confirm. Provider-owned rows have no individual Paseo lifecycle controls.

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

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

 ## Why this shape

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

 ### Subagent accumulation under long-lived parents

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

 ### Cross-client tab dismissal

@@ -161,11 +201,12 @@ $PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json

 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 for agent-scoped creation and removed by detach |
-| `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 for agent-scoped creation and removed by detach |
+| `labels["paseo.open-agent-tab.<client-id>"]` | `string?`     | `"true"` protects an open tab on that client; detach clears every matching label   |
+| `lastStatus`                                 | `AgentStatus` | `initializing` / `idle` / `running` / `error` / `closed`                           |

 See [`docs/data-model.md`](./data-model.md) for the full agent record.
@@ -67,6 +67,17 @@ npm run android:production     # Release build
 npm run android:clear          # Remove generated Android project
 ```

+For a production-ID release APK that local Android profiling tools can attach to:
+
+```bash
+PASEO_PROFILE_BUILD=1 npm run android:production
+```
+
+This keeps the `sh.paseo` package id, release Hermes bundle, and release optimizations. It adds
+`<profileable android:shell="true" />` and enables local Android trace markers for workspace mounts
+and daemon WebSocket traffic. The markers contain message types and sizes, never payload contents,
+and emit only while a system trace records the `sh.paseo` app (`perfetto -a sh.paseo ...`).
+
 Or from `packages/app`:

 ```bash
@@ -118,7 +129,7 @@ cd android
 PASEO_FDROID_BUILD=1 ./gradlew assembleRelease --no-daemon --max-workers=1 -Dorg.gradle.parallel=false
 ```

-The flag must be present for both prebuild and Gradle because Gradle starts Metro for the release bundle. Keep the source build serial and daemon-free as shown above: compiling every Expo module can exhaust memory when Gradle workers run in parallel. The profile enables source-built Expo modules, excludes the proprietary camera, Firebase notification, and Expo development-client native modules, disables EAS updates and Gradle dependency metadata, and substitutes JavaScript stubs for camera and notifications. The resulting app supports direct and pasted-link pairing but not QR scanning or push notifications.
+The flag must be present for both prebuild and Gradle because Gradle starts Metro for the release bundle. Keep the source build serial and daemon-free as shown above: compiling every Expo module can exhaust memory when Gradle workers run in parallel. The profile enables source-built Expo modules, excludes the proprietary camera, Firebase notification, and Expo development-client native modules, disables Gradle dependency metadata, and substitutes JavaScript stubs for camera and notifications. The resulting app supports direct and pasted-link pairing but not QR scanning or push notifications.

 For a single-ABI APK, pass React Native's architecture property to Gradle:

@@ -69,6 +69,7 @@ not retain non-Git directories.
 | `server/bootstrap.ts`           | Daemon initialization: HTTP server, WS server, agent manager, storage, relay  |
 | `server/websocket-server.ts`    | WebSocket connection management, hello handshake, binary frame routing        |
 | `server/session.ts`             | Per-client session state, timeline subscriptions, terminal operations         |
+| `server/directory-sync/`        | Daemon-global latest-state sequences for projects, workspaces, and agents     |
 | `server/agent/agent-manager.ts` | Agent lifecycle state machine, timeline tracking, subscriber management       |
 | `server/agent/agent-storage.ts` | File-backed JSON persistence at `$PASEO_HOME/agents/`                         |
 | `server/agent/tools/`           | Transport-neutral catalog for workspaces, agents, permissions, and automation |
@@ -76,8 +77,6 @@ not retain non-Git directories.
 | `server/agent/providers/`       | Provider adapters (see "Agent providers" below)                               |
 | `server/relay-transport.ts`     | Outbound relay connection with E2E encryption                                 |
 | `server/schedule/`              | Cron-based scheduled agents                                                   |
-| `server/loop-service.ts`        | Looping agent runs that retry until an exit condition                         |
-| `server/chat/`                  | Chat rooms for agent-to-agent and human-to-agent messaging                    |

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

@@ -99,19 +98,27 @@ Cross-platform React Native app that connects to one or more daemons.

 - Expo Router navigation (`/h/[serverId]/workspace/[workspaceId]`, `/h/[serverId]/agent/[agentId]`, etc.). The `workspaceId` URL segment is an opaque workspace id, not a directly meaningful filesystem path.
 - `HostRuntimeController` manages saved host connections, reconnection, and per-host runtime state
- `runtime/replica-cache` keeps a non-authoritative per-host display replica in AsyncStorage: only the last focused agent, its workspace, and a short timeline tail. It restores before navigation becomes ready, leaves remote hydration flags false, and is atomically replaced by the normal snapshot-plus-delta synchronization path.
+- `runtime/replica-cache` keeps the complete project, workspace, and active-agent directory plus one short focused timeline tail in AsyncStorage. It restores before navigation becomes ready and leaves remote hydration flags false.
+- `runtime/directory-sync` owns directory reconciliation. On reconnect it passes the persisted per-entity cursor through `project.list`, `fetch_workspaces`, and `fetch_agents`; the daemon returns each entity's latest projection when its sequence is newer, plus tombstones.
 - `SessionContext` wraps the daemon client for the active session
 - Composer UI and submit/draft behavior live in `packages/app/src/composer/`; screens and panels should integrate it from there instead of dropping composer internals into `components/`, `hooks/`, or `screens/workspace/`
 - Timeline reducers in `timeline/session-stream-reducers.ts` handle compaction, gap detection, sequence-based deduplication
 - Timeline sync correctness is documented in [docs/timeline-sync.md](timeline-sync.md): live streams are for immediacy, `fetch_agent_timeline_request` is authoritative, and catch-up is paged but complete.
 - Voice features: dictation (STT) and voice agent (realtime)

-The replica cache exists only to paint stale data immediately while the host connects. It does not
-own mutations, infer deletions, or replace daemon reconciliation. Pending permission requests are
-not restored from it. AsyncStorage is not encrypted, so the cached timeline tail may contain source
-code, prompts, and tool output; encrypted-at-rest storage is a separate product/security decision.
-Its serialized payload has a 1 MiB byte budget and evicts whole host snapshots in least-recently-
-written order; a single oversized host is omitted rather than partially restored.
+The replica cache paints stale data immediately while the host connects. Directory cursors are
+reconciliation checkpoints; cached entities remain non-authoritative until the daemon answers.
+Pending permission requests are not restored from it. AsyncStorage is not encrypted, so the cached
+timeline tail may contain source code, prompts, and tool output; encrypted-at-rest storage is a
+separate product/security decision. Its serialized payload has a 32 MiB byte budget and evicts whole
+host snapshots in least-recently-written order; a single oversized host is omitted rather than
+partially restored. Browser and Electron builds store it in IndexedDB. Native builds use
+AsyncStorage, and Android reserves 64 MiB for that database.
+
+The three directory entity types have independent monotonic sequences and share one daemon
+generation. The daemon retains only the latest projection per entity and bounded tombstones, not an
+event log. A missing, expired, or previous-generation cursor receives a full snapshot. Projects are
+independent records; a project with no workspaces does not need a workspace placeholder.

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

@@ -119,13 +126,11 @@ Commander.js CLI with Docker-style commands. Common agent operations are also ex

 - `paseo agent ls/run/import/attach/logs/stop/delete/send/inspect/wait/archive/reload/update/mode`
 - `paseo daemon start/stop/restart/status/pair/set-password`
- `paseo chat ls/create/inspect/post/read/wait/delete`
 - `paseo terminal ls/create/capture/send-keys/kill`
 - `paseo script ls/start/stop`
- `paseo loop run/ls/inspect/logs/stop`
 - `paseo schedule create/ls/inspect/update/pause/resume/run-once/logs/delete`
 - `paseo heartbeat create/update/delete`
- `paseo workspace create/ls/archive`
+- `paseo workspace create/ls/rename/archive`
 - `paseo permit allow/deny/ls`
 - `paseo provider ls/models`
 - hidden legacy `paseo worktree create/ls/archive` compatibility alias
@@ -141,6 +146,7 @@ Enables remote access when the daemon is behind a firewall.
 - The relay is zero-knowledge — it routes encrypted bytes and cannot read content
 - Client and daemon channels with identical API (`createClientChannel`, `createDaemonChannel`)
 - Pairing via QR code transfers the daemon's public key to the client
+- New homes keep relay disabled until pairing consent. `DaemonConfigStore` persists the desired state, while the relay runtime starts or stops the outbound transport live; pairing reads that current state instead of a startup snapshot.
 - Optional E2EE capability negotiation preserves application frame kind: text plaintext uses base64 ciphertext text frames, while binary plaintext uses raw ciphertext binary frames; mixed-version peers remain base64-only
 - Self-hosted relays opt into TLS with `daemon.relay.useTls` or `PASEO_RELAY_USE_TLS=true`; the public (client-facing) TLS setting can be overridden independently via `daemon.relay.publicUseTls` or `PASEO_RELAY_PUBLIC_USE_TLS`

@@ -228,6 +234,11 @@ New session RPCs use dotted names with `.request` and `.response` suffixes, such
 - `agent_permission_request` / `agent_permission_resolved` — Tool-call permission flow
 - `agent_deleted`, `agent_archived`, `agent_status`, `agent_list`
 - `checkout_status_update`, `checkout_diff_update`, and the full `checkout_*` request/response set for git operations
+
+Agent snapshots optionally carry the daemon-owned active turn identity, and turn lifecycle stream events
+optionally carry the same `turnId`. New clients use these fields when present and normalize an old daemon's
+status once at the directory boundary rather than maintaining a second activity model.
+
 - Terminal subscribe/input/capture commands
 - Voice/dictation streaming events (`dictation_stream_*`, `assistant_chunk`, `audio_output`, `transcription_result`)
 - Request/response pairs for fetch, list, create, etc., correlated by `requestId`; failures use `rpc_error`
@@ -293,7 +304,10 @@ initializing → idle ⇄ running
 `ManagedAgent` is a discriminated union over those lifecycle tags. Notes:

 - **AgentManager** is the source of truth for agent state and broadcasts updates to all subscribers
- 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 sequence allocation is append-only with epochs (each run starts a new epoch). The one
+  permitted in-place enrichment adds a provider message id to the manager-owned row for an accepted
+  prompt; it preserves the row's sequence, content, and timestamp. 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.
@@ -374,9 +388,8 @@ $PASEO_HOME/
 ├── agents/{cwd-with-dashes}/{agent-id}.json   # Agent record + persisted timeline rows
 ├── projects/projects.json                      # Project registry
 ├── projects/workspaces.json                    # Workspace registry
-├── chat/                                       # Chat rooms
+├── projects/icons/                             # Custom project icon images
 ├── schedules/                                  # Scheduled-agent definitions and runs
-├── loops/                                      # Loop runs and logs
 ├── config.json                                 # Daemon config (mutable)
 ├── daemon-keypair.json                         # Daemon identity for relay/E2EE
 ├── push-tokens.json                            # Mobile push tokens
@@ -5,7 +5,7 @@ It validates the compositor behavior that unit tests cannot see:

 - the resident automation `<webview>` starts in the production parking state;
 - the parked guest remains paintable and has a copyable viewport frame;
- the resident webview guest is sized to 1280x800 logical pixels;
+- a never-presented resident webview guest defaults to 1280x800 logical pixels;
 - multiple resident webviews are parked as an overlapping stack without per-capture
  stacking changes;
 - a newly attached resident webview whose first useful frame is delayed can be captured
@@ -82,10 +82,19 @@ is usually saved as 2560x1600.

 Electron captures copy from the guest web contents' compositor surface. A resident
 webview parked with `display:none`, offscreen coordinates, or `opacity:0` can lose its
-copyable surface. The production parking state keeps the host fixed at `left:0`, `top:0`,
-`width:1px`, `height:1px`, `overflow:hidden`, `opacity:1`, and `pointer-events:none`.
-The webviews inside stay full-size at 1280x800, `display:inline-flex`, and absolutely
-overlap at `left:0`, `top:0`.
+copyable surface. Each production webview keeps one permanent body-level surface. Presenting
+or parking changes that surface's geometry without reparenting the webview. The parking state
+uses `left:0`, `top:0`, `width:1px`, `height:1px`, `overflow:hidden`, `opacity:1`, and
+`pointer-events:none`. The webview stays at its resolved logical viewport, defaulting to
+1280x800 before first presentation, with `display:inline-flex` at `left:0`, `top:0`.
+Presentation resolves responsive guests to the pane's exact pixel dimensions after the surface
+has visible bounds. Do not apply percentage guest sizing against the parked surface: Electron
+exposes the 1x1 parking geometry as a real guest resize before expanding it again.
+
+The permanent browser host and `overlay-root` are explicit sibling paint planes. The browser
+plane stays below the overlay plane regardless of body insertion order; menus keep their relative
+layering inside `overlay-root`. Activating a presented browser also focuses its registered guest
+`WebContents` in main so macOS assigns keyboard first-responder ownership to the page.

 There is no renderer prep/restore handshake. Main disables guest background throttling
 once when the webview attaches, then screenshot capture uses the shared serialized queue,
@@ -14,6 +14,10 @@ For testing rules, see [testing.md](testing.md).
 - **`interface`** over `type` when both work.
 - **No `index.ts` barrel files** that only re-export — they create indirection and circular-dep risk. Import from the source.

+## Shell scripts
+
+- Bash scripts always use `#!/usr/bin/env bash`. Never hard-code `/bin/bash` or `/usr/bin/bash`; those paths are not portable to environments such as NixOS.
+
 ## Comments and noise

 - Delete any comment where removing it loses zero information. Comments explain _why_, not _what_.
@@ -2,7 +2,7 @@

 Paseo supports configuring custom agent providers through `config.json` (located at `$PASEO_HOME/config.json`, typically `~/.paseo/config.json`). You can extend built-in providers with different API backends, add ACP-compatible agents, set custom binaries, disable providers, and create multiple profiles for the same underlying provider.

-All provider configuration lives under `agents.providers` in config.json:
+Provider definitions live under `agents.providers` in config.json:

 ```json
 {
@@ -17,6 +17,20 @@ All provider configuration lives under `agents.providers` in config.json:

 Provider IDs must be lowercase alphanumeric with hyphens (`/^[a-z][a-z0-9-]*$/`).

+Each provider catalog refresh waits up to 2 minutes. If a provider loads many plugins or a large
+agent catalog during startup, raise the limit in milliseconds:
+
+```json
+{
+  "agents": {
+    "catalogRefreshTimeoutMs": 180000
+  }
+}
+```
+
+The limit applies independently to every provider refresh and covers availability plus the entire
+catalog probe. `PASEO_PROVIDER_REFRESH_TIMEOUT_MS` sets it when the config field is absent.
+
 ---

 ## Table of Contents
@@ -245,6 +259,8 @@ requires_openai_auth = false

 You can create multiple entries that extend the same built-in provider. Each gets its own entry in the provider list with independent credentials, models, and environment.

+"Profile" here means a provider alias, and it is not an **Agent profile** — that is a named bundle of provider, model, mode, thinking option and features, stored under `daemon.agentProfiles`. See [glossary.md](glossary.md) for all four senses of the word.
+
 Example: two different Anthropic accounts as separate profiles:

 ```json
@@ -584,6 +600,11 @@ When you launch an agent with an ACP provider:
 4. Paseo creates a session and sends prompts through the ACP protocol
 5. The agent streams responses, tool calls, and permission requests back over stdout

+Every ACP provider exposes an **Auto Accept** toggle. Enable it per session to let Paseo approve
+ACP permission requests without surfacing each prompt. If the provider sends no allow option,
+Paseo leaves the request for you to answer. Unattended agents enable Auto Accept unless you
+explicitly disable it.
+
 Models and modes are discovered dynamically at runtime from the agent process. If you want to override the model list (e.g., to curate which models appear in the UI), use the `models` field:

 ```json
@@ -691,7 +712,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. Explicit model IDs are passed unchanged to Claude Code, even when the same string is a compatibility alias for a built-in model. 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.

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

@@ -54,13 +54,10 @@ $PASEO_HOME/
 │       └── {agentId}.json               # One file per agent
 ├── schedules/
 │   └── {scheduleId}.json                # One file per schedule
-├── chat/
-│   └── rooms.json                       # All rooms + messages
-├── loops/
-│   └── loops.json                       # All loop records
 ├── projects/
 │   ├── projects.json                    # Project registry
-│   └── workspaces.json                  # Workspace registry
+│   ├── workspaces.json                  # Workspace registry
+│   └── icons/                           # Host-local custom project icon images
 ├── runtime/
 │   └── managed-processes/
 │       └── {recordId}.json              # Helper processes owned by Paseo; reconciled on daemon bootstrap
@@ -88,7 +85,7 @@ Each agent is stored as a separate JSON file, grouped by project directory.
 | `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 agent-scoped creation and removed by detach — see [agent-lifecycle.md](./agent-lifecycle.md)                                                                                                                                                                                                      |
+| `labels`             | `Record<string, string>`                 | Key-value labels (default `{}`). Paseo uses `paseo.parent-agent-id` for parentage and client-scoped `paseo.open-agent-tab.*` labels while managed subagent tabs are open — see [agent-lifecycle.md](./agent-lifecycle.md)                                                                                                                                                           |
 | `lastStatus`         | `AgentStatus`                            | One of: `"initializing"`, `"idle"`, `"running"`, `"error"`, `"closed"`. `closed` means the record is resumable but has no live provider runtime; archive remains represented separately by `archivedAt`.                                                                                                                                                                            |
 | `lastModeId`         | `string?`                                | Last active mode ID                                                                                                                                                                                                                                                                                                                                                                 |
 | `config`             | `SerializableConfig?`                    | Agent session configuration (see below)                                                                                                                                                                                                                                                                                                                                             |
@@ -99,7 +96,7 @@ Each agent is stored as a separate JSON file, grouped by project directory.
 | `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.)                                                                                                                                                                                                                                                                                                                        |
+| `internal`           | `boolean?`                               | Whether this is a system-internal agent                                                                                                                                                                                                                                                                                                                                             |
 | `archivedAt`         | `string?` (ISO 8601)                     | Soft-delete timestamp                                                                                                                                                                                                                                                                                                                                                               |

 ### Nested: SerializableConfig
@@ -178,6 +175,13 @@ Terminal activity contributes to the workspace status bucket **per `workspaceId`

 Single file, validated with `PersistedConfigSchema`.

+`paseo reload` reads and validates this file once inside the daemon. That snapshot drives resolution,
+classification, application, and reload bookkeeping. `DaemonConfigStore` owns applying runtime-safe
+fields and their removal/default semantics; session handlers and the CLI only relay the structured
+result. Normal config patches persist only the requested fields, so launch overrides and resolved
+defaults never leak into the file. Startup-only fields remain compared with the daemon's launch
+snapshot so a mixed edit can apply its live subset and still name the paths that require restart.
+
 ```
 {
  version: 1,
@@ -186,9 +190,12 @@ Single file, validated with `PersistedConfigSchema`.
    hostnames: true | string[],   // legacy alias `allowedHosts` is migrated on load
    trustedProxies: true | string[], // defaults to ["loopback"]; Express proxy names/CIDRs
    mcp: { enabled: boolean, injectIntoAgents: boolean },
+    git: { maxProcessesPerSecond: number, maxProcessConcurrency: number },
    appendSystemPrompt: string,    // appended to supported provider system/developer prompts
+    terminalProfiles: TerminalProfile[],  // named shell commands; omitted means DEFAULT_TERMINAL_PROFILES
+    agentProfiles: AgentProfile[],        // named agent launch bundles; omitted means none
    cors: { allowedOrigins: string[] },
-    relay: { enabled: boolean, endpoint: string, publicEndpoint: string, useTls: boolean, publicUseTls: boolean },
+    relay: { enabled: boolean, endpoint: string, publicEndpoint: string, useTls: boolean, publicUseTls: boolean }, // new homes materialize enabled: false
    auth: { password: string }    // bcrypt hash, optional
  },
  app: {
@@ -233,6 +240,55 @@ Single file, validated with `PersistedConfigSchema`.

 All fields are optional with sensible defaults.

+### Profile lists
+
+`terminalProfiles` and `agentProfiles` are both whole-list fields: a config patch replaces the
+array, never merges entries, so a client sends the complete next list on every add, edit, reorder
+and remove. List order is the display order.
+
+Absent and empty mean different things for terminal profiles — omitting the key falls back to
+`DEFAULT_TERMINAL_PROFILES`, while `[]` means the user removed them all. Agent profiles have no
+defaults, so both mean none.
+
+`PersistedConfigSchema` parses strictly, so a daemon that predates a field drops it on write
+rather than storing something it cannot describe. That is why the client gates the agent profiles
+UI on `server_info.features.agentProfiles` instead of letting a save appear to succeed against an
+older daemon.
+
+### Git process limits
+
+Git process limits are global to one daemon. The start-rate limit defaults to `64` processes per
+second, and the concurrency limit defaults to `8`:
+
+```json
+{
+  "daemon": {
+    "git": {
+      "maxProcessesPerSecond": 64,
+      "maxProcessConcurrency": 8
+    }
+  }
+}
+```
+
+`maxProcessesPerSecond` limits Git process starts in any one-second interval. The allowance can
+start as a burst; it does not wait for earlier processes to exit. `maxProcessConcurrency` limits
+the number of Git processes that have started but not exited. Every Git command uses both limits,
+including initial workspace reads, filesystem-triggered refreshes, background checks, and explicit
+requests.
+
+Environment variables override `config.json`:
+
+| Environment variable                 | Setting                  |
+| ------------------------------------ | ------------------------ |
+| `PASEO_GIT_MAX_PROCESSES_PER_SECOND` | `maxProcessesPerSecond`  |
+| `PASEO_GIT_MAX_PROCESS_CONCURRENCY`  | `maxProcessConcurrency`  |
+| `PASEO_GIT_CONCURRENCY`              | Legacy concurrency alias |
+
+`PASEO_GIT_MAX_PROCESS_CONCURRENCY` wins when it and the legacy alias are both set. Run `paseo reload`
+after changing `config.json`. Environment changes require a daemon restart; the launch environment
+remains authoritative during reload.
+
 `agents.metadataGeneration.providers` controls the preferred structured-generation fallback order for daemon-side metadata tasks such as commit messages, PR text, branch names, and generated agent titles. Entries are tried first in the configured order, then Paseo falls through to dynamically discovered defaults and finally the current selection when available.

 Local speech model ids are intentionally narrow: STT uses `parakeet-tdt-0.6b-v2-int8`, TTS uses `kokoro-en-v0_19`, and turn detection uses the bundled Silero VAD model.
@@ -305,7 +361,7 @@ One file per schedule. ID is 8 hex characters.
 ### Nested: ScheduleTarget (discriminated union on `type`)

 - `{ type: "agent", agentId: string }` — send to existing agent
- `{ type: "new-agent", config: { provider, cwd, modeId?, model?, thinkingOptionId?, title?, approvalPolicy?, sandboxMode?, networkAccess?, webSearch?, extra?, systemPrompt?, mcpServers? } }` — create a new agent
+- `{ type: "new-agent", config: { provider, cwd, modeId?, model?, thinkingOptionId?, title?, providerOptions?, featureValues?, systemPrompt?, mcpServers? } }` — create a new agent

 ### Nested: ScheduleRun

@@ -322,149 +378,30 @@ One file per schedule. ID is 8 hex characters.

 ---

-## 4. Chat
-
-**Path:** `$PASEO_HOME/chat/rooms.json`
-
-Single file containing all rooms and messages.
-
-```json
-{
-  "rooms": [ ... ],
-  "messages": [ ... ]
-}
-```
-
-### ChatRoom
-
-| Field       | Type                | Description                         |
-| ----------- | ------------------- | ----------------------------------- |
-| `id`        | `string` (UUID)     |                                     |
-| `name`      | `string`            | Unique room name (case-insensitive) |
-| `purpose`   | `string?`           | Room description                    |
-| `createdAt` | `string` (ISO 8601) |                                     |
-| `updatedAt` | `string` (ISO 8601) | Updated on each new message         |
-
-### ChatMessage
-
-| Field              | Type                | Description                         |
-| ------------------ | ------------------- | ----------------------------------- |
-| `id`               | `string` (UUID)     |                                     |
-| `roomId`           | `string`            | FK to ChatRoom.id                   |
-| `authorAgentId`    | `string`            | Agent ID of the author              |
-| `body`             | `string`            | Message text (supports `@mentions`) |
-| `replyToMessageId` | `string?`           | FK to another ChatMessage.id        |
-| `mentionAgentIds`  | `string[]`          | Extracted `@mention` agent IDs      |
-| `createdAt`        | `string` (ISO 8601) |                                     |
-
---
-
-## 5. Loop
-
-**Path:** `$PASEO_HOME/loops/loops.json`
-
-Single file containing an array of all loop records. Writes are direct (not atomic) and serialized through an in-memory queue. On daemon startup any record with `status: "running"` is recovered as `"stopped"` with an interruption log entry.
-
-| Field                   | Type                                                | Description                                |
-| ----------------------- | --------------------------------------------------- | ------------------------------------------ |
-| `id`                    | `string`                                            | 8-char UUID prefix                         |
-| `name`                  | `string?`                                           | Human-readable name                        |
-| `prompt`                | `string`                                            | Worker prompt                              |
-| `cwd`                   | `string`                                            | Working directory                          |
-| `provider`              | `string`                                            | Default provider                           |
-| `model`                 | `string?`                                           | Default model                              |
-| `modeId`                | `string?`                                           | Default mode ID                            |
-| `workerProvider`        | `string?`                                           | Override provider for workers              |
-| `workerModel`           | `string?`                                           | Override model for workers                 |
-| `verifierProvider`      | `string?`                                           | Override provider for verifiers            |
-| `verifierModel`         | `string?`                                           | Override model for verifiers               |
-| `verifierModeId`        | `string?`                                           | Override mode ID for verifiers             |
-| `verifyPrompt`          | `string?`                                           | LLM verification prompt                    |
-| `verifyChecks`          | `string[]`                                          | Shell commands to run as checks            |
-| `archive`               | `boolean`                                           | Whether to archive worker agents after use |
-| `sleepMs`               | `number`                                            | Delay between iterations (ms)              |
-| `maxIterations`         | `number?`                                           | Cap on iterations                          |
-| `maxTimeMs`             | `number?`                                           | Total time budget (ms)                     |
-| `status`                | `"running" \| "succeeded" \| "failed" \| "stopped"` |                                            |
-| `createdAt`             | `string` (ISO 8601)                                 |                                            |
-| `updatedAt`             | `string` (ISO 8601)                                 |                                            |
-| `startedAt`             | `string` (ISO 8601)                                 |                                            |
-| `completedAt`           | `string?` (ISO 8601)                                |                                            |
-| `stopRequestedAt`       | `string?` (ISO 8601)                                |                                            |
-| `iterations`            | `LoopIteration[]`                                   |                                            |
-| `logs`                  | `LoopLogEntry[]`                                    |                                            |
-| `nextLogSeq`            | `number`                                            | Monotonic log sequence counter             |
-| `activeIteration`       | `number?`                                           | Currently executing iteration index        |
-| `activeWorkerAgentId`   | `string?`                                           | Currently running worker agent             |
-| `activeVerifierAgentId` | `string?`                                           | Currently running verifier agent           |
-
-### Nested: LoopIteration
-
-| Field               | Type                                                | Description              |
-| ------------------- | --------------------------------------------------- | ------------------------ |
-| `index`             | `number`                                            | 1-based iteration index  |
-| `workerAgentId`     | `string?`                                           | Agent ID of the worker   |
-| `workerStartedAt`   | `string` (ISO 8601)                                 |                          |
-| `workerCompletedAt` | `string?` (ISO 8601)                                |                          |
-| `verifierAgentId`   | `string?`                                           | Agent ID of the verifier |
-| `status`            | `"running" \| "succeeded" \| "failed" \| "stopped"` |                          |
-| `workerOutcome`     | `"completed" \| "failed" \| "canceled"?`            |                          |
-| `failureReason`     | `string?`                                           |                          |
-| `verifyChecks`      | `LoopVerifyCheckResult[]`                           | Shell check results      |
-| `verifyPrompt`      | `LoopVerifyPromptResult?`                           | LLM verification result  |
-
-### Nested: LoopLogEntry
-
-| Field       | Type                                                 |
-| ----------- | ---------------------------------------------------- |
-| `seq`       | `number` (monotonic)                                 |
-| `timestamp` | `string` (ISO 8601)                                  |
-| `iteration` | `number?`                                            |
-| `source`    | `"loop" \| "worker" \| "verifier" \| "verify-check"` |
-| `level`     | `"info" \| "error"`                                  |
-| `text`      | `string`                                             |
-
-### Nested: LoopVerifyCheckResult
-
-| Field         | Type                |
-| ------------- | ------------------- |
-| `command`     | `string`            |
-| `exitCode`    | `number`            |
-| `passed`      | `boolean`           |
-| `stdout`      | `string`            |
-| `stderr`      | `string`            |
-| `startedAt`   | `string` (ISO 8601) |
-| `completedAt` | `string` (ISO 8601) |
-
-### Nested: LoopVerifyPromptResult
-
-| Field             | Type                |
-| ----------------- | ------------------- |
-| `passed`          | `boolean`           |
-| `reason`          | `string`            |
-| `verifierAgentId` | `string?`           |
-| `startedAt`       | `string` (ISO 8601) |
-| `completedAt`     | `string` (ISO 8601) |
-
---
-
-## 6. Project Registry
+## 4. Project Registry

 **Path:** `$PASEO_HOME/projects/projects.json`

 Array of project records.

-| Field         | Type                        | Description                                                                      |
-| ------------- | --------------------------- | -------------------------------------------------------------------------------- |
-| `projectId`   | `string`                    | Host-local primary key; new records use opaque `prj_<16 hex>` IDs                |
-| `projectKey`  | `string \| null`            | Persisted opaque cross-host grouping key; reconciliation backfills absent values |
-| `rootPath`    | `string`                    | Exact lexically normalized selected root; never realpathed                       |
-| `kind`        | `"git" \| "non_git"`        | Mutable Git observation about `rootPath`, never a membership key                 |
-| `displayName` | `string`                    | Selected-root basename, stable across remote and Git changes                     |
-| `customName`  | `string \| null`            | User-set override layered over `displayName`. Null means "use the derived name". |
-| `createdAt`   | `string` (ISO 8601)         |                                                                                  |
-| `updatedAt`   | `string` (ISO 8601)         |                                                                                  |
-| `archivedAt`  | `string \| null` (ISO 8601) | Soft-delete timestamp; required nullable                                         |
+| Field                | Type                        | Description                                                                                                                                |
+| -------------------- | --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `projectId`          | `string`                    | Host-local primary key; new records use opaque `prj_<16 hex>` IDs                                                                          |
+| `projectKey`         | `string \| null`            | Persisted opaque cross-host grouping key; reconciliation backfills absent values                                                           |
+| `rootPath`           | `string`                    | Exact lexically normalized selected root; never realpathed                                                                                 |
+| `kind`               | `"git" \| "non_git"`        | Mutable Git observation about `rootPath`, never a membership key                                                                           |
+| `displayName`        | `string`                    | Selected-root basename, stable across remote and Git changes                                                                               |
+| `customName`         | `string \| null`            | User-set override layered over `displayName`. Null means "use the derived name".                                                           |
+| `customIconRevision` | `string \| null`            | Identifies the host-local custom icon stored under `projects/icons/`. Null means the icon is discovered by scanning the project directory. |
+| `createdAt`          | `string` (ISO 8601)         |                                                                                                                                            |
+| `updatedAt`          | `string` (ISO 8601)         |                                                                                                                                            |
+| `archivedAt`         | `string \| null` (ISO 8601) | Soft-delete timestamp; required nullable                                                                                                   |
+
+Uploading a file and pasting a website or image URL are two ways of _acquiring_ the same custom
+icon. The client fetches URL imports and sends their bytes through the upload RPC. The daemon never
+receives or fetches the URL; it validates the uploaded bytes, stores them, and records a new
+`customIconRevision`. Going back to automatic deletes the stored image, as does removing the
+project.

 Active exact roots are idempotent using lexical platform-equivalence semantics. Existing legacy
 remote-shaped and path-shaped IDs remain readable, including duplicate roots; reconciliation never
@@ -476,29 +413,30 @@ workspace together with its owning project.

 ---

-## 7. Workspace Registry
+## 5. Workspace Registry

 **Path:** `$PASEO_HOME/projects/workspaces.json`

 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; the workspace's stable project membership                                                                                                                    |
-| `cwd`                  | `string`                                        | Exact execution directory selected for agents, files, scripts, and setup                                                                                                              |
-| `kind`                 | `"local_checkout" \| "worktree" \| "directory"` | Mutable checkout classification                                                                                                                                                       |
-| `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 current Git branch for git-backed workspaces. Separate from `displayName`/`title`; a background branch refresh never rewrites the name.                                           |
-| `worktreeRoot`         | `string \| null`                                | Backing checkout/worktree root. May differ from `cwd` for exact subprojects and remains persisted after the worktree is deleted so restore can reproduce the placement.               |
-| `baseBranch`           | `string \| null`                                | Normalized branch the Paseo worktree was created from; null for directories, local checkouts, and checkout-branch worktrees                                                           |
-| `isPaseoOwnedWorktree` | `boolean`                                       | Whether Paseo owns and may remove/recreate the backing `worktreeRoot`                                                                                                                 |
-| `mainRepoRoot`         | `string \| null`                                | Main repository root for worktree checkouts, independent of both exact `cwd` and backing `worktreeRoot`                                                                               |
-| `createdAt`            | `string` (ISO 8601)                             |                                                                                                                                                                                       |
-| `updatedAt`            | `string` (ISO 8601)                             |                                                                                                                                                                                       |
-| `archivedAt`           | `string \| null` (ISO 8601)                     | Soft-delete; required nullable                                                                                                                                                        |
-| `pinnedAt`             | `string \| null` (ISO 8601)                     | Pinned-to-top-of-sidebar timestamp; null means "not pinned"                                                                                                                           |
+| 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; the workspace's stable project membership                                                                                                                            |
+| `cwd`                          | `string`                                        | Exact execution directory selected for agents, files, scripts, and setup                                                                                                                      |
+| `kind`                         | `"local_checkout" \| "worktree" \| "directory"` | Mutable checkout classification                                                                                                                                                               |
+| `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 current Git branch for git-backed workspaces. Separate from `displayName`/`title`; a background branch refresh never rewrites the name.                                                   |
+| `worktreeRoot`                 | `string \| null`                                | Backing checkout/worktree root. May differ from `cwd` for exact subprojects and remains persisted after the worktree is deleted so restore can reproduce the placement.                       |
+| `baseBranch`                   | `string \| null`                                | Normalized branch the Paseo worktree was created from; null for directories, local checkouts, and checkout-branch worktrees                                                                   |
+| `isPaseoOwnedWorktree`         | `boolean`                                       | Whether Paseo owns and may remove/recreate the backing `worktreeRoot`                                                                                                                         |
+| `mainRepoRoot`                 | `string \| null`                                | Main repository root for worktree checkouts, independent of both exact `cwd` and backing `worktreeRoot`                                                                                       |
+| `createdAt`                    | `string` (ISO 8601)                             |                                                                                                                                                                                               |
+| `updatedAt`                    | `string` (ISO 8601)                             |                                                                                                                                                                                               |
+| `archivedAt`                   | `string \| null` (ISO 8601)                     | Soft-delete; required nullable                                                                                                                                                                |
+| `autoArchivedChangeRequestUrl` | `string \| null`                                | Change request whose merged state triggered auto-archive. Restore replaces it with the current merged change request, when present, so repeated snapshots cannot archive the workspace again. |
+| `pinnedAt`                     | `string \| null` (ISO 8601)                     | Pinned-to-top-of-sidebar timestamp; null means "not pinned"                                                                                                                                   |

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

@@ -509,7 +447,7 @@ than treating it as valid.

 ---

-## 8. Push Token Store
+## 6. Push Token Store

 **Path:** `$PASEO_HOME/push-tokens.json`

@@ -523,7 +461,7 @@ Simple set of Expo push notification tokens. Loaded with permissive parsing (fil

 ---

-## 9. Daemon meta files
+## 7. Daemon meta files

 These small files are not validated as full Zod schemas but are persisted under `$PASEO_HOME` for daemon identity and runtime coordination.

@@ -98,7 +98,7 @@ 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.
+`<AdaptiveModalSheet>` owns the presentation. Its content inset — the gutter that puts sheet content on the same rails as the sheet header — and compact bottom safe-area padding are the sheet's, not the caller's. A caller declares layout intent through `contentStyle` and never branches on form factor to add its own margins. 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.

@@ -122,7 +122,21 @@ The whitespace is the design.

 ---

-## 8. Responsiveness
+## 8. Alignment
+
+Things align to their glyphs, not to their boxes. A row's leading icon, its title, and the label of the button in its trailing slot sit on the same rails — the ink lines up, not the padding, not the touch target, not the hover background.
+
+Pick the rails from the content, then hold them. A settings card establishes a leading rail at the icon's left edge and a trailing rail at the last glyph's right edge; every row in that card uses the same two. A row whose icon is absent still starts its title on the leading rail. Indentation is a new rail, not an arbitrary offset.
+
+The pressable is bigger than the glyph, and that is fine. Hit areas grow outward from the aligned content — they never move it. A button that looks two pixels off because its padding is asymmetric is misaligned even though its box is correct.
+
+Optical alignment beats arithmetic when a glyph disagrees with its bounding box. Icons with visual weight on one side, chevrons, and single-character labels usually need a small nudge to look centered. Trust the eye, then leave a comment saying the offset is optical.
+
+One row off the rail makes the whole card look unconsidered.
+
+---
+
+## 9. Responsiveness

 Compact-first. The small case is designed; the large case adds chrome around it.

@@ -143,7 +157,7 @@ A new list+detail feature copies the settings shell. A new workspace-shaped feat

 ---

-## 9. Copy and voice
+## 10. Copy and voice

 Sentence case. "Pair a device", "Danger zone", "Restart daemon", "Inject Paseo tools", "No sessions yet", "Load more". Proper nouns retain casing — Paseo, Beta, Stable, Local. Title case is wrong.

@@ -165,7 +179,7 @@ Terminology:

 ---

-## 10. States
+## 11. States

 Loading is inline by default. `<LoadingSpinner size={14} color={foregroundMuted} />` sits next to the thing it relates to (`packages/app/src/screens/settings/providers-section.tsx:227-231`). Page-level loading is a centered `<LoadingSpinner size="large">` (`packages/app/src/screens/sessions-screen.tsx:69-72`). Card-level loading is a single short line, not a spinner. In-row dropdown items use `<DropdownMenuItem status="pending" pendingLabel="Removing...">`; the menu item handles its own pending state.

@@ -185,9 +199,11 @@ Partial failure (a list mostly fine but one source errored) is a bordered banner

 State surfaces at the smallest scope it affects. Field error stays under the field; page error is a banner; flow-stopping error is an `Alert`.

+Changing state must not move the layout. A row that grows when its badge arrives, a card that reflows when a count resolves, a list that jumps as data streams in — all wrong. Reserve the space the loaded state will need, so the skeleton, the spinner, and the content occupy the same box. A surface that shifts under the user stops feeling calm.
+
 ---

-## 11. List rows
+## 12. List rows

 The row anatomy is a content column with an optional trailing slot. Inside a card the row is `settingsStyles.row`. Inside a sidebar list the row carries its own padding and `borderRadius.lg` per item (`packages/app/src/components/sidebar-workspace-list.tsx:2614-2625`).

@@ -203,24 +219,30 @@ Selected state on rows in a desktop list+detail uses `surfaceSidebarHover` as th

 ---

-## 12. Status pills and badges
+## 13. Status pills and badges

-Status pills are `palette.<color>[300]` foreground on a 10%-alpha background of the same color. Success uses green, warning uses amber, danger uses red, muted uses zinc. The `<StatusBadge>` primitive (`packages/app/src/components/ui/status-badge.tsx`) is canonical.
+There is exactly one token per status signal — `statusSuccess`, `statusDanger`, `statusWarning`, `statusMerged` — and every status surface uses it: PR state icons, CI check icons and pies, diff stats, file-change icons, status pills, usage bars. A surface does not get a quieter or louder variant because of where it sits. If a dense list feels loud, that is a density or weight problem; fix the density, not the color. The tokens are generated, not hand-picked — see the rule in `packages/app/src/styles/theme.ts` and regenerate rather than nudging one value. The level is set by the densest consumer, the sidebar workspace list.

-Status dots — the small filled circles next to a host or agent name — are `borderRadius.full` filled with the status color (`statusSuccess`, `statusWarning`, `statusDanger`, or `foregroundMuted`). They sit in the trailing slot of a sidebar row or as a leading marker on a status pill.
+Status **dots** are the one exception, and they are a family of their own — `statusDotSuccess`, `statusDotDanger`, `statusDotWarning`, `statusDotRunning`, read only by `getStatusDotColor` (`packages/app/src/utils/status-dot-color.ts`). Same hues and the same generation rule, but their own band: 90% of gamut chroma against the status family's 55–60%. A dot is a few points of solid color with no shape to read and no label attached, and the running one pulses, so at the status band's chroma the dots read dimmer than the metadata beside them — backwards, since the dot is the row's state. Lightness is set by hue separation rather than by distance from the surface: at 6pt four dark hues on a light surface all read as one dark blob no matter how much contrast they have. So the light band runs as bright as the contrast floor allows at L=0.62, the last step where all four clear 3:1 against the sidebar's `surface2`; the dark band sits at L=0.72, where danger turns pink above. All four move together; regenerate the set, never one hue.
+
+Status pills are the status token as foreground on a 10%-alpha tint of the same token (`${token}1a`), with a 20% border (`${token}33`). The `<StatusBadge>` primitive (`packages/app/src/components/ui/status-badge.tsx`) is canonical; a pill never reaches into `palette`.
+
+Status dots — the small filled circles next to a host or agent name — are `borderRadius.full` filled with the status token. Which token a given agent state maps to is owned by `getStatusDotColor` (`packages/app/src/utils/status-dot-color.ts`); a row, a group header, and a project icon all call it rather than restating the mapping. They sit in the trailing slot of a sidebar row or as a leading marker on a status pill.
+
+Identity badges — the project icon, the sidebar host badge, and the PR-panel participant avatar — do not use the theme palette. They draw from the fixed ten-color identity table in `packages/app/src/styles/identity-colors.ts`, whose hexes are held to one contrast band so a color identifies rather than ranks. Project icons and PR avatars use it as a fill with a white letter — that is `identityColor`, one theme-independent hex per identity. Host badges use it as a _foreground_ on both the glyph and the label, which is a different contrast problem that the fill table cannot solve: no single hex clears 4.5:1 against both a near-white and a dark sidebar. Foregrounds therefore come from `identityForeground(name, colorScheme)`, one set per scheme, hue unchanged. That set is generated on the **status family's** lightness and chroma fraction, because a meta row puts a host badge beside a CI check and a diff stat, and two families at different lightness make the brighter one shout. Change the status band and this one changes with it. A host with no color assigned falls back to `foregroundMuted`. The table is theme-independent by design; do not fork it per theme, and do not add hexes to it without recomputing the band.

 The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `packages/app/src/components/agent-list.tsx:607-632`, and `packages/app/src/components/sidebar-workspace-list.tsx:2889-2894` are drift to be removed. New code uses `<StatusBadge>`.

 ---

-## 13. Forbidden
+## 14. Forbidden

 - `fontWeight.medium` on row titles, body text, button labels, badge text, or `<SidebarCallout>` titles. Medium is reserved for the structural-label tier described in §3 — section labels, modal/sheet titles, dense metadata emphasis, and tight action labels. Anything else is `normal`. `<ScreenTitle>` is responsive `400/300` and is never overridden.
 - `<Pressable>` wrapping `<Text>` to make a button. `<Button>` exists.
 - Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
 - A "Settings" CTA on a detail page. Detail pages are settings; settings is reached from the sidebar, the host entry, or a row's kebab menu.
 - The word "checkout" in UI strings or identifiers. The term is "workspace".
- New color tokens or hardcoded hex outside the palette. Status pill rgba backgrounds are the documented pattern (§12), not a license.
+- New color tokens or hardcoded hex outside the palette. Status pill rgba backgrounds and the identity color table are the documented exceptions (§13), not a license.
 - Placeholder text dimmed beyond `foregroundMuted`. No extra opacity, no italics, no ghost-text.
 - `onPointerEnter` and `onPointerLeave`. They do not fire on native iOS. Hover uses Pressable's `onHoverIn`/`onHoverOut` gated with `isHovered || isCompact || isNative`.
 - Raw DOM APIs without an `isWeb` guard.
@@ -233,7 +255,7 @@ The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `

 ---

-## 14. Canonical surfaces by pattern
+## 15. Canonical surfaces by pattern

 | Pattern                                             | Reference                                                                                                                                                                                                                                                                                                |
 | --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -19,8 +19,29 @@ Root checkout dev is intentionally split across terminals:
 - `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`.

+Desktop dev launches its desktop-managed daemon with `PASEO_NODE_ENV=development`,
+so development-only providers such as Mock Load Test are available. Packaged
+desktop launches always force the daemon to production mode.
+
+The web and desktop dev launchers pass the current Git branch to Metro as
+`EXPO_PUBLIC_PASEO_DEV_BUILD_LABEL`. The expanded desktop sidebar shows it in
+the titlebar row. Production builds leave the variable unset and show no label.
+
 `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.

+## Nix desktop package
+
+The flake exposes `packages.<system>.desktop` on Linux and macOS:
+
+```bash
+nix build .#desktop
+```
+
+Linux produces the `paseo-desktop` launcher and desktop entry. macOS produces
+`Applications/Paseo.app` plus the `paseo-desktop` launcher. Both use the nixpkgs
+Electron runtime and the checkout's built daemon, client, and renderer rather
+than downloading a published desktop release.
+
 ### PASEO_HOME

 `PASEO_HOME` is the directory that holds runtime state (agents, worktrees, workspace config, sockets, daemon log). Resolution rules:
@@ -98,10 +119,23 @@ The iOS simulator shares the Mac's loopback, so `localhost:<port>` reaches the h

 ### 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.
+`npm run dev:desktop` starts Electron with Chromium remote debugging enabled so
+renderer CPU profiles can be captured through CDP. By default it passes
+`--remote-debugging-port=0`, so Chromium atomically asks the OS for an available
+port and prints the selected DevTools endpoint. Set
+`PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when a QA workflow requires a validated,
+fixed port.
+
+Desktop dev also scopes Electron `userData` to the current dev root. This prevents
+desktop-only environment inherited by terminals opened inside Paseo from coupling
+a new worktree instance to the parent desktop instance's profile or single-instance
+lock.
+
+The desktop workspace script `exec`s the dev runner so the terminal owns the runner
+PID. Terminal shutdown reaches the runner as `SIGHUP`; the runner stops Metro and
+asks Electron to quit through its normal app lifecycle. Do not add an npm wrapper or
+detach Electron: either change leaves an orphan holding the worktree's single-instance
+lock and broken output pipes.

 With desktop dev running, verify the real BrowserWindow, titlebar clearance, fullscreen
 transition, and 751-pixel settings split with:
@@ -111,8 +145,9 @@ npm run verify:electron-cdp --workspace=@getpaseo/desktop
 ```

 The verifier reads the same `EXPO_PORT` and
-`PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` environment names as desktop dev. Set both when
-testing an isolated instance on non-default ports.
+`PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` environment names as desktop dev. Set an
+explicit remote-debugging port for verifier runs, and set both when testing an
+isolated instance on non-default ports.

 When running a dedicated Electron QA instance against a non-default Expo port, set
 `EXPO_DEV_URL` explicitly. Desktop main defaults to `http://localhost:8081`, so
@@ -215,6 +250,27 @@ The supervisor rotates `daemon.log`. Persisted `log.file.rotate` settings in
 `PASEO_LOG_ROTATE_SIZE` and `PASEO_LOG_ROTATE_COUNT` env vars override the
 defaults. The default rotation is `10m` x `3` files everywhere.

+### Git process pressure
+
+If Git refreshes consume too much CPU, disk, or antivirus capacity, especially on Windows, reduce
+the daemon-global Git process limits in `$PASEO_HOME/config.json`:
+
+```json
+{
+  "daemon": {
+    "git": {
+      "maxProcessesPerSecond": 5,
+      "maxProcessConcurrency": 4
+    }
+  }
+}
+```
+
+Reload the daemon with `paseo reload`. Environment-variable overrides still require a restart because
+the launch environment remains authoritative. Lower values reduce machine pressure but make Git-backed workspace state and
+Git RPCs wait longer. See [Git process limits](data-model.md#git-process-limits) for defaults,
+semantics, and environment-variable overrides.
+
 ### Agent Tool Catalog Measurement

 Measure the MCP `tools/list` payload that Paseo injects into agents with:
@@ -228,6 +284,21 @@ tools, and the browser-tools delta. It defaults to the agent-scoped catalog; use
 `-- --scope=top-level` for the unaffiliated `/mcp/agents` shape and `-- --json`
 for machine-readable output.

+## Worktree starting refs
+
+A new worktree starts from the current branch's upstream, or the local branch when it has no
+upstream. This keeps unpushed local commits out of new workspaces by default. The picker collapses
+identical refs; divergent local or non-origin refs remain explicit, qualified choices.
+
+The daemon sends the exact upstream ref because the remote and branch names cannot be inferred.
+Worktrees retain that ref for comparisons and updates from base while exposing its branch name to
+the UI. Merging into base requires a mutable local target: `origin/main` maps to local `main`, while
+another remote fails closed until the worktree records an explicit local target. Older daemons omit
+the optional field and retain the previous local-first behavior; older worktree metadata without the
+exact ref also resolves through its stored branch name.
+
+Worktrees inherit committed Git state only; uncommitted source-checkout changes are not copied.
+
 ## paseo.json service scripts

 `worktree.setup` and `worktree.teardown` accept either a multiline shell script or an array
@@ -237,9 +308,9 @@ Lifecycle commands run in the worktree through a stable script shell: `bash`
 resolved from `PATH` on macOS/Linux, and PowerShell with `-NoProfile` on
 Windows. They inherit the daemon environment plus Paseo's lifecycle variables;
 login and interactive shell startup files are not loaded, and Bash's `BASH_ENV`
-hook is unset. Daemon-run loop verify checks and ACP single-string terminal
-commands use the same non-login Bash behavior on macOS/Linux, but preserve their
-existing `cmd.exe /c` string semantics on Windows. Service scripts are separate:
+hook is unset. ACP single-string terminal commands use the same non-login Bash
+behavior on macOS/Linux, but preserve their existing `cmd.exe /c` string semantics
+on Windows. Service scripts are separate:
 they launch in a terminal and receive the service environment described below.

 Because the shell differs per platform, a lifecycle command that must run
@@ -391,7 +462,7 @@ install.

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

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

 ```bash
 npm run cli -- ls -a -g              # List all agents globally
@@ -2,20 +2,32 @@

 The file explorer uses colored SVG icons from [`material-icon-theme`](https://github.com/material-extensions/vscode-material-icon-theme) (installed as a dev dependency in `packages/app`).

-Icons are inlined as SVG strings in:
-
-```
-packages/app/src/components/material-file-icons.ts
-```
-
-This file is auto-generated. Do not edit it by hand.
-
 ## How it works

- `SVG_ICONS` maps icon names (e.g. `"typescript"`) to raw SVG strings
- `EXTENSION_TO_ICON` maps file extensions (e.g. `"ts"`) to icon names
- `getFileIconSvg(fileName)` returns the SVG string for a given filename, falling back to a generic file icon
- `packages/app/src/components/file-explorer-pane.tsx` is the only consumer; it renders the SVG with `SvgXml` from `react-native-svg`
+Two files:
+
+- `packages/app/src/components/material-file-icons.ts` — the vendor table. `SVG_ICONS` maps icon
+  names to SVG strings copied verbatim from the theme, `EXTENSION_TO_ICON` maps extensions to icon
+  names, and `getRawFileIconSvg(fileName)` looks one up with a generic fallback. Keep it a faithful
+  copy so re-copying an icon stays a mechanical edit.
+- `packages/app/src/components/file-icon-svg.ts` — `getFileIconSvg(fileName)`, the only thing
+  anyone should import. It desaturates the vendor colours and caches the result.
+
+Render with `<MaterialFileIcon fileName size />` rather than reaching for `SvgXml` yourself.
+
+## Why the colours are toned down
+
+material-icon-theme picks its palette for VS Code's file tree, where the icon is the only colour on
+the row. Ours share rows with status dots, diff stats, and check badges, and a column of them at
+full chroma is the loudest thing in the panel.
+
+Every hex in the SVG is pulled toward neutral at the same perceived lightness (`desaturateHexColor`
+in `packages/app/src/utils/color.ts`, OKLab — scaling HSL saturation instead would darken the
+yellows and barely touch the blues). Hue survives, which is the only part of an icon's colour that
+carries meaning at 16pt.
+
+`ICON_CHROMA` in `file-icon-svg.ts` is the single knob. Move it; do not add per-icon overrides, or
+we are back to hand-picking 53 colours.

 ## Adding a new icon

@@ -0,0 +1,21 @@
+# File observation
+
+Use `packages/server/src/server/file-observer` for recursive filesystem observation. Create one observer service at the owning service boundary, subscribe roots through it, and close it during owner shutdown. Keep platform watchers, directory discovery, exclusion reconciliation, event batching, failure cleanup, diagnostics, and teardown inside the module. A consumer supplies a root and excluded subtrees; it must not branch on the platform or manage child watchers.
+
+Do not replace the Linux implementation with `fs.watch({ recursive: true })`. Node 22 implements Linux recursion in JavaScript by walking the tree and watching every file and directory. Paseo's directory-only Linux watcher already exhausted resources before ignored-tree pruning and a watcher cap were added in [#794](https://github.com/getpaseo/paseo/pull/794).
+
+Closing an observation must remain safe after its root is renamed or removed. Workspace archive removes owned worktrees while releasing observation references, so teardown cannot assume the watched path still exists.
+
+`unsubscribe()` is an awaited barrier. Once it resolves, no scan, reconciliation, queued event, native handle, or callback may remain. `updateIgnore()` is the equivalent barrier for excluded paths: events queued below a newly excluded root cannot be delivered after it resolves. Treat path disappearance while scanning, attaching, or receiving a watcher error as rename/archive churn. Surface permission and resource errors so WorkspaceGit can enter bounded polling.
+
+Linux topology repair is trailing-debounced and scoped to the renamed path. A file rename needs one classification stat; a new or moved directory scans only its subtree. Full-tree scans are reserved for startup and ignore-set replacement. The initial Linux scan conservatively emits existing files discovered before their directory watcher was installed; WorkspaceGit batches these into one refresh. Benchmark this startup cost with pre-populated trees.
+
+Windows and macOS use one native recursive watcher plus an ignored-pruned, directory-indexed inventory. Native events deliver immediately. Named events trigger serialized shallow scans of their parent directories; known directory events also reconcile that subtree. This recovers concrete create and delete paths omitted by coalescing without walking the whole root for each edit. Startup and exclusion changes use an awaited full inventory barrier. Activity arms a full safety audit 30 seconds after it settles, with a 30-second minimum interval and a five-minute starvation bound; pathless native events also trigger an immediate shallow root scan. Observation fails into polling rather than retaining more than 250,000 file and directory entries per root.
+
+Read aggregate health from the owning observer service. Runtime metrics include active observations, native handles, tracked native files, pending events and immediate reconciliation work, scoped and full reconciliation activity and latency, and failure counts. Delayed safety audits do not count as pending work. Closing the service releases every subscription and clears its diagnostics. Do not add path lists, watcher handles, or platform-specific controls to this interface.
+
+Git owns Git-ignore evaluation. The observer accepts absolute excluded roots and applies updates without replacing the observation or exposing its watcher topology. This keeps tracked files inside otherwise ignored directories observable and keeps Git policy out of the filesystem module.
+
+Workspace Git verifies each repository metadata subscription with a one-shot canary inside the Git directory. If the event does not round-trip through the subscription callback, treat the watcher as unavailable and enter degraded polling. Refresh working-tree Git-ignore exclusions from ignore-file events and watcher recovery, never from a healthy-watcher timer.
+
+The real-filesystem contracts and daemon auto-archive lifecycle run in the normal server test suite. Use the scripts only for manual performance and soak work: `npm run measure:file-observer --workspace=@getpaseo/server` measures burst and sustained-create behavior, and `npm run repro:file-observer-teardown --workspace=@getpaseo/server` runs the teardown soak.
@@ -124,8 +124,13 @@ quietly relying on:
  renders inside its host, not necessarily at window origin. Position anchored
  content relative to the host: `anchorRect - hostRect`. This is what
  `measureFloatingPanelPortalHost()` is for.
+- **React context.** `@gorhom/portal` is not a React portal — a real one keeps
+  context, this one does not. It stores the element and the host renders it, so
+  context resolves at the _host's_ position. Everything provided between
+  `PortalProvider` in `app/_layout.tsx` and your sheet is invisible inside it.
+  This is why app-wide providers wrap `PortalProvider` rather than the reverse.

-The fix for transforms is Gotcha 3.
+The fix for transforms is Gotcha 3. The fix for context is Gotcha 7.

 ## Gotcha 3 — Reanimated transforms vs `measureInWindow`

@@ -236,6 +241,28 @@ Do not treat `onChange(-1)` as a close by itself. In a stacked
 another pushed sheet. Close React state from `onDismiss`; use `onChange` only to
 track phase.

+## Gotcha 7 — A sheet cannot read context from its call site
+
+React cannot copy contexts reflectively, so the only way across the teleport in
+Gotcha 2 is to render the providers a second time, with values captured on the
+near side where they are still readable. `IsolatedBottomSheetModal` takes a
+`contextBridge` for exactly that:
+
+```tsx
+const contextBridge = useCallback<ContextBridge>(
+  (content) => <ThingContext.Provider value={thing}>{content}</ThingContext.Provider>,
+  [thing],
+);
+```
+
+The prop is **required**, and `null` is a real answer. A sheet whose content
+needs nothing local should have to say so, because the failure mode is silent
+until someone adds a `useContext` deep inside and it throws on device only —
+never on web, where the desktop path uses a real portal. `menu-surface.tsx`
+bridges the menu's two contexts; the rest pass `null`.
+
+Wrapping providers _around_ the modal does nothing. They land on the wrong side.
+
 ## Recipe for a new anchored panel

 Before you write a new one, ask:
@@ -258,3 +285,6 @@ Before you write a new one, ask:
   bounded**. Verify before you commit.

 Then copy the closest canonical file and trim.
+
+Building a **menu** rather than a bare panel? Don't. Use the menu engine — it already solves
+everything above, plus submenus, sheets, and hover intent. See [menus.md](menus.md).
@@ -10,6 +10,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **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".
 - **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).
+- **Host badge** — The item on a sidebar workspace row's meta row naming which host that workspace lives on. Three things gate it, and they compose as a lattice rather than competing: the sidebar must span more than one host (automatic), **Show → Host** in the sidebar's display preferences must be on (global, all hosts at once), and then that host's own display mode decides _how_ it draws — **Name** / **Icon only** / **Hidden**. Name, color, and display mode are per-host, per-device, and live client-side on `HostProfile.appearance`; nothing about it reaches the daemon. Never add a fourth way to hide it. UI: the "Appearance" group on a host's settings page, and the "Show" submenu in the sidebar's display preferences. Code: `selectHostBadges` (`packages/app/src/hosts/appearance.ts`) takes the first two as its `enabled` input; `WorkspaceMetaRow` (`packages/app/src/components/sidebar/workspace-meta-row/index.tsx`) draws it. Don't confuse with **Status pill**, which reports state rather than identity.
 - **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.
 - **Placement** — One workspace's stable foreign-key relationship to its project plus its git checkout snapshot. Internal. An explicit creation `projectId` is authoritative when active.
 - **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`).
@@ -23,12 +24,16 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **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.
- **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing.
+- **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing. Three other things are called "profile" in this codebase, so always qualify: **Agent profile**, **Terminal profile**, and the provider aliases in [custom-providers.md](custom-providers.md). Bare "profile" is forbidden in UI copy.
+- **Agent profile** — A named launch bundle: provider, model, mode, thinking option, feature values, and free-text notes. Applying one writes those values into the **Agent controls** and is then forgotten — there is no selected profile, no default profile, and no drift tracking. The notes are written for orchestrating agents and are what the `list_profiles` MCP tool surfaces. Stored host-wide in daemon config as `agentProfiles`. UI: "Agent profiles". Code: `AgentProfile` (`packages/protocol/src/messages.ts:161`). Carries no system prompt, because a per-agent system prompt can only be set at creation. Forbidden: "Favourite", which this replaced.
+- **Terminal profile** — A named shell command a terminal can launch. Stored host-wide in daemon config as `terminalProfiles`. UI: "Terminal profiles". Code: `TerminalProfile` (`packages/protocol/src/messages.ts:135`), `resolveTerminalProfiles` (`packages/protocol/src/terminal-profiles.ts`). Also selectable as a New Workspace launch target, where the alternative is the chat agent.
 - **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi, Oh My 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).
+- **Workspace script** — A named command a workspace can run, declared in `paseo.json`. Two types: `service` and `script` (a command that runs and finishes). UI: "Scripts" for the panel and the menu, both of which list either type. Code: `WorkspaceScriptPayload` (`packages/protocol/src/messages.ts:3126`). Don't confuse with **Service**, which is one of the two types rather than a synonym for the pair.
+- **Service** — A workspace script of type `service`: long-running, may bind a port, and carries `health` of `healthy | unhealthy | null` once the daemon has observed it. The only type a sidebar workspace row reports, because a running plain script says nothing about whether the workspace is up; the row names the service and turns danger when its health fails, and where several run the failing one takes the row's single slot. UI: "Services" in the sidebar's display preferences (**Show → Services**). Code: `selectWorkspaceServiceSummary` (`packages/app/src/components/sidebar/workspace-meta-row/service-summary.ts`), `WorkspaceScriptHealthSchema` (`packages/protocol/src/messages.ts:3124`). Forbidden: "Service" as a label for the Scripts panel, which lists both types.
+- **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).
 - **Heartbeat** — Ephemeral cron prompt sent back into the same agent/conversation. Agent surfaces expose create, update cron, and delete only. Use for reminders and babysitting where status should return inline.
 - **Mode** — Provider-specific operational mode (plan, default, full-access, …). UI: icon-only. Code: `modeId` in `AgentSessionConfig` (`packages/protocol/src/messages.ts:257`).
 - **Attachment** — External or local context bound to an agent prompt: forge issue/change request, review context, uploaded file, text, or image. UI: "Attach issue or PR/MR". Code: `AgentAttachment` (`packages/protocol/src/messages.ts:782`).
@@ -40,7 +45,9 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Composer track** — A contextual lane above the composer input. Specific tracks use the `<thing> track` form: **Queue track**, **Subagents track**. Code: queue track inside `Composer` (`packages/app/src/composer/index.tsx`), `SubagentsTrack` (`packages/app/src/subagents/track.tsx`).
 - **Subagent** — User-facing term for an agent session related to a parent agent session. Use **subagents** in UI copy and docs. Internal daemon/provider plumbing may say "child agent" or `child_session`, especially for provider-managed imports; do not surface "child agent" as a product term.
 - **Attachment tray** — The selected-attachments row inside the composer input, above the text input. Code: `renderAttachmentTray` (`packages/app/src/composer/index.tsx`). Forbidden: "Attachment bar".
+- **Fork** — Starting a NEW agent session seeded with a copy of another session's curated chat history. The history rides along as a `chat_history` composer attachment on a draft; the fork does **not** resume or branch the provider-side session, and the source session keeps running untouched. Two targets, one surface, one RPC (`agent.fork_context`, gated on the `agentForkContext` host feature). UI: the fork menu lives in the assistant turn footer and offers "Fork in a new tab" / "Fork in a new workspace". On a **completed** turn it sits beside the copy button and pins a boundary to that turn, so the fork stops where the turn ended. On the **in-flight** turn it sits beside the progress loader and elapsed timer, and omits the boundary entirely — `selectForkContextRows` projects the whole timeline when no boundary is given, so the fork captures everything **up to now**, including the response still streaming. That omission is what makes mid-run forking work; pinning a boundary there would silently drop the live response. Forbidden on provider-subagent (read-only) panes. Code: `useForkAgent` (`packages/app/src/hooks/use-fork-agent.ts`), `selectForkContextRows` (`packages/server/src/server/agent/activity-curator.ts`). Don't confuse with: git fork (unrelated; Paseo has no such concept), **Worktree** (filesystem isolation, not history copying).
 - **Conflict** — Two distinct senses; do NOT use the bare word in UI copy without qualifying which: (a) **stale-write conflict** on `paseo.json` ("Config changed on disk", code `stale_project_config`, `packages/app/src/screens/project-settings-screen.tsx:593`); (b) **git merge conflict** (no current UI string).
+- **Product discussion** — Where non-bug product talk goes: [GitHub Discussions](https://github.com/getpaseo/paseo/discussions) and `#product` in Discord. Covers workflows, features, and product direction. The container term; the ask inside it is always a **workflow** — what you're doing, how you do it today, where Paseo gets in the way. Issues are bugs only. Forbidden: "Feature request" as a Paseo surface, label, or invitation; the phrase is only used when answering someone who arrived with it. Don't invent "feature discussion", "idea", or "workflow thread" as synonyms. See [CONTRIBUTING.md](../CONTRIBUTING.md).

 ## Inconsistencies (documented, not papered over)

@@ -96,6 +96,21 @@ Any gap between A and B (margins between siblings inside the same parent) is par

 If A and B genuinely can't share a parent — B portals into a different layer, floats above other content — see [Section: real gaps](#real-gaps-with-floating-panels) below.

+### Failure mode 4 — A hover-revealed trigger unmounts its own open menu
+
+A kebab that only exists while its row is hovered opens a menu, and that menu takes the pointer
+off the row: a sheet slides up over it, a popover covers it. The row un-hovers, the trailing
+overlay unmounts, and the trigger goes with it — taking the menu's open state, which lived
+inside the trigger's subtree. The surface itself is already presented in a portal, so nothing
+unmounts it and nothing is left that can close it. On a bottom sheet that means a full-screen
+backdrop swallowing every click until reload.
+
+Lift the menu's open state to whatever decides to render the trigger, and keep the trigger
+rendered while the menu is up. `useOpenKebabMenuVisibility`
+(`packages/app/src/components/sidebar/use-open-kebab-menu-visibility.ts`) is that shape for the
+sidebar rows: it owns `open`, hands the menu its controlled props, and ORs `open` into the
+row's own `showKebab`.
+
 ## Native fallback

 Hover doesn't exist on touch devices. Anything you hide behind hover must have a non-hover path on native and compact layouts:
@@ -134,5 +149,6 @@ Before opening a PR that touches hover:
 - [ ] Hovered state does **not** change the trigger's outer geometry (`width`, `height`, `padding`, `borderWidth`, mount/unmount of siblings that shift it). Internal swaps fit inside a fixed `minHeight` / `minWidth`.
 - [ ] Revealed content inside the trigger uses `opacity` + `pointerEvents`, not conditional rendering, if mounting it would reflow the trigger.
 - [ ] Visibility on native and compact layouts works without hover (`isHovered || isNative || isCompact`).
+- [ ] A menu opened from the revealed trigger keeps the trigger rendered while it is open, so losing hover can't strand it.
 - [ ] If the revealed content sits in a separate layer (portal, floating panel), `useHoverSafeZone` is wired up.
 - [ ] You opened the dev server, hovered the trigger, and slowly moved the mouse along **every** revealed element — including any visible gaps — without losing hover state.
@@ -2,7 +2,9 @@

 Paseo Hub is an explicit opt-in connection from one Paseo daemon to one Hub. Running a daemon does
 not register it with a Hub. The relationship begins only when a user runs
-`paseo hub connect <url> --token <token>` from the daemon machine.
+`paseo hub connect [url]` from the daemon machine with an explicit API key or matching stored CLI login.
+
+The human CLI login and daemon relationship are separate identities. `paseo hub login [url]` stores a durable organization-scoped CLI credential keyed by normalized Hub origin under `PASEO_HOME`. Origin resolution uses explicit command input, `PASEO_HUB_URL`, active login, then `https://hub.paseo.sh`. Connect uses exact-origin authority to request a one-time enrollment token, then passes only that token to the daemon. The daemon generates and persists its own relationship credential.

 ## Connection and authority

@@ -44,9 +46,30 @@ daemon, execution, and agent identity with that terminal state. Paseo never stor
 replays the original prompt. A duplicate create returns the existing agent without starting another
 turn.

-Hub creates use the same agent creation path as trusted clients. They may select any existing
-worktree target shape. Execution completion policy remains outside the daemon: a completed agent
-turn does not imply that the Hub execution is terminal.
+Every Hub execution creates a fresh Paseo workspace. The workspace owns the execution's agents and
+terminals. Local checkout and worktree targets select only the workspace backing and isolation; the
+Hub cannot select or reuse an existing workspace. Hub creates use the same agent creation path as
+trusted clients. They may select any worktree target shape and carry optional MCP server configuration and provider-native
+`providerOptions` for the agent session. The daemon keeps that configuration in its private agent
+record so provider sessions can recover after a restart; neither ordinary client snapshots and
+updates nor Hub projections expose session configuration. See [providers.md](providers.md) for the
+supported provider keys.
+
+Hub tool preapproval is a private, structured list of `{ kind: "mcp", server, tool }` references.
+Every reference must name an MCP server injected by the same create request. The daemon translates
+only those identities into the selected provider's native approval configuration. The protocol
+cannot name or preapprove native tools such as Bash, Edit, or Write. Explicit local or managed ask
+and deny policy takes precedence. Providers without exact MCP preapproval support reject unattended
+Hub creation instead of broadening access or waiting for an invisible prompt.
+When a create request includes a tool policy, a successful response includes
+`toolPolicyApplied: true`; absence of that acknowledgement is not success for unattended execution.
+
+A Hub workflow may use read-only provider settings for classifier steps. This is defense in depth,
+not a security boundary: classifier labels and prompt intent do not authorize tools. Exact MCP grants
+and the provider's local or managed policy remain the authorization controls.
+
+Execution completion policy remains outside the daemon: a completed agent turn does not imply that
+the Hub execution is terminal.

 The Hub ends an execution by sending `hub.execution.control.request` with the durable execution ID
 and either `interrupt` or `archive`. The daemon resolves the agent from the authenticated daemon
@@ -56,11 +79,11 @@ If no execution exists for that authenticated daemon and execution ID, interrupt
 success because the requested stopped or archived state already holds. An execution owned by another
 daemon is indistinguishable from a missing execution and is never exposed or affected.

-Interrupt uses the ordinary agent cancellation lifecycle. Archive first archives the owned agent.
-When that agent belongs to an active Paseo-owned worktree workspace, the daemon also archives the
-workspace through the shared workspace archive service, so the backing directory is removed only
-after its final active workspace reference disappears. Local and shared checkouts archive only the
-execution-owned agent.
+Interrupt uses the ordinary agent cancellation lifecycle. Archive resolves the execution agent's
+required workspaceId and sends it through the shared workspace archive service. The service archives
+that workspace's agents and terminals, then removes Paseo-owned backing directories only after their
+final active workspace reference disappears. Local checkouts remain on disk; sibling workspaces
+sharing a backing directory remain active.

 ## Disconnect and revocation

@@ -72,11 +95,13 @@ Hub authentication rejection or close code `4403` permanently revokes the local
 daemon deletes its credential, stops reconnecting, and retains only the relationship ID, Hub origin,
 scopes, and a sanitized reason for status reporting.

-`paseo hub disconnect` disables socket reconnect before requesting remote revocation. If the Hub is
-offline, the daemon persists `disconnecting` and retries revocation across daemon restarts without
-opening a Hub socket. This also covers an enrollment whose request may have succeeded but whose
-response was lost. `--force` removes local authority immediately and warns that remote revocation may
-still be pending.
+`paseo hub disconnect` disables socket reconnect and execution authority before making one bounded
+remote revocation request. The daemon then removes the local relationship whether the request
+succeeds or fails. A failed request returns a warning that server-side revocation may remain pending.
+`--force` skips the remote request. Legacy persisted `disconnecting` records are removed on startup;
+the daemon does not retry revocation in the background.
+
+`paseo hub logout` removes only the active human CLI credential and preserves credentials for other origins. Interactive logout inspects and optionally disconnects a same-origin daemon before deleting the login; a failed requested disconnect preserves the login. JSON and noninteractive logout never prompt or disconnect implicitly.

 ## Cross-repository compatibility

@@ -84,3 +109,5 @@ The consumer implementation lives in Paseo Cloud. Cloud owns its copy of the Hub
 has no Paseo runtime or build dependency. Cross-repository end-to-end verification separately builds
 a Paseo source checkout and exercises the real daemon, CLI, direct WebSocket, Cloud service, and
 Postgres. That compatibility fixture is not a package dependency or fallback implementation.
+Its `hub-e2e` ACP provider accepts only exact tool names on the injected `hub` MCP server. Other
+custom ACP providers remain unsupported for unattended preapproval.
@@ -9,11 +9,12 @@ Paseo client UI translations live in `packages/app/src/i18n`.
 - `es`
 - `fr`
 - `ja`
+- `ko`
 - `pt-BR`
 - `ru`
 - `zh-CN`

-The persisted app language setting is `"system" | "ar" | "en" | "es" | "fr" | "ja" | "pt-BR" | "ru" | "zh-CN"`. `"system"` follows the device or browser locale when it maps to a supported locale; unsupported system locales fall back to English. Japanese maps from system locales `ja` and Japanese regional locales. Brazilian Portuguese maps from system locales `pt-BR` and bare `pt`; other Portuguese regional locales remain unsupported until explicitly added.
+The persisted app language setting is `"system" | "ar" | "en" | "es" | "fr" | "ja" | "ko" | "pt-BR" | "ru" | "zh-CN"`. `"system"` follows the device or browser locale when it maps to a supported locale; unsupported system locales fall back to English. Japanese maps from system locales `ja` and Japanese regional locales. Korean maps from system locales `ko` and Korean regional locales. Brazilian Portuguese maps from system locales `pt-BR` and bare `pt`; other Portuguese regional locales remain unsupported until explicitly added.

 ## Translation Scope

@@ -23,7 +24,7 @@ Do not translate agent output, daemon output, terminal contents, file paths, pro

 ## 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`.
+English source strings live in `packages/app/src/i18n/resources/en.ts`. Each supported locale has a matching resource in `packages/app/src/i18n/resources`.

 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.

@@ -89,3 +90,4 @@ Within a migrated surface, do not leave mixed-language neighboring labels when t
 - 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.
 - Batch 5A added Brazilian Portuguese (`pt-BR`) resource coverage, language selector labels, i18next registration, and system-locale mapping for `pt-BR` and bare `pt`. Non-Brazilian Portuguese regional locales remain unsupported until a matching resource is added.
+- Batch 5B added Korean (`ko`) resource coverage, language selector labels, i18next registration, and system-locale mapping for `ko` and Korean regional locales.
@@ -0,0 +1,156 @@
+# Menus
+
+One engine, in `packages/app/src/components/ui/menu/`. `dropdown-menu.tsx` and `context-menu.tsx`
+are wrappers over it and differ only in what opens them — a press, or a long press / right click.
+Import the `DropdownMenu*` or `ContextMenu*` names as before; reach for `@/components/ui/menu`
+directly only when you are building a third trigger shape.
+
+Do not add a third menu implementation. The two that existed were byte-identical from
+`computePosition` down, and the copies drifted: only one of them ever grew a sheet.
+
+## Two presentations
+
+`MenuRoot` picks one from form factor, never from platform — a tablet in a narrow split view
+sheets the same way a phone does.
+
+| Screen                         | Surface                         | Submenus                                           |
+| ------------------------------ | ------------------------------- | -------------------------------------------------- |
+| Wide                           | Popover anchored to the trigger | Flyout overlapping the row, opened by hover intent |
+| Compact, `compactMode="sheet"` | Bottom sheet                    | The page is replaced in place, with a back header  |
+| Compact, default               | Popover                         | Same as wide                                       |
+
+`compactMode` defaults to `"popover"`, so adopting the sheet is per-menu. That is deliberate:
+flipping every menu in the app to sheets at once is not a change anyone can review. Opt a menu in
+when you have actually looked at it on a phone.
+
+`ContextMenu` is the exception: it defaults to `compactMode="sheet"` and enables native long press.
+Disable mobile triggering explicitly on draggable rows, where long press belongs to drag instead.
+
+## Selecting an item on iOS
+
+An item that closes the menu runs its action after a fixed grace period on iOS, not immediately:
+a native presenter launched while UIKit is still tearing down the surface can hang. Both surfaces
+unmount the moment the menu closes, so the wait is a timer rather than the surface's own dismissal
+callback — a callback fired from inside a subtree that is being removed is racing its own removal,
+and it loses. Selections used to be dropped entirely for exactly that reason.
+
+The consequence for callers: an `onSelect` on iOS runs a beat after the press. Don't add a second
+delay on top of it, and don't read state that the same press mutated.
+
+## Pages
+
+A submenu is a page, declared as data on the surface and reached by a `MenuSubTrigger` whose `id`
+matches:
+
+```tsx
+<MenuSurface pages={pages} sheetTitle="Display">
+  <MenuSubTrigger id="grouping" value="Project">
+    Grouping
+  </MenuSubTrigger>
+</MenuSurface>
+```
+
+Pages are data rather than nested children because the popover renders them as _siblings_ of the
+root surface — a flyout nested inside the root's box would be clipped by its `overflow: hidden`.
+Declaring them separately is what lets one model drive both presentations.
+
+`menu-navigation.ts` holds that model, and it is pure: the open flyout chain and the mobile push
+stack are the same path, so the popover renders every entry in it and the sheet renders only the
+last. Nothing else differs between the two.
+
+Opening a submenu truncates the path to the depth of the trigger that opened it. Without that,
+sliding the pointer across a row of triggers would stack up every flyout it passed instead of
+swapping between them.
+
+## Hover intent
+
+A flyout **overlaps its parent by 5pt** rather than sitting beside it. With a gap there is a strip
+of backdrop between the two that belongs to neither surface, and every pixel of it is a chance to
+dismiss the menu you are reaching for. Overlapping deletes the strip; don't reintroduce the gap
+and try to cover it with a longer timer.
+
+On top of that, a flyout opens after the pointer rests ~90ms, closes ~260ms after it leaves, and
+cancels its own pending close while the pointer is inside it. The grace still matters because the
+pointer crosses sibling rows on the way down into the flyout.
+
+Hover lives on a plain `View`, never on a `Pressable` — see [hover.md](hover.md), which owns that
+rule. Hover only fires on web, which is exactly where flyouts exist; everywhere else the page
+opens on press.
+
+## Item states
+
+`selected` and `active` are different questions and must not be merged.
+
+| Prop       | Means                      | Draws                     |
+| ---------- | -------------------------- | ------------------------- |
+| `selected` | This is the chosen value   | A check, and nothing else |
+| `active`   | This row's submenu is open | The fill, and no check    |
+
+A selected row does **not** get a background. A check and a fill are two separate claims about the
+same state, and showing both makes a chosen row compete with the row the pointer is actually on.
+`showSelectedCheck` moves the check to a reserved leading column when a group needs to stay
+aligned whether ticked or not; otherwise it sits at the trailing edge and the leading slot is free
+for the option's icon.
+
+Give options icons; leave the root rows without them. The root is labels and their current values,
+and a column of icons there is decoration competing with the values you actually came to read.
+
+## Surface details
+
+- The hover fill is **inset from the surface's edges and rounded** — a chip inside the menu, not a
+  band across it. The inset is taken _out of_ the row, never added to it: padding gives up what
+  margin takes, so labels sit at the same 13pt they always did. Insetting by growing the row is how
+  the menu ends up taller than it started.
+- **A row is as tall as what is driving it** — 28pt for a pointer, 40pt below `md` for a thumb. The
+  split is on breakpoint, not on `presentation`: the compact popover that `compactMode` defaults to
+  is worked with a thumb just as a sheet is, and sizing off the sheet would leave it at the desktop
+  height. `md` is where `useIsCompactFormFactor` divides, so row height and the popover/sheet choice
+  turn over together.
+- The desktop height only holds because the label's `lineHeight` is pinned — 18 line + 8 padding +
+  2 border is exactly 28. Leave it to the platform and content outgrows `minHeight`, which then does
+  nothing. Compact is the other way round: `minHeight` leads and the label centres in it.
+- **A row owns its fill; `MenuPage` owns the spacing between rows.** The vertical inset above the
+  first row and below the last, and the gap between rows, are the page's — one knob each,
+  `MENU_ROW_GAP` being the one a redesign turns. A row that carried vertical margin would be
+  serving both at once, and since margins don't collapse it would land as one unit at the edges and
+  two between rows, so shrinking the gap would eat the inset with it. Horizontal inset does stay on
+  the row: there is one left edge and one right edge, so nothing is doubling up.
+- `MenuPage` is also what provides a page's depth, so the popover and the sheet cannot disagree
+  about what a page is. Every entry point goes through it — root, flyout, pushed sheet page.
+- The gap reaches a page's **direct children**. A group of rows wrapped in a `View` of its own drops
+  out of it; at the current gap of zero there is nothing to lose, but anything above zero wants that
+  wrapper to carry the page style too.
+- The separator is the one row-level thing that asks for vertical space of its own, and now that
+  rows carry none, that is still one number controlling one gap. It takes no horizontal margin and
+  the page has no horizontal padding, so the rule runs the full width of the surface.
+- Separators use `borderAccent`, the same colour the surface outlines itself with. `border` sits
+  between `surface1` and `surface2`, which put it within a hair of the hover fill and made
+  separators disappear against a hovered row.
+
+## When a decision earns a submenu
+
+Put a decision behind a submenu when its options are not the point — the current _value_ is. The
+root row then reads as the answer (`Grouping  Project ›`) and costs one line instead of one line
+per option. A menu whose every option is on screen at once does not survive its third decision.
+
+Independent toggles stay on their page as a checkmark list. A pick-one group can share that page
+below a `MenuSeparator`; make selecting the checked row clear it, so "none" doesn't need a row of
+its own.
+
+## Gotchas
+
+- **Released height.** Reanimated's web entering animation leaves an inline height snapshot on
+  the surface. `AnchoredSurface` clears it, and a `revision` prop re-clears it when content
+  identity changes — a pushed page taller than the one it replaced is clipped without that.
+- **Sheets size to content.** `enableDynamicSizing`, not fixed snap points. A pushed page is
+  rarely the height of the page before it.
+- **The sheet's content is teleported out of the menu's subtree**, so `MenuSheetSurface` rebuilds
+  both menu contexts through the sheet's `contextBridge`. Providing them around the modal puts
+  them on the wrong side of the portal and every item inside throws. Gotcha 7 in
+  [floating-panels.md](floating-panels.md).
+- **One overlay per menu.** Submenus render inside their parent's layer and paint no second
+  backdrop, so there is exactly one `Modal` on native no matter how deep the menu goes.
+- Anchoring, flipping, and edge clamping live in `menu-anchor.ts` and are unit-tested. Fix
+  positioning bugs there, not at a call site.
+- Everything else about floating surfaces on Android — Portal/Modal escape, lifecycle gates,
+  status-bar offset, the open flash — is in [floating-panels.md](floating-panels.md).
@@ -70,6 +70,10 @@ definition, no longer eligible to begin.

 - Callers request semantic targets through `panel-store`; they never write shared values.
 - Gesture behavior comes from the four explicit hooks in `mobile-panels/gestures.ts`.
+- A focused interactive surface may block panel-opening gestures through
+  `useBlockMobilePanelOpenGestures`. Register only while the conflicting interaction is active and
+  unregister when the surface is hidden or unfocused. The blocker never disables gestures that close
+  an already-open panel.
 - Keep `SidebarModelProvider` outside `MobileGestureWrapper`. The provider shares sidebar derivation
  across consumers, while Gesture Handler requires the wrapper's direct child to be a native `View`
  so its injected `collapsable={false}` reaches Android/Fabric.
@@ -1,6 +1,47 @@
 # Mobile Testing

-## Maestro
+## Agent Device
+
+Agent Device `.ad` scripts are the primary mobile E2E format. An agent discovers a working flow interactively, saves the successful commands, then the replay runner executes the same typed plan locally or in CI.
+
+Record a flow while driving the app normally:
+
+```bash
+agent-device open sh.paseo.debug \
+  --platform ios \
+  --session terminal-author \
+  --save-script ./packages/app/e2e/mobile/agent-device/terminal.ios.ad
+agent-device snapshot -i --session terminal-author
+agent-device press 'id="workspace-header-menu-trigger"' --session terminal-author
+# Continue the flow and verify its result with wait/get/is/find.
+agent-device close --session terminal-author
+```
+
+`close` writes the script. Keep selectors based on stable app IDs. Keep assertions as `wait`, `get`, `is`, or `find` commands; screenshots are evidence, not assertions.
+
+Run the Paseo mobile suite:
+
+```bash
+npm run test:e2e:mobile
+```
+
+The runner uses an isolated Agent Device state directory, verifies or starts Metro for this checkout, prewarms the iOS runner, discovers each script's platform from its `context` header, and cleans its sessions, runner lease, daemon, and any Metro process it started. Attempt results, timings, logs, and failure artifacts go under `.dev/agent-device-artifacts`.
+
+Set `PASEO_MOBILE_E2E_METRO_PORT` when this worktree already has Metro on a non-default port:
+
+```bash
+PASEO_MOBILE_E2E_METRO_PORT=62093 npm run test:e2e:mobile
+```
+
+[native-terminal-basic.ios.ad](../packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad) and [native-terminal-basic.android.ad](../packages/app/e2e/mobile/agent-device/native-terminal-basic.android.ad) are the smallest examples. Each opens a fresh terminal, types a command at zero delay, submits it, and asserts its distinct output. The app must be connected to a daemon with an active workspace.
+
+When replay diverges, read its ranked selector suggestions. Edit the script deliberately and rerun it from the beginning. `--update` is retained for compatibility but no longer rewrites scripts.
+
+## Maestro compatibility
+
+Existing Maestro flows live in `packages/app/maestro/`. Agent Device can execute its supported subset with `agent-device test <path> --maestro`, which provides a migration path while `.ad` coverage replaces these flows.
+
+### Existing flows

 Maestro flows live in `packages/app/maestro/`. Reusable sub-flows live in `packages/app/maestro/flows/`.

@@ -211,6 +252,25 @@ adb emu gsm call 5551234

 Expected result: Paseo does not throw `RuntimeException: Audio focus request failed`; native audio reports an interruption and voice mode stops or pauses coherently.

+### Releasing the audio session when idle
+
+Paseo must not hold the OS audio session once it is neither capturing nor playing, or the user's
+background music stays paused. On iOS this is not just a "while recording" problem: the
+`.playAndRecord`/`.voiceChat` category is non-mixing and survives backgrounding, and iOS re-asserts
+it every time the app returns to the foreground — so one dictation turn kills music for the life of
+the process, on every open, until the app is force-quit. Android holds
+`AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE` with the same effect.
+
+`createAudioEngine` (`packages/app/src/voice/audio-engine.native.ts`) calls
+`releaseAudioSession()` whenever capture stops and the playback queue drains, and the iOS module
+also releases on `OnAppEntersBackground`. The native side re-guards on `isRecording` /
+`speechPlayer.isPlaying`, because the native engine is a singleton shared by multiple JS engine
+wrappers (voice provider + dictation) and only it knows the true state.
+
+This cannot be validated by a JS test — verify on a device: play music, open Paseo, use dictation
+once, stop, and confirm the music resumes; then background/foreground the app and confirm it keeps
+playing.
+
 ## Unistyles + Reanimated

 ### The crash
@@ -279,6 +339,111 @@ Platform-specific stream edges belong on `StreamStrategy`:

 If a chat footer looks duplicated or appears above the assistant message on mobile, start with `packages/app/src/agent-stream/layout.test.ts`. Do not add a React Native renderer test for this class of bug; make the pure layout invariant fail first.

+## Local iOS device builds
+
+Native changes (anything under `packages/expo-two-way-audio/ios/`, or any new Expo module) **cannot be
+tested over Metro or EAS Update**. Those ship JS only. A stale dev-client binary silently lacks the new
+native functions, so the feature no-ops and the test proves nothing. Rebuild the binary.
+
+Symptom of a stale dev client: `Cannot find native module 'ExpoDocumentPicker'` at startup, followed by a
+cascade of `Route "./X.tsx" is missing the required default export` warnings. The route warnings are not a
+router bug — the module-level throw aborts `_layout.tsx` evaluation, so its default export never gets
+assigned. One missing native module, N confusing warnings.
+
+**Prerequisite: Xcode needs a signed-in Apple ID for the signing team _with a valid keychain token_.** An
+account that merely appears in Xcode → Settings → Accounts is not enough — if its `Xcode-Token` is missing,
+the build below fails at code signing and blames a _certificate_ instead. See
+[Signing needs a working Apple ID token in Xcode](#signing-needs-a-working-apple-id-token-in-xcode) before
+you start, not after it fails.
+
+```bash
+cd packages/app
+npm --prefix ../.. run build:client
+APP_VARIANT=development npx expo prebuild --platform ios
+APP_VARIANT=development npx expo run:ios --device
+```
+
+`APP_VARIANT=development` is required. The `ios` npm script does not set it, and `app.config.js` defaults
+to `production` — so a bare `npm run ios` builds `sh.paseo` and collides with the App Store install instead
+of the `sh.paseo.debug` dev client. Ignore prebuild's `--non-interactive is not supported` warning; use
+`CI=1` if you need non-interactive.
+
+### Signing needs a working Apple ID token in Xcode
+
+Device builds fail with a trio of errors that all point away from the real cause:
+
+```
+error: No Accounts: Add a new account in Accounts settings.
+error: Provisioning profile "iOS Team Provisioning Profile: *" doesn't include
+       signing certificate "Apple Development: <name>".
+error: Provisioning profile "iOS Team Provisioning Profile: *" doesn't include
+       the aps-environment entitlement.
+```
+
+**`No Accounts` does not reliably mean no account is configured.** Check the line _above_ it in the build
+log before believing it:
+
+```
+DVTDeveloperAccountManager: Failed to load credentials for <apple-id>:
+  Invalid credentials in keychain for <apple-id>, missing Xcode-Token
+```
+
+That is the actual failure: the Apple ID is registered in Xcode, but its `Xcode-Token` keychain item is gone
+(typically after an Apple ID password change or a keychain reset). Xcode reports it as `No Accounts`, then
+falls back to whatever stale profile is cached — and if the machine holds a dev cert newer than that
+profile, you get the _certificate_ mismatch as a second-order symptom. Chasing the certificate error is a
+dead end.
+
+Verify what is actually configured rather than trusting the message:
+
+```bash
+# Accounts Xcode knows about
+defaults read com.apple.dt.Xcode DVTDeveloperAccountManagerAppleIDLists
+
+# The credential that is actually missing (error => no token)
+security find-generic-password -s "Xcode-Token"
+```
+
+Fix: Xcode → Settings → Accounts, re-sign-in to the listed Apple ID (removing and re-adding forces a fresh
+token). That restores `-allowProvisioningUpdates`, profile regeneration, and push.
+
+Signing an Xcode-_managed_ profile via `CODE_SIGN_STYLE=Manual` is not a workaround; Xcode rejects it with
+`is Xcode managed, but signing settings require a manually managed profile`.
+
+If you need a build on the device before the token is fixed, build unsigned and sign by hand with a cert the
+cached profile already embeds (list them with `security cms -D -i <profile>.mobileprovision`, then compare
+against `security find-identity -v -p codesigning`):
+
+```bash
+xcodebuild ... CODE_SIGNING_ALLOWED=NO CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" build
+cp <profile>.mobileprovision "$APP/embedded.mobileprovision"
+# sign nested frameworks/dylibs first, then the bundle, then:
+xcrun devicectl device install app --device <udid> "$APP"
+```
+
+This is a stopgap, not a fix: `expo prebuild` regenerates `packages/app/ios/` and discards it. It also
+requires stripping entitlements the cached profile lacks (e.g. `aps-environment`), so push is dead in such a
+build.
+
+To verify only that native Swift compiles, skip signing entirely — the pods have their own schemes:
+
+```bash
+cd packages/app/ios
+xcodebuild -workspace PaseoDebug.xcworkspace -scheme ExpoTwoWayAudio \
+  -sdk iphoneos -destination 'generic/platform=iOS' CODE_SIGNING_ALLOWED=NO build
+```
+
+Confirm the log compiled _your_ file and not a cached copy: the `SwiftCompile` line should reference
+`packages/expo-two-way-audio/ios/...`, not a path inside DerivedData.
+
+### Headless launch cannot verify runtime behavior
+
+`xcrun devicectl device process launch` reports `The app terminated with the exit code 0` about a second
+after launch when the phone's screen is off — the app is suspended and killed before the JS bundle loads.
+This is **not** a build defect. Confirm with a control: launch `com.apple.Preferences` the same way and
+watch it exit identically. Headless install and launch prove the binary is valid and that startup reaches
+RN init; anything about on-screen behavior needs a human holding the phone.
+
 ## iOS Simulator

 ```bash
@@ -0,0 +1,173 @@
+# Local plugins
+
+Local plugins contribute daemon RPCs, native app surfaces, and composer attachment sources from one
+`index.tsx`. Paseo executes the server contribution in a subprocess and evaluates the client
+contribution in the app runtime. Plugin code is trusted code; this first slice does not sandbox it.
+
+## Install a directory source
+
+Create a typecheckable plugin project, install its development dependencies, then install it into
+the daemon. `init` only writes the project files; it does not run the package manager.
+
+```bash
+paseo plugin init /absolute/path/to/my-plugin
+cd /absolute/path/to/my-plugin
+npm install
+npm run typecheck
+paseo plugin install /absolute/path/to/my-plugin
+paseo plugin install /absolute/path/to/my-plugin --id another-runtime-id
+paseo plugin ls
+```
+
+The daemon stores directory sources under the root `plugins` object:
+
+```json
+{
+  "pluginsEnabled": true,
+  "plugins": {
+    "my-plugin": {
+      "source": "directory",
+      "path": "/absolute/path/to/my-plugin",
+      "enabled": true
+    }
+  }
+}
+```
+
+The plugin system is disabled unless `pluginsEnabled` is `true`.
+
+The directory contains an identity-only manifest, one entry point, and local typechecking support:
+
+```text
+my-plugin/
+  paseo-plugin.json
+  index.tsx
+  paseo-plugin.d.ts
+  package.json
+  tsconfig.json
+```
+
+Paseo compiles TSX when loading the plugin, so these packages are development dependencies only.
+The generated declaration file supplies `@paseo/plugin` types until the SDK is distributed as a
+public package. Regenerate new plugins with the matching Paseo CLI when the SDK contract changes.
+
+```json
+{
+  "id": "my-plugin"
+}
+```
+
+The config key is the runtime plugin ID. The manifest ID is the default selected during install;
+`--id` overrides it. Existing configuration is not renamed when the manifest changes, and the
+runtime does not compare the two IDs. The same directory can be installed under several config
+keys.
+
+Source changes are explicit. Run `paseo plugin reload <id>` to stop and fully tear down the old
+plugin before compiling and starting from disk. A failed reload stays failed; Paseo does not restore
+the old code. Use `enable`, `disable`, and `remove` to manage one plugin. Remove deletes only its
+configuration, never its source directory. The global `pluginsEnabled` switch remains available.
+
+## Contribute behavior and UI
+
+Default export one contribution function. Paseo calls it with a plugin-scoped context. The compiler
+removes UI registrations from the server bundle and RPC registrations from the client bundle before
+resolving dependencies.
+
+```tsx
+import { Text } from "react-native";
+import { useQuery } from "@tanstack/react-query";
+import { z } from "zod";
+import { defineRpc, type PluginContext, useRpc } from "@paseo/plugin";
+
+const greetRpc = defineRpc({
+  name: "greet",
+  input: z.object({ name: z.string() }),
+  output: z.object({ message: z.string() }),
+});
+
+function Greeting() {
+  const greet = useRpc(greetRpc);
+  const query = useQuery({
+    queryKey: ["greeting", "Paseo"],
+    queryFn: () => greet({ name: "Paseo" }),
+  });
+  return <Text>{query.data?.message}</Text>;
+}
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(greetRpc, async ({ name }) => ({ message: `Hello, ${name}` }));
+  plugin.addSurface("main", Greeting);
+  plugin.addSidebarItem({
+    id: "main",
+    title: "Greeting",
+    icon: "MessageCircle",
+    surface: "main",
+  });
+  return () => undefined;
+}
+```
+
+The contribution function must return cleanup. Paseo invokes it once when the plugin is reloaded,
+disabled, removed, disconnected, or shut down. Cleanup is for resources created by plugin code.
+Paseo removes registered contributions, unmounts surfaces, clears query state, rejects pending RPCs,
+and stops the subprocess. Cleanup errors are logged and do not interrupt host teardown.
+
+Paseo owns the route, screen header, Lucide icon validation, close action, theme DTO, layout facts,
+and render error boundary. The contributed component owns the complete body below the header.
+
+RPC contracts validate inputs and outputs in both the app and plugin subprocess. `useRpc` returns a
+typed async function. Use the host-provided `@tanstack/react-query` for request state and caching;
+Paseo gives each plugin installation its own query client.
+
+When the same plugin contribution exists on multiple hosts, Paseo shows it once in the sidebar and
+adds a host picker to the screen header. The selected host supplies the bundle, RPC transport, and
+query cache. Plugin code cannot address another host.
+
+## Contribute composer attachments
+
+Register a declarative attachment source backed by a plugin RPC. Paseo owns the attachment menu,
+search picker, drafts, selected pill, and submission. The plugin returns complete text snapshots;
+credentials and vendor API calls stay in the daemon handler.
+
+```tsx
+const searchIssues = defineRpc({
+  name: "issues.search",
+  input: z.object({ query: z.string() }),
+  output: z.object({
+    items: z.array(
+      z.object({
+        id: z.string(),
+        identifier: z.string(),
+        title: z.string(),
+        subtitle: z.string().optional(),
+        url: z.string().url(),
+        text: z.string(),
+        resourceType: z.string(),
+      }),
+    ),
+  }),
+});
+
+const issues = defineAttachmentSource({
+  id: "issues",
+  title: "Acme issue",
+  icon: "CircleDot",
+  pickerTitle: "Attach Acme issue",
+  searchPlaceholder: "Search by identifier or title",
+  search: searchIssues,
+});
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(searchIssues, ({ query }) => searchAcmeIssues(query));
+  plugin.addAttachmentSource(issues);
+  return () => undefined;
+}
+```
+
+Attachment sources stay scoped to the composer's host. Unlike sidebar contributions, equal sources
+on several hosts are not coalesced. The selected snapshot submits as a text attachment with neutral
+external-resource presentation, so it remains readable if the plugin is removed or an older peer
+drops the optional presentation fields.
+
+See `plugin-examples/local-plugin` for a native surface and `plugin-examples/linear` for a complete
+attachment-source example.
@@ -12,7 +12,7 @@ The development workflow is shifting from manually editing files to orchestratin

 Freedom and flexibility. Every design decision follows from this:

- **Multi-provider** — Use any coding agent harness. Pick the right model for each job, switch freely as the landscape shifts. No vendor-lock in.
+- **Multi-provider** — Use any coding agent harness. Pick the right model for each job, switch freely as the landscape shifts. No vendor lock-in.
 - **Cross-device** — Desktop, mobile, web, CLI. Start work at your desk, check progress from your phone, script from the terminal.
 - **Self-hosted** — The daemon runs on your machine. Your code, your keys, your environment. No inference markup, no cloud dependency.
 - **Respectful** - No telemetry, no forced cloud, no forced accounts
@@ -0,0 +1,59 @@
+# Protocol Compatibility
+
+The app and the daemon are separate products that ship separately. A user updates the app from an app store or a desktop auto-update; they update the daemon when they feel like it. Every combination happens in the wild: new app against an old daemon, old app against a new daemon, and both sides months apart.
+
+In development both sides are always the same version, which is why this is the constraint contributors miss most often.
+
+Two contracts follow from it.
+
+## The protocol contract: always compatible
+
+A schema change must not break parsing in either direction. An old app still parses messages from a new daemon. A new daemon still parses messages from an old app.
+
+- New fields are `.optional()` with a sensible default.
+- Never flip optional to required, remove a field, or narrow a type. `string` to `enum` and nullable to non-null are both narrowing.
+- A field you stop sending stays accepted. You stop writing it, you don't stop reading it.
+- Wire schemas are pure structural declarations. No `.transform()`, `.catch()`, or `.preprocess()` on WebSocket message schemas — normalization happens in an explicit pass after validation. The reason is in [protocol-validation.md](protocol-validation.md): inbound validators are generated, and the generator only compiles pure schemas.
+- Plain `z.union()` is forbidden when every branch shares a literal tag. Use `z.discriminatedUnion()`.
+- `.default()` belongs on primitive leaves only, never on item schemas inside large arrays or big inbound containers.
+
+Two questions to ask before you commit a schema change:
+
+1. Does a six-month-old app still parse this message?
+2. Does a six-month-old daemon still send something this app accepts?
+
+If you can't answer both with yes, the change isn't done.
+
+Schemas live in `packages/protocol/src/messages.ts`. New RPC names follow [rpc-namespacing.md](rpc-namespacing.md).
+
+## The feature contract: per feature, gated once
+
+Features don't have to work across versions. A new feature usually needs a new daemon capability, and old daemons don't have it.
+
+The app checks for the capability and either runs the feature or tells the user to update the host.
+
+- **No fallback paths.** Don't build a degraded version of the feature for old daemons. Don't fan out across legacy RPCs to simulate a capability that isn't there. The user updates or doesn't get the feature.
+- **No defensive branches spread through the feature.** Detection happens in one place, and everything downstream reads a clean shape.
+- Capability flags live in `features` on the `server_info` message (`packages/protocol/src/messages.ts`, the `server_info` schema).
+
+Existing functionality keeps working across versions because of the protocol contract. Gating a new feature never substitutes for that.
+
+## Every shim is tagged and dated
+
+A shim that exists for old-app or old-daemon support carries a comment naming it, the version it arrived in, and when it can go:
+
+```ts
+// COMPAT(workspaceFileEditing): added in v0.2.0, remove after 2027-01-18 once daemon floor >= v0.2.0.
+```
+
+`rg "COMPAT\("` is the full cleanup backlog, so:
+
+- One tag per shim, at the site that has to be deleted.
+- Give it a name, a version, and a removal condition or date. Six months out is the usual default.
+- Never bury compatibility in an untagged `??` fallback or an optional-chain tunnel. Untagged back-compat never gets removed, because nobody can find it.
+
+When a tag's condition is met, delete the shim and the tag in the same change.
+
+## QA
+
+Tests don't fully cover compatibility. If you touched `packages/protocol`, say in the pull request why an older app still parses your message and why an older daemon still satisfies your app. See [qa.md](qa.md).
@@ -2,6 +2,41 @@

 This guide walks through adding a new agent provider end-to-end. There are two integration patterns, and this doc covers both.

+## Provider-native session options
+
+`AgentSessionConfig.providerOptions` carries JSON-safe configuration for the selected provider. The
+names and nesting are the provider's native contract; options are not portable between providers.
+Paseo validates the object with the selected provider's strict schema before constructing a session.
+Unknown keys fail with their `providerOptions.*` path. Paseo-owned controls such as cwd, model,
+prompt, environment, session identity, MCP transport, callbacks, and hooks cannot be passed here.
+
+This Paseo version accepts these keys:
+
+- **Codex:** `approval_policy`, `sandbox_mode`,
+  `sandbox_workspace_write.{writable_roots,network_access,exclude_slash_tmp,exclude_tmpdir_env_var}`,
+  `web_search`, `features.multi_agent_v2`, and `features.network_proxy`. A network proxy object may
+  contain `enabled`, `proxy_url`, `socks_url`, `enable_socks5`, `enable_socks5_udp`,
+  `allow_local_binding`, `allow_upstream_proxy`, `dangerously_allow_all_unix_sockets`,
+  `dangerously_allow_non_loopback_proxy`, `domains`, and `unix_sockets`. See the
+  [Codex configuration reference](https://developers.openai.com/codex/config-reference).
+- **Claude:** `allowedTools`, `disallowedTools`, `additionalDirectories`, `sandbox`, and `settings`.
+  The accepted sandbox fields cover enablement, fail-if-unavailable behavior, excluded and
+  unsandboxed commands, filesystem read/write rules, network domain/socket/local-binding rules,
+  weaker nested sandboxing, ignored violations, and the ripgrep command. `settings` accepts native
+  `permissions.{allow,ask,deny}` and sandbox settings. See the
+  [Claude Agent SDK TypeScript reference](https://platform.claude.com/docs/en/agent-sdk/typescript)
+  and [Claude settings reference](https://code.claude.com/docs/en/settings).
+- **OpenCode:** `permission`, either one `ask`/`allow`/`deny` action or the native per-tool rule
+  object. Supported entries are `read`, `edit`, `glob`, `grep`, `list`, `bash`, `task`,
+  `external_directory`, `todowrite`, `question`, `webfetch`, `websearch`, `codesearch`,
+  `repo_clone`, `repo_overview`, `lsp`, `doom_loop`, and `skill`. See the
+  [OpenCode permissions reference](https://opencode.ai/docs/permissions/). OpenCode permissions are
+  application policy, not an OS sandbox.
+
+Each provider definition owns its option schema and exact MCP preapproval mapping. A new provider
+must fail closed for Hub unattended execution until it can approve one exact injected MCP server
+and tool identity without approving native tools.
+
 ## Two Integration Patterns

 ### ACP (Agent Client Protocol) -- recommended
@@ -12,6 +47,8 @@ The only built-in ACP provider today is `copilot` (`copilot-acp-agent.ts`). `Gen

 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.

+ACP permission options are rendered as ordered actions and Paseo returns the selected option's exact `optionId`. Agents can therefore encode a single-choice question as multiple options of the same allow kind. Auto-accept does not resolve those chooser requests; they always wait for the user.
+
 ### 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.
@@ -42,11 +79,15 @@ OpenCode MCP injection is dynamic and session-scoped. Call OpenCode's `mcp.add`

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

-Submitted user-message rows preserve both identities: `messageId` is the provider-visible ID and the optional `clientMessageId` is the Paseo ID from `AgentRunOptions`. Attach `clientMessageId` only to the canonical row for that foreground submission; provider history and externally initiated user rows do not have a Paseo client ID.
+Rewind accepts the canonical wire `messageId` and resolves it to the provider identity before calling the adapter. A submitted prompt cannot be rewound until its provider echo supplies that identity.

-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. Draft feature and command listing must use the explicit draft model only; if no model is selected yet, return no metadata instead of resolving a default model through catalog discovery.
+Submitted user-message wire items carry the same Paseo ID in `messageId` and `clientMessageId`. Provider adapters attach `clientMessageId` only to the echo for that foreground submission; provider history and externally initiated user rows do not have a Paseo client ID.
+
+Provider adapters must terminalize every transient timeline row before emitting the turn's terminal event. Codex may omit the completed `contextCompaction` item when a turn ends during compaction, so its adapter closes any pending root compaction before forwarding `turn_completed`, `turn_failed`, or `turn_canceled`. A terminal turn must never leave the client showing an operation as still loading.
+
+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. Draft command listing and scratch-session feature listing require an explicit draft model. Do not resolve a default model through catalog discovery. A client-level `listFeatures` implementation may return features from an incomplete, model-less draft and owns which features are valid in that state.

 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.

@@ -64,8 +105,17 @@ Daemon bootstrap reconciles that ledger in the background, without blocking star

 The daemon keeps provider snapshots per resolved working directory, with a separate semantic global scope for settings/provider management and requests that do not carry a cwd. Provider catalog probes receive a discriminated `FetchCatalogOptions`: `{ scope: "global", force }` for global catalog refreshes, or `{ scope: "workspace", cwd, force }` for project-scoped refreshes. Providers decide what global means for their runtime; do not infer global by comparing a cwd to the user's home directory.

+`ProviderSnapshotManager` owns one refresh deadline per provider. The deadline starts before the
+availability check and covers that check plus the complete catalog probe. Providers that make
+multiple catalog requests must not apply this deadline separately to each request. The manager
+aborts the shared refresh signal at the deadline. Providers name active catalog operations and
+finish subprocess, server, or session cleanup before rejecting. Timeout errors list the operations
+that were still active when the deadline expired.
+
 Snapshot reads may probe providers only while the requested cwd scope is cold. Once an entry is warm, its `ready`, `error`, or `unavailable` state stays cached until an explicit refresh. Do not add TTL revalidation, focus-triggered refreshes, selector-open refreshes, or config-reload refreshes. Selector-open refetches may read an already-loading or stale React Query, but they must not force provider probing on their own.

+Capable clients receive a compact, content-addressed snapshot. Model rows derive their provider from the containing entry and reference snapshot-level thinking sets. The app persists that compact shape per server and cwd, then sends its hash on the next pull; an unchanged response carries no catalog body. Keep the legacy encoding for clients without the capability. The hash covers the complete client-visible compact snapshot, including status and `fetchedAt`, so explicit refreshes invalidate it even when the discovered catalog is otherwise equal.
+
 Settings refresh is the user-facing "forget stale provider knowledge everywhere" action. A settings refresh clears provider snapshot caches and in-flight loads across all cwd scopes, then immediately refreshes only the global snapshot with `force: true`. Workspace snapshots are re-probed lazily on the next scoped read; do not fan out a settings refresh across every known workspace.

 Registry/config replacement may update visible metadata such as label, description, default mode, enabled state, and provider membership, but it must not spawn provider processes. If a provider needs to be re-probed after a config change, route that through the explicit settings refresh path.
@@ -458,3 +508,11 @@ Tests use `isProviderAvailable(provider)` to skip when the binary or credentials
 **`defaultCommand` is a tuple.** The first element is the binary name, the rest are default arguments. The base class uses this to find the executable and spawn the process.

 **Runtime settings can override the command.** Users can configure custom binary paths or environment variables per provider via `ProviderRuntimeSettings`. Your factory in the registry should pass `runtimeSettings?.["your-provider"]` through to the constructor.
+
+**Session-scoped cancellation needs a stop boundary inside the provider.** Some agents cancel the whole session rather than one turn — OpenCode's `session.abort` is the example. A cancel that is still in flight when the next run starts will kill that replacement run, which is what makes "stop, then immediately prompt again" (`replaceRunning`, `notifyOnFinish` wakes, schedules) flaky. Own this in the provider session, not in `AgentManager`:
+
+- Model the stop as an explicit `stopping` turn-state variant carrying the canceled run's terminal and the cancellation the caller is still owed. Pressing Stop again retries the stop already in progress rather than opening a second one; never fire a detached retry, it will outlive its boundary.
+- **Scope the cancel settlement the way the provider scopes the cancel.** If cancellation is session-scoped, so is its settlement: track it on the session, accumulating every request issued, and let it outlive the stop that issued it. A request still in flight lands on the runner whenever the server gets to it — however many stops have come and gone since. Scoping it to the current stop looks right and quietly drops older requests from the gate. Only the newest may hold the gate closed, since recovering from a failed cancel is what pressing Stop again is for.
+- Gate the operations **the daemon issues** (prompt, slash command, summarize) on both the terminal and cancel settlement. Permission and question responses are not runner operations and must stay outside the gate, or an auto-approve deadlocks the stop. Runs the _provider_ starts on its own — plugin or autonomous wakes — are observed, not gated: the daemon does not choose when they begin, and holding their events back does not protect them from a cancel already in flight, it only hides a run that may already be dead.
+- Fail closed: if the cancel never succeeded you never proved the run stopped, so refuse new runs until the next Stop issues a fresh cancel. `AgentManager` already turns a rejected `interrupt()` into a refused cancel.
+- Suppress the canceled run's residue only until its authoritative terminal. Anything the provider publishes after that terminal is a new run by construction and must take the normal live path — buffering it and replaying it later is how autonomous/plugin wakes get lost.
@@ -0,0 +1,77 @@
+# QA
+
+QA is the main bottleneck of Paseo's product development.
+
+The bar is four questions:
+
+1. Does it work well?
+2. Does it regress anything else?
+3. Was it tested on every platform it affects?
+4. Is there automated coverage, and is that coverage real?
+
+Every pull request needs evidence for the questions its change touches. Pull requests without evidence get closed.
+
+## Evidence
+
+Evidence is something someone else can look at:
+
+- The commands you ran, pasted with their output
+- The tests you added and their results
+- Before and after screenshots
+- A video of the interaction
+- Logs, requests, responses
+
+Redact what you need to, keep the technical details. If an agent did the work, submit its raw output. A summary drops the details someone else needs to check it.
+
+## Does it work well
+
+A feature that works but stutters, shifts the layout, or misaligns by two pixels is not done.
+
+For UI, that means matching the design system in visuals, in interaction, and in performance. [design.md](design.md) is the reference.
+
+The two things that go wrong most often:
+
+- **Layout shift.** Content that jumps as data arrives, a row that resizes when a badge appears, a panel that reflows on first render. Watch the change on a slow connection and on first load, not just after everything is warm.
+- **Alignment.** Things align to their glyphs, not to their touch targets. See the alignment rules in [design.md](design.md).
+
+## Does it regress anything else
+
+Paseo is composable by design, which means your change sits next to features you didn't touch. Open the surfaces around it. A change to the agent list affects archive, subagents, and tabs; a change to git actions affects worktrees and the checkout flow.
+
+Performance is part of this. The app is Expo React Native, not a web app in a native shell. You are not writing CSS, styles resolve differently, and performance characteristics differ per platform. What feels instant in a desktop dev build can be visibly slow on a phone.
+
+If your change touches a hot path such as the terminal, the message list, or git polling, submit before and after numbers. [terminal-performance.md](terminal-performance.md) has the terminal pipeline and its benchmarks, and [development.md](development.md) covers renderer and React profiling.
+
+## Every platform it affects
+
+Your code does not only run on the platform you tested it on. The same app ships to iOS, Android, browser web, and Electron on macOS, Windows, and Linux, and the daemon runs on all three desktop operating systems plus Docker.
+
+You aren't expected to own every device. You are expected to say what you covered:
+
+| Platform        | Tested | Notes |
+| --------------- | ------ | ----- |
+| iOS             |        |       |
+| Android         |        |       |
+| Web             |        |       |
+| Desktop macOS   |        |       |
+| Desktop Windows |        |       |
+| Desktop Linux   |        |       |
+
+Install what you reasonably can. An iOS simulator and an Android emulator cover most of the gap on a single machine, see [development.md](development.md) and [android.md](android.md).
+
+For the rules about which code runs where, read the platform gating section in [CLAUDE.md](../CLAUDE.md). The recurring traps have their own docs: [hover.md](hover.md), [unistyles.md](unistyles.md), [floating-panels.md](floating-panels.md), [mobile-panels.md](mobile-panels.md), [expo-router.md](expo-router.md).
+
+App and daemon versions also drift, in both directions. That has its own contract: [protocol-compatibility.md](protocol-compatibility.md).
+
+## Automated coverage that means something
+
+Tests are evidence only when they exercise the real thing.
+
+- A bug fix needs a regression test that fails on the old code for the reported reason.
+- A feature needs tests that go through the same interface a user or a caller uses.
+- Web flows need an actual Playwright run, not a mocked-out approximation of one.
+- Agent provider work needs manual verification against the real provider by someone who can tell that it worked. A fixture and a mock prove the fixture parses, nothing more.
+
+Tests that mock away the behavior, assert on internals, or pass against the broken code claim coverage that isn't there.
+
+[testing.md](testing.md) is the standard, including how to run suites without freezing your machine. For driving a real daemon in a test, see [ad-hoc-daemon-testing.md](ad-hoc-daemon-testing.md). For mobile flows, [mobile-testing.md](mobile-testing.md). For Electron screenshots, [browser-capture-harness.md](browser-capture-harness.md).
@@ -19,23 +19,22 @@ The first carves shipped as **deep modules with a narrow Host seam**, not the `d

 - **#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.
+- **ScheduleSession** (`session/schedule/schedule-session.ts`, seam `ScheduleSessionHost`): scheduled-agent request handling.

 **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).
+`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. `start_workspace_script_request` (a workspace type) is special-cased before terminal delegation (2150).

 Rejected alternatives: **feature-module** (free functions + wide context bag) cannot own the live state machines (workspaceUpdatesSubscription, agentUpdatesSubscription, ~25 voice fields) and adds a competing idiom; **mixin-composition** preserves the shared-`this` god object verbatim and requires widening ~325 private fields to protected.

 ## Slice ordering (least-coupled first)

-The task recommended **git/checkout as the first slice — OVERRIDDEN.** Verification: `emitCheckoutStatusUpdate` is called from exactly ONE site (session.ts:4915), inside the workspace-owned `syncWorkspaceGitObserver` callback that ALSO fires workspace effects over shared watch-target maps. Extracting checkout first forces splitting the hardest workspace/git seam before workspace is touched. The strictly safer first cuts are **chat-schedule-loop** (only knot: `handleChatPostRequest`; touches no shared observer/git/voice state) and **provider-catalog** (one shared collaborator + injected predicates).
+The task recommended **git/checkout as the first slice — OVERRIDDEN.** Verification: `emitCheckoutStatusUpdate` is called from exactly ONE site (session.ts:4915), inside the workspace-owned `syncWorkspaceGitObserver` callback that ALSO fires workspace effects over shared watch-target maps. Extracting checkout first forces splitting the hardest workspace/git seam before workspace is touched. The safer first cut is **provider-catalog** (one shared collaborator + injected predicates).

 | #   | Slice                                                                         | Effort | Risk   |
 | --- | ----------------------------------------------------------------------------- | ------ | ------ |
-| 0   | Test net + disjointness tripwire (no extraction)                              | M      | low    |
-| 1   | ChatScheduleLoopController — **STOP FOR REVIEW after green**                  | M      | low    |
 | 2   | ProviderCatalogController                                                     | M      | medium |
 | 3   | Split shared workspace-git observer + agent-subscribe fan-out (no controller) | M      | high   |
 | 4   | GitCheckoutController                                                         | L      | medium |
@@ -47,34 +46,6 @@ The task recommended **git/checkout as the first slice — OVERRIDDEN.** Verific

 ---

-## Slice 0 — Test net + disjointness tripwire (prerequisite)
-
-No production code moves. Add `session.dispatch-seam.test.ts`. This is the gate the whole plan rests on, because chat/schedule/loop have **zero** handleMessage coverage today (verified).
-
-Write RED-then-GREEN against the **current in-place** Session:
-
- `chat/post` happy path (asserts `chat/post` response emitted) + fanout-limit error path (asserts the `chat/post` error envelope, NOT a bubbled `rpc_error`).
- one `schedule/*` and one `loop/*` round-trip.
- a handler that throws **synchronously** emits `rpc_error{code:"handler_error"}` + an `activity_log` error frame.
- a handler that **rejects async** emits the SAME pair.
- a table-driven assertion that the union of all controllers' owned-type `ReadonlySet`s is pairwise disjoint and covers the dispatched `SessionInboundMessage` union (grows as controllers land).
-
-**Tests:** `session.dispatch-seam.test.ts`, `session.test.ts`.
-
---
-
-## Slice 1 — ChatScheduleLoopController ← STOP FOR HUMAN REVIEW after this ships green
-
-**Move:** all 21 handlers (`handleChat*` ×7, `handleSchedule*` ×9, `handleLoop*` ×5), the three rpc-error emitters (`emitChatRpcError`/`emitScheduleRpcError`/`emitLoopRpcError` — **kept separate, not merged**), `toScheduleSummary` → `packages/server/src/server/chat/chat-schedule-loop-controller.ts`. Collapse `dispatchChatScheduleLoopMessage` + `dispatchScheduleMessage` to `return this.chatScheduleLoopController.dispatch(msg)`.
-
-**SessionContext surface:** `emit`, `sessionLogger`, `clientId` (authorAgentId fallback), `chatService`, `scheduleService`, `loopService`, and a narrow agent-control port `{ listAgents, resolveAgentIdentifier, agentStorage.list }` for `handleChatPostRequest` mention fanout.
-
-**Owned-type set MUST include all 7 `chat/*` + 5 `loop/*` + 9 `schedule/*` types** — schedule/\* is currently routed via the chat dispatcher's own `default` arm, so it must stay inside this one controller, or schedule requests silently no-op.
-
-**Behavior note:** least-coupled domain. Move the three rpc-error emitters verbatim (they differ in default code + the `ChatServiceError` branch). **Tests:** `session.dispatch-seam.test.ts`, `loop-service.test.ts`, `session.test.ts`.
-
---
-
 ## Slice 2 — ProviderCatalogController

 **Move:** 7 provider handlers + `emitProviderDisabledResponse` + `getProviderSnapshotEntryForRead` → `packages/server/src/server/provider/provider-catalog-controller.ts`. Move the `providers_snapshot_update` PUSH wiring (1235-1254) into the controller's `start()`/`dispose()`. Collapse `dispatchProviderMessage`.
@@ -9,19 +9,17 @@ 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
- classify the previous-stable-to-`HEAD` diff as patch or minor, then show the
+- resolve the release source to one commit and confirm that commit's existing CI is green
+- classify the diff from the previous stable to the release source as patch or minor, then show the
  target version and rationale to the user
 - 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

 **Go-ahead** (user says "go ahead"):

- commit the approved changelog
- run the release
+- commit the approved release inputs locally
+- run the release, which publishes npm and pushes the prepared branch and tag
+- create the release heartbeat immediately and babysit it to completion

 Rules that apply to both steps:

@@ -31,12 +29,43 @@ Rules that apply to both steps:
 - Invoking a release skill is intent to start the flow, not blanket authorization to publish.
 - If the user asks for a release preview, show the prospective changelog/release contents and answer questions, but do not commit, tag, publish, or run release commands until they explicitly authorize the release.

+## Release source and CI
+
+The default release source is `origin/main`. Fetch `origin`, then record the
+resolved commit. The default release checkout is a clean local `main` whose
+`HEAD` equals `origin/main`.
+
+An explicit user instruction can select another ref, such as a hotfix commit or
+tag. Resolve that ref once and apply every source, diff, and CI check to that
+commit instead of `origin/main`.
+
+Before making release-preparation commits, confirm the existing CI run for the
+resolved commit is green. Pending CI is watched to completion. Release
+preparation then stays local through the changelog, any explicitly requested ACP
+catalog update, lockfile preparation, and the version commit. After approval,
+commit the prepared inputs locally and run the release command. Its branch and
+tag push is the one remote release batch and starts CI for the complete release
+commit.
+
+## ACP catalog updates
+
+ACP catalog work enters a release through an explicit user request:
+
+- **Check ACP drift** — run `npm run acp:version-drift:check`. When drift exists,
+  run `npm run acp:version-drift:update`, verify the catalog, and include the
+  update in the local release-preparation commits.
+- **Update ACP** — run `npm run acp:version-drift:update`, verify the catalog, and
+  include the update in the local release-preparation commits.
+
+The release authorization covers the requested ACP commit. It ships in the same
+release push as the changelog and version commit.
+
 ## Two paths

-There are two supported ways to ship from `main`:
+There are two supported release paths:

 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**: release candidates on the `beta` channel. Each beta carries its own changelog entry, publishes npm only on the explicit `beta` dist-tag, and stays behind the Stable/Beta switch on `/download`.

 Paseo has one linear release track even though npm dist-tags are independent
 pointers. The npm invariant is:
@@ -48,8 +77,9 @@ pointers. The npm invariant is:

 ## Release version decision

-Every fresh release starts by classifying the full previous-stable-to-`HEAD`
-diff. The highest-impact change determines the version:
+Every fresh release starts by classifying the full diff from the previous
+stable to the resolved release source. The highest-impact change determines the
+version:

 - **Minor** — a user would experience the release as a significant upgrade. This
  includes substantial new workflows, providers, forges, platforms, integrations,
@@ -72,7 +102,7 @@ as described in **Fixing a failed release build**.

 Before running any stable release command:

- Make sure the intended release commit is already committed to `main` and the working tree is clean.
+- Make sure the resolved release source passed CI, the approved release inputs are committed locally on the intended branch, and the working tree is clean.
 - **Run `npm run format`, `npm run lint`, and `npm run typecheck` and commit any resulting changes BEFORE you start any `release:*` command.** `release:check` runs `npm install --workspaces --include-workspace-root` as part of `release:prepare`, which can mutate `package-lock.json` (e.g. churning `"dev": true` markers on optional deps). The next step, `version:all:*`, runs `npm version` which aborts when the working tree is dirty. If this happens mid-flight you have to commit the lockfile churn before retrying — and the pre-commit format hook will reject a lockfile-only commit because oxfmt internally skips `package-lock.json` while lefthook's glob still matches it. Avoid the whole mess by running format/lint/typecheck first, then `release:prepare` once on its own to absorb any lockfile churn into a normal commit, then start the release.
 - Do not use a release command as a substitute for checking whether the current commit is actually ready.

@@ -82,7 +112,7 @@ npm run release:patch
 npm run release:minor
 ```

-This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag. The tag push triggers `Desktop Release`, `Android APK Release`, `Docker`, and `Release Notes Sync` on GitHub Actions. EAS picks up the same tag via the EAS GitHub app and starts the iOS + Android store builds in parallel (see "Mobile builds (EAS)" below) — there is no `release-mobile.yml` in this repo.
+This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag. The tag push triggers `Desktop Release`, `Android APK Release`, `Docker`, and `Release Notes Sync` on GitHub Actions. EAS picks up the same tag via the EAS GitHub app and starts the iOS + Android store builds in parallel (see "Mobile builds (EAS)" below) — there is no mobile-release workflow under `.github/workflows`.

 After the stable release succeeds, move npm's `beta` pointer to the new stable
 version for every published package. This changes dist-tags only; do not
@@ -129,11 +159,11 @@ 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. They also build iOS, upload it to TestFlight, add it to the `Paseo Beta` external group, and submit it for Beta App Review. They do not submit mobile builds to the production stores.
 - `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.
+- **Each beta carries its own changelog entry.** `Release Notes Sync` mirrors the matching `## X.Y.Z-beta.N` entry into that prerelease body. Promotion collapses every beta entry for the version into one final stable entry. See the Changelog policy section.

 Use the beta path when you need to:

@@ -238,9 +268,11 @@ iOS and Android store builds are not in `.github/workflows`. They are triggered
 - **iOS (TestFlight + App Store)** — EAS builds with profile `production`, uploads to TestFlight, and a Fastlane lane submits the build for App Store review.
 - **Android APK (GitHub Release asset)** — separate, via `.github/workflows/android-apk-release.yml`. This is the only Android-related workflow that lives in this repo.

-EAS uses the local app version source. `packages/app/app.config.js` derives Android `versionCode` and iOS `buildNumber` from the package version as `major * 1_000_000 + minor * 1_000 + patch`, ignoring prerelease metadata. Rebuilding the same tag produces the same native build number; if a store has already accepted a binary and you need a different binary, cut a new patch instead of relying on EAS remote auto-increment.
+EAS uses the local app version source. `packages/app/app.config.js` derives the native version from the package version. Android `versionCode` is `major * 1_000_000 + minor * 1_000 + patch`. iOS reserves 1,000 build slots per app version: beta `N` uses slot `N`, and stable uses slot `999`. For example, `0.2.6-beta.2` appears in App Store Connect as version `0.2.6` build `2006002`; stable uses build `2006999`. Rebuilding the same tag produces the same native build number; if a store has already accepted a binary and you need a different binary, cut the next beta or patch instead of relying on EAS remote auto-increment.

-There is no `release-mobile.yml` in this repo. Earlier versions of these docs referenced one — that workflow was removed and the EAS GitHub app handles tag triggering directly.
+Beta tags run `Release iOS Beta`. The workflow uploads the build to TestFlight, distributes it to the persistent `Paseo Beta` external group, and submits it for Beta App Review. Testers and the group are managed once in App Store Connect; releases require no dashboard action.
+
+There is no mobile-release workflow under `.github/workflows`. The EAS GitHub app reads the workflows under `packages/app/.eas/workflows` and handles tag triggering directly.

 ### Watching mobile builds from the terminal

@@ -289,11 +321,30 @@ Do not treat `build_ios: SUCCESS` or `submit_ios: SUCCESS` as a completed iOS re

 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.

-### Babysitting mobile after a release
+## Release completion and heartbeat

-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.
+A release is **in progress** after npm publication and tag push. Report it as
+**shipped** only after every applicable build, publication, asset, manifest, and
+store submission passes the completion checklist.

-**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.
+Immediately after every beta, stable, or promotion tag push, create a heartbeat
+that resumes the release in the current conversation. Create it automatically
+with `create_heartbeat`. The heartbeat owns the release until it either reaches
+the completion checklist or finds a failure that needs new user authority.
+
+Each heartbeat checks the release tag commit, all GitHub Actions runs for the
+release branch and tag, npm dist-tags, the GitHub Release body and assets,
+desktop updater manifests, the published Docker image, and the applicable EAS
+workflow. Inspect the GitHub Release itself and confirm that the macOS, Linux,
+Windows, and Android APK assets are present along with the channel manifests
+(`latest-mac.yml`, `latest-linux.yml`, and `latest.yml` for stable;
+`beta-mac.yml`, `beta-linux.yml`, and `beta.yml` for beta).
+
+For stable releases, also confirm every required mobile build, upload, store
+submission, and review-submission job for the release commit. For betas, confirm
+the beta EAS workflow completed its TestFlight distribution and Beta App Review
+path. Delete the heartbeat only after every applicable checklist item passes,
+then report the release as shipped.

 Pattern:

@@ -301,13 +352,16 @@ Pattern:
 // mcp__paseo__create_heartbeat arguments
 {
  "name": "vX.Y.Z release babysit heartbeat",
-  "cron": "*/15 * * * *",
-  "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.",
+  "cron": "*/10 * * * *",
+  "timezone": "UTC",
+  "maxRuns": 120,
+  "expiresIn": "24h",
+  "prompt": "Resume the vX.Y.Z release babysit for commit <sha>. Check npm tags; every GitHub Actions run for the release branch and tag; the published GitHub Release body, expected desktop/APK assets, and channel manifests; the Docker image; and the matching EAS workflow. Completion requires every applicable checklist item. For stable, require build_ios, submit_ios, submit_ios_for_review, build_android, and submit_android to succeed. For beta, require the beta TestFlight distribution and Beta App Review path. If work is pending, wait for the next heartbeat. If a failure can be retried safely for the same version, follow the failed-release procedure; otherwise report the blocker. When every applicable completion-checklist item passes, delete THIS heartbeat, report shipped, and stop.",
 }
 ```

-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.
+Run an immediate status check after creating the heartbeat. The heartbeat handles
+later transitions and stops itself when the release is complete.

 ## Release notes on GitHub

@@ -315,10 +369,12 @@ The GitHub Release body is populated automatically by the `Release Notes Sync` w

 ## Website behavior

- 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 download page defaults to GitHub's latest published **stable** release.
+- A published beta prerelease is offered behind the Stable/Beta switch on `/download` (`?channel=beta`), never as the default. The switch only appears while the newest prerelease leads stable on its core version, so promoting `X.Y.Z-beta.N` to `X.Y.Z` retires the beta channel from the page until the next beta line opens.
+- Homebrew, the Play Store, the App Store, and `app.paseo.sh` have no beta. The Beta view drops those rows, and the whole Web section, rather than showing an inert "stable only" placeholder. When a surface gains a beta path — say a public TestFlight link — add its row back in `packages/website/src/routes/download.tsx`.
+- The default 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 **default 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 download page's "What's new" link deep-links the **minor group** anchor (`/changelog#release-0.3`), not the exact entry: promotion collapses the beta entries into one stable entry, so the minor group remains the durable target. A version with no entry in the bundled changelog — a tag whose changelog commit hasn't redeployed the site yet — links the plain `/changelog` instead of a dead anchor.
 - 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
@@ -399,41 +455,49 @@ No prefix (`v`), no extra text. `Release Notes Sync` matches the `## X.Y.Z` (or

 ## Changelog policy

- `CHANGELOG.md` includes stable releases and the current beta line.
+- `CHANGELOG.md` includes stable releases and every entry in the current beta series.
 - 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.
+- Each subsequent beta inserts a new top entry with the next beta number. Its notes cover the changes since the previous beta tag.
+- Stable promotion replaces every beta entry for that version with one `## 0.1.60 - YYYY-MM-DD` entry.
+- The promoted stable entry covers the full diff from the previous stable tag and collapses internal iterations across the beta series.

 ## 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.
+- **The agent running the release writes the changelog entry — beta or stable.** The release context and final wording stay with that agent.
+- **Commit history is only an index of the changes. Never draft the changelog from commit subjects or diffs alone.** For every PR in the release range, read the full PR description and every issue it links to before deciding what changed, why users care, or how changes should be grouped. Use the implementation only to verify the resulting understanding.
+- For the first beta or a direct stable release, draft from the previous stable tag to the release source. For later betas, draft from the previous beta tag to the release source. Promotion replaces the beta series with one entry drafted from the previous stable tag to the release source. Review the result against the changelog policy below, show it to the user, and wait for approval before committing it.

-## Changelog voice
+## Changelog wording

-The changelog is shown on the Paseo homepage. Write it for **end users**, not developers.
+The changelog is shown on the Paseo homepage. Each bullet is a compact factual record of
+product behavior that changed.

- **Frame everything from the user's perspective.** Describe what changed in the app, not what changed in the code. Users care that "workspaces load instantly" — not that a component no longer remounts.
- **Never mention component names, internal modules, or implementation details.** No `WorkingIndicator`, no `accumulatedUsage`, no `reconcileAndEmitWorkspaceUpdates`. Also no "virtualized lists", no "remount", no "memoization", no "debounced", no "fuzzy ranking", no "controlled input", no "uncontrolled input" — these are implementation words masquerading as user-facing copy.
- **Concrete WRONG → RIGHT examples** (real mistakes from past releases):
+- **Name the exact change.** Prefer `Added <capability>`, `Removed <behavior>`,
+  `Changed <behavior>`, or `Fixed <failure> when <condition>`.
+- **Keep the scope exact.** A conditional bug is not a general reliability problem. Do not
+  broaden one failure into claims that Paseo is now faster, smoother, responsive, or reliable.
+- **Use concrete product and runtime terms.** Git polling, persisted cache, provider catalog,
+  and WebSocket reconnects can identify the affected behavior. Component names, internal
+  modules, code symbols, and implementation techniques cannot: omit `WorkingIndicator`,
+  `reconcileAndEmitWorkspaceUpdates`, remounts, memoization, and controlled inputs.
+- **State the consequence only when the change itself is unclear.** Keep the condition that
+  makes the consequence true. Do not replace a precise change with a broad benefit claim.
+- **Do not invent context.** Mention an upgrade, platform, workload, or user action only when
+  the PR or linked issue establishes that scope.

-  | Wrong (implementation-facing)                                                       | Right (user-facing)                                         |
-  | ----------------------------------------------------------------------------------- | ----------------------------------------------------------- |
-  | Switching layouts no longer remounts the active agent                               | Splitting a pane no longer loses your scroll position       |
-  | Model, mode, and thinking pickers — searchable virtualized lists with fuzzy ranking | Mobile model selector is faster and more straightforward    |
-  | Text inputs in mobile sheets no longer flicker while typing fast                    | Typing in mobile sheets no longer flickers                  |
-  | Compact web sheets no longer crash when swiped to dismiss                           | Sheets on mobile web no longer crash when swiped to dismiss |
-  | Reduced re-renders in the agent list                                                | Agent list scrolls smoothly                                 |
-  | Added debouncing to the search input                                                | Search results no longer lag behind typing                  |
+| Avoid                                                        | Write                                                 |
+| ------------------------------------------------------------ | ----------------------------------------------------- |
+| Paseo stays responsive with many idle Git workspaces         | Removed periodic Git polling for idle workspaces      |
+| Incompatible saved app data no longer crashes after upgrades | Fixed crash when persisted cache was incompatible     |
+| Splitting layouts no longer remounts the active agent        | Fixed scroll position resetting when splitting a pane |
+| Mobile model selector is faster and more straightforward     | Added search to the mobile model selector             |

-  Test: would a non-developer reader recognise what changed when using the app? If they'd need an engineer to translate ("what's a remount?"), the bullet is still implementation-facing — rewrite it as the symptom the user experiences.
+Test each bullet against the source PR and issue: can a reviewer point to the exact behavior
+that changed, the failure that was fixed, or the capability that was added? If the bullet only
+claims a general improvement, rewrite it with the concrete change.

- **Collapse internal iterations.** If a feature was added and then fixed within the same release, just list the feature as working. Users never saw the broken version.
- **Only list changes relative to the previous stable release.** The diff is `v(previous)..HEAD`. If something was introduced and fixed between those two tags, it never shipped — don't mention the fix.
-  - **Common trap:** when drafting from `git log`, every commit looks like a separate bullet — including the "fix X" commits that landed on top of a brand-new feature in the same release window. Before listing a Fixed entry, check whether the thing being fixed was itself added in this same release. If so, drop the fix and fold it into the feature bullet.
-  - **Example:** if the release adds an in-app browser and also contains a commit "fix: browser pane keyboard handling no longer steals shortcuts", do **not** list the keyboard fix under Fixed. The browser is shipping for the first time, so users will only ever see the working version. The Added entry covers it.
+- **Use the entry's release scope.** Include changes within the matching range in **Changelog scope**.
+- **Collapse internal iterations within that scope.** Present a feature added and fixed in one range as working. A later beta can describe a fix to behavior delivered in an earlier beta; promotion folds the complete beta series into the final stable behavior.
 - **Cut low-signal entries.** "Toolbar buttons have consistent sizing" is too granular. Combine small polish items or drop them.

 ## Changelog conciseness
@@ -445,8 +509,7 @@ Every bullet must be scannable at a glance. The changelog is not release documen
 - **One line per bullet.** If a bullet wraps to three lines in a narrow column, it's too long.
 - **Split bullets that pack multiple distinct changes.** If a bullet uses "and", "plus", a comma list, or an em-dash to chain several independent improvements, break them into separate bullets — even when they share a theme or author. One bullet = one user-facing change.
 - **Trim qualifying clauses.** Drop "with a hint shown when…", "matching the CLI's behaviour", "across common install shapes". If the detail doesn't change whether a user cares, cut it.
- **Lead with what the user can do, not the mechanism.** The reader cares about the capability, not how it works under the hood. Do not explain LAN vs WAN, TLS handshakes, IPC, the daemon-relay topology, or any internal concept the user has not asked about. "Self-hosted relays can use a different TLS setting for the public endpoint" — not "Self-hosted relays support a separate TLS setting for the public endpoint, so the daemon can reach the relay over the LAN while the phone reaches it over the public secure address." If a feature genuinely needs background to be understood, it belongs in product docs, with a one-line teaser in the changelog.
- **Lead with the outcome.** "Windows: agents launch reliably from npm `.cmd` shims…" is better than "Windows: agents launch reliably across common install shapes. Claude, Codex, and OpenCode now start correctly…".
+- **Stop after identifying the change.** Do not explain LAN/WAN topology, TLS handshakes, IPC, or other architecture in a changelog bullet. Put necessary background in product docs.
 - **Attribution follows the split.** When you split a dense bullet, move each PR/author to the bullet it belongs to. Never duplicate the same PR across multiple bullets.

 ## Changelog attribution
@@ -476,7 +539,7 @@ Rules:

  This returns every distinct GitHub login that authored or co-authored a commit in the PR. Use those logins for attribution. Fall back to `gh pr view N --json author` only if the commits command returns nothing (which should not happen for merged PRs).

-  When listing PR numbers, `git log --format='%H %s' v<previous>..HEAD | grep -E '\(#[0-9]+\)$'` pulls the PR number out of squash commit subjects.
+  When listing PR numbers, `git log --format='%H %s' v<previous>..<release-source-sha> | grep -E '\(#[0-9]+\)$'` pulls the PR number out of squash commit subjects.

 ## Changelog ordering

@@ -490,51 +553,70 @@ Entries within each section (Added, Improved, Fixed) are ordered by user impact:

 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.

-Review the diff between the latest release tag and `HEAD`. Focus on:
+Review the diff between the latest release tag and the resolved release source. 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.

-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.
+Use `git diff <latest-release-tag>..<release-source-sha>` 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.

 ## Changelog scope

-The changelog always covers **previous-stable-to-`HEAD`**, beta and stable alike:
+Changelog scope follows the release being described:

- **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.
+- **First beta**: `previous stable tag → release source`
+- **Later beta**: `previous beta tag → release source`
+- **Direct stable release**: `previous stable tag → release source`
+- **Stable promotion**: replace the full beta series with one entry covering `previous stable tag → release source`

-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.
+Each beta entry records what its testers receive. Promotion produces the single stable record for the full jump from one stable version to the next.

 ## 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
- [ ] The previous-stable-to-`HEAD` diff is classified as patch or minor, with the target version and rationale approved
+- [ ] The resolved release source is the intended commit (default `origin/main`) and its existing CI is green
+- [ ] Every PR in the release range has been opened, and its full description and every linked issue have been read before drafting the changelog
+- [ ] Add a new `CHANGELOG.md` entry for this beta (heading `## X.Y.Z-beta.N - YYYY-MM-DD`), review it against the changelog policy, get approval, and commit it before cutting the release
+- [ ] The diff from the previous stable to the resolved release source is classified as patch or minor, with the target version and rationale approved
+- [ ] Release preparation stayed local until the approved release command pushed the complete branch and tag
 - [ ] `npm run release:beta:patch`, `npm run release:beta:minor`, or `npm run release:beta:next` completes successfully
+- [ ] Every GitHub Actions run for the complete release commit and tag is green
 - [ ] npm shows the version under the `beta` dist-tag, not `latest`
+- [ ] The GitHub prerelease exists with the changelog body and every expected macOS, Linux, Windows, and Android APK asset
 - [ ] GitHub `Desktop Release` workflow for the `v*-beta.N` tag is green
+- [ ] The GitHub prerelease contains `beta-mac.yml`, `beta-linux.yml`, and `beta.yml`
 - [ ] GitHub `Android APK Release` workflow for the same tag is green
+- [ ] GitHub `Docker` workflow is green and the versioned beta image is published without moving `latest`
 - [ ] GitHub `Release Notes Sync` mirrored the beta entry into the prerelease body
+- [ ] EAS `Release iOS Beta` completed its build, TestFlight distribution, external beta group, and Beta App Review path
+- [ ] The release heartbeat was created after the tag push and deleted only after every item above passed

 ### Stable release (or promotion)

 - [ ] Run the pre-release sanity check (see above) and address any findings
- [ ] The previous-stable-to-`HEAD` diff is classified as patch or minor, with the target version and rationale approved
- [ ] Ensure the intended release commit is already committed and the git worktree is clean before running any release command
+- [ ] The diff from the previous stable to the resolved release source is classified as patch or minor, with the target version and rationale approved
+- [ ] The resolved release source is the intended commit (default `origin/main`) and its existing CI is green
+- [ ] Every PR in the release range has been opened, and its full description and every linked issue have been read before drafting the changelog
+- [ ] Ensure the approved release inputs are committed locally and the git worktree is clean before running any release command
 - [ ] Ensure local `npm run typecheck` passes on that exact commit before running any release 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). Promotion replaces every `## X.Y.Z-beta.N` entry in the series with one `## X.Y.Z - YYYY-MM-DD` entry covering the full release
 - [ ] Verify the changelog heading follows strict `## X.Y.Z - YYYY-MM-DD` format
+- [ ] Release preparation stayed local until the approved release command pushed the complete branch and tag
 - [ ] `npm run release:patch`, `npm run release:minor`, or `npm run release:promote` completes successfully
+- [ ] Every GitHub Actions run for the complete release commit and tag is green
 - [ ] Move npm's `beta` dist-tag to the new stable version for every published package and verify both `latest` and `beta` resolve to it
+- [ ] The published GitHub Release exists with the changelog body and every expected macOS, Linux, Windows, and Android APK asset
 - [ ] GitHub `Desktop Release` workflow for the `v*` tag is green
+- [ ] The GitHub Release contains `latest-mac.yml`, `latest-linux.yml`, and `latest.yml`
 - [ ] GitHub `Android APK Release` workflow for the same tag is green
+- [ ] GitHub `Docker` workflow is green and both the versioned and `latest` images are published
+- [ ] GitHub `Release Notes Sync` is green and the release body matches the stable changelog entry
 - [ ] 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
+- [ ] The release heartbeat was created after the tag push and deleted only after every item above passed
@@ -53,6 +53,11 @@ Claude hook mapping:
 - `Stop`, `StopFailure`, `SessionEnd` → `idle`
 - `Notification` with `reason` or `matcher` equal to `idle_prompt` → `needs-input`

+Claude does not run `Stop` when the user interrupts a turn. A standalone Ctrl-C or Escape input
+while terminal activity is working clears the activity without finished attention. The same
+fallback applies to every hooked terminal agent; exact input matching excludes escape sequences and
+pasted content, while later provider idle events remain authoritative.
+
 Codex hook mapping:

 - `UserPromptSubmit` → `running`
@@ -25,12 +25,13 @@ Terminal frames share the daemon main event loop with all agent traffic. The `ev
 - **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.
+- **Terminal size has one daemon-owned claimant.** Focus and direct interaction send a `claim`; later geometry changes from that connection send `update`. A claim transfers ownership even when the dimensions are unchanged, while an update from any other connection is ignored. This lets an owning pane follow splits and keyboard insets without allowing an idle phone or browser to steal the PTY size.

 ## Measuring

 - **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.
+  `packages/app/e2e/browser/terminal-performance.spec.ts` and `packages/app/e2e/browser/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`.
 - **Git pressure:** the same log line includes `git.commands` (limiter occupancy, queue age,
  queue wait, execution time, failures, timeouts, and top operations),
@@ -124,14 +124,14 @@ PASEO_DESKTOP_SMOKE_ARTIFACT_DIR=/tmp/paseo-desktop-smoke \
 npm run build:desktop -- --publish never --linux --x64 --dir
 ```

-### Browser tab bridge regression
+### Desktop browser regression

-The desktop browser tab bridge E2E launches an isolated real daemon, Metro, and Electron app. It forces workspace LRU eviction to reparent the original tab and replace its guest `WebContents`, then makes one MCP call each for tab listing, snapshot, and click against that original browser id. A final MCP wait proves the real target page received the click.
+The desktop browser E2E launches an isolated real daemon, Metro, and Electron app. It forces workspace LRU eviction to reparent the original tab and replace its guest `WebContents`, then makes one MCP call each for tab listing, snapshot, and click against that original browser id. A final MCP wait proves the real target page received the click.

-Run it locally with the same command owned by the Ubuntu leg of the existing `desktop-tests` CI check:
+Run it locally with the same command owned by the Ubuntu `desktop-tests` required check:

 ```bash
-npm run test:e2e:browser-tab-bridge --workspace=@getpaseo/desktop
+npm run test:e2e:browser-tabs --workspace=@getpaseo/desktop
 ```

 ## Test organization
@@ -154,7 +154,7 @@ Vitest picks up tests by suffix. The suffix tells the runner which category it b
 | `*.real.e2e.test.ts`  | E2E that hits a real provider (Claude/Codex/Copilot/OpenCode/Pi) — needs creds in `packages/server/.env.test` | `npm run test:integration:real` / `test:e2e:real`                                    |
 | `*.local.e2e.test.ts` | E2E that needs a local-only resource                                                                          | `npm run test:integration:local` / `test:e2e:local`                                  |

-App-level Playwright browser E2E lives in `packages/app/e2e/*.spec.ts` and runs via `npm run test:e2e --workspace=@getpaseo/app` (separate from Vitest E2E). App Playwright specs that hit real providers use `*.real.spec.ts` and run through `npm run test:e2e:real --workspace=@getpaseo/app`; the default app E2E project ignores that suffix so CI does not need provider credentials.
+Browser Playwright specs live in `packages/app/e2e/browser/`. Desktop Playwright and real-Electron E2E live in `packages/desktop/e2e/`. Harness code shared by both suites lives in `packages/app/e2e/support/`; neither suite may place specs there. App Playwright specs that hit real providers use `*.real.spec.ts` and run through `npm run test:e2e:real --workspace=@getpaseo/app`; the default browser project ignores that suffix so CI does not need provider credentials.

 Live provider smoke tests belong in `*.real.e2e.test.ts`, not `*.test.ts`, even when guarded by environment variables. Default unit suites must use deterministic provider adapters/fakes so missing credits, auth outages, and upstream model drift do not block normal CI.

@@ -175,9 +175,18 @@ 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`.
- CI can shard app Playwright across multiple jobs; each shard still owns a full isolated daemon/relay/Metro stack from global setup. Helpers that restart the daemon must preserve the global setup environment, including disabled speech/local-model settings, so a restart does not change the tested surface or start background downloads.
- Global setup starts Metro before Wrangler, assigns Wrangler explicit distinct relay and inspector ports, and accepts Metro as ready only when `/status` returns `packager-status:running`. A generic TCP listener is not sufficient readiness evidence.
+- App Playwright shares one warmed Metro server per run and gives every Playwright worker its own isolated daemon and `PASEO_HOME`. Spec files run concurrently without exposing one file's projects, agents, terminals, history, or provider configuration to another worker; tests within a file remain together so file-level setup is not repeated.
+- Helpers that create projects or workspaces own those records until cleanup. Their clients remove the daemon project on close, and an automatic fixture fails any test that still leaks a project record. Deleting only the temporary directory is not cleanup. Agent helpers pass the intended `workspaceId` through to agent creation; they never infer ownership from `cwd`.
+- Tests whose subject is daemon-global state, such as an empty history or daemon restart, start a dedicated host explicitly. Filenames and directories describe product behavior, never execution order or isolation mechanics.
+- Global setup accepts Metro as ready only when `/status` returns `packager-status:running`, then fetches the document's scripts so the cold bundle compilation finishes before Playwright's per-test timeout starts. A generic TCP listener is not sufficient readiness evidence. The browser suite uses direct local daemon connections and does not start a relay.
+
+## Pull-request test routing
+
+PR checks are routed by the behavior each suite proves, using `.github/ci-paths.yml`. A package does not inherit every test suite of its runtime consumers: app changes do not run CLI or Electron-wrapper tests, and protocol changes do not run every package that imports the protocol. Cross-package static compatibility belongs to `typecheck`; full integration coverage runs after merge on main and in manual CI runs.
+
+Required matrix legs are declared as statically named jobs. Their shared steps use YAML anchors, while job-level `if` conditions let GitHub report an unaffected leg as genuinely skipped without allocating a runner or losing the exact required-check name.
+
+The smallest meaningful contract wins over package ownership. Tiny structural invariants such as daemon launch supervision run unconditionally in the always-running routing job instead of maintaining a transitive file list; this check reads source entrypoints and builds no product. Routed integration contracts use stable domain directories. Browser changes select the required Playwright shards; desktop changes select the existing required desktop jobs, with renderer, real-Electron, and packaged-app coverage together in the Ubuntu leg. CLI-side Hub changes select one focused test inside the existing required server jobs. Repository scripts and the shared Vitest configuration run every PR contract because they are cross-cutting toolchain inputs.

 ## Agent authentication in tests

@@ -5,9 +5,11 @@ Agent chat delivery has two paths:
 1. **Live stream** — `agent_stream` WebSocket messages for immediacy. These may be delta-shaped lifecycle updates.
 2. **Authoritative history** — `fetch_agent_timeline_request` for correctness. This always returns full projected timeline items, never lifecycle deltas.

-The invariant is:
+The invariants are:

-> If the daemon has committed timeline rows for an agent, any connected client that opens or resumes that agent eventually displays every row through the daemon's current tail.
+> A continuously subscribed client applies every committed row in order. Opening or resuming an
+> agent establishes the daemon's current tail in one bounded request, with older history reachable
+> through backward pagination.

 Tool output is bounded before it enters either delivery path. Canonical shell tool output is sliced
 to 64 KiB, and the same bounded item is used for durable timeline rows and live stream events.
@@ -25,17 +27,26 @@ Client heartbeat reports presence:

 Heartbeat is used for notification routing. It must not be used as a correctness gate for `agent_stream` delivery. A stale mobile focus heartbeat may affect whether the user gets notified; it must not make timeline rows disappear from the live stream.

-## Catch-up is paged but complete
+## Gap recovery is paged but complete

 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`.
+When live delivery detects a sequence gap, the app fetches `direction: "after"`. If the daemon
+responds with `hasNewer: true`, the app immediately fetches the next page from `endCursor`. Gap
+recovery is complete only when `hasNewer: false`.

 Initialization timeouts guard lack of catch-up progress, not the full multi-page sync. A successful page that queues the next `after` page refreshes the watchdog.

-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.
+Opening or resuming an agent fetches one bounded latest tail page. Older history remains
+user-driven by scrolling upward.
+
+Reaching the history-start threshold loads one older page and preserves the visible content anchor.
+Cursor progress does not trigger another page. The user must leave and return to the threshold unless
+the anchored page still leaves the viewport at history start, as with short or compacted content; in
+that case pagination continues as one loading operation until the page fills the viewport or history
+is exhausted.

 ## Durable item anchors

@@ -47,9 +58,22 @@ The daemon validates that the epoch is current and the exact source sequence sti

 ## Resume behavior

-When a client resumes with a known cursor, it catches up after that cursor to completion. It does not replace the view with a latest tail page, because tail pagination can skip the middle of a long background run.
+Opening, reconnecting, or revisiting after a selective-delivery coverage gap fetches the latest tail
+page.
+Focus alone does not mutate timeline state; the tail response is compared with the local
+authoritative range first.

-When a client resumes without a cursor, it fetches the latest tail page.
+- The same epoch and `window.maxSeq` is an exact display no-op. The app advances synchronization
+  bookkeeping without replacing timeline arrays, preserving an upward-scrolled viewport.
+- When the page overlaps or is adjacent to the local end cursor, only projected items newer than
+  that cursor are applied. Already-covered rows are not replayed.
+- A true middle gap, epoch change, or rewind atomically replaces stale canonical history with the
+  latest tail. The replacement reconciles positioned live rows beyond its coverage and unresolved
+  local submissions; it never retains two discontiguous canonical ranges.
+
+The installed tail carries `hasOlder`, so history skipped by a replacement remains reachable through
+ordinary backward pagination. A backward page is accepted only when it is adjacent to the current
+history start; a response requested from a pre-replacement range is stale and is discarded.

 ## Client replica lifetime

@@ -61,17 +85,42 @@ recomposition while the runtime still owns the same directory snapshot and timel
 Removing the host from the registry is the destructive boundary: it stops the runtime and clears the
 session and host-scoped setup state together.

+The durable replica cache persists synchronization authority only when it can store the complete
+current canonical window losslessly. The stored range describes those exact items: `startSeq` drives
+older pagination and `endSeq` drives forward catch-up. Restore paints the items immediately, requests
+`after endSeq`, and requests `before startSeq` when the user loads older history.
+
+The first resume request is bounded. If it reports more newer history, fetch one latest bounded tail
+instead of replaying every missed page. Live gap recovery still pages forward until current.
+
+If the canonical window exceeds the cache item limit, contains a discontiguous retained range, has a
+live head, or includes presentation data the cache cannot encode losslessly, persistence drops the
+range and keeps a display-only tail. Restore then uses the ordinary bounded `tail` bootstrap. Never
+slice items while retaining the pre-slice range; that falsely certifies discarded source rows.
+
+Live rows received between cache paint and catch-up stay in the separate live head and reconcile with
+the authoritative range through the existing forward-page path. The cache does not persist sync
+generation or unreconciled local submissions.
+
+Every daemon-derived live item carries its timeline epoch and sequence position. Bootstrap
+replacement keeps only positioned rows newer than the page it installs, while unresolved local
+user presentations identify themselves by having client identity without a timeline position. This
+prevents a page from duplicating rows it already covers without coupling display continuity to the
+shorter-lived submission registry. Unreconciled local presentations are not persisted in the durable
+replica cache.
+
 ## Selective and legacy delivery

 The app chooses one delivery policy from `server_info.features.selectiveAgentTimeline`:

- Selective daemons receive the union of agents visible in every pane. Additions subscribe and
-  catch up immediately. Every visibility-driven removal, including app backgrounding, stays
-  subscribed for a 30-second grace period so brief tab, pane, route, and app switches do not repeatedly
-  unsubscribe and catch up. Losing window keyboard focus does not make a selected pane invisible.
-  Disconnecting and disposal clear pending grace because the subscription itself no longer exists.
-  After grace has expired, revisiting a retained timeline displays its cached state immediately and
-  authoritative catch-up advances it to the current tail.
+- Selective daemons receive every agent visible in any pane plus the most recently viewed hidden
+  agents, up to five subscribed agents. Visible agents always win: if more than five are visible,
+  they all remain subscribed and no hidden agent does. Switching and app backgrounding preserve
+  this connection-scoped hot set, so returning to an agent still covered by it needs no catch-up.
+  Losing window keyboard focus does not make a selected pane invisible. Disconnecting clears hidden
+  hot agents; reconnect restores the currently visible set before authoritative catch-up. Revisiting
+  an evicted retained timeline displays its cached state immediately while authoritative catch-up
+  advances it to the current tail.
 - Legacy daemons keep globally streaming agent timelines. Visibility still triggers the existing
  authoritative catch-up, but the app does not issue selective-subscription RPCs.

@@ -87,14 +136,75 @@ its completion advances `seqEnd`, followed by a merged assistant message. The ap
 remaining page through the existing stream reducer. It must not append full projected text to a
 live prefix.

-Optimistic user prompts occupy stable timeline slots. Catch-up never extracts, delays, or reinserts
-them. A canonical user row replaces its matching slot in place; an unmatched prompt stays exactly
-where the user submitted it. Other canonical rows are applied after the already-present timeline
-instead of relocating visible user messages around newly fetched history.
+Every path that sends a message to an agent — composer send, dictation accept-and-send, queued
+send-now, and the automatic queue drain in `HostRuntime` — goes through
+`dispatchComposerAgentMessage` with a submission writer. There is no second transport for the same
+product action: calling `client.sendAgentMessage` directly skips the submitted row and the pending
+footer, and permanently drops attachments because the daemon does not echo them back.

-Canonical submitted user rows carry the provider's `messageId` and Paseo's optional
-`clientMessageId`. Clients reconcile optimistic prompts by `clientMessageId`. Content matching is
-limited to the dated compatibility path for daemon timelines created before that field existed.
+A submitted prompt is one `UserMessageItem` row. That row is the authoritative local presentation:
+its stable identity, text, timestamp, images, and attachments do not change when the provider
+acknowledges it. Submission lifecycle is a separate record keyed by agent, not another row shape.
+The transaction registry records two independent settlement facts: canonical acknowledgement and RPC
+settlement. Canonical acknowledgement retires optimistic activity immediately. When both facts are
+known, whichever arrives second deletes the record. A canonical acknowledgement that arrives first
+prevents a later transport error from rolling back a prompt already observed.
+
+The daemon's accepted response waits for the correlated run start and guarantees that the canonical
+submitted row has been recorded. It publishes the accepted turn's liveness before that row, so the
+client applies authoritative activity before canonical acknowledgement retires optimistic activity.
+Timeline render batching does not delay lifecycle application. Directory status never settles a
+submission. Overlapping sends settle independently rather than collapsing to one newest pending
+message.
+
+Daemons advertising `server_info.features.canonicalSubmittedPrompts` guarantee that every accepted
+prompt carrying a client message id is recorded and streamed as a canonical `user_message` with that
+same id. This includes daemon-handled commands that do not allocate a foreground turn; their submitted
+row is recorded before handler output. The app tracks submission transactions only for hosts with this
+capability. Older hosts keep the shipped untracked optimistic-row behavior and roll that row back on RPC
+rejection.
+
+Turn activity has one client-side replica. Lifecycle events can attach `turnId`, and agent snapshots can
+expose `activeTurn: { turnId, startedAt } | null`. An identified terminal cannot close a different
+identified turn; an unnamed legacy terminal can close the current turn. Snapshots, stream events,
+cancellation requests, and every visible surface update the same per-agent record. The snapshot covers
+both user-started foreground turns and autonomous provider turns;
+foreground control ownership remains a separate daemon concern. Cancellation request identity is stored
+with that record rather than in a React component, so an old request cannot clear a newer one. Submissions
+remain a separate pre-turn registry and retire on canonical acknowledgement.
+
+The compatibility boundary for older daemons is snapshot normalization: running/idle status becomes an
+anonymous active turn or idle state once, and downstream code consumes the same activity shape. The app
+does not combine anonymous lifecycle events, timestamps, timeline rows, and resume coverage to infer a
+second running state. Disconnect and replica removal remain destructive close boundaries. Elapsed time
+comes only from turn liveness, never from submission records or whichever timeline rows happen to be
+mounted.
+
+The daemon records one canonical submitted user row at acceptance. Its wire `messageId` is the
+submission's `clientMessageId`, so the row is born with its final identity and remains immutable on
+the wire. A correlated provider echo records the provider's native identity internally without
+dispatching another timeline event. Rewind resolves the wire identity to that provider identity at
+the provider boundary. Daemon-handled prompts follow the same identity rule.
+
+Content matching is limited to the dated compatibility path for daemon timelines created before
+that field existed. Canonical ingestion may match only an explicit unreconciled local candidate;
+the draft-create handoff is the one boundary that also permits the legacy canonical twin to have
+arrived first. Generic reducers and consumers do not reimplement message identity matching.
+
+Ordinary bootstrap, same-epoch reset, and catch-up replacement preserve unmatched locally submitted
+rows because a provider may never echo them. A known epoch change or rewind replaces history and
+drops acknowledged local rows omitted by the new canonical epoch; every transaction not yet
+acknowledged by the provider, and no other local row, crosses that destructive boundary. A cold
+reset without an existing epoch is destructive because the client has no continuity anchor.
+
+Tail rows are positioned history, so an unmatched local presentation is appended after the
+canonical replacement rather than ordered by timestamps from different machines. The head is a
+live overlay: cursorless items stay there during continuity replacement until canonical positions
+arrive, while a destructive replacement retains only active submission transactions.
+
+Canonical replacement owns both timeline lanes. A matching local row keeps its presentation ID and
+payload while taking the canonical row's ordered position. If a live assistant head is the
+canonical assistant prefix, it stays in the head lane. No row may be returned in both lanes.

 ## Relevant code

@@ -129,7 +129,12 @@ This mistake once produced tens of thousands of warnings from retained sidebar r

 ## 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.
+`ScrollView.contentContainerStyle` is the canonical trap. It looks like a style prop, but it is not the `style` prop Unistyles registers. How badly that bites depends on who owns the component:
+
+- **A remapped React Native `ScrollView`** still picks the style up — the Babel plugin rewrites the import and the factory tracks `contentContainerStyle` alongside `style`. The failure mode here is staleness: on first mount it can paint with the theme that was active at mount time and never repaint. The upstream tutorial calls this out in its [ScrollView Background Issue](https://www.unistyl.es/v3/tutorial/settings-screen#scrollview-background-issue) section.
+- **A third-party scroller** — `BottomSheetScrollView`, `FlashList`, anything Unistyles never rewrote — drops the style entirely on web. Nothing throws and the value looks right in JS, but the class Unistyles emitted is never applied, so the padding, gap, or background is simply absent. `AdaptiveModalSheet` shipped its compact sheet content flush to the screen edges for exactly this reason while the desktop card, which uses a real `ScrollView`, looked correct.
+
+The second case is why the wrapper-`View` fix below is not optional styling advice. A themed inset belongs on a `View` you own; a third-party scroller only gets theme-free layout.

 Avoid this pattern when the style depends on the theme:

@@ -144,7 +149,7 @@ const styles = StyleSheet.create((theme) => ({
 }));
 ```

-On first mount this can paint with the current adaptive or initial theme. If app settings later load a persisted theme and call [`UnistylesRuntime.setTheme`](https://www.unistyl.es/v3/guides/theming#change-theme), the JS-side style proxy may report the new theme while the native content container keeps the old background. That is how the welcome screen ended up with a light background and dark foreground/buttons.
+If app settings later load a persisted theme and call [`UnistylesRuntime.setTheme`](https://www.unistyl.es/v3/guides/theming#change-theme), the JS-side style proxy reports the new theme while the native content container keeps the old background. That is how the welcome screen ended up with a light background and dark foreground/buttons.

 This applies broadly to non-`style` props that carry theme-dependent values, such as component props named `color`, `trackColor`, `tintColor`, `backgroundStyle`, `handleIndicatorStyle`, and other library-specific style props. The [3rd-party view decision algorithm](https://www.unistyl.es/v3/references/3rd-party-views) recommends explicit handling for these cases, and [issue #1030](https://github.com/jpudysz/react-native-unistyles/issues/1030) shows a related native-prop update edge case around `Image.tintColor`. Treat these values as React props unless wrapped with `withUnistyles`.

@@ -340,7 +345,7 @@ Gotchas:
 - **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.
+- **The app shell uses one `AppearanceStyleBoundary`.** Runtime-patched numeric theme values are baked into Unistyles web classes rather than CSS variables, while parsed/memoized content also does not naturally re-run when appearance tokens change. The boundary sits below stable runtime providers in `app/_layout.tsx` and remounts the visual shell once. `applyAppearance` patches the active theme before inactive registry entries so its subscribers receive the committed values in the same update. Do not add local appearance keys or nested boundaries.
 - **Dynamic font tokens stay widened.** `fontFamily`, `fontSize`, and `lineHeight` on `commonTheme` are annotated `string`/`number` (not narrowed by `as const`) so the updater's return assigns; the platform default stacks live in `DEFAULT_UI_FONT_STACK` / `DEFAULT_MONO_FONT_STACK`.

 ## Debugging
@@ -26,17 +26,22 @@
        let
          pkgs = pkgsFor system;
          paseo = pkgs.callPackage ./nix/package.nix { };
-          isLinux = nixpkgs.lib.elem system [
-            "x86_64-linux"
-            "aarch64-linux"
+          versionParts = pkgs.lib.splitString "." paseo.version;
+          sourceRevision = if self ? revCount && self.revCount != null then self.revCount else 0;
+          buildRevision = sourceRevision - (sourceRevision / 10000) * 10000;
+          desktopBuildVersion = pkgs.lib.concatStringsSep "." [
+            (builtins.elemAt versionParts 0)
+            (builtins.elemAt versionParts 1)
+            (toString buildRevision)
          ];
        in
        {
          default = paseo;
          paseo = paseo;
-        }
-        // nixpkgs.lib.optionalAttrs isLinux {
-          desktop = pkgs.callPackage ./nix/desktop-package.nix { inherit paseo; };
+          desktop = pkgs.callPackage ./nix/desktop-package.nix {
+            inherit paseo;
+            buildVersion = desktopBuildVersion;
+          };
        }
      );

@@ -5,34 +5,48 @@
  nodejs_22,
  python3,
  makeWrapper,
+  autoPatchelfHook,
  copyDesktopItems,
  makeDesktopItem,
  electron,
  libuv,
+  buildVersion,
  # Reuse the daemon's prebuilt npm-deps FOD. Same lockfile, same content —
  # without this, the desktop drv produces a separately-named store path
  # (`paseo-desktop-<v>-npm-deps`) and refetches the entire registry. Override
  # the upstream hash via `paseo.override { npmDepsHash = "..."; }`.
  paseo,
 }:
-
-buildNpmPackage rec {
+buildNpmPackage {
  pname = "paseo-desktop";
  version = (builtins.fromJSON (builtins.readFile ../package.json)).version;

  src = lib.cleanSourceWith {
    src = ./..;
-    filter =
-      path: type:
-      let
-        baseName = builtins.baseNameOf path;
-        relPath = lib.removePrefix (toString ./..) path;
-      in
+    filter = path: type: let
+      baseName = builtins.baseNameOf path;
+      relPath = lib.removePrefix (toString ./..) path;
+    in
      # Exclude mobile-only platform code (we only need the web/electron build)
      !(lib.hasPrefix "/packages/app/android" relPath)
      && !(lib.hasPrefix "/packages/app/ios" relPath)
      # Website is unrelated to the desktop app
      && !(lib.hasPrefix "/packages/website" relPath)
+      # Documentation, CI definitions and agent/editor configuration. None of
+      # these reach the build, but every one of them is part of `src`, so a
+      # docs-only or workflow-only commit currently invalidates the whole
+      # desktop derivation and pays for a full Expo export to produce a
+      # byte-identical result.
+      && !(lib.hasPrefix "/docs" relPath)
+      && !(lib.hasPrefix "/.github" relPath)
+      && !(lib.hasPrefix "/.agents" relPath)
+      && !(lib.hasPrefix "/.claude" relPath)
+      && !(lib.hasPrefix "/.codex" relPath)
+      && !(lib.hasPrefix "/docker" relPath)
+      # Top-level prose only (README, CHANGELOG, AGENTS...). Deeper markdown is
+      # not necessarily documentation: skills/*/SKILL.md is a runtime file the
+      # installPhase copies into the output.
+      && builtins.match "/[^/]+\\.md" relPath == null
      # Test fixtures and build artifacts
      && !(lib.hasSuffix ".test.ts" baseName)
      && !(lib.hasSuffix ".e2e.test.ts" baseName)
@@ -48,16 +62,23 @@ buildNpmPackage rec {

  # Prevent onnxruntime-node's install script from running during automatic
  # npm rebuild. We manually rebuild only node-pty in buildPhase.
-  npmRebuildFlags = [ "--ignore-scripts" ];
+  npmRebuildFlags = ["--ignore-scripts"];

-  nativeBuildInputs = [
-    python3 # for node-gyp (node-pty)
-    makeWrapper
-    copyDesktopItems
+  nativeBuildInputs =
+    [
+      python3 # for node-gyp (node-pty)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      autoPatchelfHook
+      makeWrapper
+      copyDesktopItems
+    ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libuv
+    stdenv.cc.cc.lib # libstdc++ for sherpa-onnx prebuilt binaries
  ];

-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libuv ];
-
  dontNpmBuild = true;

  env = {
@@ -82,61 +103,125 @@ buildNpmPackage rec {
    # Expo web export for the Electron renderer
    ( cd packages/app && PASEO_WEB_PLATFORM=electron npx expo export --platform web )

-    # Desktop main process (tsc only — NOT electron-builder)
+    # Desktop main process
    npm run build:main --workspace=@getpaseo/desktop

+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Let electron-builder create the native bundle layout (including helper
+      # app names and bundle identifiers), but source Electron from nixpkgs
+      # instead of downloading a release at build time. electron-builder edits
+      # the copied helper plists, so stage a writable distribution rather than
+      # pointing it directly at the read-only Nix store.
+      electron_dist="$NIX_BUILD_TOP/electron-dist"
+      mkdir -p "$electron_dist"
+      cp -R ${electron}/Applications/Electron.app "$electron_dist/"
+      chmod -R u+w "$electron_dist/Electron.app"
+      (
+        cd packages/desktop
+        # The Nix output is not a distributable DMG, so leave it unsigned and
+        # disable the hardened runtime that requires a matching signature.
+        CSC_IDENTITY_AUTO_DISCOVERY=false \
+          ../../node_modules/.bin/electron-builder \
+            --config electron-builder.yml \
+            --dir \
+            --mac \
+            --publish never \
+            --config.electronDist="$electron_dist" \
+            --config.buildVersion=${lib.escapeShellArg buildVersion} \
+            --config.mac.identity=null \
+            --config.mac.hardenedRuntime=false \
+            --config.mac.notarize=false
+      )
+    ''}
+
    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall

-    mkdir -p $out/share/paseo-desktop $out/bin
+    mkdir -p $out/bin

-    # Preserve the monorepo layout so main.js's dev-mode path resolution
-    # (`__dirname/../../app/dist`, `__dirname/../assets/icon.png`) works
-    # without patching: invoked unpackaged via `electron path/to/main.js`,
-    # `app.isPackaged` is false, so these relative paths are used.
-    #
-    # Copy the entire packages/ tree (not just built artifacts) because npm
-    # creates workspace symlinks from node_modules/@getpaseo/* into packages/*.
-    # Missing any workspace package leaves dangling symlinks and fails the
-    # noBrokenSymlinks output check. The cleanSourceWith filter above already
-    # drops the big platform-specific things (android/ios, website, tests).
-    cp package.json $out/share/paseo-desktop/
-    cp -a packages $out/share/paseo-desktop/
-    cp -a node_modules $out/share/paseo-desktop/
+    ${lib.optionalString stdenv.hostPlatform.isLinux ''
+      mkdir -p $out/share/paseo-desktop

-    # Skills directory referenced at runtime by some agents
-    if [ -d skills ]; then
-      cp -a skills $out/share/paseo-desktop/
-    fi
+      # Materialize only the desktop and daemon runtime graphs. Copying the
+      # complete monorepo used to ship every build-time dependency (including
+      # Electron, Expo tooling, and cross-platform builder binaries), making the
+      # desktop output larger than 2 GiB.
+      PASEO_TRACE_DESKTOP=1 node scripts/trace-daemon.mjs > desktop-files.txt

-    # Hicolor icon for desktop environments
-    install -Dm644 packages/desktop/assets/icon.png \
-      $out/share/icons/hicolor/512x512/apps/paseo-desktop.png
+      while IFS= read -r path; do
+        [ -z "$path" ] && continue
+        mkdir -p "$out/share/paseo-desktop/$(dirname "$path")"
+        cp -a "$path" "$out/share/paseo-desktop/$path"
+      done < desktop-files.txt

-    # Launcher wraps nixpkgs electron.
-    # --no-sandbox: Chromium's setuid sandbox can't live in /nix/store
-    # (immutable, no setuid). Acceptable for v1; a follow-up can wire
-    # `security.wrappers` via a NixOS module for users who want the sandbox.
-    #
-    # EXPO_DEV_URL: We run unpackaged via `electron path/to/main.js`, so
-    # `app.isPackaged` is false. In that mode main.ts loads `DEV_SERVER_URL`
-    # (defaults to http://localhost:8081 — the Expo dev server, which doesn't
-    # exist here). Point it at the `paseo://` protocol handler instead, which
-    # serves from `__dirname/../../app/dist` (our install layout matches).
-    makeWrapper ${electron}/bin/electron $out/bin/paseo-desktop \
-      --add-flags "$out/share/paseo-desktop/packages/desktop/dist/main.js" \
-      --add-flags "--no-sandbox" \
-      --set EXPO_DEV_URL "paseo://app/"
+      # Keep the same unpackaged monorepo layout expected by main.js.
+      cp package.json $out/share/paseo-desktop/
+      mkdir -p $out/share/paseo-desktop/packages/app
+      cp -a packages/app/dist $out/share/paseo-desktop/packages/app/

-    copyDesktopItems
+      for runtime_path in \
+        packages/desktop/dist/main.js \
+        packages/desktop/dist/preload.js \
+        packages/desktop/dist/features/browser-keyboard/guest-preload.js \
+        packages/desktop/package.json; do
+        if [ ! -e "$out/share/paseo-desktop/$runtime_path" ]; then
+          echo "desktop runtime trace omitted $runtime_path" >&2
+          exit 1
+        fi
+      done
+
+      if [ -e $out/share/paseo-desktop/node_modules/electron ]; then
+        echo "desktop runtime trace included npm Electron" >&2
+        exit 1
+      fi
+
+      # Skills directory referenced at runtime by some agents
+      if [ -d skills ]; then
+        cp -a skills $out/share/paseo-desktop/
+      fi
+
+      # Hicolor icon for desktop environments
+      install -Dm644 packages/desktop/assets/icon.png \
+        $out/share/icons/hicolor/512x512/apps/paseo-desktop.png
+
+      # Electron derives Wayland's toplevel app_id from the package name in the
+      # app root it launches. Point it at a one-file app named "paseo-desktop"
+      # so shells can match the window to the desktop entry and hicolor icon.
+      mkdir -p $out/share/paseo-desktop/electron-app
+      printf '%s\n' "{ \"name\": \"paseo-desktop\", \"version\": \"$version\", \"main\": \"index.js\" }" \
+        > $out/share/paseo-desktop/electron-app/package.json
+      printf '%s\n' 'require("../packages/desktop/dist/main.js");' \
+        > $out/share/paseo-desktop/electron-app/index.js
+
+      # Chromium's setuid sandbox cannot live in the immutable Nix store.
+      makeWrapper ${electron}/bin/electron $out/bin/paseo-desktop \
+        --add-flags "$out/share/paseo-desktop/electron-app" \
+        --add-flags "--no-sandbox" \
+        --add-flags "--class=paseo-desktop" \
+        --set EXPO_DEV_URL "paseo://app/" \
+        --set CHROME_DESKTOP "paseo-desktop.desktop"
+
+      copyDesktopItems
+    ''}
+
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      app="$(find packages/desktop/release -maxdepth 3 -type d -name Paseo.app -print -quit)"
+      if [ -z "$app" ]; then
+        echo "electron-builder did not produce Paseo.app" >&2
+        exit 1
+      fi
+      mkdir -p "$out/Applications"
+      cp -R "$app" "$out/Applications/Paseo.app"
+      ln -s ../Applications/Paseo.app/Contents/MacOS/Paseo "$out/bin/paseo-desktop"
+    ''}

    runHook postInstall
  '';

-  desktopItems = [
+  desktopItems = lib.optionals stdenv.hostPlatform.isLinux [
    (makeDesktopItem {
      name = "paseo-desktop";
      desktopName = "Paseo";
@@ -144,8 +229,24 @@ buildNpmPackage rec {
      comment = "Self-hosted daemon for AI coding agents";
      exec = "paseo-desktop";
      icon = "paseo-desktop";
+      categories = ["Development"];
+      startupWMClass = "paseo-desktop";
+    })
+    # Hidden alias entry. Which of the two names Electron ends up publishing as
+    # the Wayland app_id depends on the Electron version: 41 uses the app-root
+    # package.json `name` ("paseo-desktop"), 38 uses the runtime app name that
+    # main.ts sets ("Paseo"). Ship a NoDisplay entry for the second spelling so
+    # the icon resolves either way without a duplicate launcher item.
+    (makeDesktopItem {
+      name = "Paseo";
+      desktopName = "Paseo";
+      genericName = "AI Coding Agents";
+      comment = "Self-hosted daemon for AI coding agents";
+      exec = "paseo-desktop";
+      icon = "paseo-desktop";
      categories = [ "Development" ];
      startupWMClass = "Paseo";
+      noDisplay = true;
    })
  ];

@@ -154,6 +255,6 @@ buildNpmPackage rec {
    homepage = "https://github.com/getpaseo/paseo";
    license = lib.licenses.agpl3Plus;
    mainProgram = "paseo-desktop";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
 }
@@ -230,7 +230,6 @@ in
      '';

      environment = {
-        NODE_ENV = "production";
        PASEO_HOME = cfg.dataDir;
        PASEO_LISTEN = "${cfg.listenAddress}:${toString cfg.port}";
      } // lib.optionalAttrs cfg.inheritUserEnvironment (
@@ -1 +1 @@
-sha256-n7k3zQ1NOm7dGmpqKE6RaEkl50/M2eFek6XIQJbYCEc=
+sha256-MgMvQC+EGJ8gGosqel8oC88pMzf2Mtetd2D8Yg5VFAM=
@@ -37,6 +37,21 @@ buildNpmPackage rec {
      && !(lib.hasPrefix "/packages/website/public" relPath)
      && !(lib.hasPrefix "/packages/desktop/src" relPath)
      && !(lib.hasPrefix "/packages/desktop/src-tauri" relPath)
+      # Documentation, CI definitions and agent/editor configuration. None of
+      # these reach the build. Excluding them here also matters for the desktop
+      # derivation, which inherits this package's npmDeps: leaving them in makes
+      # a docs-only commit produce a new npm-deps .drv, and so a new desktop
+      # .drv, and so a full rebuild for a byte-identical result.
+      && !(lib.hasPrefix "/docs" relPath)
+      && !(lib.hasPrefix "/.github" relPath)
+      && !(lib.hasPrefix "/.agents" relPath)
+      && !(lib.hasPrefix "/.claude" relPath)
+      && !(lib.hasPrefix "/.codex" relPath)
+      && !(lib.hasPrefix "/docker" relPath)
+      # Top-level prose only (README, CHANGELOG, AGENTS...). Deeper markdown is
+      # not necessarily documentation: skills/*/SKILL.md is a runtime file the
+      # daemon's trace script copies into the output.
+      && builtins.match "/[^/]+\\.md" relPath == null
      # Exclude test fixtures and debug files
      && !(lib.hasSuffix ".test.ts" baseName)
      && !(lib.hasSuffix ".e2e.test.ts" baseName)
@@ -114,9 +129,10 @@ buildNpmPackage rec {

    # Create wrapper for the server entry point (for systemd / direct use)
    mkdir -p $out/bin
+    # Keep Paseo's runtime mode separate from NODE_ENV, which belongs to spawned agents.
    makeWrapper ${nodejs}/bin/node $out/bin/paseo-server \
      --add-flags "$out/lib/paseo/packages/server/dist/scripts/supervisor-entrypoint.js" \
-      --set NODE_ENV production
+      --set PASEO_NODE_ENV production

    # Create wrapper for the CLI
    makeWrapper ${nodejs}/bin/node $out/bin/paseo \
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.2.3",
+  "version": "0.4.0",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -23,6 +23,7 @@
  "workspaces": [
    "packages/expo-two-way-audio",
    "packages/highlight",
+    "packages/plugin",
    "packages/protocol",
    "packages/client",
    "packages/server",
@@ -39,25 +40,28 @@
    "dev:server:watch": "concurrently --kill-others --names protocol,client,server --prefix-colors yellow,blue,cyan \"npm run watch:protocol\" \"npm run watch:client\" \"npm run dev:server:raw\"",
    "dev:server:raw": "npm run dev --workspace=@getpaseo/server",
    "dev:app": "cross-env PASEO_LISTEN=127.0.0.1:6768 EXPO_PORT=8081 ./scripts/dev-app.sh",
+    "test:e2e:mobile": "./scripts/test-mobile-agent-device.sh",
    "dev:website": "npm run dev --workspace=@getpaseo/website",
    "postinstall": "node scripts/postinstall-patches.mjs",
    "prepare": "lefthook install --force",
    "build": "npm run build --workspaces --if-present",
    "build:highlight": "npm run build --workspace=@getpaseo/highlight",
    "build:highlight:clean": "npm run build:clean --workspace=@getpaseo/highlight",
+    "build:plugin": "npm run build --workspace=@paseo/plugin",
+    "build:plugin:clean": "npm run build:clean --workspace=@paseo/plugin",
    "build:relay": "npm run build --workspace=@getpaseo/relay",
    "build:relay:clean": "npm run build:clean --workspace=@getpaseo/relay",
    "build:protocol": "npm run build --workspace=@getpaseo/protocol",
    "build:protocol:clean": "npm run build:clean --workspace=@getpaseo/protocol",
    "build:client": "npm run build --workspace=@getpaseo/client",
    "build:client:clean": "npm run build:protocol:clean && npm run build:clean --workspace=@getpaseo/client",
-    "build:server-deps": "concurrently --kill-others-on-fail --names highlight,relay,client --prefix-colors yellow,blue,cyan \"npm run build:highlight\" \"npm run build:relay\" \"npm run build:client\"",
-    "build:server-deps:clean": "npm run build:highlight:clean && npm run build:relay:clean && npm run build:client:clean",
+    "build:server-deps": "concurrently --kill-others-on-fail --names highlight,plugin,relay,client --prefix-colors yellow,green,blue,cyan \"npm run build:highlight\" \"npm run build:plugin\" \"npm run build:relay\" \"npm run build:client\"",
+    "build:server-deps:clean": "npm run build:highlight:clean && npm run build:plugin: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:daemon-web-ui": "node scripts/build-daemon-web-ui.mjs",
-    "build:app-deps": "npm run build:highlight && npm run build:client && npm run build --workspace=@getpaseo/expo-two-way-audio",
-    "build:app-deps:clean": "npm run build:highlight:clean && npm run build:client:clean && npm run build --workspace=@getpaseo/expo-two-way-audio",
+    "build:app-deps": "npm run build:highlight && npm run build:plugin && 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:plugin:clean && npm run build:client:clean && npm run build --workspace=@getpaseo/expo-two-way-audio",
    "watch:protocol": "npm run watch --workspace=@getpaseo/protocol",
    "watch:client": "tsc -p packages/client/tsconfig.json --watch --preserveWatchOutput",
    "typecheck": "npm run typecheck --workspaces --if-present",
@@ -0,0 +1,25 @@
+name: Release iOS Beta
+
+on:
+  push:
+    tags:
+      - "v*-beta.*"
+
+jobs:
+  build_ios:
+    name: Build iOS beta
+    type: build
+    params:
+      platform: ios
+      profile: production
+
+  distribute_ios_beta:
+    name: Distribute iOS beta
+    needs: [build_ios]
+    type: testflight
+    params:
+      build_id: ${{ needs.build_ios.outputs.build_id }}
+      profile: production
+      external_groups:
+        - Paseo Beta
+      submit_beta_review: true
@@ -1,9 +1,14 @@
 const fs = require("node:fs");
 const path = require("node:path");
 const pkg = require("./package.json");
+const withAndroidAsyncStorageSize = require("./plugins/with-android-async-storage-size");
+const withAndroidProfileable = require("./plugins/with-android-profileable");
 const withFdroidAutolinking = require("./plugins/with-fdroid-autolinking");
+const withPasteInput = require("./plugins/with-paste-input");
+const { getNativeReleaseVersion } = require("./native-release-version");
 const appVariant = process.env.APP_VARIANT ?? "production";
 const isFdroidBuild = process.env.PASEO_FDROID_BUILD === "1";
+const isProfileBuild = process.env.PASEO_PROFILE_BUILD === "1";

 const buildProfile = isFdroidBuild
  ? {
@@ -15,7 +20,6 @@ const buildProfile = isFdroidBuild
      cameraPlugins: [],
      fdroidPlugins: [withFdroidAutolinking],
      notificationPlugins: [],
-      updates: { enabled: false },
    }
  : {
      androidPermissions: [
@@ -44,33 +48,8 @@ const buildProfile = isFdroidBuild
          },
        ],
      ],
-      updates: {},
    };

-function getNativeBuildVersionCode(version) {
-  const match = /^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/.exec(version);
-  if (!match) {
-    throw new Error(`Cannot derive Android versionCode from non-semver version: ${version}`);
-  }
-
-  const [, majorText, minorText, patchText] = match;
-  const major = Number(majorText);
-  const minor = Number(minorText);
-  const patch = Number(patchText);
-
-  if (minor > 999 || patch > 999) {
-    throw new Error(`Cannot derive collision-free Android versionCode from version: ${version}`);
-  }
-
-  const versionCode = major * 1_000_000 + minor * 1_000 + patch;
-
-  if (!Number.isSafeInteger(versionCode) || versionCode <= 0 || versionCode > 2_100_000_000) {
-    throw new Error(`Derived Android versionCode is out of range: ${versionCode}`);
-  }
-
-  return versionCode;
-}
-
 function resolveSecretFile(params) {
  const fromEnv = process.env[params.envKey];
  if (typeof fromEnv === "string" && fromEnv.trim().length > 0) {
@@ -113,25 +92,18 @@ const variants = {
 };

 const variant = variants[appVariant] ?? variants.production;
-const nativeBuildVersionCode = getNativeBuildVersionCode(pkg.version);
+const nativeReleaseVersion = getNativeReleaseVersion(pkg.version);

 export default {
  expo: {
    name: variant.name,
    slug: "voice-mobile",
-    version: pkg.version,
+    version: nativeReleaseVersion.appVersion,
    orientation: "portrait",
    icon: "./assets/images/icon.png",
    scheme: "paseo",
    userInterfaceStyle: "automatic",
    newArchEnabled: true,
-    runtimeVersion: {
-      policy: "appVersion",
-    },
-    updates: {
-      url: "https://u.expo.dev/0e7f65ce-0367-46c8-a238-2b65963d235a",
-      ...buildProfile.updates,
-    },
    ios: {
      supportsTablet: true,
      infoPlist: {
@@ -142,7 +114,7 @@ export default {
      ...(variant.googleServiceInfoPlist
        ? { googleServicesFile: variant.googleServiceInfoPlist }
        : {}),
-      buildNumber: String(nativeBuildVersionCode),
+      buildNumber: nativeReleaseVersion.iosBuildNumber,
    },
    android: {
      adaptiveIcon: {
@@ -156,7 +128,7 @@ export default {
      usesCleartextTraffic: true,
      permissions: buildProfile.androidPermissions,
      package: variant.packageId,
-      versionCode: nativeBuildVersionCode,
+      versionCode: nativeReleaseVersion.androidVersionCode,
      ...(variant.googleServicesFile ? { googleServicesFile: variant.googleServicesFile } : {}),
    },
    web: {
@@ -168,6 +140,8 @@ export default {
    },
    plugins: [
      "expo-router",
+      withPasteInput,
+      [withAndroidAsyncStorageSize, 64],
      ...buildProfile.cameraPlugins,
      [
        "expo-splash-screen",
@@ -202,6 +176,7 @@ export default {
        },
      ],
      ...buildProfile.fdroidPlugins,
+      ...(isProfileBuild ? [withAndroidProfileable] : []),
    ],
    experiments: {
      typedRoutes: true,
@@ -210,6 +185,7 @@ export default {
    },
    extra: {
      fdroidBuild: isFdroidBuild,
+      profileBuild: isProfileBuild,
      router: {},
      eas: {
        projectId: "0e7f65ce-0367-46c8-a238-2b65963d235a",
@@ -1,34 +0,0 @@
-// "00-" prefix is intentional: this file must sort before every other spec.
-// Sessions history is daemon-global — any agent created by a prior spec hides the empty state.
-// If the beforeAll probe below fails, a spec sorted before this file is creating agents.
-import { test } from "./fixtures";
-import { connectSeedClient } from "./helpers/seed-client";
-import { expectSessionsEmptyState, openSessions } from "./helpers/archive-tab";
-
-test.describe("Sessions screen empty state", () => {
-  test.beforeAll(async () => {
-    const client = await connectSeedClient();
-    try {
-      const history = await client.fetchAgentHistory({ page: { limit: 1 } });
-      if (history.entries.length > 0) {
-        throw new Error(
-          `Sessions empty-state precondition failed: daemon already has ${history.entries.length} agent(s). ` +
-            `Either a spec that sorts before 00-sessions-empty.spec.ts created agents, ` +
-            `or the daemon has stale history from a previous run.`,
-        );
-      }
-    } finally {
-      await client.close().catch(() => undefined);
-    }
-  });
-
-  test("shows empty placeholder when there is no session history", async ({
-    page,
-    withWorkspace,
-  }) => {
-    const workspace = await withWorkspace({ prefix: "sessions-empty-" });
-    await workspace.navigateTo();
-    await openSessions(page);
-    await expectSessionsEmptyState(page);
-  });
-});
@@ -1,29 +0,0 @@
-import { test } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { getServerId } from "./helpers/server-id";
-import {
-  expectProviderInstalledInSettings,
-  installAcpCatalogProvider,
-  openAddProviderArea,
-  openSettingsHost,
-  openSettingsHostSection,
-} from "./helpers/settings";
-
-const ACP_PROVIDER = {
-  id: "hermes",
-  name: "Hermes",
-};
-
-test.describe("ACP provider catalog", () => {
-  test("adds a catalog provider from settings", async ({ page }) => {
-    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 installAcpCatalogProvider(page, ACP_PROVIDER.name);
-    await expectProviderInstalledInSettings(page, ACP_PROVIDER.name);
-  });
-});
@@ -1,48 +0,0 @@
-import { test } from "./fixtures";
-import {
-  expectLoadedTimelineDoesNotScroll,
-  expectTimelinePromptNotMounted,
-  expectTimelinePromptVisible,
-  holdNextOlderTimelinePage,
-  makeLoadedTimelineFitViewport,
-  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();
-    }
-  });
-
-  test("loads older history when the initial page does not fill the viewport", async ({ page }) => {
-    test.setTimeout(120_000);
-    const agent = await seedLongMockAgentTimeline({ turns: 30 });
-    try {
-      await makeLoadedTimelineFitViewport(page);
-      const olderPage = await holdNextOlderTimelinePage(page, agent);
-      await openAgentTimeline(page, agent);
-      await expectTimelinePromptVisible(page, agent.newestPrompt);
-      await expectLoadedTimelineDoesNotScroll(page);
-      await olderPage.expectLoading();
-      olderPage.release();
-      await expectTimelinePromptVisible(page, agent.oldestPrompt);
-    } finally {
-      await agent.cleanup();
-    }
-  });
-});
@@ -0,0 +1,70 @@
+import { mkdtempSync, realpathSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { submitMessage } from "../support/helpers/composer";
+import { choosePermissionAction, expectPermissionActions } from "../support/helpers/permissions";
+import {
+  cleanupRewindFlow,
+  launchAgent,
+  type AgentHandle,
+  type RewindFlowProvider,
+} from "../support/helpers/rewind-flow";
+
+const QUESTION = "Which option should I choose?";
+const OPTIONS = ["Alpha", "Beta", "Gamma"];
+
+async function askAgentToOfferChoices(handle: AgentHandle): Promise<void> {
+  await submitMessage(
+    handle.page,
+    `Use your built-in question tool now. Ask exactly "${QUESTION}" with exactly three choices named Alpha, Beta, and Gamma. Do not answer the question yourself. After I choose, reply exactly SELECTED_<CHOICE>, replacing <CHOICE> with my selection.`,
+  );
+}
+
+async function expectAgentToResumeWithSelection(handle: AgentHandle, selection: string) {
+  const finish = await handle.client.waitForFinish(handle.agentId, 240_000);
+  expect(finish.status).toBe("idle");
+  expect(finish.final?.lastError).toBeFalsy();
+  await expect(
+    handle.page
+      .getByTestId("assistant-message")
+      .filter({ hasText: `SELECTED_${selection}` })
+      .last(),
+  ).toBeVisible({ timeout: 30_000 });
+}
+
+async function capturePermissionChoices(page: Page, outputPath: string) {
+  await page.screenshot({ path: outputPath });
+  await expect(page.getByText(QUESTION, { exact: true })).toBeVisible();
+  await expect(page.getByRole("button", { name: "Beta" })).toBeVisible();
+}
+
+test.use({ e2eForkProviders: ["kimi"] });
+
+test.describe("real ACP permission choices", () => {
+  test.setTimeout(600_000);
+
+  test("Kimi renders its question choices and resumes with the selected option", async ({
+    page,
+  }, testInfo) => {
+    const provider = "kimi" satisfies RewindFlowProvider;
+    const cwd = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-acp-question-kimi-")));
+    let handle: AgentHandle | undefined;
+
+    try {
+      handle = await launchAgent({ page, provider, cwd, mode: "full-access" });
+      await askAgentToOfferChoices(handle);
+      await expectPermissionActions(page, OPTIONS);
+      const screenshotPath = testInfo.outputPath("kimi-permission-choices.png");
+      await capturePermissionChoices(page, screenshotPath);
+      await testInfo.attach("Kimi permission choices", {
+        path: screenshotPath,
+        contentType: "image/png",
+      });
+      await choosePermissionAction(page, "Beta");
+      await expectAgentToResumeWithSelection(handle, "BETA");
+    } finally {
+      await cleanupRewindFlow({ handle, cwd });
+    }
+  });
+});
@@ -0,0 +1,43 @@
+import { test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  expectProviderInstalledInSettings,
+  installAcpCatalogProvider,
+  openAddProviderArea,
+  openSettingsHost,
+  openSettingsHostSection,
+} from "../support/helpers/settings";
+
+const ACP_PROVIDER = {
+  id: "hermes",
+  name: "Hermes",
+};
+
+interface ProviderCatalogDaemonClient {
+  connect(): Promise<void>;
+  close(): Promise<void>;
+  patchDaemonConfig(config: { removeProviders?: string[] }): Promise<unknown>;
+}
+
+test.describe("ACP provider catalog", () => {
+  test("adds a catalog provider from settings", async ({ page }) => {
+    const client = await connectDaemonClient<ProviderCatalogDaemonClient>({
+      clientIdPrefix: "provider-catalog-e2e",
+    });
+    try {
+      await gotoAppShell(page);
+      await openSettings(page);
+      await openSettingsHost(page, getServerId());
+      await openSettingsHostSection(page, getServerId(), "providers");
+      await openAddProviderArea(page);
+
+      await installAcpCatalogProvider(page, ACP_PROVIDER.name);
+      await expectProviderInstalledInSettings(page, ACP_PROVIDER.name);
+    } finally {
+      await client.patchDaemonConfig({ removeProviders: [ACP_PROVIDER.id] }).catch(() => undefined);
+      await client.close().catch(() => undefined);
+    }
+  });
+});
@@ -1,7 +1,7 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { test, expect, type Page } from "./fixtures";
-import { seedMockAgentWorkspace, openAgentRoute } from "./helpers/mock-agent";
+import { test, expect, type Page } from "../support/fixtures";
+import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";

 function visibleComposer(page: Page) {
  return page.locator("textarea[data-composer-input]").filter({ visible: true }).first();
@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { mkdtemp, rm, stat } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  addProjectFlow,
  addProjectFlowBack,
@@ -13,17 +13,21 @@ import {
  expectAddProjectPage,
  expectNewWorkspaceForAddedProject,
  openAddProjectFlow,
-} from "./helpers/add-project-flow";
-import { gotoAppShell } from "./helpers/app";
+  openAddProjectHostSelection,
+} from "../support/helpers/add-project-flow";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  addConnectedHostAndReload,
  addOfflineHostAndReload,
  waitForConnectedHost,
-} from "./helpers/hosts";
-import { type IsolatedHostDaemon, startIsolatedHostDaemon } from "./helpers/isolated-host-daemon";
-import { expectOpenedProject } from "./helpers/project-picker-ui";
-import { connectSeedClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/hosts";
+import {
+  type IsolatedHostDaemon,
+  startIsolatedHostDaemon,
+} from "../support/helpers/isolated-host-daemon";
+import { expectOpenedProject } from "../support/helpers/project-picker-ui";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 const SECONDARY_HOST_ID = "add-project-flow-secondary";
 const SECONDARY_HOST_LABEL = "Secondary Host";
@@ -62,12 +66,14 @@ async function expectProjectHasNoWorkspaces(projectId: string): Promise<void> {
 test.describe("Add Project command-center flow", () => {
  test.describe.configure({ timeout: 180_000 });

-  test("a single connected host opens directly on method selection", async ({ page }) => {
+  test("method selection has no search field", async ({ page }) => {
    await gotoAppShell(page);

    await openAddProjectFlow(page);

    await expect(addProjectFlowMethod(page, "directory-search")).toBeVisible();
+    await expect(addProjectFlowInput(page)).toHaveCount(0);
+    await expect(addProjectFlow(page).getByRole("textbox")).toHaveCount(0);
    await expect(page.getByTestId("add-project-flow-page-host")).toHaveCount(0);
  });

@@ -143,7 +149,7 @@ test.describe("Add Project command-center flow", () => {
        serverId: SECONDARY_HOST_ID,
        endpoint: `localhost:${secondaryHost.port}`,
      });
-      await openAddProjectFlow(page, "host");
+      await openAddProjectHostSelection(page);

      await page.keyboard.press("ArrowDown");
      await page.keyboard.press("Enter");
@@ -152,7 +158,7 @@ test.describe("Add Project command-center flow", () => {
      await expect(addProjectFlow(page)).toContainText(SECONDARY_HOST_LABEL);
    });

-    test("Escape and Back restore page input and active selection before closing at the root", async ({
+    test("Escape and Back restore searchable page input before closing at the root", async ({
      page,
    }) => {
      await gotoAppShell(page);
@@ -165,21 +171,20 @@ test.describe("Add Project command-center flow", () => {
        serverId: SECONDARY_HOST_ID,
        endpoint: `localhost:${secondaryHost.port}`,
      });
-      await openAddProjectFlow(page, "host");
+      await openAddProjectHostSelection(page);

      await addProjectFlowInput(page).fill("o");
      await page.keyboard.press("ArrowDown");
      await page.keyboard.press("Enter");
      await expectAddProjectPage(page, "method");

-      await addProjectFlowInput(page).fill("new");
-      await page.keyboard.press("Enter");
+      await chooseAddProjectMethod(page, "new-directory");
      await expectAddProjectPage(page, "new-directory-parent");
      await page.keyboard.press("Escape");

      await expectAddProjectPage(page, "method");
-      await expect(addProjectFlowInput(page)).toHaveValue("new");
-      await page.keyboard.press("Enter");
+      await expect(addProjectFlowInput(page)).toHaveCount(0);
+      await chooseAddProjectMethod(page, "new-directory");
      await expectAddProjectPage(page, "new-directory-parent");
      await addProjectFlowBack(page).click();

@@ -213,7 +218,7 @@ test.describe("Add Project command-center flow", () => {
          serverId: SECONDARY_HOST_ID,
          endpoint: `localhost:${secondaryHost.port}`,
        });
-        await openAddProjectFlow(page, "host");
+        await openAddProjectHostSelection(page);
        await addProjectFlowHost(page, SECONDARY_HOST_ID).click();
        await expectAddProjectPage(page, "method");

@@ -1,7 +1,7 @@
 import { mkdir, mkdtemp, rm, stat } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { expect, test } from "./fixtures";
+import { expect, test } from "../support/fixtures";
 import {
  addProjectFlow,
  addProjectFlowBack,
@@ -10,12 +10,16 @@ import {
  expectAddProjectPage,
  expectNewWorkspaceForAddedProject,
  openAddProjectFlow,
-} from "./helpers/add-project-flow";
-import { gotoAppShell } from "./helpers/app";
-import { createTempGithubRepo, hasGithubAuth, type GhRepoFixture } from "./helpers/github-fixtures";
-import { expectOpenedProject } from "./helpers/project-picker-ui";
-import { connectSeedClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/add-project-flow";
+import { gotoAppShell } from "../support/helpers/app";
+import {
+  createTempGithubRepo,
+  hasGithubAuth,
+  type GhRepoFixture,
+} from "../support/helpers/github-fixtures";
+import { expectOpenedProject } from "../support/helpers/project-picker-ui";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 test.describe("Add Project GitHub flow", () => {
  test.describe.configure({ timeout: 300_000 });
@@ -0,0 +1,893 @@
+import type { Page } from "@playwright/test";
+import { expect, test as baseTest } from "../support/fixtures";
+import { expectAgentIdle } from "../support/helpers/agent-stream";
+import {
+  attachImageFromMenu,
+  expectAttachmentPill,
+  expectComposerVisible,
+  submitMessage,
+} from "../support/helpers/composer";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import {
+  openAgentRoute,
+  seedMockAgentWorkspace,
+  type MockAgentWorkspace,
+} from "../support/helpers/mock-agent";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+
+interface FrameRect {
+  top: number;
+  right: number;
+  bottom: number;
+  left: number;
+  width: number;
+  height: number;
+}
+
+interface ElementFrame {
+  mounted: boolean;
+  visible: boolean;
+  painted: boolean;
+  rect: FrameRect | null;
+  opacity: number | null;
+  backgroundColor: string | null;
+}
+
+interface ContentChildFrame extends ElementFrame {
+  key: string;
+  text: string;
+}
+
+interface TurnFrame {
+  at: number;
+  userRow: ElementFrame;
+  attachment: ElementFrame;
+  footerRow: ElementFrame;
+  spinner: ElementFrame;
+  agentTab: ElementFrame;
+  tabProgress: ElementFrame;
+  interruptControl: ElementFrame;
+  primaryActionCount: number;
+  composer: ElementFrame & { value: string | null };
+  contentChildren: ContentChildFrame[];
+  scroll: ElementFrame & {
+    scrollTop: number | null;
+    clientHeight: number | null;
+    scrollHeight: number | null;
+  };
+}
+
+interface ActivityCheckpoint {
+  row: boolean;
+  stop: boolean;
+  footer: boolean;
+  tabProgress: boolean;
+  elapsed: boolean;
+}
+
+interface ActivityOracleState {
+  phase: "waiting" | "observing" | "complete";
+  checkpoints: ActivityCheckpoint[];
+  observer: MutationObserver;
+}
+
+type RunningReleaseOrder = "turn-before-response" | "response-before-turn" | "snapshot-before-turn";
+
+const FIRST_PROMPT_IMAGE = {
+  name: "first-prompt.png",
+  mimeType: "image/png",
+  buffer: Buffer.from(
+    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
+    "base64",
+  ),
+};
+
+declare global {
+  interface Window {
+    __consecutiveTurnFrames?: { active: boolean; frames: TurnFrame[] };
+    __activityContinuityOracle?: ActivityOracleState;
+  }
+}
+
+const test = baseTest.extend<{ streamingAgent: MockAgentWorkspace }>({
+  streamingAgent: async ({ page: _page }, provide) => {
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "consecutive-ten-second-turns-",
+      title: "Consecutive ten-second turns",
+      model: "ten-second-stream",
+      initialPrompt: "emit 100 coalesced agent stream updates",
+    });
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await provide(agent);
+    await agent.cleanup();
+  },
+});
+
+async function recordTurnFrames(page: Page, prompt: string): Promise<void> {
+  await page.evaluate((promptText) => {
+    const state = { active: true, frames: [] as TurnFrame[] };
+    const emptyElement = (): ElementFrame => ({
+      mounted: false,
+      visible: false,
+      painted: false,
+      rect: null,
+      opacity: null,
+      backgroundColor: null,
+    });
+    const rectOf = (element: Element): FrameRect => {
+      const rect = element.getBoundingClientRect();
+      return {
+        top: rect.top,
+        right: rect.right,
+        bottom: rect.bottom,
+        left: rect.left,
+        width: rect.width,
+        height: rect.height,
+      };
+    };
+    const intersects = (first: FrameRect, second: FrameRect) =>
+      first.bottom > second.top &&
+      first.top < second.bottom &&
+      first.right > second.left &&
+      first.left < second.right;
+    const windowRect: FrameRect = {
+      top: 0,
+      right: innerWidth,
+      bottom: innerHeight,
+      left: 0,
+      width: innerWidth,
+      height: innerHeight,
+    };
+    const hasColor = (color: string) =>
+      color !== "" && color !== "none" && color !== "transparent" && color !== "rgba(0, 0, 0, 0)";
+    const isVisible = (element: Element, clip?: Element | null) => {
+      const rect = rectOf(element);
+      return (
+        element.isConnected &&
+        element.checkVisibility() &&
+        rect.width > 0 &&
+        rect.height > 0 &&
+        intersects(rect, windowRect) &&
+        (!clip || intersects(rect, rectOf(clip)))
+      );
+    };
+    const isPainted = (element: Element, clip?: Element | null) => {
+      if (!isVisible(element, clip)) return false;
+      return [element, ...Array.from(element.querySelectorAll("*"))].some((candidate) => {
+        if (!isVisible(candidate, clip)) return false;
+        const style = getComputedStyle(candidate);
+        if (Number(style.opacity) <= 0) return false;
+        if (hasColor(style.backgroundColor)) return true;
+        const hasPaintedBorder = ["Top", "Right", "Bottom", "Left"].some(
+          (side) =>
+            Number.parseFloat(style.getPropertyValue(`border-${side.toLowerCase()}-width`)) > 0 &&
+            hasColor(style.getPropertyValue(`border-${side.toLowerCase()}-color`)),
+        );
+        if (hasPaintedBorder) return true;
+        if (candidate.textContent?.trim() && hasColor(style.color)) return true;
+        if (candidate instanceof SVGElement) {
+          const fill = style.fill || candidate.getAttribute("fill") || "";
+          const stroke = style.stroke || candidate.getAttribute("stroke") || "";
+          return hasColor(fill) || hasColor(stroke);
+        }
+        return candidate instanceof HTMLImageElement || candidate instanceof HTMLCanvasElement;
+      });
+    };
+    const snapshot = (
+      element: Element | null | undefined,
+      clip?: Element | null,
+      painted?: boolean,
+    ): ElementFrame => {
+      if (!element?.isConnected) return emptyElement();
+      const style = getComputedStyle(element);
+      return {
+        mounted: true,
+        visible: isVisible(element, clip),
+        painted: painted ?? isPainted(element, clip),
+        rect: rectOf(element),
+        opacity: Number(style.opacity),
+        backgroundColor: style.backgroundColor,
+      };
+    };
+    const unionRect = (elements: Element[]): FrameRect | null => {
+      if (elements.length === 0) return null;
+      const rects = elements.map(rectOf);
+      const top = Math.min(...rects.map((rect) => rect.top));
+      const right = Math.max(...rects.map((rect) => rect.right));
+      const bottom = Math.max(...rects.map((rect) => rect.bottom));
+      const left = Math.min(...rects.map((rect) => rect.left));
+      return { top, right, bottom, left, width: right - left, height: bottom - top };
+    };
+    const spinnerSnapshot = (
+      footer: Element | null | undefined,
+      clip: Element | null,
+    ): ElementFrame => {
+      const dots = Array.from(footer?.querySelectorAll("*") ?? []).filter((candidate) =>
+        hasColor(getComputedStyle(candidate).backgroundColor),
+      );
+      if (dots.length === 0) return emptyElement();
+      const opacities = dots.map((dot) => Number(getComputedStyle(dot).opacity));
+      return {
+        mounted: true,
+        visible: dots.some((dot) => isVisible(dot, clip)),
+        painted: dots.some((dot, index) => opacities[index] > 0 && isVisible(dot, clip)),
+        rect: unionRect(dots),
+        opacity: Math.max(...opacities),
+        backgroundColor: getComputedStyle(dots[0]).backgroundColor,
+      };
+    };
+    const findImageAttachment = (row: Element | undefined) =>
+      row?.querySelector('[role="button"][aria-label="Open image attachment"]');
+    const findAgentTabState = () => {
+      const agentTab = Array.from(
+        document.querySelectorAll('[data-testid^="workspace-tab-agent_"]'),
+      ).find((candidate) => isVisible(candidate));
+      return {
+        agentTab,
+        tabProgress: agentTab?.querySelector('[role="progressbar"][aria-label="Agent running"]'),
+      };
+    };
+    const countPrimaryActions = (composerRoot: Element | null | undefined) =>
+      Array.from(composerRoot?.querySelectorAll('[role="button"][aria-label]') ?? []).filter(
+        (candidate) =>
+          /stop agent|canceling agent|interrupt agent|send message|send and interrupt|queue message/i.test(
+            candidate.getAttribute("aria-label") ?? "",
+          ) && isVisible(candidate),
+      ).length;
+    const sample = () => {
+      const viewport = Array.from(
+        document.querySelectorAll('[data-testid="agent-chat-scroll"]'),
+      ).find((candidate) => isVisible(candidate));
+      const promptRow = Array.from(
+        viewport?.querySelectorAll('[data-testid="user-message"]') ?? [],
+      ).find((candidate) => candidate.textContent?.includes(promptText));
+      const attachment = findImageAttachment(promptRow);
+      const footer = Array.from(
+        viewport?.querySelectorAll('[data-testid="turn-working-indicator"]') ?? [],
+      )[0];
+      const spinner = spinnerSnapshot(footer, viewport ?? null);
+      const footerRow = footer?.parentElement;
+      const composer = Array.from(
+        document.querySelectorAll('[aria-label="Message agent..."]'),
+      ).find((candidate) => isVisible(candidate));
+      const composerRoot = composer?.closest('[data-testid="message-input-root"]');
+      const interrupt = Array.from(
+        composerRoot?.querySelectorAll('[role="button"][aria-label]') ?? [],
+      ).find((candidate) =>
+        /stop agent|canceling agent/i.test(candidate.getAttribute("aria-label") ?? ""),
+      );
+      const primaryActionCount = countPrimaryActions(composerRoot);
+      const { agentTab, tabProgress } = findAgentTabState();
+      const scrollFrame = snapshot(viewport);
+      const contentChildren = Array.from(viewport?.firstElementChild?.children ?? []).map(
+        (child, index): ContentChildFrame =>
+          Object.assign(snapshot(child, viewport), {
+            key:
+              (child.querySelector('[data-testid="turn-working-indicator"]')
+                ? "turn-footer"
+                : (child.getAttribute("data-history-row-id") ??
+                  child.getAttribute("data-testid"))) ?? `child-${index}`,
+            text: child.textContent?.trim().slice(0, 120) ?? "",
+          }),
+      );
+      state.frames.push({
+        at: performance.now(),
+        userRow: snapshot(promptRow, viewport),
+        attachment: snapshot(attachment, viewport),
+        footerRow: snapshot(footerRow, viewport, spinner.painted),
+        spinner,
+        agentTab: snapshot(agentTab),
+        tabProgress: snapshot(tabProgress),
+        interruptControl: snapshot(interrupt),
+        primaryActionCount,
+        composer: {
+          ...snapshot(composerRoot ?? composer),
+          value:
+            composer instanceof HTMLInputElement || composer instanceof HTMLTextAreaElement
+              ? composer.value
+              : null,
+        },
+        contentChildren,
+        scroll: {
+          ...scrollFrame,
+          scrollTop: viewport instanceof HTMLElement ? viewport.scrollTop : null,
+          clientHeight: viewport instanceof HTMLElement ? viewport.clientHeight : null,
+          scrollHeight: viewport instanceof HTMLElement ? viewport.scrollHeight : null,
+        },
+      });
+      if (state.active) scheduleAfterNextPaint();
+    };
+    const scheduleAfterNextPaint = () => {
+      requestAnimationFrame(() => setTimeout(sample, 0));
+    };
+    window.__consecutiveTurnFrames = state;
+    scheduleAfterNextPaint();
+  }, prompt);
+}
+
+async function waitForRecordedFrames(
+  page: Page,
+  predicate: "user-visible" | "turn-running",
+  count: number,
+): Promise<void> {
+  await expect
+    .poll(() =>
+      page.evaluate(
+        (input) => {
+          const frames = window.__consecutiveTurnFrames?.frames ?? [];
+          return frames.filter((frame) => {
+            if (input.predicate === "user-visible") return frame.userRow.visible;
+            return (
+              frame.interruptControl.painted &&
+              frame.footerRow.painted &&
+              frame.spinner.painted &&
+              frame.tabProgress.painted
+            );
+          }).length;
+        },
+        { predicate },
+      ),
+    )
+    .toBeGreaterThanOrEqual(count);
+}
+
+async function recordPaintsFor(page: Page, durationMs: number): Promise<void> {
+  const until = await page.evaluate((duration) => performance.now() + duration, durationMs);
+  await expect
+    .poll(() => page.evaluate(() => window.__consecutiveTurnFrames?.frames.at(-1)?.at ?? 0))
+    .toBeGreaterThanOrEqual(until);
+}
+
+async function installActivityContinuityOracle(page: Page, prompt: string): Promise<void> {
+  await page.evaluate((promptText) => {
+    const isVisible = (element: Element | null) => Boolean(element?.checkVisibility());
+    const snapshot = (): ActivityCheckpoint => {
+      const visibleAgentTab = Array.from(
+        document.querySelectorAll('[data-testid^="workspace-tab-agent_"]'),
+      ).find((candidate) => isVisible(candidate));
+      return {
+        row: Array.from(document.querySelectorAll('[data-testid="user-message"]')).some(
+          (candidate) => candidate.textContent?.includes(promptText),
+        ),
+        stop: isVisible(document.querySelector('[role="button"][aria-label="Stop agent"]')),
+        footer: isVisible(document.querySelector('[data-testid="turn-working-indicator"]')),
+        tabProgress: isVisible(
+          visibleAgentTab?.querySelector('[role="progressbar"][aria-label="Agent running"]') ??
+            null,
+        ),
+        elapsed: isVisible(document.querySelector('[data-testid="turn-working-elapsed"]')),
+      };
+    };
+    const state = {
+      phase: "waiting" as ActivityOracleState["phase"],
+      checkpoints: [] as ActivityCheckpoint[],
+      observer: null as unknown as MutationObserver,
+    };
+    const observeCommit = () => {
+      const checkpoint = snapshot();
+      if (state.phase === "waiting" && checkpoint.row) {
+        state.phase = "observing";
+      }
+      if (state.phase !== "observing") return;
+      state.checkpoints.push(checkpoint);
+      if (checkpoint.elapsed) {
+        state.phase = "complete";
+        state.observer.disconnect();
+      }
+    };
+    state.observer = new MutationObserver(observeCommit);
+    window.__activityContinuityOracle = state;
+    state.observer.observe(document.body, {
+      subtree: true,
+      childList: true,
+      attributes: true,
+      characterData: true,
+    });
+  }, prompt);
+}
+
+async function waitForActivityOracleArmed(page: Page): Promise<void> {
+  await expect
+    .poll(() => page.evaluate(() => window.__activityContinuityOracle?.phase ?? "missing"))
+    .not.toBe("waiting");
+}
+
+async function readActivityContinuityOracle(page: Page): Promise<ActivityCheckpoint[]> {
+  return page.evaluate(() => {
+    const state = window.__activityContinuityOracle;
+    if (!state) throw new Error("Activity continuity oracle was never installed");
+    state.observer.disconnect();
+    return state.checkpoints;
+  });
+}
+
+function expectActivityContinuity(checkpoints: ActivityCheckpoint[]): void {
+  const incompleteActivityCheckpoints = checkpoints.filter(
+    (checkpoint) => !checkpoint.stop || !checkpoint.footer || !checkpoint.tabProgress,
+  );
+  expect(checkpoints[0]?.row, "activity oracle never armed on the optimistic row").toBe(true);
+  expect(
+    incompleteActivityCheckpoints,
+    `activity oracle observed row without full activity cluster:\n${JSON.stringify(incompleteActivityCheckpoints, null, 2)}\n\nall checkpoints:\n${JSON.stringify(checkpoints, null, 2)}`,
+  ).toEqual([]);
+  expect(
+    checkpoints.slice(0, -1).filter((checkpoint) => checkpoint.elapsed),
+    `activity oracle observed elapsed before its authoritative disarm checkpoint:\n${JSON.stringify(checkpoints, null, 2)}`,
+  ).toEqual([]);
+  expect(checkpoints.at(-1)?.elapsed, "activity oracle never observed authoritative elapsed").toBe(
+    true,
+  );
+}
+
+async function stopTurnFrameRecording(page: Page): Promise<TurnFrame[]> {
+  return page.evaluate(() => {
+    const state = window.__consecutiveTurnFrames;
+    if (!state) throw new Error("Turn frames were never recorded");
+    state.active = false;
+    return state.frames;
+  });
+}
+
+function formatFrames(frames: TurnFrame[], centers: number | number[]): string {
+  const indexes = new Set<number>();
+  for (const center of Array.isArray(centers) ? centers : [centers]) {
+    for (let index = Math.max(0, center - 3); index <= center + 3; index += 1) {
+      if (index < frames.length) indexes.add(index);
+    }
+  }
+  return Array.from(indexes)
+    .sort((left, right) => left - right)
+    .map((index) => `frame ${index}: ${JSON.stringify(frames[index])}`)
+    .join("\n");
+}
+
+function expectRowContinuity(frames: TurnFrame[]): void {
+  const first = frames.findIndex((frame) => hasPaintedLayout(frame.userRow));
+  const baseline = frames[first]?.userRow.rect?.top;
+  const disappeared = frames.findIndex(
+    (frame, index) => index > first && !hasPaintedLayout(frame.userRow),
+  );
+  const reappeared = frames.findIndex(
+    (frame, index) => index > disappeared && disappeared >= 0 && hasPaintedLayout(frame.userRow),
+  );
+  const shifted = frames.findIndex(
+    (frame, index) =>
+      index > first &&
+      hasPaintedLayout(frame.userRow) &&
+      baseline !== undefined &&
+      Math.abs((frame.userRow.rect?.top ?? baseline) - baseline) > 1,
+  );
+  const attachmentMissing = frames.findIndex(
+    (frame, index) => index >= first && !hasPaintedLayout(frame.attachment),
+  );
+  const violations = [
+    ...(first < 0 ? ["submitted row never became visible"] : []),
+    ...(disappeared >= 0
+      ? [
+          `submitted row disappeared for ${Math.max(0, reappeared - disappeared)} recorded frames (${Math.max(0, (frames[reappeared]?.at ?? frames.at(-1)?.at ?? 0) - frames[disappeared].at).toFixed(1)}ms) before authoritative recovery`,
+        ]
+      : []),
+    ...(shifted >= 0
+      ? [
+          `submitted row moved from ${baseline?.toFixed(1)} to ${frames[shifted].userRow.rect?.top.toFixed(1)}`,
+        ]
+      : []),
+    ...(attachmentMissing >= 0 ? ["submitted image attachment left the painted layout"] : []),
+  ];
+  let failure = Math.max(0, first);
+  if (attachmentMissing >= 0) failure = attachmentMissing;
+  if (shifted >= 0) failure = shifted;
+  if (disappeared >= 0) failure = disappeared;
+  expect(
+    violations,
+    `transition violations:\n${formatFrames(frames, [failure, Math.max(failure, reappeared)])}`,
+  ).toEqual([]);
+}
+
+interface FrameViolation {
+  frame: number;
+  reason: string;
+}
+
+function geometryChanged(
+  value: number | null | undefined,
+  expected: number | null | undefined,
+): boolean {
+  if (value == null || expected == null) return true;
+  return Math.abs(value - expected) > 1;
+}
+
+function hasPaintedLayout(element: ElementFrame): boolean {
+  return [element.mounted, element.visible, element.painted].every(Boolean);
+}
+
+function violationsForChecks(
+  frame: number,
+  checks: Array<{ passes: boolean; reason: string }>,
+): FrameViolation[] {
+  return checks.filter(({ passes }) => !passes).map(({ reason }) => ({ frame, reason }));
+}
+
+function collectElementViolations(
+  frame: TurnFrame,
+  baseline: TurnFrame | undefined,
+  index: number,
+): FrameViolation[] {
+  return violationsForChecks(index, [
+    {
+      passes: hasPaintedLayout(frame.userRow),
+      reason: "submitted row left the painted layout",
+    },
+    {
+      passes: !geometryChanged(frame.userRow.rect?.top, baseline?.userRow.rect?.top),
+      reason: "submitted row moved vertically",
+    },
+    {
+      passes: [hasPaintedLayout(frame.footerRow), (frame.footerRow.rect?.height ?? 0) > 0].every(
+        Boolean,
+      ),
+      reason: "footer row was absent from the painted layout",
+    },
+    {
+      passes: [
+        geometryChanged(frame.footerRow.rect?.top, baseline?.footerRow.rect?.top),
+        geometryChanged(frame.footerRow.rect?.height, baseline?.footerRow.rect?.height),
+      ].every((hasChanged) => !hasChanged),
+      reason: "footer geometry moved",
+    },
+    {
+      passes: hasPaintedLayout(frame.spinner),
+      reason: "working spinner was not painted",
+    },
+    {
+      passes: hasPaintedLayout(frame.tabProgress),
+      reason: "selected tab running indicator was not painted",
+    },
+    {
+      passes: hasPaintedLayout(frame.interruptControl),
+      reason: "interrupt control was not painted",
+    },
+    {
+      passes: frame.primaryActionCount === 1,
+      reason: `expected one primary action, found ${frame.primaryActionCount}`,
+    },
+    {
+      passes: [hasPaintedLayout(frame.composer), frame.composer.value === ""].every(Boolean),
+      reason: "composer was not painted and empty",
+    },
+    {
+      passes: [
+        geometryChanged(frame.composer.rect?.top, baseline?.composer.rect?.top),
+        geometryChanged(frame.composer.rect?.height, baseline?.composer.rect?.height),
+      ].every((hasChanged) => !hasChanged),
+      reason: "composer geometry moved",
+    },
+  ]);
+}
+
+function collectScrollViolations(
+  frame: TurnFrame,
+  baseline: TurnFrame | undefined,
+  index: number,
+): FrameViolation[] {
+  return violationsForChecks(index, [
+    {
+      passes: [
+        frame.scroll.mounted,
+        frame.scroll.visible,
+        !geometryChanged(frame.scroll.rect?.top, baseline?.scroll.rect?.top),
+        !geometryChanged(frame.scroll.rect?.height, baseline?.scroll.rect?.height),
+        !geometryChanged(frame.scroll.clientHeight, baseline?.scroll.clientHeight),
+      ].every(Boolean),
+      reason: "scroll viewport geometry moved",
+    },
+    {
+      passes: [
+        geometryChanged(frame.scroll.scrollTop, baseline?.scroll.scrollTop),
+        geometryChanged(frame.scroll.scrollHeight, baseline?.scroll.scrollHeight),
+      ].every((hasChanged) => !hasChanged),
+      reason: "scroll content metrics moved",
+    },
+  ]);
+}
+
+function collectContentViolations(
+  frame: TurnFrame,
+  stableContentChildren: Map<string, ContentChildFrame>,
+  index: number,
+): FrameViolation[] {
+  return Array.from(stableContentChildren).flatMap(([key, expected]) => {
+    const child = frame.contentChildren.find((candidate) => candidate.key === key);
+    return violationsForChecks(index, [
+      {
+        passes: [
+          Boolean(child?.mounted),
+          !geometryChanged(child?.rect?.top, expected.rect?.top),
+          !geometryChanged(child?.rect?.bottom, expected.rect?.bottom),
+          !geometryChanged(child?.rect?.height, expected.rect?.height),
+        ].every(Boolean),
+        reason: `content row ${key} geometry moved`,
+      },
+    ]);
+  });
+}
+
+function expectAtomicIdleToRunningTransition(frames: TurnFrame[]): void {
+  const first = frames.findIndex((frame) => frame.userRow.visible);
+  const running = frames.findIndex(
+    (frame, index) =>
+      index >= first &&
+      frame.interruptControl.painted &&
+      frame.footerRow.painted &&
+      frame.spinner.painted &&
+      frame.tabProgress.painted,
+  );
+  const transition = frames.slice(first);
+  const baseline = transition[0];
+  const violations: FrameViolation[] = [];
+  const stableContentChildren = new Map(
+    baseline?.contentChildren
+      .filter(({ key }) => key !== "turn-footer")
+      .map((child) => [child.key, child]),
+  );
+  if (first < 0) violations.push({ frame: 0, reason: "submitted row never became visible" });
+  if (running < 0) violations.push({ frame: Math.max(first, 0), reason: "turn never visibly ran" });
+  for (const [offset, frame] of transition.entries()) {
+    const index = first + offset;
+    violations.push(...collectElementViolations(frame, baseline, index));
+    violations.push(...collectScrollViolations(frame, baseline, index));
+    violations.push(...collectContentViolations(frame, stableContentChildren, index));
+  }
+  for (let offset = 1; offset < transition.length; offset += 1) {
+    const before = transition[offset - 1];
+    const after = transition[offset];
+    const footerEnteredLayout = [
+      (before.footerRow.rect?.height ?? 0) <= 0,
+      (after.footerRow.rect?.height ?? 0) > 0,
+    ].every(Boolean);
+    if (footerEnteredLayout) {
+      violations.push({
+        frame: first + offset,
+        reason: "footer height changed from zero to non-zero",
+      });
+    }
+  }
+  const failure = violations[0]?.frame ?? Math.max(first, 0);
+  expect(
+    violations,
+    `transition violations:\n${violations.map(({ frame, reason }) => `frame ${frame}: ${reason}`).join("\n")}\n\nframe record:\n${formatFrames(frames, [failure, running])}`,
+  ).toEqual([]);
+}
+
+function expectSubmittedMessageHeightStable(frames: TurnFrame[]): void {
+  const first = frames.findIndex((frame) => frame.userRow.visible);
+  const baseline = frames[first]?.userRow.rect?.height;
+  const changes = frames
+    .slice(first)
+    .flatMap((frame, offset) =>
+      geometryChanged(frame.userRow.rect?.height, baseline)
+        ? [`frame ${first + offset}: submitted row height changed`]
+        : [],
+    );
+  expect(changes, `submitted message geometry changed:\n${changes.join("\n")}`).toEqual([]);
+}
+
+function expectAtomicFirstPromptTransition(frames: TurnFrame[]): void {
+  expectRowContinuity(frames);
+  const first = frames.findIndex((frame) => hasPaintedLayout(frame.userRow));
+  const transition = frames.slice(first);
+  const violations: FrameViolation[] = [];
+  for (const [offset, frame] of transition.entries()) {
+    const index = first + offset;
+    violations.push(
+      ...violationsForChecks(index, [
+        {
+          passes: hasPaintedLayout(frame.footerRow),
+          reason: "footer was not painted with the first prompt",
+        },
+        {
+          passes: hasPaintedLayout(frame.spinner),
+          reason: "working spinner was not painted with the first prompt",
+        },
+        {
+          passes: hasPaintedLayout(frame.composer) && frame.composer.value === "",
+          reason: "composer was not painted and empty with the first prompt",
+        },
+        {
+          passes: !frame.agentTab.mounted || hasPaintedLayout(frame.tabProgress),
+          reason: "created agent tab appeared without running state",
+        },
+        {
+          passes: !frame.agentTab.mounted || hasPaintedLayout(frame.interruptControl),
+          reason: "created agent appeared without its interrupt control",
+        },
+      ]),
+    );
+  }
+  const failure = violations[0]?.frame ?? Math.max(first, 0);
+  expect(
+    violations,
+    `transition violations:\n${violations.map(({ frame, reason }) => `frame ${frame}: ${reason}`).join("\n")}\n\nframe record:\n${formatFrames(frames, failure)}`,
+  ).toEqual([]);
+}
+
+async function recordDelayedRunningTransition(
+  page: Page,
+  agent: MockAgentWorkspace,
+  releaseOrder: RunningReleaseOrder,
+): Promise<{ frames: TurnFrame[]; checkpoints: ActivityCheckpoint[] }> {
+  const gate = await installDaemonWebSocketGate(page);
+  await openAgentRoute(page, { workspaceId: agent.workspaceId, agentId: agent.agentId });
+  await expectAgentIdle(page);
+  await expect(page.getByRole("button", { name: "Copy turn" })).toHaveCount(1);
+
+  const prompt = "Second prompt keeps streaming.";
+  gate.holdNextAgentStreamEvent("turn_started");
+  gate.holdNextAgentUpdate(agent.agentId, "running");
+  gate.holdNextServerMessage("send_agent_message_response");
+  gate.setAgentStreamItemSuppressed("assistant_message", true);
+  await recordTurnFrames(page, prompt);
+  await installActivityContinuityOracle(page, prompt);
+  await submitMessage(page, prompt);
+  await Promise.all([
+    gate.waitForHeldAgentStreamEvent("turn_started"),
+    gate.waitForHeldAgentUpdate(agent.agentId, "running"),
+    gate.waitForHeldServerMessage("send_agent_message_response"),
+  ]);
+
+  let turnReleased = false;
+  let snapshotReleased = false;
+  let responseReleased = false;
+  try {
+    await expect(page.getByTestId("user-message").filter({ hasText: prompt })).toBeVisible();
+    await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toHaveValue("");
+    await gate.waitForAgentStreamItem("user_message");
+    await waitForActivityOracleArmed(page);
+    const elapsedBeforeAuthoritative = await page.getByTestId("turn-working-elapsed").count();
+
+    if (releaseOrder === "turn-before-response") {
+      gate.releaseHeldAgentStreamEvent("turn_started");
+      turnReleased = true;
+      await expect(page.getByTestId("turn-working-elapsed")).toBeVisible();
+      gate.releaseHeldServerMessage("send_agent_message_response");
+      responseReleased = true;
+      gate.releaseHeldAgentUpdate(agent.agentId, "running");
+      snapshotReleased = true;
+    } else if (releaseOrder === "response-before-turn") {
+      gate.releaseHeldServerMessage("send_agent_message_response");
+      responseReleased = true;
+      await recordPaintsFor(page, 80);
+      gate.releaseHeldAgentStreamEvent("turn_started");
+      turnReleased = true;
+      await expect(page.getByTestId("turn-working-elapsed")).toBeVisible();
+      gate.releaseHeldAgentUpdate(agent.agentId, "running");
+      snapshotReleased = true;
+    } else {
+      gate.releaseHeldServerMessage("send_agent_message_response");
+      responseReleased = true;
+      await recordPaintsFor(page, 80);
+      gate.releaseHeldAgentUpdate(agent.agentId, "running");
+      snapshotReleased = true;
+      await expect(page.getByTestId("turn-working-elapsed")).toBeVisible();
+      gate.releaseHeldAgentStreamEvent("turn_started");
+      turnReleased = true;
+    }
+
+    await waitForRecordedFrames(page, "turn-running", 3);
+    const frames = await stopTurnFrameRecording(page);
+    const checkpoints = await readActivityContinuityOracle(page);
+    expectActivityContinuity(checkpoints);
+    expect(elapsedBeforeAuthoritative).toBe(0);
+    gate.setAgentStreamItemSuppressed("assistant_message", false);
+    return { frames, checkpoints };
+  } finally {
+    if (!turnReleased) gate.releaseHeldAgentStreamEvent("turn_started");
+    if (!snapshotReleased) gate.releaseHeldAgentUpdate(agent.agentId, "running");
+    if (!responseReleased) gate.releaseHeldServerMessage("send_agent_message_response");
+    gate.setAgentStreamItemSuppressed("assistant_message", false);
+  }
+}
+
+// The first prompt of a brand new agent is submitted before the agent exists, so the
+// authoritative timeline arrives after the row is already on screen. That is the only
+// path where hydration can move an already-visible message.
+test("keeps the first prompt of a new agent in place through authoritative hydration", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "new-agent-first-prompt-" });
+  try {
+    await page.addInitScript(() => {
+      localStorage.setItem(
+        "@paseo:create-agent-preferences",
+        JSON.stringify({
+          provider: "mock",
+          providerPreferences: {
+            mock: { mode: "load-test", model: "ten-second-stream" },
+          },
+        }),
+      );
+    });
+    const gate = await installDaemonWebSocketGate(page);
+    await gotoWorkspace(page, workspace.workspaceId);
+    await clickNewChat(page);
+    await expectComposerVisible(page);
+
+    const prompt = "Delay synthetic user message by 300ms.";
+    await attachImageFromMenu(page, FIRST_PROMPT_IMAGE);
+    await expectAttachmentPill(page, "composer-image-attachment-pill");
+    await recordTurnFrames(page, prompt);
+    await submitMessage(page, prompt);
+
+    const submittedRow = page.getByTestId("user-message").filter({ hasText: prompt }).first();
+    await expect(submittedRow).toBeVisible();
+    await gate.waitForServerMessage("fetch_agent_timeline_response");
+    await recordPaintsFor(page, 80);
+    expectAtomicFirstPromptTransition(await stopTurnFrameRecording(page));
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("keeps follow-up activity continuous when turn starts before response", async ({
+  page,
+  streamingAgent,
+}) => {
+  const { frames } = await recordDelayedRunningTransition(
+    page,
+    streamingAgent,
+    "turn-before-response",
+  );
+  expectAtomicIdleToRunningTransition(frames);
+});
+
+test("keeps a submitted message height stable when its canonical echo arrives", async ({
+  page,
+  streamingAgent,
+}) => {
+  const gate = await installDaemonWebSocketGate(page);
+  await openAgentRoute(page, {
+    workspaceId: streamingAgent.workspaceId,
+    agentId: streamingAgent.agentId,
+  });
+  await expectAgentIdle(page);
+
+  const prompt = "Canonical echo must not resize this message.";
+  gate.holdNextAgentStreamItem("user_message");
+  await recordTurnFrames(page, prompt);
+  await submitMessage(page, prompt);
+  await gate.waitForHeldAgentStreamItem("user_message");
+  const submittedRow = page.getByTestId("user-message").filter({ hasText: prompt });
+  await expect(submittedRow).toBeVisible();
+  await recordPaintsFor(page, 80);
+
+  gate.releaseHeldAgentStreamItem("user_message");
+  await expect(submittedRow.getByTestId("rewind-menu-trigger")).toBeVisible();
+  await recordPaintsFor(page, 80);
+
+  expectSubmittedMessageHeightStable(await stopTurnFrameRecording(page));
+});
+
+test("keeps follow-up activity continuous when response arrives before running state", async ({
+  page,
+  streamingAgent,
+}) => {
+  const { frames } = await recordDelayedRunningTransition(
+    page,
+    streamingAgent,
+    "response-before-turn",
+  );
+  expectAtomicIdleToRunningTransition(frames);
+});
+
+test("keeps follow-up activity continuous when snapshot opens before turn event", async ({
+  page,
+  streamingAgent,
+}) => {
+  const { frames } = await recordDelayedRunningTransition(
+    page,
+    streamingAgent,
+    "snapshot-before-turn",
+  );
+  expectAtomicIdleToRunningTransition(frames);
+});
@@ -0,0 +1,133 @@
+import type { Locator } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import { expectAgentIdle, expectAgentReadyToInterrupt } from "../support/helpers/agent-stream";
+import {
+  cancelAgent,
+  expectComposerDraft,
+  expectComposerVisible,
+  submitMessage,
+} from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+async function completeSubmittedTurn(
+  page: Page,
+  agent: Awaited<ReturnType<typeof seedMockAgentWorkspace>>,
+  prompt: string,
+): Promise<Locator> {
+  await submitMessage(page, prompt);
+  const userMessage = page.getByTestId("user-message").filter({ hasText: prompt });
+  await expect(userMessage).toBeVisible();
+
+  const finish = await agent.client.waitForFinish(agent.agentId, 30_000);
+  expect(finish.status).toBe("idle");
+  await expect(page.getByText("(end of synthetic stream)", { exact: true })).toBeVisible();
+  await expect(userMessage).toHaveAttribute("aria-busy", "false");
+  return userMessage;
+}
+
+async function rewindConversation(page: Page, userMessage: Locator, prompt: string): Promise<void> {
+  await userMessage.getByText(prompt, { exact: true }).hover();
+  await userMessage.getByRole("button", { name: "Rewind to this message", exact: true }).click();
+  await page.getByRole("button", { name: "Rewind conversation", exact: true }).click();
+}
+
+async function expectTurnCompletesNormally(
+  page: Page,
+  agent: Awaited<ReturnType<typeof seedMockAgentWorkspace>>,
+): Promise<void> {
+  const finish = await agent.client.waitForFinish(agent.agentId, 30_000);
+  expect(finish.status).toBe("idle");
+  await expect(page.getByText("(end of synthetic stream)", { exact: true })).toBeVisible();
+  await expectAgentIdle(page);
+}
+
+test.describe("Agent message rewind", () => {
+  test("rewinds a submitted prompt and restores it to the composer", async ({ page }) => {
+    test.setTimeout(90_000);
+    const prompt = "Restore this submitted prompt after rewind.";
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "message-rewind-roundtrip-",
+      title: "Message rewind roundtrip",
+      model: "ten-second-stream",
+    });
+
+    try {
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+      const userMessage = await completeSubmittedTurn(page, agent, prompt);
+
+      await rewindConversation(page, userMessage, prompt);
+
+      await expect(page.getByText("(end of synthetic stream)", { exact: true })).toHaveCount(0);
+      await expectComposerDraft(page, prompt);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("keeps a pre-acknowledgement turn running after rewind is rejected", async ({ page }) => {
+    test.setTimeout(90_000);
+    const prompt = "Delay synthetic user message by 2000ms.";
+    const rewindError = "Cannot rewind before the provider acknowledges the submitted prompt";
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "message-rewind-pre-echo-",
+      title: "Message rewind pre-echo",
+      model: "ten-second-stream",
+    });
+
+    try {
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+      await submitMessage(page, prompt);
+      const userMessage = page.getByTestId("user-message").filter({ hasText: prompt });
+      await expect(userMessage).toBeVisible();
+      await expectAgentReadyToInterrupt(page);
+
+      await rewindConversation(page, userMessage, prompt);
+
+      await expect(page.getByText(rewindError, { exact: true })).toBeVisible();
+      await expectAgentReadyToInterrupt(page);
+      await expectTurnCompletesNormally(page, agent);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("does not offer rewind for daemon-handled prompts", async ({ page }) => {
+    const commandPrompt = "/mock handled-command";
+    const providerPrompt = "Keep this provider-bound prompt rewindable.";
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "message-rewind-daemon-command-",
+      title: "Message rewind daemon command",
+      model: "ten-second-stream",
+    });
+
+    try {
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+      await expectAgentIdle(page);
+
+      await submitMessage(page, commandPrompt);
+      const commandMessage = page.getByTestId("user-message").filter({ hasText: commandPrompt });
+      await expect(commandMessage).toBeVisible();
+      await expect(page.getByText("Mock command handled", { exact: true })).toBeVisible();
+      await commandMessage.getByText(commandPrompt, { exact: true }).hover();
+      await expect(
+        commandMessage.getByRole("button", { name: "Rewind to this message", exact: true }),
+      ).toHaveCount(0);
+
+      await submitMessage(page, providerPrompt);
+      const providerMessage = page.getByTestId("user-message").filter({ hasText: providerPrompt });
+      await expect(providerMessage).toBeVisible();
+      await expectAgentReadyToInterrupt(page);
+      await providerMessage.getByText(providerPrompt, { exact: true }).hover();
+      await expect(
+        providerMessage.getByRole("button", { name: "Rewind to this message", exact: true }),
+      ).toBeVisible();
+      await cancelAgent(page);
+      await expectAgentIdle(page);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+});
@@ -0,0 +1,225 @@
+import { expect, test, type Page } from "../support/fixtures";
+import path from "node:path";
+import type { FormPreferences } from "@/create-agent-preferences/preferences";
+import {
+  applyProfileFromPicker,
+  drillIntoProvider,
+  openModelPicker,
+  seedAgentProfiles,
+  seedModelProvider,
+} from "../support/helpers/agent-profiles";
+import { gotoAppShell } from "../support/helpers/app";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import {
+  openGlobalNewWorkspaceComposer,
+  selectNewWorkspaceProject,
+  submitNewWorkspacePrompt,
+} from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+
+const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";
+const MODELESS_PROVIDER = "modeless-profile-e2e";
+const MODELESS_MODEL = "pi-profile-model";
+
+type WebSocketMessage = string | Buffer;
+
+interface CreateAgentRequestMessage {
+  type: "create_agent_request";
+  config?: {
+    provider?: unknown;
+    modeId?: unknown;
+    featureValues?: unknown;
+  };
+}
+
+function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
+  const rawMessage = typeof message === "string" ? message : message.toString("utf8");
+  try {
+    const envelope = JSON.parse(rawMessage) as { type?: unknown; message?: unknown };
+    return envelope.type === "session" && envelope.message && typeof envelope.message === "object"
+      ? (envelope.message as Record<string, unknown>)
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+async function recordAndBlockCreateAgentRequest(page: Page): Promise<{
+  waitForRequest(): Promise<CreateAgentRequestMessage>;
+}> {
+  let resolveRequest: ((message: CreateAgentRequestMessage) => void) | null = null;
+  const request = 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 { waitForRequest: () => request };
+}
+
+async function seedPoisonedModelessPreference(page: Page): Promise<void> {
+  await page.addInitScript(
+    ({ preferencesKey, provider, model }) => {
+      localStorage.setItem(
+        preferencesKey,
+        JSON.stringify({
+          provider,
+          providerPreferences: {
+            [provider]: { model, mode: "full-access" },
+            mock: { model: "ten-second-stream", mode: "load-test" },
+          },
+        } satisfies FormPreferences),
+      );
+    },
+    {
+      preferencesKey: CREATE_AGENT_PREFERENCES_KEY,
+      provider: MODELESS_PROVIDER,
+      model: MODELESS_MODEL,
+    },
+  );
+}
+
+async function readProviderModePreference(page: Page, provider: string): Promise<unknown> {
+  return page.evaluate(
+    ({ preferencesKey, providerId }) => {
+      const raw = localStorage.getItem(preferencesKey);
+      if (!raw) return null;
+      const preferences = JSON.parse(raw) as FormPreferences;
+      return preferences.providerPreferences?.[providerId]?.mode ?? null;
+    },
+    { preferencesKey: CREATE_AGENT_PREFERENCES_KEY, providerId: provider },
+  );
+}
+
+test.describe("Agent profiles repair modeless provider preferences", () => {
+  test.describe.configure({ timeout: 240_000 });
+
+  test("applying a profile heals a stale mode before returning to Pi", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "profile-modeless-preferences-" });
+    const profiles = await seedAgentProfiles([
+      {
+        id: "agent_profile_modeless_repair",
+        name: "Approval work",
+        provider: "mock",
+        model: "one-minute-stream",
+        modeId: "approval-test",
+      },
+    ]);
+    const provider = await seedModelProvider({
+      id: MODELESS_PROVIDER,
+      label: "Pi profile test",
+      extends: "pi",
+      command: [process.execPath, path.resolve("e2e/fixtures/fake-pi-rpc.mjs")],
+      models: [
+        {
+          id: MODELESS_MODEL,
+          label: "Pi profile model",
+          description: "Modeless profile regression model",
+        },
+      ],
+    });
+    await seedPoisonedModelessPreference(page);
+    const createAgentRecorder = await recordAndBlockCreateAgentRequest(page);
+
+    try {
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+      await openGlobalNewWorkspaceComposer(page);
+      await selectNewWorkspaceProject(page, {
+        projectKey: workspace.projectKey,
+        projectDisplayName: workspace.projectDisplayName,
+      });
+
+      await openModelPicker(page);
+      await applyProfileFromPicker(page, "Approval work");
+
+      await expect
+        .poll(() => readProviderModePreference(page, MODELESS_PROVIDER), { timeout: 10_000 })
+        .toBeNull();
+      await expect
+        .poll(() => readProviderModePreference(page, "mock"), { timeout: 10_000 })
+        .toBe("approval-test");
+
+      await openModelPicker(page);
+      await drillIntoProvider(page, MODELESS_PROVIDER);
+      await page.getByRole("button", { name: /Pi profile model/ }).click();
+
+      await submitNewWorkspacePrompt(page, "Create a Pi agent after repairing preferences.");
+      const createAgentRequest = await createAgentRecorder.waitForRequest();
+      expect(createAgentRequest).toMatchObject({
+        config: { provider: MODELESS_PROVIDER },
+      });
+      expect(createAgentRequest.config).not.toHaveProperty("modeId");
+    } finally {
+      await workspace.cleanup();
+      await provider.restore();
+      await profiles.restore();
+    }
+  });
+
+  test("cross-provider profile features survive immediate workspace creation", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "profile-feature-transition-" });
+    const featureProviderId = "profile-feature-e2e";
+    const featureModelId = "claude-opus-5";
+    const profiles = await seedAgentProfiles([
+      {
+        id: "agent_profile_feature_transition",
+        name: "Fast profile",
+        provider: featureProviderId,
+        model: featureModelId,
+        modeId: "bypassPermissions",
+        featureValues: { fast_mode: true },
+      },
+    ]);
+    const provider = await seedModelProvider({
+      id: featureProviderId,
+      label: "Profile feature test",
+      models: [
+        {
+          id: featureModelId,
+          label: "Profile feature model",
+          description: "Cross-provider feature regression model",
+        },
+      ],
+    });
+    const createAgentRecorder = await recordAndBlockCreateAgentRequest(page);
+
+    try {
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+      await openGlobalNewWorkspaceComposer(page);
+      await selectNewWorkspaceProject(page, {
+        projectKey: workspace.projectKey,
+        projectDisplayName: workspace.projectDisplayName,
+      });
+
+      await openModelPicker(page);
+      await applyProfileFromPicker(page, "Fast profile");
+      await submitNewWorkspacePrompt(page, "Create an agent with profile features.");
+
+      const createAgentRequest = await createAgentRecorder.waitForRequest();
+      expect(createAgentRequest).toMatchObject({
+        config: {
+          provider: featureProviderId,
+          featureValues: { fast_mode: true },
+        },
+      });
+    } finally {
+      await workspace.cleanup();
+      await provider.restore();
+      await profiles.restore();
+    }
+  });
+});
@@ -0,0 +1,118 @@
+import { expect, test } from "../support/fixtures";
+import {
+  applyProfileFromPicker,
+  closeModelPicker,
+  expectComposerDoesNotName,
+  expectAgentProfilesEmptyPrompt,
+  expectProfileEditTooltip,
+  expectComposerMode,
+  expectComposerModel,
+  expectModelRowSelected,
+  expectProfileEditIsPencilOnly,
+  expectProfileVisibleForProvider,
+  openModelPicker,
+  openAgentProfilesFromEmptyPrompt,
+  seedAgentProfiles,
+} from "../support/helpers/agent-profiles";
+import { expectWorkspaceAgentConfiguration } from "../support/helpers/command-center-agent-controls";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+const PROFILE = {
+  id: "agent_profile_e2e_ui_work",
+  name: "UI work",
+  icon: "🎨",
+  provider: "mock",
+  model: "one-minute-stream",
+  modeId: "approval-test",
+  notes: "Use for UI work.",
+};
+
+const PROFILE_SUMMARY = "Mock Load Test · One minute stream · Approval test";
+
+test.describe("Agent profiles in the model picker", () => {
+  test("an empty host still exposes agent profile settings from the picker", async ({ page }) => {
+    const seed = await seedAgentProfiles([]);
+    const workspace = await seedMockAgentWorkspace({
+      repoPrefix: "agent-profiles-empty-",
+      title: "Agent profiles empty",
+    });
+
+    try {
+      await openAgentRoute(page, workspace);
+      await expectComposerVisible(page);
+      await openModelPicker(page);
+      await expectAgentProfilesEmptyPrompt(page);
+      await openAgentProfilesFromEmptyPrompt(page);
+    } finally {
+      await workspace.cleanup();
+      await seed.restore();
+    }
+  });
+
+  test("applying a pinned profile materializes it into the composer and is then forgotten", async ({
+    page,
+  }) => {
+    const seed = await seedAgentProfiles([PROFILE]);
+    // A live agent is one provider's process, so the profile has to name that
+    // same provider or the picker will not offer it at all.
+    const workspace = await seedMockAgentWorkspace({
+      repoPrefix: "agent-profiles-picker-",
+      title: "Agent profiles picker",
+      model: "ten-second-stream",
+      modeId: "load-test",
+    });
+
+    try {
+      await test.step("the agent starts on its seeded model and mode", async () => {
+        await openAgentRoute(page, workspace);
+        await expectComposerVisible(page);
+        await expectComposerModel(page, "Ten second stream");
+        await expectComposerMode(page, "Load test");
+      });
+
+      await test.step("the sole provider opens directly", async () => {
+        await openModelPicker(page);
+        await expect(page.getByTestId("model-search-input").first()).toBeVisible();
+        await expect(page.getByTestId("sheet-header-back")).toHaveCount(0);
+        await expect(page.locator('[data-testid^="model-provider-"]')).toHaveCount(0);
+        await expectProfileVisibleForProvider(page, {
+          name: PROFILE.name,
+          summary: PROFILE_SUMMARY,
+        });
+        await expectProfileEditIsPencilOnly(page);
+        await expectProfileEditTooltip(page);
+      });
+
+      await test.step("applying it writes its model and mode into the composer", async () => {
+        await applyProfileFromPicker(page, PROFILE.name);
+        await expectComposerModel(page, "One minute stream");
+        await expectComposerMode(page, "Approval test");
+        await expectWorkspaceAgentConfiguration(workspace, {
+          id: workspace.agentId,
+          provider: "mock",
+          model: "one-minute-stream",
+          modeId: "approval-test",
+        });
+      });
+
+      await test.step("the composer names the model, never the profile", async () => {
+        await expectComposerDoesNotName(page, PROFILE.name);
+      });
+
+      await test.step("reopening returns directly to the provider models", async () => {
+        await openModelPicker(page);
+        await expect(page.getByTestId("model-search-input").first()).toBeVisible();
+        await expectProfileVisibleForProvider(page, {
+          name: PROFILE.name,
+          summary: PROFILE_SUMMARY,
+        });
+        await expectModelRowSelected(page, { provider: "mock", modelId: "one-minute-stream" });
+        await closeModelPicker(page);
+      });
+    } finally {
+      await workspace.cleanup();
+      await seed.restore();
+    }
+  });
+});
@@ -0,0 +1,128 @@
+import { test } from "../support/fixtures";
+import {
+  createAgentProfile,
+  createAgentProfileFromEmptyState,
+  editAgentProfile,
+  expectAgentProfile,
+  expectAgentProfileForm,
+  expectAgentProfileOrder,
+  expectAgentProfileTagsGone,
+  expectHostAgentProfiles,
+  expectNoAgentProfiles,
+  moveAgentProfileUp,
+  openAgentProfileSettings,
+  removeAgentProfile,
+  seedAgentProfiles,
+  stageLegacyFavoritesForHostMigration,
+} from "../support/helpers/agent-profiles";
+
+const MOCK_PROVIDER_LABEL = "Mock Load Test";
+
+test.describe("Agent profiles settings", () => {
+  test("legacy model favourites migrate into provider-and-model-only host profiles", async ({
+    page,
+  }) => {
+    const seed = await seedAgentProfiles([]);
+    const migratedProfile = {
+      id: "legacy_favorite:mock:one-minute-stream",
+      name: "One minute stream",
+      provider: "mock",
+      model: "one-minute-stream",
+    };
+
+    try {
+      await stageLegacyFavoritesForHostMigration(page, [
+        { provider: "mock", modelId: "one-minute-stream" },
+      ]);
+
+      await expectHostAgentProfiles([migratedProfile]);
+      await openAgentProfileSettings(page);
+      await expectAgentProfile(page, {
+        name: migratedProfile.name,
+        tags: [MOCK_PROVIDER_LABEL, "One minute stream"],
+      });
+    } finally {
+      await seed.restore();
+    }
+  });
+
+  test("host owner creates, edits, reorders and removes agent profiles", async ({ page }) => {
+    // The journey owns the list, so it starts from an empty one whatever the
+    // worker ran before, and hands it back untouched.
+    const seed = await seedAgentProfiles([]);
+
+    try {
+      await test.step("the section starts empty", async () => {
+        await openAgentProfileSettings(page);
+        await expectNoAgentProfiles(page);
+      });
+
+      await test.step("create a profile from the modal", async () => {
+        await createAgentProfileFromEmptyState(page, {
+          name: "UI work",
+          provider: MOCK_PROVIDER_LABEL,
+          model: "Ten second stream",
+          thinking: "High",
+          mode: "Approval test",
+          notes: "Use for UI work — components, layout and design tokens.",
+        });
+        await expectAgentProfile(page, {
+          name: "UI work",
+          tags: [MOCK_PROVIDER_LABEL, "Ten second stream", "Approval test", "High"],
+          notes: "Use for UI work — components, layout and design tokens.",
+        });
+      });
+
+      await test.step("editing to a model without thinking levels drops the level", async () => {
+        await editAgentProfile(page, "UI work", {
+          model: "One minute stream",
+          notes: "Now for quick checks.",
+        });
+        await expectAgentProfile(page, {
+          name: "UI work",
+          tags: [MOCK_PROVIDER_LABEL, "One minute stream", "Approval test"],
+          notes: "Now for quick checks.",
+        });
+        await expectAgentProfileTagsGone(page, {
+          name: "UI work",
+          tags: ["Ten second stream", "High"],
+        });
+      });
+
+      await test.step("the edit form reopens on what was stored", async () => {
+        await expectAgentProfileForm(page, "UI work", {
+          provider: MOCK_PROVIDER_LABEL,
+          model: "One minute stream",
+          mode: "Approval test",
+          notes: "Now for quick checks.",
+        });
+      });
+
+      await test.step("a second profile lands below the first", async () => {
+        await createAgentProfile(page, {
+          name: "Deep review",
+          provider: MOCK_PROVIDER_LABEL,
+          model: "Five minute stream",
+        });
+        await expectAgentProfileOrder(page, ["UI work", "Deep review"]);
+      });
+
+      await test.step("reorder puts the second profile on top", async () => {
+        await moveAgentProfileUp(page, "Deep review");
+        await expectAgentProfileOrder(page, ["Deep review", "UI work"]);
+      });
+
+      await test.step("removing a profile confirms by name", async () => {
+        await removeAgentProfile(page, "UI work");
+        await expectAgentProfileOrder(page, ["Deep review"]);
+      });
+
+      await test.step("removing the last profile returns the empty state", async () => {
+        await removeAgentProfile(page, "Deep review");
+        await expectNoAgentProfiles(page);
+      });
+    } finally {
+      await seed.restore();
+    }
+  });
+});
@@ -0,0 +1,236 @@
+import { expect, type Page } from "@playwright/test";
+import { test } from "../support/fixtures";
+import {
+  readScrollMetrics,
+  scrollChatAwayFromBottom,
+} from "../support/helpers/agent-bottom-anchor";
+import { getServerId } from "../support/helpers/server-id";
+import { seedMockAgentWorkspace, type MockAgentWorkspace } from "../support/helpers/mock-agent";
+import {
+  continueToNextQuestion,
+  fillQuestionAnswer,
+  submitQuestionAnswers,
+  waitForQuestionPrompt,
+} from "../support/helpers/questions";
+import { openMobileAgentSidebar } from "../support/helpers/sidebar";
+import {
+  expectTimelinePromptVisible,
+  openAgentTimeline,
+  seedLongMockAgentTimeline,
+} from "../support/helpers/timeline-pagination";
+import { switchWorkspaceViaSidebar } from "../support/helpers/workspace-ui";
+
+async function expectChatAtBottom(page: Page): Promise<void> {
+  await expect
+    .poll(async () => (await readScrollMetrics(page)).distanceFromBottom, {
+      timeout: 10_000,
+    })
+    .toBeLessThanOrEqual(72);
+}
+
+async function openCompactWorkspace(
+  page: Page,
+  workspace: Pick<MockAgentWorkspace, "workspaceId">,
+): Promise<void> {
+  await openMobileAgentSidebar(page);
+  await switchWorkspaceViaSidebar({
+    page,
+    serverId: getServerId(),
+    workspaceId: workspace.workspaceId,
+  });
+}
+
+function armDelayedScrollForHiddenChat(page: Page): Promise<void> {
+  return page
+    .locator('[data-testid="agent-chat-scroll"]:visible')
+    .first()
+    .evaluate((root) => {
+      const scroll = root as HTMLElement;
+      return new Promise<void>((resolve) => {
+        const observer = new ResizeObserver(() => {
+          if (scroll.getClientRects().length > 0) return;
+          observer.disconnect();
+          scroll.dispatchEvent(new Event("scroll"));
+          resolve();
+        });
+        observer.observe(scroll);
+      });
+    });
+}
+
+test("pointer jitter cannot turn geometry changes into scroll intent", async ({ page }) => {
+  test.setTimeout(240_000);
+  const longChat = await seedLongMockAgentTimeline({ turns: 30 });
+  const backgroundPrompt = "Continue after a pointer is released outside the chat";
+
+  try {
+    await page.setViewportSize({ width: 390, height: 844 });
+    await openAgentTimeline(page, longChat);
+    await expectTimelinePromptVisible(page, longChat.newestPrompt);
+    await expectChatAtBottom(page);
+
+    const scroll = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+    const bounds = await scroll.boundingBox();
+    expect(bounds, "Expected visible chat scroll bounds").not.toBeNull();
+    await page.mouse.move(bounds!.x + bounds!.width / 2, bounds!.y + bounds!.height / 2);
+    await page.mouse.down();
+    await page.mouse.move(bounds!.x + bounds!.width / 2, bounds!.y + bounds!.height / 2 - 3);
+    await page.setViewportSize({ width: 390, height: 1124 });
+    await page.setViewportSize({ width: 390, height: 844 });
+    await page.mouse.move(410, bounds!.y + bounds!.height / 2 - 3);
+    await page.mouse.up();
+
+    await longChat.client.sendAgentMessage(longChat.agentId, backgroundPrompt);
+    await longChat.client.waitForFinish(longChat.agentId, 20_000);
+    await expectTimelinePromptVisible(page, backgroundPrompt);
+    await expectChatAtBottom(page);
+  } finally {
+    await longChat.cleanup();
+  }
+});
+
+test("a retained chat ignores delayed scroll delivery while hidden", async ({ page }) => {
+  test.setTimeout(240_000);
+  const longChat = await seedLongMockAgentTimeline({ turns: 30 });
+  const otherWorkspace = await seedMockAgentWorkspace({
+    repoPrefix: "scroll-return-hidden-other-",
+    title: "Other workspace",
+    initialPrompt: "Open the other workspace",
+  });
+  const backgroundPrompt = "emit 500 coalesced agent stream updates";
+
+  try {
+    await page.setViewportSize({ width: 390, height: 844 });
+    await openAgentTimeline(page, longChat);
+    await expectTimelinePromptVisible(page, longChat.newestPrompt);
+    await expectChatAtBottom(page);
+
+    const delayedScrollDelivered = armDelayedScrollForHiddenChat(page);
+    await openCompactWorkspace(page, otherWorkspace);
+    await delayedScrollDelivered;
+    await longChat.client.sendAgentMessage(longChat.agentId, backgroundPrompt);
+    await longChat.client.waitForFinish(longChat.agentId, 20_000);
+
+    await openCompactWorkspace(page, longChat);
+    await expectTimelinePromptVisible(page, backgroundPrompt);
+    await expectChatAtBottom(page);
+  } finally {
+    await Promise.allSettled([longChat.cleanup(), otherWorkspace.cleanup()]);
+  }
+});
+
+test("a retained streaming chat returns to the bottom and continues following", async ({
+  page,
+}) => {
+  test.setTimeout(240_000);
+  const longChat = await seedLongMockAgentTimeline({ turns: 30 });
+  const otherWorkspace = await seedMockAgentWorkspace({
+    repoPrefix: "scroll-return-streaming-other-",
+    title: "Other workspace",
+    initialPrompt: "Open the other workspace",
+  });
+  const streamingPrompt = "Continue streaming while this workspace is hidden";
+
+  try {
+    await page.setViewportSize({ width: 390, height: 844 });
+    await openAgentTimeline(page, longChat);
+    await expectTimelinePromptVisible(page, longChat.newestPrompt);
+    await expectChatAtBottom(page);
+
+    await longChat.client.sendAgentMessage(longChat.agentId, streamingPrompt);
+    await longChat.client.waitForAgentUpsert(
+      longChat.agentId,
+      (snapshot) => snapshot.status === "running",
+      15_000,
+    );
+    await openCompactWorkspace(page, otherWorkspace);
+    await openCompactWorkspace(page, longChat);
+
+    await expectTimelinePromptVisible(page, streamingPrompt);
+    await expectChatAtBottom(page);
+    await longChat.client.waitForFinish(longChat.agentId, 20_000);
+    await expectChatAtBottom(page);
+  } finally {
+    await Promise.allSettled([longChat.cleanup(), otherWorkspace.cleanup()]);
+  }
+});
+
+test("a retained chat preserves an intentional reading position", async ({ page }) => {
+  test.setTimeout(240_000);
+  const longChat = await seedLongMockAgentTimeline({ turns: 30 });
+  const otherWorkspace = await seedMockAgentWorkspace({
+    repoPrefix: "scroll-return-reading-position-other-",
+    title: "Other workspace",
+    initialPrompt: "Open the other workspace",
+  });
+
+  try {
+    await page.setViewportSize({ width: 390, height: 844 });
+    await openAgentTimeline(page, longChat);
+    await expectTimelinePromptVisible(page, longChat.newestPrompt);
+    const readingPosition = await scrollChatAwayFromBottom(page, {
+      deltaY: -900,
+      minDistanceFromBottom: 300,
+    });
+
+    await openCompactWorkspace(page, otherWorkspace);
+    await openCompactWorkspace(page, longChat);
+
+    await expect
+      .poll(async () => Math.abs((await readScrollMetrics(page)).offsetY - readingPosition.offsetY))
+      .toBeLessThanOrEqual(24);
+  } finally {
+    await Promise.allSettled([longChat.cleanup(), otherWorkspace.cleanup()]);
+  }
+});
+
+test("editing keys in an embedded question keep output following", async ({ page }) => {
+  test.setTimeout(240_000);
+  const longChat = await seedLongMockAgentTimeline({ turns: 30 });
+  const questionPrompt = "Emit synthetic questions: two free-write questions.";
+  const firstQuestion = "What is the GitHub private repo URL to push to?";
+  const secondQuestion = "What should the first commit message be?";
+
+  try {
+    await page.setViewportSize({ width: 390, height: 844 });
+    await openAgentTimeline(page, longChat);
+    await expectTimelinePromptVisible(page, longChat.newestPrompt);
+    await expectChatAtBottom(page);
+
+    await longChat.client.sendAgentMessage(longChat.agentId, questionPrompt);
+    await waitForQuestionPrompt(page, 30_000);
+    await fillQuestionAnswer(page, {
+      question: firstQuestion,
+      answer: "git@github.com:user/private-repo.git",
+    });
+    const firstInput = page
+      .getByTestId("question-form-card")
+      .first()
+      .getByRole("textbox", { name: firstQuestion });
+    const inputBounds = await firstInput.boundingBox();
+    expect(inputBounds, "Expected embedded question input bounds").not.toBeNull();
+    await page.mouse.move(
+      inputBounds!.x + inputBounds!.width / 2,
+      inputBounds!.y + inputBounds!.height / 2,
+    );
+    await page.mouse.down();
+    await page.mouse.move(
+      inputBounds!.x + inputBounds!.width / 2 + 20,
+      inputBounds!.y + inputBounds!.height / 2 - 3,
+    );
+    await page.mouse.up();
+    await firstInput.press("Home");
+    await firstInput.press("ArrowUp");
+    await continueToNextQuestion(page);
+    await fillQuestionAnswer(page, {
+      question: secondQuestion,
+      answer: "Initialize private repo",
+    });
+    await submitQuestionAnswers(page);
+    await longChat.client.waitForFinish(longChat.agentId, 20_000);
+
+    await expectChatAtBottom(page);
+  } finally {
+    await longChat.cleanup();
+  }
+});
@@ -1,11 +1,12 @@
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  awaitAssistantMessage,
  expectAgentIdle,
  expectInlineWorkingIndicator,
+  expectRunningAgentChrome,
  expectTurnCopyButton,
  expectScrollFollowsNewContent,
-} from "./helpers/agent-stream";
+} from "../support/helpers/agent-stream";
 import {
  expectScrollStaysFixed,
  clickToolCallBesideScrollToBottomButton,
@@ -13,16 +14,40 @@ import {
  scrollAgentChatToBottom,
  scrollChatAwayFromBottom,
  waitForScrollableChat,
-} from "./helpers/agent-bottom-anchor";
-import { delayCreatedAgentInitialTailResponse } from "./helpers/agent-timeline-gate";
-import { selectModel } from "./helpers/app";
-import { clickNewChat } from "./helpers/launcher";
-import { expectComposerVisible, startRunningMockAgent } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+} from "../support/helpers/agent-bottom-anchor";
+import { delayCreatedAgentInitialTailResponse } from "../support/helpers/agent-timeline-gate";
+import { selectModel } from "../support/helpers/app";
+import { clickNewChat } from "../support/helpers/launcher";
+import { expectComposerVisible, startRunningMockAgent } from "../support/helpers/composer";
+import {
+  openAgentRoute,
+  seedMockAgentWorkspace,
+  seedRunningMockAgentWorkspace,
+} from "../support/helpers/mock-agent";

 const SCROLL_AWAY_MIN_SCROLLABLE_DISTANCE = 360;

 test.describe("Agent stream UI", () => {
+  test("keeps running agent chrome after page refresh", async ({ page }) => {
+    const title = "Running agent refresh";
+    const agent = await seedRunningMockAgentWorkspace({
+      repoPrefix: "stream-running-refresh-",
+      title,
+      model: "five-minute-stream",
+      initialPrompt: "Stay running while the page refreshes.",
+    });
+    try {
+      await openAgentRoute(page, agent);
+      await expectRunningAgentChrome(page, title);
+
+      await page.reload();
+
+      await expectRunningAgentChrome(page, title);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
  test("auto-scroll sticks to bottom across token bursts", async ({ page }) => {
    test.setTimeout(120_000);
    const agent = await startRunningMockAgent(page, {
@@ -0,0 +1,210 @@
+import { expect, test as base } from "../support/fixtures";
+import {
+  appendSettledTimelineTurns,
+  createNearTenMegabyteAssistantPng,
+  createSettledMockAgent,
+  createSmallAssistantPng,
+  emitSettledAssistantImage,
+  expectAssistantImageNotMounted,
+  expectAssistantImageRendered,
+  openAssistantImageTimeline,
+  openExistingImageAgentTabs,
+  remountAndRecoverAssistantImageFromHistory,
+  sendFollowUpAndExpectVisibleResponse,
+  switchAwayAndBackWithoutImageInstability,
+  userPagesUntilAssistantImageRenders,
+} from "../support/helpers/assistant-images";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+
+const test = base.extend<{ imageWorkspace: SeededWorkspace }>({
+  imageWorkspace: async ({ page: _page }, provide) => {
+    const workspace = await seedWorkspace({ repoPrefix: "agent-tab-image-stability-" });
+    try {
+      await provide(workspace);
+    } finally {
+      await workspace.cleanup();
+    }
+  },
+});
+
+test("switching between settled agent tabs keeps a real assistant PNG rendered", async ({
+  imageWorkspace: workspace,
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const image = await createSmallAssistantPng(workspace, {
+    alt: "Real file image",
+    fileName: "assistant-preview.png",
+  });
+  const imageAgent = await createSettledMockAgent(workspace, "Image timeline");
+  const otherAgent = await createSettledMockAgent(workspace, "Other timeline");
+  await emitSettledAssistantImage(workspace.client, imageAgent, image);
+
+  await openExistingImageAgentTabs(page, { imageAgent, otherAgent });
+  await expectAssistantImageRendered(page, image);
+  await switchAwayAndBackWithoutImageInstability(page, { image, imageAgent, otherAgent });
+});
+
+test("reloading a timeline anchors near-tail assistant image growth", async ({
+  imageWorkspace: workspace,
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const image = await createSmallAssistantPng(workspace, {
+    alt: "Reload geometry image",
+    fileName: "reload-geometry-image.png",
+  });
+  const imageAgent = await createSettledMockAgent(workspace, "Reload image geometry");
+  await emitSettledAssistantImage(workspace.client, imageAgent, image);
+  await appendSettledTimelineTurns(workspace.client, imageAgent, 3);
+
+  await page.addInitScript(
+    ({ accessibleName }) => {
+      interface ImageGeometryEvent {
+        atMs: number;
+        complete: boolean;
+        height: number;
+        naturalHeight: number;
+        naturalWidth: number;
+        scrollTop: number;
+        width: number;
+      }
+      const state = {
+        accessibleName,
+        events: [] as ImageGeometryEvent[],
+        mutationObserver: null as MutationObserver | null,
+        resizeObserver: null as ResizeObserver | null,
+        target: null as Element | null,
+      };
+      const record = () => {
+        const target = state.target;
+        if (!target) return;
+        const imageElement =
+          target instanceof HTMLImageElement ? target : target.querySelector("img");
+        const scroll = target.closest('[data-testid="agent-chat-scroll"]');
+        const rect = target.getBoundingClientRect();
+        const event: ImageGeometryEvent = {
+          atMs: performance.now(),
+          complete: imageElement?.complete ?? false,
+          height: rect.height,
+          naturalHeight: imageElement?.naturalHeight ?? 0,
+          naturalWidth: imageElement?.naturalWidth ?? 0,
+          scrollTop: scroll instanceof HTMLElement ? scroll.scrollTop : -1,
+          width: rect.width,
+        };
+        const previous = state.events.at(-1);
+        if (
+          !previous ||
+          previous.complete !== event.complete ||
+          previous.height !== event.height ||
+          previous.naturalHeight !== event.naturalHeight ||
+          previous.naturalWidth !== event.naturalWidth ||
+          previous.scrollTop !== event.scrollTop ||
+          previous.width !== event.width
+        ) {
+          state.events.push(event);
+        }
+      };
+      const inspect = () => {
+        const target = Array.from(document.querySelectorAll('[role="img"]')).find(
+          (element) => element.getAttribute("aria-label") === accessibleName,
+        );
+        if (!target || target === state.target) {
+          record();
+          return;
+        }
+        state.target = target;
+        state.resizeObserver?.disconnect();
+        state.resizeObserver = new ResizeObserver(record);
+        state.resizeObserver.observe(target);
+        record();
+      };
+      const start = () => {
+        state.mutationObserver = new MutationObserver(inspect);
+        state.mutationObserver.observe(document.documentElement, {
+          attributes: true,
+          attributeFilter: ["src", "style"],
+          childList: true,
+          subtree: true,
+        });
+        inspect();
+      };
+      if (document.readyState === "loading") {
+        document.addEventListener("DOMContentLoaded", start, { once: true });
+      } else {
+        start();
+      }
+      (
+        window as unknown as {
+          __paseoReloadImageGeometry?: typeof state;
+        }
+      ).__paseoReloadImageGeometry = state;
+    },
+    { accessibleName: image.alt },
+  );
+
+  await openAssistantImageTimeline(page, imageAgent);
+  await expectAssistantImageRendered(page, image);
+  await page.reload();
+  await expectAssistantImageRendered(page, image);
+  await page.waitForTimeout(500);
+
+  const events = await page.evaluate(() => {
+    const state = (
+      window as unknown as {
+        __paseoReloadImageGeometry?: { events: Array<unknown> };
+      }
+    ).__paseoReloadImageGeometry;
+    if (!state) throw new Error("Reload image geometry observer was not installed");
+    return state.events;
+  });
+  const geometryEvents = events as Array<{ height: number; scrollTop: number }>;
+  const initialGeometry = geometryEvents.find((event) => event.height > 0);
+  if (!initialGeometry)
+    throw new Error(`Image geometry was never measurable: ${JSON.stringify(events)}`);
+  const expandedGeometry = geometryEvents.find((event) => event.height > initialGeometry.height);
+  if (!expandedGeometry)
+    throw new Error(`Image geometry never expanded: ${JSON.stringify(events)}`);
+  expect(expandedGeometry.scrollTop, JSON.stringify(events)).toBeGreaterThan(
+    initialGeometry.scrollTop,
+  );
+});
+
+test("a real assistant PNG remains reachable through pagination and remount", async ({
+  imageWorkspace: workspace,
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const image = await createSmallAssistantPng(workspace, {
+    alt: "Paginated real file image",
+    fileName: "paginated-assistant-preview.png",
+  });
+  const imageAgent = await createSettledMockAgent(workspace, "Paginated image timeline");
+  await emitSettledAssistantImage(workspace.client, imageAgent, image);
+  await appendSettledTimelineTurns(workspace.client, imageAgent, 40);
+
+  await openAssistantImageTimeline(page, imageAgent);
+  await expectAssistantImageNotMounted(page, image);
+  await userPagesUntilAssistantImageRenders(page, image);
+  await remountAndRecoverAssistantImageFromHistory(page, image);
+});
+
+test("a near-10 MiB real assistant PNG renders and the app remains responsive", async ({
+  imageWorkspace: workspace,
+  page,
+}) => {
+  test.setTimeout(180_000);
+  const image = await createNearTenMegabyteAssistantPng(workspace, {
+    alt: "Large real file image",
+    fileName: "large-assistant-preview.png",
+  });
+  const imageAgent = await createSettledMockAgent(workspace, "Large image timeline");
+  await emitSettledAssistantImage(workspace.client, imageAgent, image);
+
+  await openAssistantImageTimeline(page, imageAgent);
+  await expectAssistantImageRendered(page, image);
+  await sendFollowUpAndExpectVisibleResponse(page, {
+    prompt: "confirm responsiveness: emit 1 coalesced agent stream updates",
+    response: "stress-update-0",
+  });
+});
@@ -0,0 +1,86 @@
+import { randomUUID } from "node:crypto";
+import { metroTest as test } from "../support/fixtures";
+import { buildCreateAgentPreferences, buildSeededHost } from "../support/helpers/daemon-registry";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import type { MockAgentWorkspace } from "../support/helpers/mock-agent";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import {
+  expectTimelinePromptVisible,
+  holdOlderHistoryPages,
+  openAgentTimeline,
+  scrollThroughOlderHistoryPages,
+} from "../support/helpers/timeline-pagination";
+
+test("does not repeat an assistant block when the current app paginates a published 0.2.5 daemon", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const serverId = `srv_old_pagination_${randomUUID().replaceAll("-", "").slice(0, 12)}`;
+  const daemon = await startIsolatedHostDaemon(serverId, { publishedVersion: "0.2.5" });
+  const workspace = await seedWorkspace({
+    repoPrefix: "timeline-old-daemon-pagination-",
+    port: daemon.port,
+  });
+  const createdAgent = await workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.repoPath,
+    workspaceId: workspace.workspaceId,
+    title: "Published daemon pagination regression",
+    modeId: "load-test",
+    model: "ten-second-stream",
+  });
+  const agent: MockAgentWorkspace = {
+    agentId: createdAgent.id,
+    workspaceId: workspace.workspaceId,
+    cwd: workspace.repoPath,
+    client: workspace.client,
+    cleanup: workspace.cleanup,
+  };
+
+  try {
+    for (let index = 0; index < 40; index += 1) {
+      await agent.client.sendAgentMessage(
+        agent.agentId,
+        `timeline-pagination-older-turn-${index}: emit 1 coalesced agent stream updates`,
+      );
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+    }
+    await agent.client.sendAgentMessage(agent.agentId, "build a realistic long mock timeline");
+    await agent.client.waitForFinish(agent.agentId, 20_000);
+    for (let index = 0; index < 20; index += 1) {
+      await agent.client.sendAgentMessage(
+        agent.agentId,
+        `timeline-pagination-turn-${index}: emit 1 coalesced agent stream updates`,
+      );
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+    }
+
+    const host = buildSeededHost({
+      serverId,
+      endpoint: `127.0.0.1:${daemon.port}`,
+      nowIso: new Date().toISOString(),
+    });
+    await page.addInitScript(
+      ({ seededHost, preferences }) => {
+        localStorage.setItem("@paseo:e2e", "1");
+        localStorage.setItem("@paseo:daemon-registry", JSON.stringify([seededHost]));
+        localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
+      },
+      { seededHost: host, preferences: buildCreateAgentPreferences() },
+    );
+
+    const history = await holdOlderHistoryPages(page, agent, daemon.port);
+    await openAgentTimeline(page, agent, serverId);
+    await expectTimelinePromptVisible(
+      page,
+      "timeline-pagination-turn-19: emit 1 coalesced agent stream updates",
+    );
+    await scrollThroughOlderHistoryPages(page, 3, history);
+
+    history.expectRepeatedEntries();
+    await history.expectOwnedTextRendered("Now I have a clearer picture.");
+  } finally {
+    await agent.cleanup();
+    await daemon.close();
+  }
+});
@@ -0,0 +1,291 @@
+import { expect, test } from "../support/fixtures";
+import {
+  expectSameOlderHistoryLoadingOperation,
+  expectStableHistoryStartGutter,
+  expectTimelineAtHistoryStart,
+  expectTimelinePromptCentered,
+  expectTimelinePromptNotMounted,
+  expectTimelinePromptPositionPreserved,
+  expectTimelinePromptVisible,
+  holdBootstrapTimelinePage,
+  holdDaemonHydration,
+  holdOlderHistoryPages,
+  makeLoadedTimelineFitViewport,
+  openAgentTimeline,
+  rememberOlderHistoryLoadingOperation,
+  rememberTimelineViewport,
+  rememberTimelinePromptPosition,
+  reloadAgentTimelineFromPersistedReplica,
+  scrollTimelineUntilOlderHistoryIsReachable,
+  scrollTimelineToOldestLoadedEdge,
+  scrollTimelineToNewestLoadedEdge,
+  seedLongMockAgentTimeline,
+  scrollThroughOlderHistoryPages,
+  seedRealisticOlderTimeline,
+  sendLiveTurnBeforeHydration,
+  expectTimelineViewportAnchoredAfterPrepend,
+  userNavigatesTimelineToHistoryStartWithKeyboard,
+  userScrollsTimelineToHistoryStart,
+  waitForPersistedCanonicalTimelineRange,
+} from "../support/helpers/timeline-pagination";
+import { trackAgentTimelineRequests } from "../support/helpers/agent-timeline-gate";
+import { seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+test.describe("Agent timeline pagination", () => {
+  test("resumes a persisted canonical timeline after its exact end", async ({ page }) => {
+    const prompt = "timeline persisted range resumes without tail replay";
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "timeline-persisted-range-",
+      title: "Persisted timeline range",
+      initialPrompt: prompt,
+    });
+    try {
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, prompt);
+      const range = await waitForPersistedCanonicalTimelineRange(page, agent.agentId);
+
+      const tracker = await trackAgentTimelineRequests(page, agent.agentId);
+      await page.reload();
+      await expectTimelinePromptVisible(page, prompt);
+
+      const request = await tracker.nextRequest();
+      expect(request).toEqual({
+        direction: "after",
+        cursor: { epoch: range.epoch, seq: range.endSeq },
+      });
+      await tracker.waitForResponse();
+      expect(tracker.requests().some((entry) => entry.direction === "tail")).toBe(false);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("keeps a fixed history-start gutter before, during, and after pagination", async ({
+    page,
+  }) => {
+    const agent = await seedLongMockAgentTimeline({ turns: 40 });
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await expectStableHistoryStartGutter(page);
+
+      await userScrollsTimelineToHistoryStart(page);
+      await history.expectRequestedPages(1);
+      await expectStableHistoryStartGutter(page);
+
+      history.releasePage(1);
+      await history.expectSettledWithRequestedPages(1);
+      await expectStableHistoryStartGutter(page);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("loads one page each time the user returns to history start", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+      await expectTimelinePromptCentered(page, agent.newestPrompt);
+      await expectTimelinePromptNotMounted(page, agent.oldestPrompt);
+
+      await userScrollsTimelineToHistoryStart(page);
+      await history.expectRequestedPages(1);
+      history.releasePage(1);
+      await history.expectSettledWithRequestedPages(1);
+      await expectTimelinePromptCentered(page, agent.firstOlderPagePrompt);
+
+      await userScrollsTimelineToHistoryStart(page);
+      await history.expectRequestedPages(2);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("loads older history when the user navigates to history start with the keyboard", async ({
+    page,
+  }) => {
+    const agent = await seedLongMockAgentTimeline({ turns: 40 });
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+
+      await userNavigatesTimelineToHistoryStartWithKeyboard(page);
+      await history.expectRequestedPages(1);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("does not repeat an assistant block that spans older history pages", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedRealisticOlderTimeline();
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+
+      await scrollThroughOlderHistoryPages(page, 3, history);
+      history.expectNoRepeatedEntries();
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("keeps the visible timeline position anchored while prepending a page", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await userScrollsTimelineToHistoryStart(page);
+      await history.expectRequestedPages(1);
+      const viewport = await rememberTimelineViewport(page);
+
+      history.releasePage(1);
+      await expectTimelineViewportAnchoredAfterPrepend(page, viewport);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("keeps visible history anchored when live output grows during a prepend", async ({
+    page,
+  }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await userScrollsTimelineToHistoryStart(page);
+      await history.expectRequestedPages(1);
+      const position = await rememberTimelinePromptPosition(page, agent.initialTailOldestPrompt);
+
+      await agent.client.sendAgentMessage(
+        agent.agentId,
+        "timeline live during held older page: emit 20 coalesced agent stream updates",
+      );
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+      history.releasePage(1);
+
+      await expectTimelinePromptPositionPreserved(page, position);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("finishes loading an older page while live output continues", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 40 });
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await userScrollsTimelineToHistoryStart(page);
+      await history.expectRequestedPages(1);
+
+      await agent.client.sendAgentMessage(agent.agentId, "keep streaming while history settles");
+      await agent.client.waitForAgentUpsert(
+        agent.agentId,
+        (snapshot) => snapshot.status === "running",
+      );
+      history.releasePage(1);
+
+      await expect(page.getByTestId("load-older-history-spinner")).toBeHidden({ timeout: 5_000 });
+      const running = await agent.client.fetchAgents({ scope: "active" });
+      expect(running.entries.find((entry) => entry.agent.id === agent.agentId)?.agent.status).toBe(
+        "running",
+      );
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("keeps the visible timeline anchored when the final page finishes", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 40 });
+    try {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await userScrollsTimelineToHistoryStart(page);
+      await history.expectRequestedPages(1);
+      const position = await rememberTimelinePromptPosition(page, agent.initialTailOldestPrompt);
+
+      history.releasePage(1);
+
+      await expectTimelinePromptPositionPreserved(page, position);
+      await history.expectSettledWithRequestedPages(1);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("continues one loading operation while older pages still leave history start exposed", async ({
+    page,
+  }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      await makeLoadedTimelineFitViewport(page);
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await scrollTimelineToOldestLoadedEdge(page);
+      await history.expectRequestedPages(1);
+      const loading = await rememberOlderHistoryLoadingOperation(page);
+
+      history.releasePage(1);
+      await history.expectRequestedPages(2);
+      await expectTimelineAtHistoryStart(page);
+      await expectSameOlderHistoryLoadingOperation(page, loading);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("keeps complete loaded history reachable after reload", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      await openAgentTimeline(page, agent);
+      await scrollTimelineUntilOlderHistoryIsReachable(page, agent.oldestPrompt);
+      await expectTimelinePromptVisible(page, agent.oldestPrompt);
+
+      const hydration = await holdDaemonHydration(page);
+      await reloadAgentTimelineFromPersistedReplica(page, agent);
+      hydration.release();
+      await scrollTimelineUntilOlderHistoryIsReachable(page, agent.oldestPrompt);
+
+      await expectTimelinePromptVisible(page, agent.oldestPrompt);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("preserves a live row received before replica hydration", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      await openAgentTimeline(page, agent);
+      await scrollTimelineUntilOlderHistoryIsReachable(page, agent.oldestPrompt);
+
+      const hydration = await holdBootstrapTimelinePage(page, agent);
+      await reloadAgentTimelineFromPersistedReplica(page, agent);
+      await hydration.waitForDelayedResponse();
+      const livePrompt = await sendLiveTurnBeforeHydration(agent);
+      await expectTimelinePromptVisible(page, livePrompt);
+
+      hydration.release();
+      await hydration.waitForDelayedCatchUp();
+      await expectTimelinePromptVisible(page, livePrompt);
+      hydration.releaseCatchUp();
+      await scrollTimelineUntilOlderHistoryIsReachable(page, agent.oldestPrompt);
+      await expectTimelinePromptVisible(page, agent.oldestPrompt);
+      await scrollTimelineToNewestLoadedEdge(page);
+      await expectTimelinePromptVisible(page, livePrompt);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+});
@@ -0,0 +1,66 @@
+import { test } from "../support/fixtures";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import {
+  expectTimelinePresentationUnchanged,
+  expectTimelinePromptNotMounted,
+  expectTimelinePromptVisible,
+  openAgentTimeline,
+  rememberTimelinePresentation,
+  scrollTimelinePromptIntoView,
+  scrollTimelineUntilOlderHistoryIsReachable,
+  seedLongMockAgentTimeline,
+} from "../support/helpers/timeline-pagination";
+import {
+  commitTimelineTurnsWhileDisconnected,
+  disconnectViewedTimeline,
+  expectOneResumeCheckWithoutTail,
+  expectResumeOverflowFallsBackToOneTail,
+  rememberTimelineRequestCounts,
+  restoreViewedTimelineWithHeldResponse,
+} from "../support/helpers/timeline-resume";
+
+test.describe("Agent timeline resume", () => {
+  test("a long disconnected run lands as one latest-tail update", async ({ page }) => {
+    test.setTimeout(120_000);
+    const gate = await installDaemonWebSocketGate(page);
+    const agent = await seedLongMockAgentTimeline({ turns: 3 });
+    try {
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+      const requests = rememberTimelineRequestCounts(gate);
+      await disconnectViewedTimeline(page, gate);
+      const background = await commitTimelineTurnsWhileDisconnected(agent, 24);
+      await restoreViewedTimelineWithHeldResponse(page, gate);
+
+      await expectTimelinePromptVisible(page, background.newestPrompt);
+      await expectTimelinePromptNotMounted(page, background.firstPrompt);
+      expectResumeOverflowFallsBackToOneTail(gate, requests);
+      await scrollTimelineUntilOlderHistoryIsReachable(page, background.firstPrompt);
+    } finally {
+      gate.restore();
+      await agent.cleanup();
+    }
+  });
+
+  test("an unchanged resume leaves a scrolled-up timeline untouched", async ({ page }) => {
+    test.setTimeout(120_000);
+    const gate = await installDaemonWebSocketGate(page);
+    const agent = await seedLongMockAgentTimeline({ turns: 30 });
+    try {
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+      await scrollTimelinePromptIntoView(page, agent.initialTailAnchorPrompt);
+      const presentation = await rememberTimelinePresentation(page, agent.initialTailAnchorPrompt);
+      const requests = rememberTimelineRequestCounts(gate);
+
+      await disconnectViewedTimeline(page, gate);
+      await restoreViewedTimelineWithHeldResponse(page, gate);
+
+      await expectTimelinePresentationUnchanged(page, presentation);
+      expectOneResumeCheckWithoutTail(gate, requests);
+    } finally {
+      gate.restore();
+      await agent.cleanup();
+    }
+  });
+});
@@ -0,0 +1,66 @@
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { openSettingsSection } from "../support/helpers/settings";
+
+test("shows Pure black in the appearance picker", async ({ page }, testInfo) => {
+  await page.goto("/settings");
+  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
+  await openSettingsSection(page, "appearance");
+
+  const themeTrigger = page.getByLabel("Theme: System", { exact: true });
+  await themeTrigger.click();
+  await expect(page.getByText("Pure black", { exact: true })).toBeVisible();
+  await page.screenshot({
+    path: testInfo.outputPath("appearance-theme-picker.png"),
+    fullPage: true,
+  });
+});
+
+test("keeps the selected workspace visible in Pure black", async ({ page }, testInfo) => {
+  const workspace = await seedWorkspace({
+    repoPrefix: "pure-black-selected-workspace-",
+    title: "Selected workspace",
+  });
+
+  try {
+    await page.addInitScript(() => {
+      localStorage.setItem("@paseo:app-settings", JSON.stringify({ theme: "pureBlack" }));
+    });
+    await gotoAppShell(page);
+
+    const row = page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspace.workspaceId}`);
+    await expect(row).toBeVisible({ timeout: 30_000 });
+    await row.click();
+
+    await expect(row).toHaveAttribute("aria-selected", "true");
+    await expect(row).toHaveCSS("background-color", "rgb(22, 22, 22)");
+    await page.screenshot({
+      path: testInfo.outputPath("pure-black-selected-workspace.png"),
+      fullPage: true,
+    });
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("applies the interface font size to settings text", async ({ page }) => {
+  await page.addInitScript(() => {
+    localStorage.setItem("@paseo:app-settings", JSON.stringify({ uiFontSize: 24 }));
+  });
+  await page.goto("/settings");
+  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
+  await openSettingsSection(page, "appearance");
+
+  const sectionTitle = page.getByText("Theme", { exact: true }).first();
+  await expect(sectionTitle).toHaveCSS("font-size", "18px");
+
+  const fontSizeInput = page.getByLabel("Interface font size");
+  await expect(fontSizeInput).toHaveValue("24");
+  await fontSizeInput.fill("12");
+  await fontSizeInput.press("Tab");
+
+  await expect(fontSizeInput).toHaveValue("12");
+  await expect(sectionTitle).toHaveCSS("font-size", "9px");
+});
@@ -0,0 +1,79 @@
+import { test } from "../support/fixtures";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import {
+  archiveFinishedSubagents,
+  expectArchiveFinishedInProgress,
+  expectArchiveFinishedRetry,
+  expectManagedSubagentArchived,
+  expectManagedSubagentUnarchived,
+  expectSubagentRowGone,
+  expectSubagentRowVisible,
+  holdManagedSubagentArchiveRequest,
+  openSubagentsTrack,
+  rejectNextManagedSubagentArchiveRequest,
+  seedParentWithSubagent,
+} from "../support/helpers/subagents";
+
+test.describe("Archive finished subagents", () => {
+  let workspace: SeededWorkspace;
+
+  test.beforeAll(async () => {
+    workspace = await seedWorkspace({ repoPrefix: "archive-finished-subagents-" });
+  });
+
+  test.afterAll(async () => {
+    await workspace?.cleanup();
+  });
+
+  test("archives a finished managed child from the track", async ({ page }) => {
+    const agents = await seedParentWithSubagent(workspace, {
+      parentTitle: "Archive parent",
+      childTitle: "Finished child",
+    });
+    await workspace.client.waitForAgentUpsert(
+      agents.child.id,
+      (snapshot) => snapshot.status === "idle",
+    );
+
+    const archiveGate = await holdManagedSubagentArchiveRequest(page, agents.child.id);
+    await openAgentRoute(page, { workspaceId: agents.workspaceId, agentId: agents.parent.id });
+    await openSubagentsTrack(page);
+    await expectSubagentRowVisible(page, agents.child.id);
+
+    await archiveFinishedSubagents(page);
+    await archiveGate.waitForRequest();
+
+    await expectSubagentRowGone(page, agents.child.id);
+    await expectArchiveFinishedInProgress(page, 0, 1);
+    await expectManagedSubagentUnarchived(workspace, agents.child.id);
+    archiveGate.release();
+    await expectManagedSubagentArchived(workspace, agents.child.id);
+  });
+
+  test("restores a failed child and retries the archive", async ({ page }) => {
+    const agents = await seedParentWithSubagent(workspace, {
+      parentTitle: "Retry parent",
+      childTitle: "Retry child",
+    });
+    await workspace.client.waitForAgentUpsert(
+      agents.child.id,
+      (snapshot) => snapshot.status === "idle",
+    );
+
+    const rejection = await rejectNextManagedSubagentArchiveRequest(page, agents.child.id);
+    await openAgentRoute(page, { workspaceId: agents.workspaceId, agentId: agents.parent.id });
+    await openSubagentsTrack(page);
+    await expectSubagentRowVisible(page, agents.child.id);
+
+    await archiveFinishedSubagents(page);
+    await rejection.waitForRejection();
+
+    await expectSubagentRowVisible(page, agents.child.id);
+    await expectArchiveFinishedRetry(page, 1, 1);
+    await archiveFinishedSubagents(page);
+
+    await expectSubagentRowGone(page, agents.child.id);
+    await expectManagedSubagentArchived(workspace, agents.child.id);
+  });
+});
@@ -1,9 +1,9 @@
 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 { test } from "../support/fixtures";
+import { getServerId } from "../support/helpers/server-id";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { createTempGitRepo } from "../support/helpers/workspace";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import {
  archiveAgentFromDaemon,
@@ -20,7 +20,7 @@ import {
  primeAdditionalPage,
  resetSeededPageState,
  reloadWorkspace,
-} from "./helpers/archive-tab";
+} from "../support/helpers/archive-tab";

 test.describe("Archive tab reconciliation", () => {
  let client: Awaited<ReturnType<typeof connectSeedClient>>;
@@ -1,18 +1,18 @@
 import { mkdtempSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { test, expect } from "./fixtures";
-import { openSessions } from "./helpers/archive-tab";
+import { test, expect } from "../support/fixtures";
+import { openSessions } from "../support/helpers/archive-tab";
 import {
  assertChatTranscript,
  cleanupRewindFlow,
  launchAgent,
  sendMessage,
  type AgentHandle,
-} from "./helpers/rewind-flow";
-import type { SeedDaemonClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/rewind-flow";
+import type { SeedDaemonClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 interface TimelineClient extends SeedDaemonClient {
  fetchAgentTimeline(
@@ -1,17 +1,25 @@
-import { expect, test as base, type Page } from "./fixtures";
-import { scrollAgentChatToBottom } from "./helpers/agent-bottom-anchor";
-import { awaitAssistantMessage } from "./helpers/agent-stream";
-import { expectComposerVisible, submitMessage } from "./helpers/composer";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
+import { expect, test as base } from "../support/fixtures";
+import { awaitAssistantMessage } from "../support/helpers/agent-stream";
+import {
+  expectChatHistoryAttachment,
+  expectInFlightForkAvailable,
+  expectLiveAssistantText,
+  forkInFlightTurnToNewTab,
+  forkMostRecentAssistantTurnToNewTab,
+  forkMostRecentAssistantTurnToNewWorkspace,
+  observeForkAttachment,
+} from "../support/helpers/assistant-fork";
+import { expectComposerVisible, submitMessage } from "../support/helpers/composer";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
  openAgentRoute,
  seedMockAgentWorkspace,
  type MockAgentOptions,
  type MockAgentWorkspace,
-} from "./helpers/mock-agent";
-import { getServerId } from "./helpers/server-id";
-import { seedSavedSettingsHosts } from "./helpers/settings";
-import { submitNewWorkspaceEmpty } from "./helpers/new-workspace";
+} from "../support/helpers/mock-agent";
+import { getServerId } from "../support/helpers/server-id";
+import { seedSavedSettingsHosts } from "../support/helpers/settings";
+import { submitNewWorkspaceEmpty } from "../support/helpers/new-workspace";

 const test = base.extend<{
  seedForkWorkspace: (options: MockAgentOptions) => Promise<MockAgentWorkspace>;
@@ -27,30 +35,6 @@ const test = base.extend<{
  },
 });

-async function openAssistantForkMenu(page: Page): Promise<void> {
-  await expect
-    .poll(
-      async () => {
-        await scrollAgentChatToBottom(page);
-        return page.getByTestId("assistant-fork-menu-trigger").count();
-      },
-      { timeout: 30_000 },
-    )
-    .toBeGreaterThan(0);
-  const trigger = page.getByTestId("assistant-fork-menu-trigger").last();
-  await expect(trigger).toBeVisible({ timeout: 30_000 });
-  await trigger.click();
-  await expect(page.getByTestId("assistant-fork-menu-content")).toBeVisible({
-    timeout: 10_000,
-  });
-}
-
-async function expectChatHistoryPill(page: Page): Promise<void> {
-  const pill = page.getByTestId("composer-chat-history-attachment-pill").first();
-  await expect(pill).toBeVisible({ timeout: 30_000 });
-  await expect(pill).toContainText("Chat history");
-}
-
 test.describe("Assistant fork menu", () => {
  test.describe.configure({ timeout: 180_000 });

@@ -71,9 +55,38 @@ test.describe("Assistant fork menu", () => {
      timeout: 30_000,
    });

-    await openAssistantForkMenu(page);
-    await page.getByTestId("assistant-fork-menu-new-tab").click();
-    await expectChatHistoryPill(page);
+    await forkMostRecentAssistantTurnToNewTab(page);
+    await expectChatHistoryAttachment(page);
+  });
+
+  test("forks a streaming assistant turn without interrupting it", async ({
+    page,
+    seedForkWorkspace,
+  }) => {
+    const visibleBeforeFork = "where the auto-scroll logic actually lives";
+    const visibleAfterFork = "the first useful step is to read the relevant files";
+    const sourceAgentTitle = "Assistant fork in flight";
+    const forkAttachment = observeForkAttachment(page);
+
+    const session = await seedForkWorkspace({
+      repoPrefix: "assistant-fork-in-flight-",
+      title: sourceAgentTitle,
+      model: "thirty-minute-stream",
+    });
+
+    await openAgentRoute(page, session);
+    await expectComposerVisible(page);
+    await submitMessage(page, "Walk me through the scroll anchor behavior.");
+
+    await expectInFlightForkAvailable(page);
+    await expectLiveAssistantText(page, visibleBeforeFork);
+
+    await forkInFlightTurnToNewTab(page);
+    await expectChatHistoryAttachment(page);
+    expect(await forkAttachment.waitForText()).toContain(visibleBeforeFork);
+
+    await page.getByRole("button", { name: sourceAgentTitle }).click();
+    await expectLiveAssistantText(page, visibleAfterFork);
  });

  test("focuses a forked assistant turn in a new workspace draft tab", async ({
@@ -99,8 +112,7 @@ test.describe("Assistant fork menu", () => {
    const agentTab = page.getByTestId(`workspace-tab-agent_${session.agentId}`);
    await expect(agentTab).toHaveAttribute("aria-selected", "true");

-    await openAssistantForkMenu(page);
-    await page.getByTestId("assistant-fork-menu-new-tab").click();
+    await forkMostRecentAssistantTurnToNewTab(page);

    const selectedTab = page
      .getByTestId("workspace-tabs-row")
@@ -110,7 +122,7 @@ test.describe("Assistant fork menu", () => {
      timeout: 30_000,
    });
    await expect(agentTab).toHaveAttribute("aria-selected", "false");
-    await expectChatHistoryPill(page);
+    await expectChatHistoryAttachment(page);
  });

  test("keeps the fork attachment after submitting an existing-workspace draft tab", async ({
@@ -129,9 +141,8 @@ test.describe("Assistant fork menu", () => {
    await awaitAssistantMessage(page);
    await session.client.waitForFinish(session.agentId, 45_000);

-    await openAssistantForkMenu(page);
-    await page.getByTestId("assistant-fork-menu-new-tab").click();
-    await expectChatHistoryPill(page);
+    await forkMostRecentAssistantTurnToNewTab(page);
+    await expectChatHistoryAttachment(page);

    await submitMessage(page, "");

@@ -171,17 +182,16 @@ test.describe("Assistant fork menu", () => {
    await awaitAssistantMessage(page);
    await session.client.waitForFinish(session.agentId, 45_000);

-    await openAssistantForkMenu(page);
-    await page.getByTestId("assistant-fork-menu-new-workspace").click();
+    await forkMostRecentAssistantTurnToNewWorkspace(page);

    await expect(page).toHaveURL(/\/new\?.*draftId=/, { timeout: 30_000 });
-    await expectChatHistoryPill(page);
+    await expectChatHistoryAttachment(page);

    await page.getByTestId("host-picker-trigger").click();
    await page
      .getByTestId("new-workspace-host-picker-option-secondary-assistant-fork-host")
      .click();
-    await expectChatHistoryPill(page);
+    await expectChatHistoryAttachment(page);
  });

  test("keeps the fork attachment after the new agent receives its user message", async ({
@@ -200,9 +210,8 @@ test.describe("Assistant fork menu", () => {
    await awaitAssistantMessage(page);
    await session.client.waitForFinish(session.agentId, 45_000);

-    await openAssistantForkMenu(page);
-    await page.getByTestId("assistant-fork-menu-new-workspace").click();
-    await expectChatHistoryPill(page);
+    await forkMostRecentAssistantTurnToNewWorkspace(page);
+    await expectChatHistoryAttachment(page);

    await submitNewWorkspaceEmpty(page);

@@ -0,0 +1,587 @@
+import type { BrowserContext } from "@playwright/test";
+import { expect, test, type Page } from "../support/fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+const CROSS_STRUCTURE_MARKDOWN = [
+  "# P1 — High-value UI behavior",
+  "",
+  "5. Claude model and thinking preferences",
+  "",
+  "   - Switch Claude models and confirm each model retains its own thinking choice.",
+  "   - Cover new-workspace drafts, queued launches, schedules, and editing existing schedules.",
+  "   - Confirm Opus 5 exposes the Fast toggle.",
+  "   - Smoke with an older saved Fabel/model alias and with daemon/client version drift.",
+  "",
+  "6. Chat, composer, and timeline stability",
+].join("\n");
+
+const ASSISTANT_MARKDOWN = [
+  CROSS_STRUCTURE_MARKDOWN,
+  "",
+  "Direct matches:",
+  "",
+  "Formatted **strong prose**, _emphasized prose_, and ~~struck prose~~.",
+  "",
+  "- **[First issue](https://example.com/issues/1)**: exact `apply_patch` failure.",
+  "- [Second issue](https://example.com/issues/2): repeated sandbox setup.",
+  "",
+  "5. Fifth item",
+  "6. Sixth item",
+  "7. Seventh item",
+  "8. Eighth item",
+  "",
+  "Nested list:",
+  "",
+  "3. Outer three",
+  "",
+  "   7. Inner seven",
+  "   8. Inner eight",
+  "   9. Inner nine",
+  "",
+  "A hard break  ",
+  "stays hard.",
+  "",
+  "www.example.com stays plain Markdown text.",
+  "",
+  '[docs](https://docs.example.com "Reference") and <https://autolink.example.com>.',
+  "",
+  "[workspace file](file:///tmp/paseo%20notes.md#L4)",
+  "",
+  "`https://example.com/generated` stays code, not a generated link.",
+  "",
+  "```typescript",
+  'const answer = "yes";',
+  "  return answer;",
+  "```",
+  "",
+  "After code.",
+  "",
+  "```bash",
+  "echo trailing",
+  "",
+  "```",
+  "",
+  "````text",
+  "before",
+  "```",
+  "after",
+  "````",
+  "",
+  "| Left | Right | Center |",
+  "| :-- | --: | :-: |",
+  "| Current \\| active | ~~obsolete~~ | ready |",
+].join("\n");
+
+const EXPECTED_WHOLE_SELECTION_MARKDOWN = ASSISTANT_MARKDOWN.replace(
+  `${CROSS_STRUCTURE_MARKDOWN}\n\n`,
+  "",
+)
+  .replace(
+    "<https://autolink.example.com>",
+    "[https://autolink.example.com](https://autolink.example.com)",
+  )
+  .replace(
+    "3. Outer three\n\n   7. Inner seven\n   8. Inner eight\n   9. Inner nine",
+    "3. Outer three\n    7. Inner seven\n    8. Inner eight\n    9. Inner nine",
+  )
+  // Rendering drops the blank line before a closing fence, so copying cannot bring it
+  // back. The fence is here to cover a body that ends in more than one newline.
+  .replace("```bash\necho trailing\n\n```", "```bash\necho trailing\n```");
+
+interface ClipboardContent {
+  html: string;
+  plainText: string;
+}
+
+async function allowRichClipboard(context: BrowserContext): Promise<void> {
+  await context.grantPermissions(["clipboard-read", "clipboard-write"]);
+}
+
+async function selectStructuredClipboardFixture(page: Page): Promise<void> {
+  await selectAssistantTextRange(page, "Direct matches:", "ready");
+}
+
+async function selectAssistantElement(page: Page, selector: string): Promise<void> {
+  const assistantMessage = page.getByTestId("assistant-message").filter({
+    hasText: "Direct matches:",
+  });
+  await assistantMessage.locator(selector).evaluate((element) => {
+    const selection = window.getSelection();
+    const range = document.createRange();
+    range.selectNodeContents(element);
+    selection?.removeAllRanges();
+    selection?.addRange(range);
+  });
+}
+
+async function selectAssistantText(page: Page, text: string): Promise<void> {
+  await selectAssistantTextRange(page, text, text);
+}
+
+async function selectAssistantListItemFromMarker(
+  page: Page,
+  listTag: "ol" | "ul",
+  itemText: string,
+  endText: string,
+): Promise<void> {
+  const assistantMessage = page.getByTestId("assistant-message").filter({
+    hasText: "Direct matches:",
+  });
+  const item = assistantMessage
+    .locator(`[data-paseo-markdown-tag="${listTag}"]`)
+    .filter({ hasText: itemText })
+    .locator(':scope > [data-paseo-markdown-tag="li"]')
+    .filter({ hasText: itemText });
+
+  await item.evaluate((element, selectedEndText) => {
+    const marker = element.querySelector(':scope > [data-paseo-markdown-list-marker="true"]');
+    const markerText = marker?.firstChild;
+    if (!(markerText instanceof Text)) {
+      throw new Error("Expected rendered list marker text");
+    }
+
+    const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+    let endNode: Text | null = null;
+    let endOffset = -1;
+    while (walker.nextNode()) {
+      const node = walker.currentNode;
+      const offset = node.textContent?.indexOf(selectedEndText) ?? -1;
+      if (node instanceof Text && offset >= 0) {
+        endNode = node;
+        endOffset = offset + selectedEndText.length;
+        break;
+      }
+    }
+    if (!endNode) {
+      throw new Error(`Could not find list item selection end: ${selectedEndText}`);
+    }
+
+    const range = document.createRange();
+    range.setStart(markerText, 0);
+    range.setEnd(endNode, endOffset);
+    const selection = window.getSelection();
+    selection?.removeAllRanges();
+    selection?.addRange(range);
+  }, endText);
+}
+
+async function doubleClickAssistantMarkdownText(
+  page: Page,
+  tag: "code" | "strong",
+  text: string,
+): Promise<void> {
+  const assistantMessage = page.getByTestId("assistant-message").filter({
+    hasText: "Direct matches:",
+  });
+  await assistantMessage
+    .locator(`[data-paseo-markdown-tag="${tag}"]`)
+    .filter({ hasText: text })
+    .dblclick({ position: { x: 5, y: 5 } });
+}
+
+async function selectAssistantTextRange(
+  page: Page,
+  startText: string,
+  endText: string,
+): Promise<void> {
+  const assistantMessage = page.getByTestId("assistant-message").filter({
+    hasText: "Direct matches:",
+  });
+  await assistantMessage.evaluate(
+    (element, selectedRange) => {
+      const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+      let startNode: Node | null = null;
+      let startOffset = -1;
+      let endNode: Node | null = null;
+      let endOffset = -1;
+      let textNode = walker.nextNode();
+      while (textNode) {
+        if (!startNode) {
+          const offset = textNode.textContent?.indexOf(selectedRange.startText) ?? -1;
+          if (offset >= 0) {
+            startNode = textNode;
+            startOffset = offset;
+          }
+        }
+        if (startNode) {
+          const offset = textNode.textContent?.indexOf(selectedRange.endText) ?? -1;
+          if (offset >= 0) {
+            endNode = textNode;
+            endOffset = offset + selectedRange.endText.length;
+            break;
+          }
+        }
+        textNode = walker.nextNode();
+      }
+      if (!startNode || !endNode) {
+        throw new Error(
+          `Could not find assistant text range: ${selectedRange.startText} — ${selectedRange.endText}`,
+        );
+      }
+      const range = document.createRange();
+      range.setStart(startNode, startOffset);
+      range.setEnd(endNode, endOffset);
+      const selection = window.getSelection();
+      selection?.removeAllRanges();
+      selection?.addRange(range);
+    },
+    { startText, endText },
+  );
+}
+
+/**
+ * Select from `startText` into the middle of the next rendered code line.
+ *
+ * Highlighted code splits a line across one text node per syntax token and puts the
+ * newline in a node of its own, so this is a partial selection that crosses a line
+ * break — the shape whose whitespace Turndown would collapse.
+ */
+async function selectAssistantAcrossCodeLines(
+  page: Page,
+  startText: string,
+  endText: string,
+): Promise<void> {
+  const assistantMessage = page.getByTestId("assistant-message").filter({
+    hasText: "Direct matches:",
+  });
+  await assistantMessage.evaluate(
+    (element, selectedRange) => {
+      const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+      let startNode: Node | null = null;
+      let startOffset = -1;
+      let textNode = walker.nextNode();
+      while (textNode) {
+        if (!startNode) {
+          const offset = textNode.textContent?.indexOf(selectedRange.startText) ?? -1;
+          if (offset >= 0) {
+            startNode = textNode;
+            startOffset = offset;
+          }
+          textNode = walker.nextNode();
+          continue;
+        }
+        const endOffset = textNode.textContent?.indexOf(selectedRange.endText) ?? -1;
+        if (endOffset >= 0) {
+          const range = document.createRange();
+          range.setStart(startNode, startOffset);
+          range.setEnd(textNode, endOffset + selectedRange.endText.length);
+          const selection = window.getSelection();
+          selection?.removeAllRanges();
+          selection?.addRange(range);
+          return;
+        }
+        textNode = walker.nextNode();
+      }
+      throw new Error(
+        `Could not find a code range: ${selectedRange.startText} — ${selectedRange.endText}`,
+      );
+    },
+    { startText, endText },
+  );
+}
+
+async function copySelection(page: Page): Promise<void> {
+  await page.keyboard.press("ControlOrMeta+c");
+}
+
+/** The Copy button writes text/plain only, so the rich reader would throw on it. */
+async function readPlainClipboard(page: Page): Promise<string> {
+  return page.evaluate(() => navigator.clipboard.readText());
+}
+
+async function readRichClipboard(page: Page): Promise<ClipboardContent> {
+  return page.evaluate(async () => {
+    const items = await navigator.clipboard.read();
+    const item = items[0];
+    if (!item) {
+      throw new Error("Expected clipboard content");
+    }
+    return {
+      html: await (await item.getType("text/html")).text(),
+      plainText: await (await item.getType("text/plain")).text(),
+    };
+  });
+}
+
+test("copying an assistant selection preserves Markdown structure and links", async ({
+  context,
+  page,
+}) => {
+  await page.addInitScript(() => {
+    localStorage.setItem("@paseo:app-settings", JSON.stringify({ uiFontFamily: "serif" }));
+  });
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "assistant-selection-copy-",
+    title: "Assistant selection copy",
+    initialPrompt: "Render the clipboard fixture.",
+    featureValues: { mockAssistantResponse: ASSISTANT_MARKDOWN },
+  });
+
+  try {
+    await allowRichClipboard(context);
+    await agent.client.waitForAgentUpsert(
+      agent.agentId,
+      (snapshot) => snapshot.status === "idle",
+      30_000,
+    );
+    await openAgentRoute(page, agent);
+
+    const assistantMessage = page.getByTestId("assistant-message").filter({
+      hasText: "Direct matches:",
+    });
+    for (const [tag, text] of [
+      ["strong", "strong prose"],
+      ["em", "emphasized prose"],
+      ["s", "struck prose"],
+    ]) {
+      const formattedProse = assistantMessage
+        .locator(`[data-paseo-markdown-tag="${tag}"]`)
+        .filter({ hasText: text });
+      await expect(formattedProse).toHaveCSS("font-family", "serif");
+      await expect(formattedProse).not.toHaveAttribute("data-pmono");
+    }
+    const inlineCode = assistantMessage
+      .locator('[data-paseo-markdown-tag="code"]')
+      .filter({ hasText: "apply_patch" });
+    await expect(inlineCode).toHaveAttribute("data-pmono", "");
+
+    await selectStructuredClipboardFixture(page);
+    await copySelection(page);
+
+    const clipboard = await readRichClipboard(page);
+    expect(clipboard.plainText).toBe(EXPECTED_WHOLE_SELECTION_MARKDOWN);
+    expect(clipboard.html).not.toContain("<ul>");
+    expect(clipboard.html).not.toContain("<li>");
+    expect(clipboard.html).toContain("<div>- ");
+    expect(clipboard.html).toContain(
+      '<strong><a href="https://example.com/issues/1">First issue</a></strong>',
+    );
+    expect(clipboard.html).toContain("<code>apply_patch</code>");
+    expect(clipboard.html).toContain("<div>5. Fifth item</div>");
+    expect(clipboard.html).toContain("A hard break<br>");
+    expect(clipboard.html).toContain(
+      '<a href="http://www.example.com/">www.example.com</a> stays plain Markdown text.',
+    );
+    expect(clipboard.html).toContain(
+      '<a href="https://docs.example.com/" title="Reference">docs</a>',
+    );
+    expect(clipboard.html).toContain(
+      '<a href="https://autolink.example.com/">https://autolink.example.com</a>',
+    );
+    expect(clipboard.html).toContain(
+      '<a href="file:///tmp/paseo%20notes.md#L4">workspace file</a>',
+    );
+    expect(clipboard.html).toContain("<code>https://example.com/generated</code>");
+    expect(clipboard.html).not.toContain(
+      '<a href="https://example.com/generated"><code>https://example.com/generated</code></a>',
+    );
+    expect(clipboard.html).toContain('<code class="language-typescript">');
+    expect(clipboard.html).toContain(
+      '<pre><code class="language-text">before\n```\nafter\n</code></pre>',
+    );
+    expect(clipboard.html).toContain("<table>");
+    expect(clipboard.html).toContain('<td style="text-align:left">Current | active</td>');
+    expect(clipboard.html.match(/<td\b/g)).toHaveLength(3);
+    expect(clipboard.html).toContain("<s>obsolete</s>");
+    expect(clipboard.html).toContain('<th style="text-align:left">Left</th>');
+    expect(clipboard.html).toContain('<th style="text-align:right">Right</th>');
+    expect(clipboard.html).toContain('<th style="text-align:center">Center</th>');
+
+    await doubleClickAssistantMarkdownText(page, "code", "apply_patch");
+    await copySelection(page);
+
+    const doubleClickedCodeClipboard = await readRichClipboard(page);
+    expect(doubleClickedCodeClipboard.plainText).toBe("apply_patch");
+    expect(doubleClickedCodeClipboard.html).not.toContain("<code>");
+
+    await doubleClickAssistantMarkdownText(page, "strong", "strong prose");
+    await copySelection(page);
+
+    const doubleClickedBoldClipboard = await readRichClipboard(page);
+    expect(doubleClickedBoldClipboard.plainText).toBe("strong");
+    expect(doubleClickedBoldClipboard.html).not.toContain("<strong>");
+
+    await selectAssistantTextRange(
+      page,
+      "P1 — High-value UI behavior",
+      "Smoke with an older saved Fabel/model alias and with daemon/client version drift.",
+    );
+    await copySelection(page);
+
+    const headingAndListClipboard = await readRichClipboard(page);
+    expect(headingAndListClipboard.plainText).toBe(
+      [
+        "P1 — High-value UI behavior",
+        "===========================",
+        "",
+        "5. Claude model and thinking preferences",
+        "    - Switch Claude models and confirm each model retains its own thinking choice.",
+        "    - Cover new-workspace drafts, queued launches, schedules, and editing existing schedules.",
+        "    - Confirm Opus 5 exposes the Fast toggle.",
+        "    - Smoke with an older saved Fabel/model alias and with daemon/client version drift.",
+      ].join("\n"),
+    );
+    expect(headingAndListClipboard.html).toMatch(
+      /<h1>P1 — High-value UI behavior<\/h1>\s*<div>5\. Claude model and thinking preferences\s*<\/div><div>- Switch Claude models/,
+    );
+
+    await selectAssistantText(page, "First");
+    await copySelection(page);
+
+    const partialClipboard = await readRichClipboard(page);
+    expect(partialClipboard.plainText).toBe("First");
+    expect(partialClipboard.html).toContain("<p>First</p>");
+
+    await selectAssistantTextRange(page, "Direct matches:", "repeated sandbox setup.");
+    await copySelection(page);
+
+    const paragraphAndListClipboard = await readRichClipboard(page);
+    expect(paragraphAndListClipboard.plainText).toBe(
+      [
+        "Direct matches:",
+        "",
+        "Formatted **strong prose**, _emphasized prose_, and ~~struck prose~~.",
+        "",
+        "- **[First issue](https://example.com/issues/1)**: exact `apply_patch` failure.",
+        "- [Second issue](https://example.com/issues/2): repeated sandbox setup.",
+      ].join("\n"),
+    );
+    expect(paragraphAndListClipboard.html).not.toContain("<ul>");
+    expect(paragraphAndListClipboard.html).not.toContain("<li>");
+    expect(paragraphAndListClipboard.html).toContain(
+      '<div>- <strong><a href="https://example.com/issues/1">First issue</a></strong>',
+    );
+
+    await selectAssistantListItemFromMarker(page, "ul", "First issue", "failure.");
+    await copySelection(page);
+
+    const draggedBulletClipboard = await readRichClipboard(page);
+    expect(draggedBulletClipboard.plainText).toBe(
+      "- **[First issue](https://example.com/issues/1)**: exact `apply_patch` failure.",
+    );
+    expect(draggedBulletClipboard.html).toContain(
+      '<div>- <strong><a href="https://example.com/issues/1">First issue</a></strong>',
+    );
+
+    await selectAssistantListItemFromMarker(page, "ol", "Sixth item", "Sixth item");
+    await copySelection(page);
+
+    const draggedNumberClipboard = await readRichClipboard(page);
+    expect(draggedNumberClipboard.plainText).toBe("6. Sixth item");
+    expect(draggedNumberClipboard.html).toContain("<div>6. Sixth item</div>");
+
+    await selectAssistantText(page, "docs");
+    await copySelection(page);
+
+    const titledLinkClipboard = await readRichClipboard(page);
+    expect(titledLinkClipboard.plainText).toBe("docs");
+    expect(titledLinkClipboard.html).not.toContain("<a ");
+
+    await selectAssistantText(page, "https://autolink.example.com");
+    await copySelection(page);
+
+    const autolinkClipboard = await readRichClipboard(page);
+    expect(autolinkClipboard.plainText).toBe("https://autolink.example.com");
+
+    await selectAssistantText(page, "workspace file");
+    await copySelection(page);
+
+    const fileLinkClipboard = await readRichClipboard(page);
+    expect(fileLinkClipboard.plainText).toBe("workspace file");
+    expect(fileLinkClipboard.html).not.toContain("<a ");
+
+    await selectAssistantTextRange(page, "Seventh item", "Eighth item");
+    await copySelection(page);
+
+    const midListClipboard = await readRichClipboard(page);
+    expect(midListClipboard.plainText).toBe("Seventh item\n\n8. Eighth item");
+    expect(midListClipboard.html).toContain("<div>8. Eighth item</div>");
+
+    await selectAssistantTextRange(page, "Inner eight", "Inner nine");
+    await copySelection(page);
+
+    const nestedListClipboard = await readRichClipboard(page);
+    expect(nestedListClipboard.plainText).toBe("Inner eight\n\n9. Inner nine");
+    expect(nestedListClipboard.html).toContain("<div>9. Inner nine</div>");
+
+    await selectAssistantTextRange(page, "Seventh item", "Nested list:");
+    await copySelection(page);
+
+    const crossBlockClipboard = await readRichClipboard(page);
+    expect(crossBlockClipboard.plainText).toBe("Seventh item\n\n8. Eighth item\n\nNested list:");
+    expect(crossBlockClipboard.html).toContain("<div>8. Eighth item</div>");
+
+    await selectAssistantText(page, "Current");
+    await copySelection(page);
+
+    const partialTableClipboard = await readRichClipboard(page);
+    expect(partialTableClipboard.plainText).toBe("Current");
+    expect(partialTableClipboard.html).toContain("<p>Current</p>");
+    expect(partialTableClipboard.html).not.toContain("&lt;table");
+
+    await selectAssistantTextRange(page, "Right", "ready");
+    await copySelection(page);
+
+    const columnSliceClipboard = await readRichClipboard(page);
+    expect(columnSliceClipboard.plainText).toContain("ready");
+    expect(columnSliceClipboard.html).not.toContain("<table>");
+    expect(columnSliceClipboard.html).toContain("ready");
+    expect(columnSliceClipboard.html).toContain("<s>obsolete</s>");
+
+    // A partial selection loses its `pre` wrapper, so the code reaches Turndown as
+    // prose unless it is diverted first: the line break and the indentation go, and
+    // Markdown-significant characters get escaped.
+    await selectAssistantAcrossCodeLines(page, "const", "return");
+    await copySelection(page);
+
+    const codeLinesClipboard = await readRichClipboard(page);
+    expect(codeLinesClipboard.plainText).toBe('const answer = "yes";\n  return');
+    expect(codeLinesClipboard.html).toContain('<pre><code class="language-typescript">');
+
+    // Selecting inside code expresses an intent to copy code, even when the selection
+    // contains every character in the block.
+    await selectAssistantElement(
+      page,
+      '[data-paseo-markdown-language="typescript"] [data-paseo-markdown-tag="code"]',
+    );
+    await copySelection(page);
+
+    const completeCodeClipboard = await readRichClipboard(page);
+    expect(completeCodeClipboard.plainText).toBe('const answer = "yes";\n  return answer;');
+
+    // Crossing the block boundary expresses an intent to carry its Markdown structure.
+    await selectAssistantAcrossCodeLines(page, "const", "After code.");
+    await copySelection(page);
+
+    const crossedCodeClipboard = await readRichClipboard(page);
+    expect(crossedCodeClipboard.plainText).toBe(
+      '```typescript\nconst answer = "yes";\n  return answer;\n```\n\nAfter code.',
+    );
+
+    // Selecting a whole line runs off its end into the newline node. A trailing
+    // newline auto-executes the line when it is pasted into a terminal.
+    await selectAssistantAcrossCodeLines(page, "const", "  ");
+    await copySelection(page);
+
+    expect((await readRichClipboard(page)).plainText).toBe('const answer = "yes";');
+
+    // The block's own Copy button had the same hazard: a Markdown fence body ends in
+    // a newline, and the button copied it raw.
+    const typescriptFence = assistantMessage.locator('[data-paseo-markdown-language="typescript"]');
+    // The button is opacity 0 / pointerEvents none until the fence is hovered.
+    await typescriptFence.hover();
+    await typescriptFence.locator("[data-paseo-markdown-ignore]").click();
+
+    expect(await readPlainClipboard(page)).toBe('const answer = "yes";\n  return answer;');
+
+    // A blank line before the closing fence leaves the body ending in two newlines,
+    // so stripping only the terminal one still hands the terminal an executable line.
+    const bashFence = assistantMessage.locator('[data-paseo-markdown-language="bash"]');
+    await bashFence.hover();
+    await bashFence.locator("[data-paseo-markdown-ignore]").click();
+
+    expect(await readPlainClipboard(page)).toBe("echo trailing");
+  } finally {
+    await agent.cleanup();
+  }
+});
@@ -0,0 +1,185 @@
+import { existsSync } from "node:fs";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import {
+  clickSessionRow,
+  expectSessionRowArchived,
+  openSessions,
+} from "../support/helpers/archive-tab";
+import {
+  cloneGithubRepoDefaultBranchOnly,
+  createTempGithubRepo,
+} from "../support/helpers/github-fixtures";
+import {
+  archiveWorkspaceFromDaemon,
+  connectNewWorkspaceDaemonClient,
+} from "../support/helpers/new-workspace";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  waitForSidebarHydration,
+  waitForWorkspaceInSidebar,
+} from "../support/helpers/workspace-ui";
+
+test.describe("Auto-archive after pull request merge", () => {
+  test.describe.configure({ retries: 0, timeout: 180_000 });
+
+  test("manual restore latches and keeps a merged pull request workspace active", async ({
+    page,
+  }) => {
+    const scenario = await createMergedPullRequestScenario();
+
+    try {
+      await scenario.autoArchive();
+      await openArchivedWorkspaceFromHistory(page, scenario.agentTitle);
+      await restoreWorkspace(page, scenario.workspaceId);
+
+      await scenario.refreshMergedPullRequest();
+      await scenario.expectWorkspaceRemainsActive();
+      await waitForWorkspaceInSidebar(page, {
+        serverId: getServerId(),
+        workspaceId: scenario.workspaceId,
+      });
+    } finally {
+      await scenario.cleanup();
+    }
+  });
+});
+
+interface MergedPullRequestScenario {
+  agentTitle: string;
+  workspaceId: string;
+  autoArchive(): Promise<void>;
+  refreshMergedPullRequest(): Promise<void>;
+  expectWorkspaceRemainsActive(): Promise<void>;
+  cleanup(): Promise<void>;
+}
+
+async function createMergedPullRequestScenario(): Promise<MergedPullRequestScenario> {
+  const cleanups: Array<() => Promise<unknown>> = [];
+
+  try {
+    const repo = await createTempGithubRepo({
+      category: "auto-archive-latch",
+      prs: [{ title: "Auto-archive latch", state: "merged" }],
+    });
+    cleanups.push(() => repo.cleanup());
+    const checkout = await cloneGithubRepoDefaultBranchOnly(repo);
+    cleanups.push(() => checkout.cleanup());
+    const workspaceClient = await connectNewWorkspaceDaemonClient();
+    cleanups.push(() => workspaceClient.close());
+    const agentClient = await connectSeedClient();
+    cleanups.push(() => agentClient.close());
+    const previousConfig = await workspaceClient.getDaemonConfig();
+    await workspaceClient.patchDaemonConfig({ autoArchiveAfterMerge: false });
+    cleanups.push(() =>
+      workspaceClient.patchDaemonConfig({
+        autoArchiveAfterMerge: previousConfig.config.autoArchiveAfterMerge,
+      }),
+    );
+
+    const pullRequest = repo.prs[0];
+    if (!pullRequest) {
+      throw new Error("Expected the merged pull request fixture");
+    }
+    const created = await workspaceClient.createPaseoWorktree({
+      cwd: checkout.path,
+      action: "checkout",
+      checkoutSource: {
+        kind: "change_request",
+        forge: "github",
+        number: pullRequest.number,
+      },
+      worktreeSlug: `auto-archive-latch-${Date.now()}`,
+    });
+    if (!created.workspace || created.error) {
+      throw new Error(created.error ?? "Failed to create merged pull request workspace");
+    }
+
+    const workspace = created.workspace;
+    cleanups.push(() => workspaceClient.removeProject(workspace.projectId));
+    cleanups.push(() => archiveWorkspaceFromDaemon(workspaceClient, workspace.workspaceDirectory));
+    const agentTitle = `Auto-archive latch ${Date.now()}`;
+    const agent = await agentClient.createAgent({
+      provider: "mock",
+      model: "ten-second-stream",
+      modeId: "load-test",
+      cwd: workspace.workspaceDirectory,
+      workspaceId: workspace.id,
+      title: agentTitle,
+    });
+    await agentClient.waitForAgentUpsert(
+      agent.id,
+      (snapshot) => snapshot.status === "idle",
+      30_000,
+    );
+
+    return {
+      agentTitle,
+      workspaceId: workspace.id,
+      autoArchive: async () => {
+        await workspaceClient.patchDaemonConfig({ autoArchiveAfterMerge: true });
+        await workspaceClient.checkoutRefresh(workspace.workspaceDirectory);
+        await expect
+          .poll(() => agentClient.fetchAgent({ agentId: agent.id }), { timeout: 30_000 })
+          .toMatchObject({ agent: { archivedAt: expect.any(String) } });
+        await expect
+          .poll(() => existsSync(workspace.workspaceDirectory), { timeout: 30_000 })
+          .toBe(false);
+      },
+      refreshMergedPullRequest: async () => {
+        const refresh = await workspaceClient.checkoutRefresh(workspace.workspaceDirectory);
+        if (!refresh.success) {
+          throw new Error(`Failed to refresh restored workspace: ${String(refresh.error)}`);
+        }
+      },
+      expectWorkspaceRemainsActive: async () => {
+        const observationDeadline = Date.now() + 5_000;
+        await expect
+          .poll(
+            async () => {
+              const descriptor = (await workspaceClient.fetchWorkspaces()).entries.find(
+                (entry) => entry.id === workspace.id,
+              );
+              if (!descriptor) {
+                return "archived";
+              }
+              return Date.now() >= observationDeadline ? "active" : "observing";
+            },
+            { timeout: 10_000, intervals: [100, 250, 500] },
+          )
+          .toBe("active");
+      },
+      cleanup: () => runScenarioCleanups(cleanups),
+    };
+  } catch (error) {
+    await runScenarioCleanups(cleanups);
+    throw error;
+  }
+}
+
+async function runScenarioCleanups(cleanups: Array<() => Promise<unknown>>): Promise<void> {
+  while (cleanups.length > 0) {
+    await cleanups
+      .pop()?.()
+      .catch(() => undefined);
+  }
+}
+
+async function openArchivedWorkspaceFromHistory(page: Page, agentTitle: string): Promise<void> {
+  await gotoAppShell(page);
+  await waitForSidebarHydration(page);
+  await openSessions(page);
+  await expectSessionRowArchived(page, agentTitle);
+  await clickSessionRow(page, agentTitle);
+  await expect(page.getByText("Workspace archived", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+}
+
+async function restoreWorkspace(page: Page, workspaceId: string): Promise<void> {
+  const action = page.getByTestId("workspace-recovery-action");
+  await expect(action).toHaveText("Restore");
+  await action.click();
+  await waitForWorkspaceInSidebar(page, { serverId: getServerId(), workspaceId });
+}
@@ -1,6 +1,6 @@
-import { expect, test, type Page } from "./fixtures";
-import { expectComposerVisible } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 const MOBILE_VIEWPORT = { width: 390, height: 844 };

@@ -1,15 +1,18 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/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";
+} from "../support/helpers/branch-switcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { readWorktreeBranchInfo } from "../support/helpers/workspace";
+import {
+  switchWorkspaceViaSidebar,
+  waitForSidebarHydration,
+} from "../support/helpers/workspace-ui";

 async function renameWorkspaceViaSidebar(
  page: Page,
@@ -1,12 +1,14 @@
-import { unlink, writeFile } from "node:fs/promises";
+import { execFileSync } from "node:child_process";
+import { readFile, unlink, 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";
+import { buildHostWorkspaceRoute, buildSettingsSectionRoute } from "../../src/utils/host-routes";
+import { test, expect } from "../support/fixtures";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { getServerId } from "../support/helpers/server-id";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { createTempGitRepo } from "../support/helpers/workspace";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";

 interface DirtyWorkspace {
  id: string;
@@ -15,6 +17,9 @@ interface DirtyWorkspace {

 interface WorkspaceFixtureOptions {
  includeDeletedFile?: boolean;
+  includeNestedFolders?: boolean;
+  includeRenamedFile?: boolean;
+  includeUntrackedFile?: boolean;
 }

 interface CleanupTask {
@@ -23,6 +28,39 @@ interface CleanupTask {

 const cleanupTasks: CleanupTask[] = [];
 const APP_SETTINGS_KEY = "@paseo:app-settings";
+
+async function failNextDiscardRequest(page: Page): Promise<void> {
+  await page.routeWebSocket(daemonWsRoutePattern(), (browserSocket) => {
+    const serverSocket = browserSocket.connectToServer();
+    browserSocket.onMessage((message) => {
+      if (typeof message === "string") {
+        const envelope = JSON.parse(message) as {
+          message?: { type?: string; cwd?: string; requestId?: string };
+        };
+        if (envelope.message?.type === "checkout.discard_changes.request") {
+          browserSocket.send(
+            JSON.stringify({
+              type: "session",
+              message: {
+                type: "checkout.discard_changes.response",
+                payload: {
+                  cwd: envelope.message.cwd,
+                  success: false,
+                  error: { code: "UNKNOWN", message: "Injected revert failure" },
+                  requestId: envelope.message.requestId,
+                },
+              },
+            }),
+          );
+          return;
+        }
+      }
+      serverSocket.send(message);
+    });
+    serverSocket.onMessage((message) => browserSocket.send(message));
+  });
+}
+
 const CHANGES_PREFERENCES_KEY = "@paseo:changes-preferences";

 const BEFORE = `import { useLayoutEffect, useMemo, useRef, useState } from "react";
@@ -201,47 +239,218 @@ test.afterEach(async () => {
  }
 });

-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 file actions open from the kebab and right-click", async ({ page }) => {
+test("changes file actions open below the right-click without a reserved kebab", async ({
+  page,
+}) => {
  const workspace = await createWorkspaceWithMountedTabDiff({ includeDeletedFile: true });
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);

  await expect(page.getByTestId("diff-file-1")).toContainText("zz-deleted.ts");
-  await page.getByTestId("diff-file-1-actions").click();
+  const deletedFileName = page.getByText("zz-deleted.ts", { exact: true });
+  await expect(deletedFileName).toHaveCSS("user-select", "none");
+  await deletedFileName.dblclick();
+  expect(await page.evaluate(() => window.getSelection()?.toString() ?? "")).toBe("");
+  await expect(page.getByTestId(/diff-file-\d+-actions/)).toHaveCount(0);
+  await page.getByTestId("diff-file-1-toggle").click({ button: "right" });
+  await expect(page.getByText("Copy path")).toBeVisible();
+  await page.getByText("Copy path", { exact: true }).click({ button: "right" });
  await expect(page.getByText("Copy path")).toBeVisible();
  await expect(page.getByTestId("diff-file-1-open-file")).toHaveCount(0);
  await page.keyboard.press("Escape");

-  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+  const fileRow = page.getByTestId("diff-file-0-toggle");
+  const fileRowBounds = await fileRow.boundingBox();
+  expect(fileRowBounds).not.toBeNull();
+  await fileRow.click({ button: "right", position: { x: 80, y: 10 } });
  await expect(page.getByTestId("diff-file-0-open-file")).toBeVisible();
+  const menuBounds = await page.getByTestId("diff-file-0-context-menu").boundingBox();
+  expect(menuBounds).not.toBeNull();
+  expect(menuBounds!.x).toBeCloseTo(fileRowBounds!.x + 80, 0);
+  expect(menuBounds!.y).toBeGreaterThan(fileRowBounds!.y + 10);
  await page.getByTestId("diff-file-0-open-file").click();

  await expect(page.getByTestId("workspace-file-pane")).toBeVisible();
  await expect(page.getByTestId("workspace-tab-file_src/use-mounted-tab-set.ts")).toBeVisible();
 });

+test("changes context menus duplicate files and folders", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff();
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+  await page.getByTestId("diff-file-0-duplicate").click();
+  await expect
+    .poll(() => readFile(path.join(workspace.repoPath, "src/use-mounted-tab-set copy.ts"), "utf8"))
+    .toBe(AFTER);
+
+  await page.getByTestId("changes-toggle-view-mode").click();
+  await page.getByTestId("diff-folder-src-toggle").click({ button: "right" });
+  await page.getByTestId("diff-folder-src-duplicate").click();
+  await expect
+    .poll(() => readFile(path.join(workspace.repoPath, "src copy/use-mounted-tab-set.ts"), "utf8"))
+    .toBe(AFTER);
+});
+
+test("changes context menu recursively collapses descendant folders", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff({ includeNestedFolders: true });
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  await page.getByTestId("changes-toggle-view-mode").click();
+  await expect(page.getByTestId("diff-folder-src/zz-folder")).toBeVisible();
+  await expect(page.getByTestId("diff-folder-src/zz-folder/nested")).toBeVisible();
+
+  await page.getByTestId("diff-folder-src-toggle").click({ button: "right" });
+  await page.getByTestId("diff-folder-src-collapse-folder").click();
+  await expect(page.getByTestId("diff-folder-src/zz-folder")).toHaveCount(0);
+
+  await page.getByTestId("diff-folder-src-toggle").click();
+  await expect(page.getByTestId("diff-folder-src/zz-folder")).toBeVisible();
+  await expect(page.getByText("root.ts", { exact: true })).toHaveCount(0);
+
+  await page.getByTestId("diff-folder-src/zz-folder-toggle").click();
+  await expect(page.getByText("root.ts", { exact: true })).toBeVisible();
+  await expect(page.getByTestId("diff-folder-src/zz-folder/nested")).toBeVisible();
+  await expect(page.getByText("changed.ts", { exact: true })).toHaveCount(0);
+
+  await page.getByTestId("diff-folder-src/zz-folder/nested-toggle").click();
+  await expect(page.getByText("changed.ts", { exact: true })).toBeVisible();
+});
+
+test("changes context menus expose folder revert and restore a file after confirmation", async ({
+  page,
+}) => {
+  const workspace = await createWorkspaceWithMountedTabDiff();
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  await page.getByTestId("changes-toggle-view-mode").click();
+  await page.getByTestId("diff-folder-src-toggle").click({ button: "right" });
+  const folderRevert = page.getByTestId("diff-folder-src-revert");
+  await expect(folderRevert).toBeVisible();
+  const revertLabelColor = await folderRevert
+    .getByText("Discard changes", { exact: true })
+    .evaluate((element) => getComputedStyle(element).color);
+  await expect(folderRevert.locator("svg")).toHaveCSS("stroke", revertLabelColor);
+  await page.keyboard.press("Escape");
+
+  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+  const cancelledConfirmation = new Promise<string>((resolve) => {
+    page.once("dialog", async (dialog) => {
+      const message = dialog.message();
+      await dialog.dismiss();
+      resolve(message);
+    });
+  });
+  await page.getByTestId("diff-file-0-revert").click();
+  expect(await cancelledConfirmation).toContain("src/use-mounted-tab-set.ts");
+  await expect(page.getByTestId("diff-file-0")).toBeVisible();
+  await expect
+    .poll(() => readFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), "utf8"))
+    .toBe(AFTER);
+
+  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+  const confirmation = new Promise<string>((resolve) => {
+    page.once("dialog", async (dialog) => {
+      const message = dialog.message();
+      await dialog.accept();
+      resolve(message);
+    });
+  });
+  await page.getByTestId("diff-file-0-revert").click();
+  expect(await confirmation).toContain("src/use-mounted-tab-set.ts");
+
+  await expect(page.getByTestId("diff-file-0")).toHaveCount(0, { timeout: 30_000 });
+  await expect
+    .poll(() => readFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), "utf8"))
+    .toBe(BEFORE);
+});
+
+test("discarding a staged rename restores its source path", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff({ includeRenamedFile: true });
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  const renamedToggle = page
+    .getByTestId(/^diff-file-\d+-toggle$/)
+    .filter({ hasText: "zz-renamed.ts" });
+  const toggleTestId = await renamedToggle.getAttribute("data-testid");
+  expect(toggleTestId).not.toBeNull();
+  const rowTestId = toggleTestId!.slice(0, -"-toggle".length);
+  await renamedToggle.click({ button: "right" });
+  const confirmation = new Promise<void>((resolve) => {
+    page.once("dialog", async (dialog) => {
+      await dialog.accept();
+      resolve();
+    });
+  });
+  await page.getByTestId(`${rowTestId}-revert`).click();
+  await confirmation;
+
+  await expect(page.getByText("zz-renamed.ts", { exact: true })).toHaveCount(0, {
+    timeout: 30_000,
+  });
+  await expect
+    .poll(() => readFile(path.join(workspace.repoPath, "src/rename-source.ts"), "utf8"))
+    .toBe("export const renamed = true;\n");
+});
+
+test("discarding an untracked file removes it from the working tree", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff({ includeUntrackedFile: true });
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  const untrackedToggle = page
+    .getByTestId(/^diff-file-\d+-toggle$/)
+    .filter({ hasText: "zz-untracked.txt" });
+  const toggleTestId = await untrackedToggle.getAttribute("data-testid");
+  expect(toggleTestId).not.toBeNull();
+  const rowTestId = toggleTestId!.slice(0, -"-toggle".length);
+  await untrackedToggle.click({ button: "right" });
+  const confirmation = new Promise<void>((resolve) => {
+    page.once("dialog", async (dialog) => {
+      await dialog.accept();
+      resolve();
+    });
+  });
+  await page.getByTestId(`${rowTestId}-revert`).click();
+  await confirmation;
+
+  await expect(page.getByText("zz-untracked.txt", { exact: true })).toHaveCount(0, {
+    timeout: 30_000,
+  });
+  await expect(
+    readFile(path.join(workspace.repoPath, "zz-untracked.txt"), "utf8"),
+  ).rejects.toThrow();
+});
+
+test("shows a revert error returned by the daemon", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff();
+  await failNextDiscardRequest(page);
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+  const confirmation = new Promise<void>((resolve) => {
+    page.once("dialog", async (dialog) => {
+      await dialog.accept();
+      resolve();
+    });
+  });
+  await page.getByTestId("diff-file-0-revert").click();
+  await confirmation;
+
+  await expect(page.getByText("Injected revert failure", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(page.getByTestId("diff-file-0")).toBeVisible();
+  await expect
+    .poll(() => readFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), "utf8"))
+    .toBe(AFTER);
+});
+
 test("Changes switches between inline and full-tab navigation", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff({ includeDeletedFile: true });
  await useUnwrappedDiffLines(page);
@@ -303,7 +512,7 @@ test("Changes switches between inline and full-tab navigation", async ({ page })
  await page.getByTestId("explorer-content-area").getByTestId("diff-file-1-toggle").click();
  await expect(page.getByTestId(/^workspace-working-diff-close-/)).toHaveCount(1);
  await expect(visiblePanel.getByText("zz-deleted.ts", { exact: true })).toBeVisible();
-  await expect(visiblePanel).toContainText("Deleted");
+  await expect(visiblePanel.getByRole("img", { name: "Deleted" })).toBeVisible();

  await changesTabToggle.click();
  await expect(page.getByTestId(/^workspace-working-diff-close-/)).toHaveCount(0);
@@ -339,7 +548,50 @@ test("changes diff switches between flat and tree file lists", async ({ page })
  await scrollToLowerUnwrappedDiffRows(page);
  await page.getByTestId("changes-toggle-view-mode").click();
  await expect(page.getByTestId("diff-folder-src")).toBeVisible();
+  await expect(page.getByTestId("diff-folder-src").getByText("src", { exact: true })).toHaveCSS(
+    "user-select",
+    "none",
+  );
  await expect(page.getByTestId("diff-file-0")).toBeVisible();
+  await expect(page.getByTestId("diff-folder-src-toggle").locator("svg")).toHaveCount(1);
+  await expect(page.getByTestId("diff-file-0-toggle").locator("svg")).toHaveCount(1);
+  const folderToggleBounds = await page.getByTestId("diff-folder-src-toggle").boundingBox();
+  const folderChevronBounds = await page
+    .getByTestId("diff-folder-src-toggle")
+    .locator("svg")
+    .boundingBox();
+  expect(folderToggleBounds).not.toBeNull();
+  expect(folderChevronBounds).not.toBeNull();
+  expect(folderChevronBounds!.y + folderChevronBounds!.height / 2).toBeCloseTo(
+    folderToggleBounds!.y + folderToggleBounds!.height / 2,
+    0,
+  );
+  const folderLabelBounds = await page
+    .getByTestId("diff-folder-src")
+    .getByText("src", { exact: true })
+    .boundingBox();
+  const fileLabelBounds = await page
+    .getByTestId("diff-file-0")
+    .getByText("use-mounted-tab-set.ts", { exact: true })
+    .boundingBox();
+  expect(folderLabelBounds).not.toBeNull();
+  expect(fileLabelBounds).not.toBeNull();
+  expect(fileLabelBounds!.x - folderLabelBounds!.x).toBeCloseTo(16, 0);
+
+  const folderToggle = page.getByTestId("diff-folder-src-toggle");
+  await folderToggle.click();
+  await expect(folderToggle).toHaveAttribute("aria-selected", "true");
+  await expect(page.getByTestId("diff-file-0")).toHaveCount(0);
+  await folderToggle.click();
+  await expect(folderToggle).toHaveAttribute("aria-selected", "true");
+  await expect(page.getByTestId("diff-file-0")).toBeVisible();
+
+  const fileToggle = page.getByTestId("diff-file-0-toggle");
+  await fileToggle.click({ button: "right" });
+  await expect(fileToggle).toHaveAttribute("aria-selected", "true");
+  await expect(folderToggle).toHaveAttribute("aria-selected", "false");
+  await expect(page.getByTestId("diff-file-0-context-menu")).toBeVisible();
+  await page.keyboard.press("Escape");

  await page.getByRole("button", { name: "Collapse all" }).click();
  await expect(page.getByTestId("diff-file-0")).toHaveCount(0);
@@ -353,56 +605,7 @@ test("changes diff switches between flat and tree file lists", async ({ page })
  await expectFlatFileList(page);
 });

-test("workspace file panes keep their controls on shared alignment rails", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await openWorkspaceChanges(page, workspace);
-
-  await page.getByTestId("changes-toggle-view-mode").click();
-  await expect(page.getByTestId("diff-folder-src")).toBeVisible();
-
-  const changesRightRail = await Promise.all([
-    readSvgRight(page, "explorer-close"),
-    readSvgRight(page, "changes-options-menu"),
-    readSvgRight(page, "diff-file-0-actions"),
-  ]);
-  expectAligned(changesRightRail);
-
-  const [folderStat, fileStat] = await Promise.all([
-    page.getByTestId("diff-folder-src-stat").boundingBox(),
-    page.getByTestId("diff-file-0-stat").boundingBox(),
-  ]);
-  expect(folderStat).not.toBeNull();
-  expect(fileStat).not.toBeNull();
-  expect(folderStat!.x + folderStat!.width).toBeCloseTo(fileStat!.x + fileStat!.width, 0);
-
-  await page.getByTestId("explorer-tab-files").click();
-  await expect(page.getByTestId("file-explorer-row-0")).toBeVisible();
-
-  const filesRightRail = await Promise.all([
-    readSvgRight(page, "explorer-close"),
-    readSvgRight(page, "files-refresh"),
-    readSvgRight(page, "file-explorer-row-0-actions"),
-  ]);
-  expectAligned(filesRightRail);
-
-  const [sortLabel, firstRowIcon, treeBounds, rowBounds] = await Promise.all([
-    page.getByTestId("files-sort-label").boundingBox(),
-    page.getByTestId("file-explorer-row-0").locator("svg").first().boundingBox(),
-    page.getByTestId("file-explorer-tree-scroll").boundingBox(),
-    page.getByTestId("file-explorer-row-0").boundingBox(),
-  ]);
-  expect(sortLabel).not.toBeNull();
-  expect(firstRowIcon).not.toBeNull();
-  expect(treeBounds).not.toBeNull();
-  expect(rowBounds).not.toBeNull();
-  expect(sortLabel!.x).toBeCloseTo(firstRowIcon!.x, 0);
-  expect(rowBounds!.x).toBeCloseTo(treeBounds!.x, 0);
-  expect(rowBounds!.x + rowBounds!.width).toBeCloseTo(treeBounds!.x + treeBounds!.width, 0);
-});
-
-test("changes diff keeps unwrapped gutter and code rows aligned after code size changes", async ({
-  page,
-}) => {
+test("changes diff applies code size changes to gutter and code typography", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff();
  await useCodeFont(page, 12);
  await useUnwrappedDiffLines(page);
@@ -415,7 +618,6 @@ test("changes diff keeps unwrapped gutter and code rows aligned after code size

  await expectDiffCodeFontSize(page, 18);
  await expectVisibleDiffRowsShareTypography(page);
-  await expectVisibleDiffRowsAligned(page);
 });

 async function useCodeFont(page: Page, codeFontSize: number): Promise<void> {
@@ -467,33 +669,28 @@ async function expectFlatFileList(page: Page): Promise<void> {
 }

 async function expectDiffCodeFontSize(page: Page, fontSize: number): Promise<void> {
+  const visibleCodeText = page
+    .getByTestId(/^diff-code-text-/)
+    .filter({ visible: true })
+    .first();
  await expect
    .poll(async () => {
-      return page
-        .getByTestId("diff-code-text-1")
-        .evaluate((text) => Number.parseFloat(getComputedStyle(text).fontSize));
+      return visibleCodeText.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;
  }[];
@@ -528,7 +725,6 @@ async function readVisibleDiffRowGeometry(page: Page): Promise<{
          index: code.index,
          gutterTop: gutter.top,
          codeTop: code.top,
-          delta: Math.abs(code.top - gutter.top),
          gutterLineHeight: gutter.lineHeight,
          codeLineHeight: code.lineHeight,
        };
@@ -536,7 +732,6 @@ async function readVisibleDiffRowGeometry(page: Page): Promise<{
      .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) => ({
@@ -556,7 +751,16 @@ async function createWorkspaceWithMountedTabDiff(
  if (options.includeDeletedFile) {
    files.push({ path: "src/zz-deleted.ts", content: "export const deleted = true;\n" });
  }
-  const repo = await createTempGitRepo("diff-row-alignment-", { files });
+  if (options.includeRenamedFile) {
+    files.push({ path: "src/rename-source.ts", content: "export const renamed = true;\n" });
+  }
+  if (options.includeNestedFolders) {
+    files.push(
+      { path: "src/zz-folder/root.ts", content: "export const root = 1;\n" },
+      { path: "src/zz-folder/nested/changed.ts", content: "export const nested = 1;\n" },
+    );
+  }
+  const repo = await createTempGitRepo("changes-pane-", { files });
  const client = await connectSeedClient();
  cleanupTasks.push({
    run: async () => {
@@ -566,9 +770,24 @@ async function createWorkspaceWithMountedTabDiff(
  });

  await writeFile(path.join(repo.path, "src/use-mounted-tab-set.ts"), AFTER);
+  if (options.includeUntrackedFile) {
+    await writeFile(path.join(repo.path, "zz-untracked.txt"), "remove me\n");
+  }
  if (options.includeDeletedFile) {
    await unlink(path.join(repo.path, "src/zz-deleted.ts"));
  }
+  if (options.includeRenamedFile) {
+    execFileSync("git", ["mv", "src/rename-source.ts", "src/zz-renamed.ts"], {
+      cwd: repo.path,
+    });
+  }
+  if (options.includeNestedFolders) {
+    await writeFile(path.join(repo.path, "src/zz-folder/root.ts"), "export const root = 2;\n");
+    await writeFile(
+      path.join(repo.path, "src/zz-folder/nested/changed.ts"),
+      "export const nested = 2;\n",
+    );
+  }
  const createdWorkspace = await client.createWorkspace({
    source: { kind: "directory", path: repo.path },
  });
@@ -593,21 +812,6 @@ async function openChangesInVisibleExplorer(page: Page): Promise<void> {
  await expect(page.getByText("use-mounted-tab-set.ts")).toBeVisible({ timeout: 30_000 });
 }

-async function readSvgRight(page: Page, testID: string): Promise<number> {
-  const box = await page.getByTestId(testID).locator("svg").first().boundingBox();
-  if (!box) {
-    throw new Error(`Could not measure ${testID}`);
-  }
-  return box.x + box.width;
-}
-
-function expectAligned(values: number[]): void {
-  const [first, ...rest] = values;
-  for (const value of rest) {
-    expect(value).toBeCloseTo(first, 0);
-  }
-}
-
 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({
@@ -660,86 +864,3 @@ async function scrollToLowerUnwrappedDiffRows(page: Page): Promise<void> {
  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);
-}
@@ -0,0 +1,239 @@
+import { expect, test } from "../support/fixtures";
+import { trackPromptJumpRequests } from "../support/helpers/agent-timeline-gate";
+import {
+  clickChatOutlineRowEdge,
+  disableChatOutlineFromAppearance,
+  expectActiveChatOutlinePrompt,
+  expectChatOutlinePreview,
+  expectChatOutlinePrompts,
+  expectChatOutlinePromptToRemainBare,
+  expectLiveTurnPromptAboveFoldAndActive,
+  expectNoChatOutlinePreviewWhileCrossingToSidebar,
+  expectNoChatOutline,
+  expectNoChatOutlinePreview,
+  expectOneActiveChatOutlinePrompt,
+  focusChatOutlinePrompt,
+  hoverChatOutlinePrompt,
+  chatOutlineRail,
+  movePointerOffChatOutline,
+  pointAtChatOutlineRowEdge,
+  pressEnterOnFocusedPrompt,
+  splitCurrentPanelRight,
+} from "../support/helpers/chat-outline";
+import {
+  expectTimelineAtMaximumScrollWithPromptVisible,
+  expectTimelinePromptNotMounted,
+  expectTimelinePromptLandedBelowTop,
+  expectTimelinePromptVisible,
+  holdOlderHistoryPages,
+  openAgentTimeline,
+  scrollThroughOlderHistoryPages,
+  scrollTimelineToNewestLoadedEdge,
+  scrollTimelineToOldestLoadedEdge,
+  seedLongMockAgentTimeline,
+  type LongTimelineAgent,
+} from "../support/helpers/timeline-pagination";
+
+// Wide enough that the timeline panel clears the rail's MIN_PANEL_WIDTH with room
+// to spare. At 1280 the panel measures 960, which sits too close to the threshold
+// for chrome-width changes elsewhere to stay out of these tests.
+const WIDE_VIEWPORT = { width: 1440, height: 900 };
+const LOADED_TURNS = 16;
+
+test.describe("desktop chat outline", () => {
+  test("indexes unloaded prompts and jumps with one bounded merged page", async ({ page }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      const jumps = await trackPromptJumpRequests(page, agent.agentId);
+      await page.setViewportSize(WIDE_VIEWPORT);
+      await openAgentTimeline(page, agent);
+
+      const rail = chatOutlineRail(page);
+      await expectChatOutlinePrompts(page, 80);
+      await expectTimelinePromptNotMounted(page, agent.oldestPrompt);
+
+      await rail.getByRole("tab").nth(39).click();
+      await expectTimelinePromptLandedBelowTop(page, agent.prompts[39]);
+      await expect.poll(() => jumps.requests()).toHaveLength(1);
+      expect(jumps.requests()[0]).toMatchObject({ limit: 40, mergeWindow: true });
+
+      await page.getByTestId("scroll-to-bottom-button").click();
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+
+      const requestsBeforeLoadedJump = jumps.requests().length;
+      await rail.getByRole("tab").last().click();
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+      expect(jumps.requests()).toHaveLength(requestsBeforeLoadedJump);
+
+      await rail.getByRole("tab").first().click();
+      await expectTimelinePromptVisible(page, agent.oldestPrompt);
+      await agent.client.sendAgentMessage(agent.agentId, "live prompt while viewing old history");
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+      await expectTimelinePromptVisible(page, agent.oldestPrompt);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test.describe("with the whole conversation loaded", () => {
+    let agent: LongTimelineAgent;
+
+    test.beforeAll(async () => {
+      test.setTimeout(120_000);
+      agent = await seedLongMockAgentTimeline({ turns: LOADED_TURNS });
+    });
+
+    test.afterAll(async () => {
+      await agent.cleanup();
+    });
+
+    test.beforeEach(async ({ page }) => {
+      await page.setViewportSize(WIDE_VIEWPORT);
+      await openAgentTimeline(page, agent);
+      await expectChatOutlinePrompts(page, LOADED_TURNS);
+    });
+
+    test("previews the prompt under the pointer, anywhere across its row", async ({ page }) => {
+      await hoverChatOutlinePrompt(page, 2);
+      await expectChatOutlinePreview(page, agent.prompts[1]);
+
+      await pointAtChatOutlineRowEdge(page, 7);
+      await expectChatOutlinePreview(page, agent.prompts[6]);
+
+      await movePointerOffChatOutline(page);
+      await expectNoChatOutlinePreview(page);
+    });
+
+    test("does not preview while crossing the rail toward the sidebar", async ({ page }) => {
+      await expectNoChatOutlinePreviewWhileCrossingToSidebar(page);
+    });
+
+    test("closes the preview when the pointer leaves after a jump", async ({ page }) => {
+      await clickChatOutlineRowEdge(page, 4);
+      await movePointerOffChatOutline(page);
+
+      await expectNoChatOutlinePreview(page);
+    });
+
+    test("previews and jumps to the focused prompt from the keyboard", async ({ page }) => {
+      await focusChatOutlinePrompt(page, 1);
+      await expectChatOutlinePreview(page, agent.prompts[0]);
+
+      await pressEnterOnFocusedPrompt(page);
+      await expectTimelinePromptLandedBelowTop(page, agent.oldestPrompt);
+      await expectActiveChatOutlinePrompt(page, 1);
+    });
+
+    test("moves the active mark as the reader jumps and scrolls", async ({ page }) => {
+      await expectOneActiveChatOutlinePrompt(page);
+
+      await clickChatOutlineRowEdge(page, 4);
+      await expectTimelinePromptVisible(page, agent.prompts[3]);
+      await expectActiveChatOutlinePrompt(page, 4);
+
+      await scrollTimelineToOldestLoadedEdge(page);
+      await expectActiveChatOutlinePrompt(page, 1);
+    });
+
+    test("keeps a clicked prompt free of persistent selection chrome", async ({ page }) => {
+      await clickChatOutlineRowEdge(page, 4);
+
+      await expectChatOutlinePromptToRemainBare(page, 4);
+    });
+
+    test("clamps the newest prompt at maximum scroll while keeping it visible", async ({
+      page,
+    }) => {
+      await clickChatOutlineRowEdge(page, LOADED_TURNS);
+
+      await expectTimelineAtMaximumScrollWithPromptVisible(page, agent.newestPrompt);
+    });
+
+    test("keeps the current prompt active throughout a long live assistant turn", async ({
+      page,
+    }) => {
+      const prompt = "chat outline live turn reading position";
+      await agent.client.sendAgentMessage(agent.agentId, prompt);
+      try {
+        await expectLiveTurnPromptAboveFoldAndActive(page, prompt, LOADED_TURNS + 1);
+      } finally {
+        await agent.client.waitForFinish(agent.agentId, 15_000);
+      }
+    });
+  });
+
+  test.describe("with virtualized loaded history", () => {
+    let agent: LongTimelineAgent;
+
+    test.beforeAll(async () => {
+      test.setTimeout(120_000);
+      agent = await seedLongMockAgentTimeline({ turns: 80 });
+    });
+
+    test.afterAll(async () => {
+      await agent.cleanup();
+    });
+
+    test.beforeEach(async ({ page }) => {
+      await page.setViewportSize(WIDE_VIEWPORT);
+    });
+
+    test("pins a loaded prompt inside the virtualized block without fetching", async ({ page }) => {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await expectChatOutlinePrompts(page, 80);
+      await scrollThroughOlderHistoryPages(page, 2, history);
+      await scrollTimelineToNewestLoadedEdge(page);
+      const requestsBeforeJump = history.requestCount();
+
+      await clickChatOutlineRowEdge(page, 30);
+      await expectTimelinePromptLandedBelowTop(page, agent.prompts[29]);
+
+      expect(history.requestCount()).toBe(requestsBeforeJump);
+    });
+
+    test("pins a newer loaded prompt when jumping downward from old history", async ({ page }) => {
+      const history = await holdOlderHistoryPages(page, agent);
+      await openAgentTimeline(page, agent);
+      await expectChatOutlinePrompts(page, 80);
+      await scrollThroughOlderHistoryPages(page, 2, history);
+      await scrollTimelineToNewestLoadedEdge(page);
+
+      await clickChatOutlineRowEdge(page, 30);
+      await expectTimelinePromptLandedBelowTop(page, agent.prompts[29]);
+
+      await clickChatOutlineRowEdge(page, 60);
+
+      await expectTimelinePromptLandedBelowTop(page, agent.prompts[59]);
+    });
+  });
+
+  test("hides the rail when a split makes its panel narrow", async ({ page }) => {
+    const agent = await seedLongMockAgentTimeline({ turns: 2 });
+    try {
+      await page.setViewportSize(WIDE_VIEWPORT);
+      await openAgentTimeline(page, agent);
+
+      await splitCurrentPanelRight(page);
+
+      await expectNoChatOutline(page);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("can be disabled from Appearance settings", async ({ page }) => {
+    const agent = await seedLongMockAgentTimeline({ turns: 2 });
+    try {
+      await page.setViewportSize(WIDE_VIEWPORT);
+      await openAgentTimeline(page, agent);
+
+      await disableChatOutlineFromAppearance(page);
+
+      await expectNoChatOutline(page);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+});
@@ -0,0 +1,66 @@
+import { mkdtempSync, realpathSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "../support/fixtures";
+import { submitMessage } from "../support/helpers/composer";
+import { cleanupRewindFlow, launchAgent, type AgentHandle } from "../support/helpers/rewind-flow";
+import { openSubagentsTrack } from "../support/helpers/subagents";
+
+process.env.CLAUDE_CODE_WORKFLOWS = "1";
+
+const WORKFLOW_SCRIPT = path.resolve(__dirname, "../fixtures/claude-workflow/inspect-project.js");
+const REPO_ROOT = path.resolve(__dirname, "../../../..");
+const DESCRIPTION = "Inspect Paseo and explain what the project does";
+
+test.describe("real Claude project-inspection workflow", () => {
+  test.setTimeout(300_000);
+
+  test("shows the workflow's actual report in the generic detail pane", async ({
+    page,
+  }, testInfo) => {
+    const cwd = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-project-inspection-")));
+    let handle: AgentHandle | undefined;
+
+    try {
+      handle = await launchAgent({ page, provider: "claude", cwd, mode: "full-access" });
+      await submitMessage(
+        page,
+        `Use Claude Code's Workflow tool exactly once with scriptPath ${JSON.stringify(
+          WORKFLOW_SCRIPT,
+        )} and args ${JSON.stringify({ repoPath: REPO_ROOT })}. Wait for completion, then reply with exactly PROJECT_INSPECTION_DONE.`,
+      );
+
+      await expect(page.getByTestId("subagents-track-header")).toBeVisible({ timeout: 60_000 });
+      await openSubagentsTrack(page);
+      const row = page
+        .getByTestId(/^subagents-track-row-/)
+        .filter({ has: page.getByText(DESCRIPTION, { exact: true }) });
+      await expect(row).toBeVisible({ timeout: 60_000 });
+      await expect(row.getByRole("progressbar", { name: "Agent running" })).toHaveCount(0, {
+        timeout: 180_000,
+      });
+      await expect(
+        page.getByTestId("assistant-message").filter({ hasText: "PROJECT_INSPECTION_DONE" }).last(),
+      ).toBeVisible({ timeout: 180_000 });
+
+      await row.click();
+      const panel = page.getByTestId("provider-subagent-panel");
+      await expect(panel).toBeVisible({ timeout: 30_000 });
+      for (const heading of [
+        "What Paseo is",
+        "Who it is for",
+        "How it works",
+        "Repository structure",
+      ]) {
+        await expect(panel.getByText(heading, { exact: true })).toBeVisible();
+      }
+      await expect(panel.getByText("export const meta", { exact: false })).toHaveCount(0);
+      await expect(
+        panel.getByText("Inspect the Paseo repository at", { exact: false }),
+      ).toHaveCount(0);
+      await page.screenshot({ path: testInfo.outputPath("project-workflow-pane.png") });
+    } finally {
+      await cleanupRewindFlow({ handle, cwd });
+    }
+  });
+});
@@ -0,0 +1,55 @@
+import { mkdtempSync, realpathSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { test } from "../support/fixtures";
+import {
+  askClaudeToRunWorkflow,
+  expectSingleWorkflowParentCard,
+  expectWorkflowCompleted,
+  expectWorkflowRunning,
+  openWorkflowTimeline,
+  releaseWorkflow,
+} from "../support/helpers/claude-workflow";
+import { cleanupRewindFlow, launchAgent, type AgentHandle } from "../support/helpers/rewind-flow";
+
+// Claude Code currently gates the Workflow tool behind its own rollout. The real-provider test
+// opts in explicitly so it tests Paseo's integration rather than the account's rollout cohort.
+process.env.CLAUDE_CODE_WORKFLOWS = "1";
+
+const WORKFLOW_SCRIPT = path.resolve(__dirname, "../fixtures/claude-workflow/one-child.js");
+
+test.describe("real Claude workflow subagent row", () => {
+  test.setTimeout(300_000);
+
+  test("shows a real Claude workflow running and completed through the generic subagent UI", async ({
+    page,
+  }, testInfo) => {
+    const cwd = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-claude-workflow-row-")));
+    const gatePath = path.join(cwd, "release-workflow");
+    let handle: AgentHandle | undefined;
+
+    try {
+      handle = await launchAgent({ page, provider: "claude", cwd, mode: "full-access" });
+
+      await test.step("ask Claude to run the workflow", async () => {
+        await askClaudeToRunWorkflow(handle!, WORKFLOW_SCRIPT, gatePath);
+        await expectWorkflowRunning(page);
+        await page.screenshot({ path: testInfo.outputPath("workflow-running.png") });
+        releaseWorkflow(gatePath);
+      });
+
+      await test.step("see the workflow finish without leaving a running row", async () => {
+        await expectWorkflowCompleted(page);
+        await expectSingleWorkflowParentCard(page);
+        await page.screenshot({ path: testInfo.outputPath("workflow-completed.png") });
+      });
+
+      await test.step("open the workflow through the existing provider-subagent pane", async () => {
+        await openWorkflowTimeline(page);
+        await page.screenshot({ path: testInfo.outputPath("workflow-timeline.png") });
+      });
+    } finally {
+      await cleanupRewindFlow({ handle, cwd });
+    }
+  });
+});
@@ -1,12 +1,12 @@
-import { expect, test, type Page } from "./fixtures";
-import { composerLocator, expectComposerVisible, submitMessage } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import { composerLocator, expectComposerVisible, submitMessage } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import {
  expectSessionRowArchived,
  expectWorkspaceTabHidden,
  expectWorkspaceTabVisible,
  openSessions,
-} from "./helpers/archive-tab";
+} from "../support/helpers/archive-tab";

 interface SlashCommandScenario {
  agentId: string;
@@ -1,6 +1,6 @@
-import { expect, test } from "./fixtures";
-import { allowPermission, waitForPermissionPrompt } from "./helpers/permissions";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test } from "../support/fixtures";
+import { allowPermission, waitForPermissionPrompt } from "../support/helpers/permissions";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 test.describe("Codex plan approval", () => {
  test("shows a single actionable plan panel and removes it after implementation starts", async ({
@@ -0,0 +1,109 @@
+import { test } from "../support/fixtures";
+import type { FormPreferences } from "@/create-agent-preferences/preferences";
+import { closeCommandCenter, openCommandCenter } from "../support/helpers/command-center";
+import {
+  applyCommandCenterAgentControls,
+  chooseCommandCenterAgentControl,
+  expectCommandCenterAgentControlSelected,
+  expectFocusedAgentControls,
+  expectWorkspaceAgentConfiguration,
+  submitDraftAgent,
+  waitForDraftComposer,
+} from "../support/helpers/command-center-agent-controls";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { seedWorkspace } from "../support/helpers/seed-client";
+
+const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";
+
+async function seedMockDraftPreferences(page: import("@playwright/test").Page): Promise<void> {
+  await page.addInitScript(
+    ({ preferencesKey }) => {
+      localStorage.setItem(
+        preferencesKey,
+        JSON.stringify({
+          provider: "mock",
+          providerPreferences: {
+            mock: {
+              model: "five-minute-stream",
+              mode: "load-test",
+            },
+          },
+        } satisfies FormPreferences),
+      );
+    },
+    { preferencesKey: CREATE_AGENT_PREFERENCES_KEY },
+  );
+}
+
+test.describe("Command Center agent controls", () => {
+  test.describe.configure({ timeout: 180_000 });
+
+  test("changes a running agent setting and preserves its selected row", async ({ page }) => {
+    const workspace = await seedMockAgentWorkspace({
+      repoPrefix: "command-center-live-controls-",
+      title: "Command Center live controls",
+      model: "five-minute-stream",
+    });
+    try {
+      // A stale runtime mode makes selecting the provider's supported mode
+      // exercise the live setting RPC instead of the selected-row no-op.
+      await workspace.client.setAgentMode(workspace.agentId, "legacy-mode");
+      await openAgentRoute(page, {
+        workspaceId: workspace.workspaceId,
+        agentId: workspace.agentId,
+      });
+      await openCommandCenter(page);
+      await chooseCommandCenterAgentControl({
+        page,
+        query: "load test",
+        choice: "Mode › Load test",
+      });
+      await expectWorkspaceAgentConfiguration(workspace, {
+        id: workspace.agentId,
+        provider: "mock",
+        model: "five-minute-stream",
+        modeId: "load-test",
+      });
+      await openCommandCenter(page);
+      await expectCommandCenterAgentControlSelected({
+        page,
+        query: "load test",
+        choice: "Mode › Load test",
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("applies draft model and setting choices to the created agent", async ({ page }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "command-center-draft-controls-" });
+    await seedMockDraftPreferences(page);
+
+    try {
+      await openDraftComposer(page, workspace.workspaceId);
+      await applyCommandCenterAgentControls(page, DRAFT_AGENT_CONTROL_CHOICES);
+      await closeCommandCenter(page);
+      await submitDraftAgent(page, "Create an agent with Command Center draft choices");
+      await expectFocusedAgentControls(page, DRAFT_AGENT_CONTROL_CHOICES);
+      await expectWorkspaceAgentConfiguration(workspace, {
+        provider: "mock",
+        model: "ten-second-stream",
+        modeId: "load-test",
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
+
+const DRAFT_AGENT_CONTROL_CHOICES = [
+  { query: "ten second stream", choice: "Model › Mock Load Test › Ten second stream" },
+  { query: "load test", choice: "Mode › Load test" },
+] as const;
+
+async function openDraftComposer(page: import("@playwright/test").Page, workspaceId: string) {
+  await gotoWorkspace(page, workspaceId);
+  await clickNewChat(page);
+  await waitForDraftComposer(page);
+}
@@ -0,0 +1,139 @@
+import { expect, test } from "../support/fixtures";
+import { openCommandCenter } from "../support/helpers/command-center";
+import {
+  delayDirectorySuggestionResponses,
+  expectOneLineTruncatedFileResult,
+  expectStableCommandCenterLayout,
+  failDirectorySuggestionRequests,
+  startCommandCenterLayoutObservation,
+} from "../support/helpers/command-center-file-search";
+import { expectFileTabOpen } from "../support/helpers/file-explorer";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+
+const FILE_PATH =
+  "packages/app/src/command-center/features/workspace-file-search/layout-stability/needle-layout-stability-command-center.tsx";
+const FILE_NAME = "needle-layout-stability-command-center.tsx";
+const FILE_DIRECTORY =
+  "packages/app/src/command-center/features/workspace-file-search/layout-stability";
+
+function paseoSizedFiles(): Array<{ path: string; content: string }> {
+  const files = Array.from({ length: 120 }, (_, index) => ({
+    path: `packages/app/src/features/feature-${String(index).padStart(3, "0")}/index.ts`,
+    content: `export const feature${index} = ${index};\n`,
+  }));
+  files.push({ path: FILE_PATH, content: "export const layoutNeedle = true;\n" });
+  return files;
+}
+
+async function seedMatchingWorkspaces(count: number): Promise<SeededWorkspace[]> {
+  return Promise.all(
+    Array.from({ length: count }, (_, index) =>
+      seedWorkspace({
+        repoPrefix: `command-center-file-search-error-${String(index).padStart(2, "0")}-`,
+        title: `Home failure ${String(index).padStart(2, "0")}`,
+      }),
+    ),
+  );
+}
+
+test.use({
+  userAgent:
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/145.0 Safari/537.36",
+});
+
+test("workspace file search stays geometrically stable through delayed loading and results", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const seeded = await seedWorkspace({
+    repoPrefix: "command-center-file-search-",
+    title: "Paseo-shaped file search",
+    repo: { files: paseoSizedFiles() },
+  });
+
+  try {
+    await delayDirectorySuggestionResponses(page, 800);
+    await gotoWorkspace(page, seeded.workspaceId);
+    await page.keyboard.press("Meta+P");
+
+    const panel = page.getByTestId("command-center-panel");
+    await expect(panel).toBeVisible({ timeout: 30_000 });
+    await expect(panel.getByRole("button", { name: "Files" })).toBeVisible();
+    await startCommandCenterLayoutObservation(page);
+
+    await panel.getByTestId("command-center-input").fill(FILE_NAME);
+    const row = panel.getByRole("button", {
+      name: `${FILE_NAME} ${FILE_DIRECTORY}`,
+    });
+    await expect(row).toBeVisible({ timeout: 30_000 });
+    await expectOneLineTruncatedFileResult(row, {
+      filename: FILE_NAME,
+      path: FILE_DIRECTORY,
+    });
+
+    await panel.getByTestId("command-center-input").fill("needle-layout");
+    await page.waitForTimeout(150);
+    expect(await row.isVisible()).toBe(true);
+    await expect(panel.getByTestId("command-center-file-search-loading")).toBeVisible();
+    await expect(panel.getByText("Searching files...", { exact: true })).toHaveCount(0);
+    await expect(panel.getByTestId("command-center-file-search-loading")).toBeHidden();
+    await expectStableCommandCenterLayout(page);
+
+    await row.click();
+    await expectFileTabOpen(page, FILE_PATH);
+  } finally {
+    await seeded.cleanup();
+  }
+});
+
+test("dropping the files scope leaves the search row the same height", async ({ page }) => {
+  const seeded = await seedWorkspace({
+    repoPrefix: "command-center-file-search-scope-",
+    title: "Scope chip height",
+  });
+
+  try {
+    await gotoWorkspace(page, seeded.workspaceId);
+    await page.keyboard.press("Meta+P");
+
+    const panel = page.getByTestId("command-center-panel");
+    await expect(panel).toBeVisible({ timeout: 30_000 });
+    const header = panel.getByTestId("command-center-header");
+    const scoped = await header.boundingBox();
+
+    await page.getByTestId("command-center-files-scope").click();
+    await expect(page.getByTestId("command-center-files-scope")).toHaveCount(0);
+    const unscoped = await header.boundingBox();
+
+    expect(scoped?.height).toBe(unscoped?.height);
+  } finally {
+    await seeded.cleanup();
+  }
+});
+
+test("unscoped command search keeps commands visible and reports file-search failures", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const seeded = await seedMatchingWorkspaces(9);
+
+  try {
+    await failDirectorySuggestionRequests(page);
+    await gotoWorkspace(page, seeded[0].workspaceId);
+    const panel = await openCommandCenter(page);
+    await panel.getByTestId("command-center-input").fill("home");
+
+    await expect(panel.getByRole("button", { name: "Home", exact: true })).toBeVisible();
+    await expect(panel.getByRole("button", { name: /Home failure 08/ })).toBeVisible();
+    await expect(panel.getByTestId("command-center-file-search-error")).toHaveText(
+      "Error: Test file search transport failure.",
+    );
+    await expect(panel.getByTestId("command-center-file-search-error")).toBeInViewport({
+      ratio: 1,
+    });
+    await expect(panel.getByText("No matches", { exact: true })).toHaveCount(0);
+  } finally {
+    await Promise.allSettled(seeded.map((workspace) => workspace.cleanup()));
+  }
+});
@@ -0,0 +1,58 @@
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { openCommandCenter } from "../support/helpers/command-center";
+import { seedWorkspace } from "../support/helpers/seed-client";
+
+const GROUP_BY_STATUS = "Group by status";
+const GROUP_BY_PROJECT = "Group by project";
+
+// Result rows carry no testID of their own, so the entries are addressed by their visible label.
+async function runGroupingEntry(page: Page, label: string, absent: string): Promise<void> {
+  const panel = await openCommandCenter(page);
+  await panel.getByTestId("command-center-input").fill("group");
+
+  const entry = panel.getByText(label, { exact: true });
+  await expect(entry).toBeVisible({ timeout: 30_000 });
+  // The entry always names the mode you are not in, so its opposite must never be listed.
+  await expect(panel.getByText(absent, { exact: true })).toHaveCount(0);
+
+  await entry.click();
+  await expect(page.getByTestId("command-center-panel")).not.toBeVisible({ timeout: 30_000 });
+}
+
+test.describe("Command center sidebar grouping", () => {
+  test.describe.configure({ timeout: 120_000 });
+
+  test("flips sidebar grouping and persists the choice across a reload", async ({ page }) => {
+    const seeded = await seedWorkspace({ repoPrefix: "command-center-grouping-" });
+
+    try {
+      await gotoAppShell(page);
+      const projectList = page.getByTestId("sidebar-project-workspace-list-scroll");
+      const statusList = page.getByTestId("sidebar-status-list-scroll");
+      await expect(projectList).toBeVisible({ timeout: 30_000 });
+
+      // Query-only: the grouping entry stays out of the default empty-query list.
+      const panel = await openCommandCenter(page);
+      await expect(panel.getByText(GROUP_BY_STATUS, { exact: true })).toHaveCount(0);
+      await expect(panel.getByText(GROUP_BY_PROJECT, { exact: true })).toHaveCount(0);
+      await page.keyboard.press("Escape");
+      await expect(panel).not.toBeVisible({ timeout: 30_000 });
+
+      await runGroupingEntry(page, GROUP_BY_STATUS, GROUP_BY_PROJECT);
+      await expect(statusList).toBeVisible({ timeout: 30_000 });
+      await expect(projectList).toHaveCount(0);
+
+      // The only assertion that catches a flip which never reached persisted storage.
+      await page.reload();
+      await expect(statusList).toBeVisible({ timeout: 30_000 });
+
+      // Grouping persists, so the run must leave the sidebar back in project mode.
+      await runGroupingEntry(page, GROUP_BY_PROJECT, GROUP_BY_STATUS);
+      await expect(projectList).toBeVisible({ timeout: 30_000 });
+      await expect(statusList).toHaveCount(0);
+    } finally {
+      await seeded.cleanup().catch(() => undefined);
+    }
+  });
+});
@@ -1,13 +1,13 @@
 import { randomUUID } from "node:crypto";
 import { expect } from "@playwright/test";
-import { test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { createIdleAgent } from "./helpers/archive-tab";
-import { openCommandCenter } from "./helpers/command-center";
-import { addOfflineHostAndReload } from "./helpers/hosts";
-import { expectAgentTabActive } from "./helpers/launcher";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { createIdleAgent } from "../support/helpers/archive-tab";
+import { openCommandCenter } from "../support/helpers/command-center";
+import { addOfflineHostAndReload } from "../support/helpers/hosts";
+import { expectAgentTabActive } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 const PRIMARY_HOST_LABEL = "Primary Host";
 const SECONDARY_HOST_ID = "host-command-center-secondary";
--- a/Show More
+++ b/Show More